Commit 3f04e3d3 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

Merge remote-tracking branch 'tip/timers/core/timers/core' into clockevents/3.16

parents 8cffcb0c 2779ac16
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ to deliver its interrupts via SPIs.

- clock-frequency : The frequency of the main counter, in Hz. Optional.

- always-on : a boolean property. If present, the timer is powered through an
  always-on power domain, therefore it never loses context.

Example:

	timer {
+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ gmac0: ethernet@ff700000 {
	interrupt-names = "macirq";
	mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
	clocks = <&emac_0_clk>;
	clocks-names = "stmmaceth";
	clock-names = "stmmaceth";
};
+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Optional properties:
- max-frame-size: See ethernet.txt file in the same directory
- clocks: If present, the first clock should be the GMAC main clock,
  further clocks may be specified in derived bindings.
- clocks-names: One name for each entry in the clocks property, the
- clock-names: One name for each entry in the clocks property, the
  first one should be "stmmaceth".

Examples:
+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ Example:
		reg 		= <0xfe61f080 0x4>;
		reg-names	= "irqmux";
		interrupts 	= <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
		interrupts-names = "irqmux";
		interrupt-names	= "irqmux";
		ranges 		= <0 0xfe610000 0x5000>;

		PIO0: gpio@fe610000 {
@@ -165,7 +165,7 @@ sdhci0:sdhci@fe810000{
	interrupt-parent = <&PIO3>;
	#interrupt-cells = <2>;
	interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */
	interrupts-names = "card-detect";
	interrupt-names = "card-detect";
	pinctrl-names = "default";
	pinctrl-0	= <&pinctrl_mmc>;
};
+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ mcasp0: mcasp0@1d00000 {
	reg = <0x100000 0x3000>;
	reg-names "mpu";
	interrupts = <82>, <83>;
	interrupts-names = "tx", "rx";
	interrupt-names = "tx", "rx";
	op-mode = <0>;		/* MCASP_IIS_MODE */
	tdm-slots = <2>;
	serial-dir = <
Loading