diff options
| author | Adam Ford <aford173@gmail.com> | 2017-08-25 07:33:26 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-13 09:24:26 -0400 |
| commit | bf1ddfc026f7e27414a303d6c2805e98dc18f4d3 (patch) | |
| tree | adbeda170ac8a99a79c34d1451c303e03c6cac76 /arch/arm/dts/logicpd-torpedo-37xx-devkit.dts | |
| parent | 74cd48e1323658fc79f03b442bb9869ca56c0226 (diff) | |
| download | u-boot-bf1ddfc026f7e27414a303d6c2805e98dc18f4d3.zip u-boot-bf1ddfc026f7e27414a303d6c2805e98dc18f4d3.tar.gz u-boot-bf1ddfc026f7e27414a303d6c2805e98dc18f4d3.tar.bz2 | |
arm: dts: omap3: Re-sync DTS files with Linux 4.13-RC5
The DTS files had some spacing issues and they needed fixing. This
pull re-sync's the OMAP3xx related DTS files with Linux 4.13-RC5.
To keep the DTS and DTSI files clean and in sync with Linux, new
u-boot.dtsi files are added.
Signed-off-by: Adam Ford <aford173@gmail.com>
V3: The resync broke card detect on MMC1 on Logic PD's Torpedo,
so we add the cd-invert to the Torpedo's -u-boot.dtsi file.
V2: Add the u-boot.dtsi files for OMAP3, OMAP36xx, and Torpedo
Remove the need for the second patch in the series
Diffstat (limited to 'arch/arm/dts/logicpd-torpedo-37xx-devkit.dts')
| -rw-r--r-- | arch/arm/dts/logicpd-torpedo-37xx-devkit.dts | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts index de603a4..43e9364 100644 --- a/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts +++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts @@ -14,10 +14,6 @@ model = "LogicPD Zoom DM3730 Torpedo + Wireless Development Kit"; compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3"; - chosen { - stdout-path = &uart1; - }; - gpio_keys { compatible = "gpio-keys"; pinctrl-names = "default"; @@ -196,15 +192,12 @@ interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins &mmc1_cd>; + cd-gpios = <&gpio4 31 IRQ_TYPE_LEVEL_LOW>; /* gpio127 */ vmmc-supply = <&vmmc1>; bus-width = <4>; cap-power-off-card; }; -&mmc2 { - status = "disabled"; -}; - &omap3_pmx_core { gpio_key_pins: pinmux_gpio_key_pins { pinctrl-single,pins = < @@ -256,9 +249,9 @@ OMAP3_CORE1_IOPAD(0x2110, PIN_INPUT | MUX_MODE0) /* cam_xclka.cam_xclka */ OMAP3_CORE1_IOPAD(0x2112, PIN_INPUT | MUX_MODE0) /* cam_pclk.cam_pclk */ - OMAP3_CORE1_IOPAD(0x2114, PIN_INPUT | MUX_MODE0) /* cam_d0.cam_d0 */ - OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0) /* cam_d1.cam_d1 */ - OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0) /* cam_d2.cam_d2 */ + OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0) /* cam_d0.cam_d0 */ + OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0) /* cam_d1.cam_d1 */ + OMAP3_CORE1_IOPAD(0x211a, PIN_INPUT | MUX_MODE0) /* cam_d2.cam_d2 */ OMAP3_CORE1_IOPAD(0x211c, PIN_INPUT | MUX_MODE0) /* cam_d3.cam_d3 */ OMAP3_CORE1_IOPAD(0x211e, PIN_INPUT | MUX_MODE0) /* cam_d4.cam_d4 */ OMAP3_CORE1_IOPAD(0x2120, PIN_INPUT | MUX_MODE0) /* cam_d5.cam_d5 */ |