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

Commit 3c10608a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.10/dt-late-signed' of... 

Merge tag 'omap-for-v4.10/dt-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "omap dts changes for v4.10, part 2" from Tony Lindgren:

Second set of device tree changes for omaps for v4.10 merge window:

- Fix up new instances of gpio-key,wakeup to use wakeup-source

- Add beaglebone LCDC blue-and-red-wiring property to make use
  of the new driver features

- Add bindings for IIO support for am335x and am437x

- Add palmas PMIC overide powerhold property for am57xx

- Update am335x-baltos to use phy-handle property

- Add initial support for am571x-idk

* tag 'omap-for-v4.10/dt-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: AM571x-IDK Initial Support
  ARM: dts: am335x-baltos: use phy-phandle declarations
  ARM: dts: am57xx-idk-common: Add overide powerhold property
  ARM: dts: am57xx-beagle-x15-common: Add overide powerhold property
  ARM: dts: am57xx-idk: Add Industrial output support
  ARM: dts: am57xx-idk: Add Industrial input support
  ARM: dts: am437x-idk: Add Industrial output support
  ARM: dts: am437x-idk: Add Industrial input support
  ARM: dts: am335x-icev2: Add ADC support
  ARM: dts: am335x-icev2: Disable Industrial I/O LEDs and fix naming
  ARM: dts: am335x-icev2: Add Industrial input support
  ARM: dts: am335x-boneblack: Add blue-and-red-wiring -property to LCDC node
  ARM: dts: omap5: replace gpio-key,wakeup with wakeup-source property
parents f76d02e2 5817430b

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -175,6 +175,9 @@ Boards: 
- AM5728 IDK

  compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"



- AM5718 IDK

  compatible = "ti,am5718-idk", "ti,am5718", "ti,dra7"



- DRA742 EVM:  Software Development Board for DRA742

  compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7"

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \ 
	am57xx-cl-som-am57x.dtb \

	am57xx-sbc-am57x.dtb \

	am572x-idk.dtb \

	am571x-idk.dtb \

	dra7-evm.dtb \

	dra72-evm.dtb \

	dra72-evm-revc.dtb \

arch/arm/boot/dts/am335x-baltos-ir2110.dts

+8 −2
Original line number Diff line number Diff line
@@ -54,16 +54,22 @@ 
	dr_mode = "host";

};



&davinci_mdio {

	phy0: ethernet-phy@0 {

		reg = <1>;

	};

};



&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

	phy-handle = <&phy0>;

};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <7>;

	phy-mode = "rgmii-txid";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};



&phy_sel {

arch/arm/boot/dts/am335x-baltos-ir3220.dts

+1 −1
Original line number Diff line number Diff line
@@ -109,9 +109,9 @@ 
};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <7>;

	phy-mode = "rgmii-txid";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};



&phy_sel {

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+1 −1
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ 
};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <7>;

	phy-mode = "rgmii-txid";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};



&phy_sel {