ARM: dts: ux500: Rename generic pin configs according to pin group
authorStephan Gerhold <stephan@gerhold.net>
Mon, 25 Nov 2019 12:22:53 +0000 (13:22 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 9 Dec 2019 13:45:01 +0000 (14:45 +0100)
Some components (e.g. SDI, I2C) can be used with different pin assignments.
Before we can add the alternative configurations, we need to rename the
current configurations to more generic names.

Each pin configuration usually configures one specific pin group.
Therefore we rename the configurations to use the pin group as name.
Make up for the slightly longer names by removing the "_mode" suffix.

Rename all existing uses to use the new labels.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20191125122256.53482-2-stephan@gerhold.net
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/boot/dts/ste-dbx5x0-pinctrl.dtsi
arch/arm/boot/dts/ste-href.dtsi
arch/arm/boot/dts/ste-snowball.dts

index fbc41ca..b3ef91b 100644 (file)
@@ -8,7 +8,7 @@
 &pinctrl {
        /* Settings for all UART default and sleep states */
        uart0 {
-               uart0_default_mode: uart0_default {
+               u0_a_1_default: u0_a_1_default {
                        default_mux {
                                function = "u0";
                                groups = "u0_a_1";
@@ -23,7 +23,7 @@
                        };
                };
 
-               uart0_sleep_mode: uart0_sleep {
+               u0_a_1_sleep: u0_a_1_sleep {
                        sleep_cfg1 {
                                pins = "GPIO0_AJ5", "GPIO2_AH4"; /* CTS+RXD */
                                ste,config = <&slpm_in_wkup_pdis>;
@@ -40,7 +40,7 @@
        };
 
        uart1 {
-               uart1_default_mode: uart1_default {
+               u1rxtx_a_1_default: u1rxtx_a_1_default {
                        default_mux {
                                function = "u1";
                                groups = "u1rxtx_a_1";
@@ -55,7 +55,7 @@
                        };
                };
 
-               uart1_sleep_mode: uart1_sleep {
+               u1rxtx_a_1_sleep: u1rxtx_a_1_sleep {
                        sleep_cfg1 {
                                pins = "GPIO4_AH6"; /* RXD */
                                ste,config = <&slpm_in_wkup_pdis>;
@@ -68,7 +68,7 @@
        };
 
        uart2 {
-               uart2_default_mode: uart2_default {
+               u2rxtx_c_1_default: u2rxtx_c_1_default {
                        default_mux {
                                function = "u2";
                                groups = "u2rxtx_c_1";
@@ -83,7 +83,7 @@
                        };
                };
 
-               uart2_sleep_mode: uart2_sleep {
+               u2rxtx_c_1_sleep: u2rxtx_c_1_sleep {
                        sleep_cfg1 {
                                pins = "GPIO29_W2"; /* RXD */
                                ste,config = <&in_wkup_pdis>;
@@ -97,7 +97,7 @@
 
        /* Settings for all I2C default and sleep states */
        i2c0 {
-               i2c0_default_mode: i2c_default {
+               i2c0_a_1_default: i2c0_a_1_default {
                        default_mux {
                                function = "i2c0";
                                groups = "i2c0_a_1";
                        };
                };
 
-               i2c0_sleep_mode: i2c_sleep {
+               i2c0_a_1_sleep: i2c0_a_1_sleep {
                        sleep_cfg1 {
                                pins = "GPIO147_C15", "GPIO148_B16"; /* SDA/SCL */
                                ste,config = <&slpm_in_wkup_pdis>;
        };
 
        i2c1 {
-               i2c1_default_mode: i2c_default {
+               i2c1_b_2_default: i2c1_b_2_default {
                        default_mux {
                                function = "i2c1";
                                groups = "i2c1_b_2";
                        };
                };
 
-               i2c1_sleep_mode: i2c_sleep {
+               i2c1_b_2_sleep: i2c1_b_2_sleep {
                        sleep_cfg1 {
                                pins = "GPIO16_AD3", "GPIO17_AD4"; /* SDA/SCL */
                                ste,config = <&slpm_in_wkup_pdis>;
        };
 
        i2c2 {
-               i2c2_default_mode: i2c_default {
+               i2c2_b_2_default: i2c2_b_2_default {
                        default_mux {
                                function = "i2c2";
                                groups = "i2c2_b_2";
                        };
                };
 
-               i2c2_sleep_mode: i2c_sleep {
+               i2c2_b_2_sleep: i2c2_b_2_sleep {
                        sleep_cfg1 {
                                pins = "GPIO10_AF5", "GPIO11_AG4"; /* SDA/SCL */
                                ste,config = <&slpm_in_wkup_pdis>;
        };
 
        i2c3 {
-               i2c3_default_mode: i2c_default {
+               i2c3_c_2_default: i2c3_c_2_default {
                        default_mux {
                                function = "i2c3";
                                groups = "i2c3_c_2";
                        };
                };
 
-               i2c3_sleep_mode: i2c_sleep {
+               i2c3_c_2_sleep: i2c3_c_2_sleep {
                        sleep_cfg1 {
                                pins = "GPIO229_AG7", "GPIO230_AF7"; /* SDA/SCL */
                                ste,config = <&slpm_in_wkup_pdis>;
         * enable I2C4 and UART1 at the same time.
         */
        i2c4 {
-               i2c4_default_mode: i2c_default {
+               i2c4_b_1_default: i2c4_b_1_default {
                        default_mux {
                                function = "i2c4";
                                groups = "i2c4_b_1";
                        };
                };
 
-               i2c4_sleep_mode: i2c_sleep {
+               i2c4_b_1_sleep: i2c4_b_1_sleep {
                        sleep_cfg1 {
                                pins = "GPIO4_AH6", "GPIO5_AG6"; /* SDA/SCL */
                                ste,config = <&slpm_in_wkup_pdis>;
        /* Settings for all MMC/SD/SDIO default and sleep states */
        sdi0 {
                /* This is the external SD card slot, 4 bits wide */
-               sdi0_default_mode: sdi0_default {
+               mc0_a_1_default: mc0_a_1_default {
                        default_mux {
                                function = "mc0";
                                groups = "mc0_a_1";
                        };
                };
 
-               sdi0_sleep_mode: sdi0_sleep {
+               mc0_a_1_sleep: mc0_a_1_sleep {
                        sleep_cfg1 {
                                pins =
                                "GPIO18_AC2", /* CMDDIR */
 
        sdi1 {
                /* This is the WLAN SDIO 4 bits wide */
-               sdi1_default_mode: sdi1_default {
+               mc1_a_1_default: mc1_a_1_default {
                        default_mux {
                                function = "mc1";
                                groups = "mc1_a_1";
                        };
                };
 
-               sdi1_sleep_mode: sdi1_sleep {
+               mc1_a_1_sleep: mc1_a_1_sleep {
                        sleep_cfg1 {
                                pins = "GPIO208_AH16"; /* CLK */
                                ste,config = <&slpm_out_lo_wkup_pdis>;
 
        sdi2 {
                /* This is the eMMC 8 bits wide, usually PoP eMMC */
-               sdi2_default_mode: sdi2_default {
+               mc2_a_1_default: mc2_a_1_default {
                        default_mux {
                                function = "mc2";
                                groups = "mc2_a_1";
                        };
                };
 
-               sdi2_sleep_mode: sdi2_sleep {
+               mc2_a_1_sleep: mc2_a_1_sleep {
                        sleep_cfg1 {
                                pins = "GPIO128_A5"; /* CLK */
                                ste,config = <&out_lo_wkup_pdis>;
 
        sdi4 {
                /* This is the eMMC 8 bits wide, usually PCB-mounted eMMC */
-               sdi4_default_mode: sdi4_default {
+               mc4_a_1_default: mc4_a_1_default {
                        default_mux {
                                function = "mc4";
                                groups = "mc4_a_1";
                        };
                };
 
-               sdi4_sleep_mode: sdi4_sleep {
+               mc4_a_1_sleep: mc4_a_1_sleep {
                        sleep_cfg1 {
                                pins = "GPIO203_AE23"; /* CLK */
                                ste,config = <&out_lo_wkup_pdis>;
         * cannot be muxed onto any pins.
         */
        msp0 {
-               msp0_default_mode: msp0_default {
+               msp0txrxtfstck_a_1_default: msp0txrxtfstck_a_1_default {
                        default_msp0_mux {
                                function = "msp0";
                                groups = "msp0txrx_a_1", "msp0tfstck_a_1";
        };
 
        msp1 {
-               msp1_default_mode: msp1_default {
+               msp1txrx_a_1_default: msp1txrx_a_1_default {
                        default_mux {
                                function = "msp1";
                                groups = "msp1txrx_a_1", "msp1_a_1";
        };
 
        msp2 {
-               msp2_default_mode: msp2_default {
+               msp2_a_1_default: msp2_a_1_default {
                        /* MSP2 usually used for HDMI audio */
                        default_mux {
                                function = "msp2";
        };
 
        musb {
-               musb_default_mode: musb_default {
+               usb_a_1_default: usb_a_1_default {
                        default_mux {
                                function = "usb";
                                groups = "usb_a_1";
                        };
                };
 
-               musb_sleep_mode: musb_sleep {
+               usb_a_1_sleep: usb_a_1_sleep {
                        sleep_cfg1 {
                                pins =
                                "GPIO256_AF28", /* NXT */
index 4f6acbd..7613a40 100644 (file)
        soc {
                uart@80120000 {
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&uart0_default_mode>;
-                       pinctrl-1 = <&uart0_sleep_mode>;
+                       pinctrl-0 = <&u0_a_1_default>;
+                       pinctrl-1 = <&u0_a_1_sleep>;
                        status = "okay";
                };
 
                /* This UART is unused and thus left disabled */
                uart@80121000 {
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&uart1_default_mode>;
-                       pinctrl-1 = <&uart1_sleep_mode>;
+                       pinctrl-0 = <&u1rxtx_a_1_default>;
+                       pinctrl-1 = <&u1rxtx_a_1_sleep>;
                };
 
                uart@80007000 {
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&uart2_default_mode>;
-                       pinctrl-1 = <&uart2_sleep_mode>;
+                       pinctrl-0 = <&u2rxtx_c_1_default>;
+                       pinctrl-1 = <&u2rxtx_c_1_sleep>;
                        status = "okay";
                };
 
                i2c@80004000 {
                        pinctrl-names = "default","sleep";
-                       pinctrl-0 = <&i2c0_default_mode>;
-                       pinctrl-1 = <&i2c0_sleep_mode>;
+                       pinctrl-0 = <&i2c0_a_1_default>;
+                       pinctrl-1 = <&i2c0_a_1_sleep>;
                };
 
                i2c@80122000 {
                        pinctrl-names = "default","sleep";
-                       pinctrl-0 = <&i2c1_default_mode>;
-                       pinctrl-1 = <&i2c1_sleep_mode>;
+                       pinctrl-0 = <&i2c1_b_2_default>;
+                       pinctrl-1 = <&i2c1_b_2_sleep>;
                };
 
                i2c@80128000 {
                        pinctrl-names = "default","sleep";
-                       pinctrl-0 = <&i2c2_default_mode>;
-                       pinctrl-1 = <&i2c2_sleep_mode>;
+                       pinctrl-0 = <&i2c2_b_2_default>;
+                       pinctrl-1 = <&i2c2_b_2_sleep>;
                        lp5521@33 {
                                compatible = "national,lp5521";
                                reg = <0x33>;
@@ -96,8 +96,8 @@
 
                i2c@80110000 {
                        pinctrl-names = "default","sleep";
-                       pinctrl-0 = <&i2c3_default_mode>;
-                       pinctrl-1 = <&i2c3_sleep_mode>;
+                       pinctrl-0 = <&i2c3_c_2_default>;
+                       pinctrl-1 = <&i2c3_c_2_sleep>;
                };
 
                /* ST6G3244ME level translator for 1.8/2.9 V */
                        vmmc-supply = <&ab8500_ldo_aux3_reg>;
                        vqmmc-supply = <&vmmci>;
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&sdi0_default_mode>;
-                       pinctrl-1 = <&sdi0_sleep_mode>;
+                       pinctrl-0 = <&mc0_a_1_default &sdi0_default_mode>;
+                       pinctrl-1 = <&mc0_a_1_sleep>;
 
                        status = "okay";
                };
                        bus-width = <4>;
                        non-removable;
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&sdi1_default_mode>;
-                       pinctrl-1 = <&sdi1_sleep_mode>;
+                       pinctrl-0 = <&mc1_a_1_default>;
+                       pinctrl-1 = <&mc1_a_1_sleep>;
 
                        status = "okay";
                };
                        non-removable;
                        vmmc-supply = <&db8500_vsmps2_reg>;
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&sdi2_default_mode>;
-                       pinctrl-1 = <&sdi2_sleep_mode>;
+                       pinctrl-0 = <&mc2_a_1_default>;
+                       pinctrl-1 = <&mc2_a_1_sleep>;
 
                        status = "okay";
                };
                        non-removable;
                        vmmc-supply = <&ab8500_ldo_aux2_reg>;
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&sdi4_default_mode>;
-                       pinctrl-1 = <&sdi4_sleep_mode>;
+                       pinctrl-0 = <&mc4_a_1_default>;
+                       pinctrl-1 = <&mc4_a_1_sleep>;
 
                        status = "okay";
                };
 
                msp0: msp@80123000 {
                        pinctrl-names = "default";
-                       pinctrl-0 = <&msp0_default_mode>;
+                       pinctrl-0 = <&msp0txrxtfstck_a_1_default>;
                        status = "okay";
                };
 
                msp1: msp@80124000 {
                        pinctrl-names = "default";
-                       pinctrl-0 = <&msp1_default_mode>;
+                       pinctrl-0 = <&msp1txrx_a_1_default>;
                        status = "okay";
                };
 
                msp2: msp@80117000 {
                        pinctrl-names = "default";
-                       pinctrl-0 = <&msp2_default_mode>;
+                       pinctrl-0 = <&msp2_a_1_default>;
                };
 
                msp3: msp@80125000 {
 
                                ab8500_usb {
                                        pinctrl-names = "default", "sleep";
-                                       pinctrl-0 = <&musb_default_mode>;
-                                       pinctrl-1 = <&musb_sleep_mode>;
+                                       pinctrl-0 = <&usb_a_1_default>;
+                                       pinctrl-1 = <&usb_a_1_sleep>;
                                };
 
                                ab8500-regulators {
                        };
                };
 
+               pinctrl {
+                       sdi0 {
+                               sdi0_default_mode: sdi0_default {
+                                       /* Some boards set additional settings here */
+                               };
+                       };
+               };
+
                mcde@a0350000 {
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&lcd_default_mode>;
index 566b35a..8b80dcd 100644 (file)
 
                msp0: msp@80123000 {
                        pinctrl-names = "default";
-                       pinctrl-0 = <&msp0_default_mode>;
+                       pinctrl-0 = <&msp0txrxtfstck_a_1_default>;
                        status = "okay";
                };
 
                msp1: msp@80124000 {
                        pinctrl-names = "default";
-                       pinctrl-0 = <&msp1_default_mode>;
+                       pinctrl-0 = <&msp1txrx_a_1_default>;
                        status = "okay";
                };
 
                msp2: msp@80117000 {
                        pinctrl-names = "default";
-                       pinctrl-0 = <&msp2_default_mode>;
+                       pinctrl-0 = <&msp2_a_1_default>;
                };
 
                msp3: msp@80125000 {
                        vmmc-supply = <&ab8500_ldo_aux3_reg>;
                        vqmmc-supply = <&vmmci>;
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&sdi0_default_mode>;
-                       pinctrl-1 = <&sdi0_sleep_mode>;
+                       pinctrl-0 = <&mc0_a_1_default &sdi0_default_mode>;
+                       pinctrl-1 = <&mc0_a_1_sleep>;
 
                        /* GPIO218 MMC_CD */
                        cd-gpios  = <&gpio6 26 GPIO_ACTIVE_LOW>;
                        max-frequency = <100000000>;
                        bus-width = <4>;
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&sdi1_default_mode>;
-                       pinctrl-1 = <&sdi1_sleep_mode>;
+                       pinctrl-0 = <&mc1_a_1_default>;
+                       pinctrl-1 = <&mc1_a_1_sleep>;
 
                        status = "okay";
                };
                sdi2_per3@80005000 {
                        arm,primecell-periphid = <0x10480180>;
                        pinctrl-names = "default";
-                       pinctrl-0 = <&sdi2_sleep_mode>;
+                       pinctrl-0 = <&mc2_a_1_sleep>;
 
                        status = "okay";
                };
                        cap-mmc-highspeed;
                        vmmc-supply = <&ab8500_ldo_aux2_reg>;
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&sdi4_default_mode>;
-                       pinctrl-1 = <&sdi4_sleep_mode>;
+                       pinctrl-0 = <&mc4_a_1_default>;
+                       pinctrl-1 = <&mc4_a_1_sleep>;
 
                        status = "okay";
                };
 
                uart@80120000 {
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&uart0_default_mode>;
-                       pinctrl-1 = <&uart0_sleep_mode>;
+                       pinctrl-0 = <&u0_a_1_default>;
+                       pinctrl-1 = <&u0_a_1_sleep>;
                        status = "okay";
                };
 
                /* This UART is unused and thus left disabled */
                uart@80121000 {
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&uart1_default_mode>;
-                       pinctrl-1 = <&uart1_sleep_mode>;
+                       pinctrl-0 = <&u1rxtx_a_1_default>;
+                       pinctrl-1 = <&u1rxtx_a_1_sleep>;
                };
 
                uart@80007000 {
                        pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&uart2_default_mode>;
-                       pinctrl-1 = <&uart2_sleep_mode>;
+                       pinctrl-0 = <&u2rxtx_c_1_default>;
+                       pinctrl-1 = <&u2rxtx_c_1_sleep>;
                        status = "okay";
                };
 
                i2c@80004000 {
                        pinctrl-names = "default","sleep";
-                       pinctrl-0 = <&i2c0_default_mode>;
-                       pinctrl-1 = <&i2c0_sleep_mode>;
+                       pinctrl-0 = <&i2c0_a_1_default>;
+                       pinctrl-1 = <&i2c0_a_1_sleep>;
                };
 
                i2c@80122000 {
                        pinctrl-names = "default","sleep";
-                       pinctrl-0 = <&i2c1_default_mode>;
-                       pinctrl-1 = <&i2c1_sleep_mode>;
+                       pinctrl-0 = <&i2c1_b_2_default>;
+                       pinctrl-1 = <&i2c1_b_2_sleep>;
                };
 
                i2c@80128000 {
                        pinctrl-names = "default","sleep";
-                       pinctrl-0 = <&i2c2_default_mode>;
-                       pinctrl-1 = <&i2c2_sleep_mode>;
+                       pinctrl-0 = <&i2c2_b_2_default>;
+                       pinctrl-1 = <&i2c2_b_2_sleep>;
                        lsm303dlh@18 {
                                /* Accelerometer */
                                compatible = "st,lsm303dlh-accel";
 
                i2c@80110000 {
                        pinctrl-names = "default","sleep";
-                       pinctrl-0 = <&i2c3_default_mode>;
-                       pinctrl-1 = <&i2c3_sleep_mode>;
+                       pinctrl-0 = <&i2c3_c_2_default>;
+                       pinctrl-1 = <&i2c3_c_2_sleep>;
                };
 
                spi@80002000 {
 
                                ab8500_usb {
                                        pinctrl-names = "default", "sleep";
-                                       pinctrl-0 = <&musb_default_mode>;
-                                       pinctrl-1 = <&musb_sleep_mode>;
+                                       pinctrl-0 = <&usb_a_1_default>;
+                                       pinctrl-1 = <&usb_a_1_sleep>;
                                };
 
                                ext_regulators: ab8500-ext-regulators {