lcd: unify lcd pinmux usage in dts [1/1]

PD#SWPL-3294

Problem:
unify lcd pinmux usage in dts

Solution:
change lcd pinmux usage to be recommend by linux upstream

Verify:
verify by t962x_r311

Change-Id: I7069b5272fa779575a8111b12a3ed835ab72cd02
Signed-off-by: Shaochan Liu <shaochan.liu@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index 880e7a5..c3d094f 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -1567,7 +1567,7 @@
        /*lcd_extern*/
        lcd_extern_off_pins:lcd_extern_off_pin {
                mux {
-                       pins = "GPIOH_2",
+                       groups = "GPIOH_2",
                                "GPIOH_3";
                        function = "gpio_periphs";
                        /*output-high;*/
@@ -1579,50 +1579,50 @@
        /*backlight*/
        bl_pwm_on_pins:bl_pwm_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_vs_on_pins:bl_pwm_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_off_pins:bl_pwm_off_pin {
                mux {
-                       pins = "GPIOZ_6";
+                       groups = "GPIOZ_6";
                        function = "gpio_periphs";
                        output-low;
                };
        };
        bl_pwm_combo_0_on_pins:bl_pwm_combo_0_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_combo_1_on_pins:bl_pwm_combo_1_on_pin {
                mux {
-                       pins = "pwm_c_z";
+                       groups = "pwm_c_z";
                        function = "pwm_c";
                };
        };
        bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z7";
+                       groups = "pwm_vs_z7";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_off_pins:bl_pwm_combo_off_pin {
                mux {
-                       pins = "GPIOZ_6",
+                       groups = "GPIOZ_6",
                                "GPIOZ_7";
                        function = "gpio_periphs";
                        output-low;

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index 09477ca..5a3c4a4 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -1564,7 +1564,7 @@
        /*lcd_extern*/
        lcd_extern_off_pins:lcd_extern_off_pin {
                mux {
-                       pins = "GPIOH_2",
+                       groups = "GPIOH_2",
                                "GPIOH_3";
                        function = "gpio_periphs";
                        /*output-high;*/
@@ -1576,50 +1576,50 @@
        /*backlight*/
        bl_pwm_on_pins:bl_pwm_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_vs_on_pins:bl_pwm_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_off_pins:bl_pwm_off_pin {
                mux {
-                       pins = "GPIOZ_6";
+                       groups = "GPIOZ_6";
                        function = "gpio_periphs";
                        output-low;
                };
        };
        bl_pwm_combo_0_on_pins:bl_pwm_combo_0_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_combo_1_on_pins:bl_pwm_combo_1_on_pin {
                mux {
-                       pins = "pwm_c_z";
+                       groups = "pwm_c_z";
                        function = "pwm_c";
                };
        };
        bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z7";
+                       groups = "pwm_vs_z7";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_off_pins:bl_pwm_combo_off_pin {
                mux {
-                       pins = "GPIOZ_6",
+                       groups = "GPIOZ_6",
                                "GPIOZ_7";
                        function = "gpio_periphs";
                        output-low;

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index 3ea9f13..e8d4868 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -1553,7 +1553,7 @@
        /*lcd_extern*/
        lcd_extern_off_pins:lcd_extern_off_pin {
                mux {
-                       pins = "GPIOH_2",
+                       groups = "GPIOH_2",
                                "GPIOH_3";
                        function = "gpio_periphs";
                        /*output-high;*/
@@ -1565,50 +1565,50 @@
        /*backlight*/
        bl_pwm_on_pins:bl_pwm_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_vs_on_pins:bl_pwm_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_off_pins:bl_pwm_off_pin {
                mux {
-                       pins = "GPIOZ_6";
+                       groups = "GPIOZ_6";
                        function = "gpio_periphs";
                        output-low;
                };
        };
        bl_pwm_combo_0_on_pins:bl_pwm_combo_0_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_combo_1_on_pins:bl_pwm_combo_1_on_pin {
                mux {
-                       pins = "pwm_c_z";
+                       groups = "pwm_c_z";
                        function = "pwm_c";
                };
        };
        bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z7";
+                       groups = "pwm_vs_z7";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_off_pins:bl_pwm_combo_off_pin {
                mux {
-                       pins = "GPIOZ_6",
+                       groups = "GPIOZ_6",
                                "GPIOZ_7";
                        function = "gpio_periphs";
                        output-low;

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
index ba553a1..ab3ab7f 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts
@@ -1567,7 +1567,7 @@
        /*lcd_extern*/
        lcd_extern_off_pins:lcd_extern_off_pin {
                mux {
-                       pins = "GPIOH_2",
+                       groups = "GPIOH_2",
                                "GPIOH_3";
                        function = "gpio_periphs";
                        /*output-high;*/
@@ -1579,50 +1579,50 @@
        /*backlight*/
        bl_pwm_on_pins:bl_pwm_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_vs_on_pins:bl_pwm_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_off_pins:bl_pwm_off_pin {
                mux {
-                       pins = "GPIOZ_6";
+                       groups = "GPIOZ_6";
                        function = "gpio_periphs";
                        output-low;
                };
        };
        bl_pwm_combo_0_on_pins:bl_pwm_combo_0_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_combo_1_on_pins:bl_pwm_combo_1_on_pin {
                mux {
-                       pins = "pwm_c_z";
+                       groups = "pwm_c_z";
                        function = "pwm_c";
                };
        };
        bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z7";
+                       groups = "pwm_vs_z7";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_off_pins:bl_pwm_combo_off_pin {
                mux {
-                       pins = "GPIOZ_6",
+                       groups = "GPIOZ_6",
                                "GPIOZ_7";
                        function = "gpio_periphs";
                        output-low;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index 6b8c7e5..a7a196e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -1555,7 +1555,7 @@
        /*lcd_extern*/
        lcd_extern_off_pins:lcd_extern_off_pin {
                mux {
-                       pins = "GPIOH_2",
+                       groups = "GPIOH_2",
                                "GPIOH_3";
                        function = "gpio_periphs";
                        /*output-high;*/
@@ -1567,50 +1567,50 @@
        /*backlight*/
        bl_pwm_on_pins:bl_pwm_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_vs_on_pins:bl_pwm_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_off_pins:bl_pwm_off_pin {
                mux {
-                       pins = "GPIOZ_6";
+                       groups = "GPIOZ_6";
                        function = "gpio_periphs";
                        output-low;
                };
        };
        bl_pwm_combo_0_on_pins:bl_pwm_combo_0_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_combo_1_on_pins:bl_pwm_combo_1_on_pin {
                mux {
-                       pins = "pwm_c_z";
+                       groups = "pwm_c_z";
                        function = "pwm_c";
                };
        };
        bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z7";
+                       groups = "pwm_vs_z7";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_off_pins:bl_pwm_combo_off_pin {
                mux {
-                       pins = "GPIOZ_6",
+                       groups = "GPIOZ_6",
                                "GPIOZ_7";
                        function = "gpio_periphs";
                        output-low;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index d02cc3c..ad07f80 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -1561,7 +1561,7 @@
        /*lcd_extern*/
        lcd_extern_off_pins:lcd_extern_off_pin {
                mux {
-                       pins = "GPIOH_2",
+                       groups = "GPIOH_2",
                                "GPIOH_3";
                        function = "gpio_periphs";
                        /*output-high;*/
@@ -1573,50 +1573,50 @@
        /*backlight*/
        bl_pwm_on_pins:bl_pwm_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_vs_on_pins:bl_pwm_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_off_pins:bl_pwm_off_pin {
                mux {
-                       pins = "GPIOZ_6";
+                       groups = "GPIOZ_6";
                        function = "gpio_periphs";
                        output-low;
                };
        };
        bl_pwm_combo_0_on_pins:bl_pwm_combo_0_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_combo_1_on_pins:bl_pwm_combo_1_on_pin {
                mux {
-                       pins = "pwm_c_z";
+                       groups = "pwm_c_z";
                        function = "pwm_c";
                };
        };
        bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z7";
+                       groups = "pwm_vs_z7";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_off_pins:bl_pwm_combo_off_pin {
                mux {
-                       pins = "GPIOZ_6",
+                       groups = "GPIOZ_6",
                                "GPIOZ_7";
                        function = "gpio_periphs";
                        output-low;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index a1d132e..0e7b1f5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -1553,7 +1553,7 @@
        /*lcd_extern*/
        lcd_extern_off_pins:lcd_extern_off_pin {
                mux {
-                       pins = "GPIOH_2",
+                       groups = "GPIOH_2",
                                "GPIOH_3";
                        function = "gpio_periphs";
                        /*output-high;*/
@@ -1565,50 +1565,50 @@
        /*backlight*/
        bl_pwm_on_pins:bl_pwm_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_vs_on_pins:bl_pwm_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_off_pins:bl_pwm_off_pin {
                mux {
-                       pins = "GPIOZ_6";
+                       groups = "GPIOZ_6";
                        function = "gpio_periphs";
                        output-low;
                };
        };
        bl_pwm_combo_0_on_pins:bl_pwm_combo_0_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_combo_1_on_pins:bl_pwm_combo_1_on_pin {
                mux {
-                       pins = "pwm_c_z";
+                       groups = "pwm_c_z";
                        function = "pwm_c";
                };
        };
        bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z7";
+                       groups = "pwm_vs_z7";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_off_pins:bl_pwm_combo_off_pin {
                mux {
-                       pins = "GPIOZ_6",
+                       groups = "GPIOZ_6",
                                "GPIOZ_7";
                        function = "gpio_periphs";
                        output-low;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
index d97d59a..706cd74 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts
@@ -1556,7 +1556,7 @@
        /*lcd_extern*/
        lcd_extern_off_pins:lcd_extern_off_pin {
                mux {
-                       pins = "GPIOH_2",
+                       groups = "GPIOH_2",
                                "GPIOH_3";
                        function = "gpio_periphs";
                        /*output-high;*/
@@ -1568,50 +1568,50 @@
        /*backlight*/
        bl_pwm_on_pins:bl_pwm_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_vs_on_pins:bl_pwm_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_off_pins:bl_pwm_off_pin {
                mux {
-                       pins = "GPIOZ_6";
+                       groups = "GPIOZ_6";
                        function = "gpio_periphs";
                        output-low;
                };
        };
        bl_pwm_combo_0_on_pins:bl_pwm_combo_0_on_pin {
                mux {
-                       pins = "pwm_b";
+                       groups = "pwm_b";
                        function = "pwm_b";
                };
        };
        bl_pwm_combo_1_on_pins:bl_pwm_combo_1_on_pin {
                mux {
-                       pins = "pwm_c_z";
+                       groups = "pwm_c_z";
                        function = "pwm_c";
                };
        };
        bl_pwm_combo_0_vs_on_pins:bl_pwm_combo_0_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z6";
+                       groups = "pwm_vs_z6";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_1_vs_on_pins:bl_pwm_combo_1_vs_on_pin {
                mux {
-                       pins = "pwm_vs_z7";
+                       groups = "pwm_vs_z7";
                        function = "pwm_vs";
                };
        };
        bl_pwm_combo_off_pins:bl_pwm_combo_off_pin {
                mux {
-                       pins = "GPIOZ_6",
+                       groups = "GPIOZ_6",
                                "GPIOZ_7";
                        function = "gpio_periphs";
                        output-low;