Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87c7662b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux 

Pull devicetree bug fixes from Grant Likely:
 "These are some important bug fixes that need to get into v3.15.

  This branch contains a pair of important bug fixes for the DT code:

   - Fix some incorrect binding property names before they enter common
     usage

   - Fix bug where some platform devices will be unable to get their
     interrupt number when they depend on an interrupt controller that
     is not available at device creation time.  This is a problem
     causing mainline to fail on a number of ARM platforms"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
  of/irq: do irq resolution in platform_get_irq
  of: selftest: add deferred probe interrupt test
  dt: Fix binding typos in clock-names and interrupt-names
parents 838b4c02 9ec36caf

Documentation/devicetree/bindings/net/socfpga-dwmac.txt

+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";

};

Documentation/devicetree/bindings/net/stmmac.txt

+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:

Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt

+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>;

};

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt

+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 = <

arch/arm/boot/dts/am33xx.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ 
			      <0x46000000 0x400000>;

			reg-names = "mpu", "dat";

			interrupts = <80>, <81>;

			interrupts-names = "tx", "rx";

			interrupt-names = "tx", "rx";

			status = "disabled";

			dmas = <&edma 8>,

				<&edma 9>;
@@ -816,7 +816,7 @@ 
			      <0x46400000 0x400000>;

			reg-names = "mpu", "dat";

			interrupts = <82>, <83>;

			interrupts-names = "tx", "rx";

			interrupt-names = "tx", "rx";

			status = "disabled";

			dmas = <&edma 10>,

				<&edma 11>;