Commit f5196776 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.16/dt-part2-v2' of... 

Merge tag 'omap-for-v3.16/dt-part2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "ARM: omap dt changes for v3.16 merge window, part 2" From Tony Lindgren:

Device tree related changes for omaps.

* tag 'omap-for-v3.16/dt-part2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (49 commits)
  ARM: dts: Enable mcpdm and mcbsp1 on DuoVero
  ARM: dts: Convert DuoVero Parlor to use IOPAD macro
  ARM: dts: am43xx: fix starting offset of NAND.filesystem MTD partition
  ARM: dts: dra7: add support for parallel NAND flash
  ARM: dts: am437x-gp-evm: Add ethernet support for GP EVM
  ARM: dts: am4372: Add cpsw phy sel dt node
  ARM: OMAP2+: Use pdata quirks for wl12xx on VAR-STK/DVK-OM44
  ARM: dts: Add VAR-SOM-OM44 WLAN nodes
  ARM: dts: Add support for OMAP4 VAR-DVK-OM44
  ARM: dts: Add support for OMAP4 Variscite OM44 family
  ARM: dts: Change IOPAD macro's for OMAP4/5
  ARM: dts: AM33XX: fix ethernet and mdio default state
  ARM: dts: am4372: Add hdq device tree data
  ARM: omap2+: skip device build from platform code for dt
  dts: dra7-evm: add USB support
  ARM: dts: dra7: Add USB related nodes
  ARM: dts: dra7-clock: Add "l3init_960m_gfclk" clock gate
  ARM: dts: omap4+: Add clocks to USB2 PHY node
  ARM: dts: dra7: add OCP2SCP3 and SATA nodes
  ARM: dts: omap5: add sata node
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 805e55d5 d712ff63

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

+15 −3
Original line number Diff line number Diff line
@@ -80,7 +80,10 @@ SoCs: 
  compatible = "ti,omap5432", "ti,omap5"



- DRA742

  compatible = "ti,dra7xx", "ti,dra7"

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



- DRA722

  compatible = "ti,dra722", "ti,dra72", "ti,dra7"



- AM4372

  compatible = "ti,am4372", "ti,am43"
@@ -102,6 +105,12 @@ Boards: 
- OMAP4 DuoVero with Parlor : Commercial expansion board with daughter board

  compatible = "gumstix,omap4-duovero-parlor", "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";



- OMAP4 VAR-STK-OM44 : Commercial dev kit with VAR-OM44CustomBoard and VAR-SOM-OM44 w/WLAN

  compatible = "variscite,var-stk-om44", "variscite,var-som-om44", "ti,omap4460", "ti,omap4";



- OMAP4 VAR-DVK-OM44 : Commercial dev kit with VAR-OM44CustomBoard, VAR-SOM-OM44 w/WLAN and LCD touchscreen

  compatible = "variscite,var-dvk-om44", "variscite,var-som-om44", "ti,omap4460", "ti,omap4";



- OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x

  compatible = "ti,omap3-evm", "ti,omap3"
@@ -120,5 +129,8 @@ Boards: 
- AM437x GP EVM

  compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"



- DRA7 EVM:  Software Developement Board for DRA7XX

  compatible = "ti,dra7-evm", "ti,dra7"
 
- DRA742 EVM:  Software Developement Board for DRA742

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



- DRA722 EVM: Software Development Board for DRA722

  compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"

Documentation/devicetree/bindings/usb/omap-usb.txt

+3 −1
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ Board specific device node entry 
};



OMAP DWC3 GLUE

 - compatible : Should be "ti,dwc3"

 - compatible : Should be

	* "ti,dwc3" for OMAP5 and DRA7

	* "ti,am437x-dwc3" for AM437x

 - ti,hwmods : Should be "usb_otg_ss"

 - reg : Address and length of the register set for the device.

 - interrupts : The irq number of this device that is used to interrupt the

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ toshiba Toshiba Corporation 
toumaz	Toumaz

usi	Universal Scientifc Industrial Co., Ltd.

v3	V3 Semiconductor

variscite	Variscite Ltd.

via	VIA Technologies, Inc.

voipac	Voipac Technologies s.r.o.

winbond Winbond Electronics corp.

arch/arm/boot/dts/Makefile

+36 −32
Original line number Diff line number Diff line
@@ -239,65 +239,69 @@ dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb 
dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \

	nspire-tp.dtb \

	nspire-clp.dtb

dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \

	omap2430-sdp.dtb \

