arm: dts: omap3: Re-sync DTS files with Linux 4.13-RC5
Subsystems (3)
PATCH v3 1/1 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.
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
--- .../dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi | 45 + arch/arm/dts/logicpd-torpedo-37xx-devkit.dts | 15 +- arch/arm/dts/omap3-cpu-thermal.dtsi | 20 + arch/arm/dts/omap3-u-boot.dtsi | 19 + arch/arm/dts/omap3.dtsi | 1676 +++++----- arch/arm/dts/omap34xx-omap36xx-clocks.dtsi | 448 +-- .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 452 +-- arch/arm/dts/omap36xx-clocks.dtsi | 148 +- arch/arm/dts/omap36xx-omap3430es2plus-clocks.dtsi | 368 +-- arch/arm/dts/omap36xx-u-boot.dtsi | 10 + arch/arm/dts/omap36xx.dtsi | 172 +- arch/arm/dts/omap3xxx-clocks.dtsi | 3292 ++++++++++---------- arch/arm/mach-omap2/omap3/Kconfig | 1 + 13 files changed, 3382 insertions(+), 3284 deletions(-)
arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi new file +45 -0
@@ -0,0 +1,45 @@ +/* + * Copyright (C) 2017 + * Logic PD - http://www.logicpd.com + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/ { + chosen { + stdout-path = &uart1; + }; +}; + +&i2c1 { + clock-frequency = <400000>; +}; + +&i2c2 { + clock-frequency = <400000>; +}; + +&mmc1 { + cd-inverted; +}; + +&mmc2 { + status = "disabled"; +}; + +&mmc3 { + status = "disabled"; +}; + +&uart1 { + reg-shift = <2>; +}; + +&uart2 { + reg-shift = <2>; +}; + +&uart3 { + reg-shift = <2>; +}; +
arch/arm/dts/logicpd-torpedo-37xx-devkit.dts +4 -11
@@ -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 */
arch/arm/dts/omap3-cpu-thermal.dtsi new file +20 -0
@@ -0,0 +1,20 @@ +/* + * Device Tree Source for OMAP3 SoC CPU thermal + * + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of any + * kind, whether express or implied. + */ + +#include <dt-bindings/thermal/thermal.h> + +cpu_thermal: cpu_thermal { + polling-delay-passive = <250>; /* milliseconds */ + polling-delay = <1000>; /* milliseconds */ + coefficients = <0 20000>; + + /* sensor ID */ + thermal-sensors = <&bandgap 0>; +};
arch/arm/dts/omap3-u-boot.dtsi new file +19 -0
@@ -0,0 +1,19 @@ +/* + * Copyright (C) 2017 + * Logic PD - http://www.logicpd.com + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&uart1 { + reg-shift = <2>; +}; + +&uart2 { + reg-shift = <2>; +}; + +&uart3 { + reg-shift = <2>; +}; +
arch/arm/dts/omap3.dtsi +840 -836
1,682 lines not on this page · raw message
arch/arm/dts/omap34xx-omap36xx-clocks.dtsi +224 -224
485 lines not on this page · raw message
arch/arm/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi +226 -226
461 lines not on this page · raw message
arch/arm/dts/omap36xx-clocks.dtsi +74 -74
177 lines not on this page · raw message
arch/arm/dts/omap36xx-omap3430es2plus-clocks.dtsi +184 -184
73 lines not on this page · raw message
arch/arm/dts/omap36xx-u-boot.dtsi new file +10 -0
Lines of this file are not shown. View the raw message.
arch/arm/dts/omap36xx.dtsi +89 -83
172 lines not on this page · raw message
arch/arm/dts/omap3xxx-clocks.dtsi +1646 -1646
3,292 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.7.4
Part of the diff is not shown here. View the raw message.
PATCH v3 1/1 arm: dts: omap3: Re-sync DTS files with Linux 4.13-RC5
Quoted 6 lines · Adam Ford
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.dtsifiles are added.
Quoted 7 lines
Signed-off-by Adam Ford <[email protected]>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.dtsifile.V2: Add the
u-boot.dtsifiles for OMAP3, OMAP36xx, and Torpedo
Remove the need for the second patch in the series
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170913/5aafb8da/attachment.sig>