ARM: dts: move the pwm_ab and pwm_cd nodes to meson.dtsi

According to the vendor kernel sources these also exist (at the same
address) on Meson6 and Meson8. This can be found by running
$ grep -R "define PWM_PWM_[A-D]" arch/arm/
in the Amlogic GPL kernel tree (arm-src-kernel-2015-01-15-321cfb5a46).
pwm_ef does not seem to exist on older SoCs, so we keep it in
meson8b.dtsi for now.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index 15204e44161da6c98e8528488c8bf2be3a46ca6a..4c27ca083afbf8adadfc07e5c8cf06d91a6278b5 100644 (file)
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -108,6 +108,20 @@
                                status = "disabled";
                        };
 
+                       pwm_ab: pwm@8550 {
+                               compatible = "amlogic,meson-pwm";
+                               reg = <0x8550 0x10>;
+                               #pwm-cells = <3>;
+                               status = "disabled";
+                       };
+
+                       pwm_cd: pwm@8650 {
+                               compatible = "amlogic,meson-pwm";
+                               reg = <0x8650 0x10>;
+                               #pwm-cells = <3>;
+                               status = "disabled";
+                       };
+
                        saradc: adc@8680 {
                                compatible = "amlogic,meson-saradc";
                                reg = <0x8680 0x34>;

diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index 72e4f425f190d03902713831eb8ba5b1a6373c77..65b36c944b45f2cfdef1b963a68c0d644dfe318c 100644 (file)
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -129,20 +129,6 @@
                #reset-cells = <1>;
        };
 
-       pwm_ab: pwm@8550 {
-               compatible = "amlogic,meson8b-pwm";
-               reg = <0x8550 0x10>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
-       pwm_cd: pwm@8650 {
-               compatible = "amlogic,meson8b-pwm";
-               reg = <0x8650 0x10>;
-               #pwm-cells = <3>;
-               status = "disabled";
-       };
-
        pwm_ef: pwm@86c0 {
                compatible = "amlogic,meson8b-pwm";
                reg = <0x86c0 0x10>;
@@ -193,6 +179,14 @@
        arm,filter-ranges = <0x100000 0xc0000000>;
 };
 
+&pwm_ab {
+       compatible = "amlogic,meson8b-pwm";
+};
+
+&pwm_cd {
+       compatible = "amlogic,meson8b-pwm";
+};
+
 &saradc {
        compatible = "amlogic,meson8b-saradc", "amlogic,meson-saradc";
        clocks = <&clkc CLKID_XTAL>,