Merge tag 'soc-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / ti / omap / omap3-overo-common-lcd43.dtsi

diff --git a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi b/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi
similarity index 96%
rename from arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
rename to arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi
index d95a0e130058cbe7c6ef3c1c3771970f77d48bea..981f02f088f85a79b3e9d38e718de8fcdd09cb1e 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi
@@ -8,7 +8,7 @@
  */
 
 &omap3_pmx_core {
-       dss_dpi_pins: pinmux_dss_dpi_pins {
+       dss_dpi_pins: dss-dpi-pins {
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0)       /* dss_pclk.dss_pclk */
                        OMAP3_CORE1_IOPAD(0x20d6, PIN_OUTPUT | MUX_MODE0)       /* dss_hsync.dss_hsync */
@@ -41,19 +41,19 @@
                >;
        };
 
-       lte430_pins: pinmux_lte430_pins {
+       lte430_pins: lte430-pins {
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x2174, PIN_OUTPUT | MUX_MODE4)       /* uart2_cts.gpio_144 */
                >;
        };
 
-       backlight_pins: pinmux_backlight_pins {
+       backlight_pins: backlight-pins {
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE4)       /* uart2_rts.gpio_145 */
                >;
        };
 
-       mcspi1_pins: pinmux_mcspi1_pins {
+       mcspi1_pins: mcspi1-pins {
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x21c8, PIN_INPUT | MUX_MODE0)        /* mcspi1_clk.mcspi1_clk */
                        OMAP3_CORE1_IOPAD(0x21ca, PIN_INPUT | MUX_MODE0)        /* mcspi1_simo.mcspi1_simo */
@@ -62,7 +62,7 @@
                >;
        };
 
-       ads7846_pins: pinmux_ads7846_pins {
+       ads7846_pins: ads7846-pins {
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x2138, PIN_INPUT_PULLDOWN | MUX_MODE4)       /* csi2_dx1.gpio_114 */
                >;