dtb-$(CONFIG_ARCH_OMAP2) += omap2420-h4.dtb \

	omap2420-n800.dtb \

	omap2420-n810.dtb \

	omap2420-n810-wimax.dtb \

	omap2430-sdp.dtb

dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \

	am3517-evm.dtb \

	am3517_mt_ventoux.dtb \

	omap3430-sdp.dtb \

	omap3-beagle.dtb \

	omap3-beagle-xm.dtb \

	omap3-beagle-xm-ab.dtb \

	omap3-cm-t3517.dtb \

	omap3-sbc-t3517.dtb \

	omap3-cm-t3530.dtb \

	omap3-sbc-t3530.dtb \

	omap3-cm-t3730.dtb \

	omap3-sbc-t3730.dtb \

	omap3-devkit8000.dtb \

	omap3-beagle-xm.dtb \

	omap3-beagle-xm-ab.dtb \

	omap3-evm.dtb \

	omap3-evm-37xx.dtb \

	omap3-gta04.dtb \

	omap3-igep0020.dtb \

	omap3-igep0030.dtb \

	omap3-ldp.dtb \

	omap3-lilly-dbb056.dtb \

	omap3-n900.dtb \

	omap3-n9.dtb \

	omap3-n950.dtb \

	omap3-overo-alto35.dtb \

	omap3-overo-storm-alto35.dtb \

	omap3-overo-chestnut43.dtb \

	omap3-overo-storm-chestnut43.dtb \

	omap3-overo-gallop43.dtb \

	omap3-overo-storm-gallop43.dtb \

	omap3-overo-palo43.dtb \

	omap3-overo-storm-alto35.dtb \

	omap3-overo-storm-chestnut43.dtb \

	omap3-overo-storm-gallop43.dtb \

	omap3-overo-storm-palo43.dtb \

	omap3-overo-summit.dtb \

	omap3-overo-storm-summit.dtb \

	omap3-overo-tobi.dtb \

	omap3-overo-storm-tobi.dtb \

	omap3-gta04.dtb \

	omap3-igep0020.dtb \

	omap3-igep0030.dtb \

	omap3-lilly-dbb056.dtb \

	omap3-zoom3.dtb \

	omap4-duovero-parlor.dtb \

	omap3-overo-summit.dtb \

	omap3-overo-tobi.dtb \

	omap3-sbc-t3517.dtb \

	omap3-sbc-t3530.dtb \

	omap3-sbc-t3730.dtb \

	omap3-zoom3.dtb

dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \

	am335x-bone.dtb \

	am335x-boneblack.dtb \

	am335x-evm.dtb \

	am335x-evmsk.dtb \

	am335x-nano.dtb

dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \

	omap4-panda.dtb \

	omap4-panda-a4.dtb \

	omap4-panda-es.dtb \

	omap4-var-som.dtb \

	omap4-sdp.dtb \

	omap4-sdp-es23plus.dtb \

	omap5-uevm.dtb \

	am335x-evm.dtb \

	am335x-evmsk.dtb \

	am335x-bone.dtb \

	am335x-boneblack.dtb \

	am335x-nano.dtb \

	am335x-base0033.dtb \

	am3517-craneboard.dtb \

	am3517-evm.dtb \

	am3517_mt_ventoux.dtb \

	am43x-epos-evm.dtb \

	am437x-gp-evm.dtb \

	dra7-evm.dtb

	omap4-var-dvk-om44.dtb \

	omap4-var-stk-om44.dtb

dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \

	am437x-gp-evm.dtb

dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \

	omap5-sbc-t54.dtb \

	omap5-uevm.dtb

dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \

	dra72-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \

	orion5x-lacie-ethernet-disk-mini-v2.dtb \

	orion5x-maxtor-shared-storage-2.dtb \

arch/arm/boot/dts/am335x-bone-common.dtsi

+21 −20
Original line number Diff line number Diff line
@@ -182,32 +182,32 @@ 


&usb {

	status = "okay";

};



	control@44e10620 {

&usb_ctrl_mod {

	status = "okay";

};



	usb-phy@47401300 {

&usb0_phy {

	status = "okay";

};



	usb-phy@47401b00 {

&usb1_phy {

	status = "okay";

};



	usb@47401000 {

&usb0 {

	status = "okay";

};



	usb@47401800 {

&usb1 {

	status = "okay";

	dr_mode = "host";

};



	dma-controller@47402000  {

&cppi41dma  {

	status = "okay";

};

};



&i2c0 {

	pinctrl-names = "default";
@@ -280,13 +280,14 @@ 
	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;



	status = "okay";

};



&davinci_mdio {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";

};



&mmc1 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE