pwm: pwm driver compatible with g12b

PD#165090: pwm: pwm driver compatible with g12b

pwm driver compatible with g12b,enable pwm controller pwm_AO_cd
pwm_ab pwm_ef for dvfs and wifi.

Change-Id: If65c4b5239ee0a4f4409aa85d9481645b44521e9
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>

diff --git a/Documentation/devicetree/bindings/amlogic/pwm-meson.txt b/Documentation/devicetree/bindings/amlogic/pwm-meson.txt
index 279d90bebaf1f8fd7f02c8aa810ffdf7f510ce8c..43a06aab347c60ba4fab2ba25b1477c0fbfbf036 100644 (file)
--- a/Documentation/devicetree/bindings/amlogic/pwm-meson.txt
+++ b/Documentation/devicetree/bindings/amlogic/pwm-meson.txt
@@ -13,7 +13,11 @@ Required properties:
                                        amlogic,g12a-ee-pwm
                                ao
                                        amlogic,g12a-ao-pwm
-
+                       -for g12b
+                               ee
+                                       amlogic,g12b-ee-pwm
+                               ao
+                                       amlogic,g12b-ao-pwm
                        -for axg
                                ee
                                        amlogic,axg-ee-pwm

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
index e6c3d48e731007be31ce08bf46f4465c4a8e4fba..6c5765c070c8a6ef26efbdd302385a4a54b1574b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -497,6 +497,14 @@
        pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
 };
 
+&pwm_ab {
+               status = "okay";
+       };
+
+&pwm_ef {
+               status = "okay";
+       };
+
 &pwm_AO_cd {
                status = "okay";
        };

diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
index 71a75db81c6e83688ddca5440b4f845e4713d2d2..390a657aa22ad6ba099bd71b8ed24868d656f864 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -556,7 +556,7 @@
                        };
 
                        pwm_ab: pwm@1b000 {
-                               compatible = "amlogic,g12a-ee-pwm";
+                               compatible = "amlogic,g12b-ee-pwm";
                                reg = <0x0 0x1b000 0x0 0x20>;
                                #pwm-cells = <3>;
                                clocks = <&xtal>,
@@ -574,7 +574,7 @@
                        };
 
                        pwm_cd: pwm@1a000 {
-                               compatible = "amlogic,g12a-ee-pwm";
+                               compatible = "amlogic,g12b-ee-pwm";
                                reg = <0x0 0x1a000  0x0 0x20>;
                                #pwm-cells = <3>;
                                clocks = <&xtal>,
@@ -589,7 +589,7 @@
                        };
 
                        pwm_ef: pwm@19000 {
-                               compatible = "amlogic,g12a-ee-pwm";
+                               compatible = "amlogic,g12b-ee-pwm";
                                reg = <0x0 0x19000  0x0 0x20>;
                                #pwm-cells = <3>;
                                clocks = <&xtal>,
@@ -708,7 +708,7 @@
                        };
 
                        pwm_AO_ab: pwm@7000 {
-                               compatible = "amlogic,g12a-ao-pwm";
+                               compatible = "amlogic,g12b-ao-pwm";
                                reg = <0x0 0x7000  0x0 0x20>;
                                #pwm-cells = <3>;
                                clocks = <&xtal>,
@@ -723,7 +723,7 @@
                        };
 
                        pwm_AO_cd: pwm@2000 {
-                               compatible = "amlogic,g12a-ao-pwm";
+                               compatible = "amlogic,g12b-ao-pwm";
                                reg = <0x0 0x2000  0x0 0x20>;
                                #pwm-cells = <3>;
                                clocks = <&xtal>,

diff --git a/drivers/amlogic/pwm/pwm_meson.c b/drivers/amlogic/pwm/pwm_meson.c
index 22853df3c023a15205394e0c525af9ffcf4d6da3..3d4f99a2cca7d3250ce18784bb0604c14a2aada6 100644 (file)
--- a/drivers/amlogic/pwm/pwm_meson.c
+++ b/drivers/amlogic/pwm/pwm_meson.c
@@ -521,6 +521,8 @@ static const struct meson_pwm_data pwm_m8b_data = {
 static const struct of_device_id meson_pwm_matches[] = {
        { .compatible = "amlogic,g12a-ee-pwm", .data = &pwm_g12a_ee_data },
        { .compatible = "amlogic,g12a-ao-pwm", .data = &pwm_g12a_ao_data },
+       { .compatible = "amlogic,g12b-ee-pwm", .data = &pwm_g12a_ee_data },
+       { .compatible = "amlogic,g12b-ao-pwm", .data = &pwm_g12a_ao_data },
        { .compatible = "amlogic,txlx-ee-pwm", .data = &pwm_txlx_ee_data },
        { .compatible = "amlogic,txlx-ao-pwm", .data = &pwm_txlx_ao_data },
        { .compatible = "amlogic,axg-ee-pwm", .data = &pwm_axg_ee_data },