projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1923b69)
lcd: unify lcd pinmux usage in dts [1/1]
authorShaochan Liu <shaochan.liu@amlogic.com>
Wed, 26 Dec 2018 07:07:47 +0000 (15:07 +0800)
committerJianxin Pan <jianxin.pan@amlogic.com>
Fri, 18 Jan 2019 04:06:39 +0000 (20:06 -0800)
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>
arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts patch | blob | history
arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts patch | blob | history
arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts patch | blob | history
arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts patch | blob | history
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts patch | blob | history
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts patch | blob | history
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts patch | blob | history
arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts patch | blob | history

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 880e7a59e04992c04651d2cdf05cf6d0d9518cf4..c3d094f90b323b6e560ced5542d896cc11b29756 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 09477ca4c93e15ef31113d556f735f4e793570bf..5a3c4a4c9e7f331ef869e30f3512c3f8b52ca14b 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 3ea9f13d74163301bd7849af60bc421f52b1ff86..e8d486892df1ae7b52ac15a05a02eb146123bb0c 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 ba553a1ea67c0f2c04612da3128d6cd3773822b9..ab3ab7fbf9c1c54a2e3ec8bf2d4a90ac367811f5 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 6b8c7e5124636f4d81c5a6de1c957d431204dddc..a7a196e588d411ef0d14793d810f1dc8b5838e3a 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 d02cc3ce945b272b837146a4ea54db118c3b8270..ad07f80f25404e575b713684e5bf7e7cae173bdf 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 a1d132e25b3892172a84b5acc21c1cacfb599e37..0e7b1f5f18e8c04cbf569436132f16185f145ece 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 d97d59a262b3dec037a37365ed0d155b47999e11..706cd74339656854b42c21264ffef85dd40c55d4 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;
Domain: System / Kernel;