ODROID-COMMON: arm64/dts: overlay: Separate PWM and apply overlay.

- The PWM's configuration is difference between the n2 and c4. So
  separate configuration and placed to the device tree overlays.

Change-Id: Ia870ce6ea4404c8bc7028ae7f1cc72174406ed27

diff --git a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
index a53b95e3e12e1f6f91b389dda6b54247e30de99d..f0abf6b23e3201858bd75c889c34ca2dccaf16ef 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
@@ -139,20 +139,6 @@
        tv_bit_mode = <1>;
 };
 
-&pwm_cd {
-       status = "okay";
-       pinctrl-names = "pwm_pins","gpio_periphs";
-       pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins2>;
-       pinctrl-1 = <&pwmcd_to_gpios>;
-};
-
-&pwm_ef {
-       status = "okay";
-       pinctrl-names = "pwm_pins","gpio_periphs";
-       pinctrl-0 = <&pwm_e_pins &pwm_f_pins1>;
-       pinctrl-1 = <&pwmef_to_gpios>;
-};
-
 &pwm_AO_cd {
        status = "okay";
 };
@@ -257,18 +243,6 @@
                };
        };
 
-       pwmcd_to_gpios:pwmcd_gpio {
-               mux {
-                       groups = "GPIOX_5", "GPIOX_6";
-                       function = "gpio_periphs";
-               };
-       };
-       pwmef_to_gpios:pwmef_gpio {
-               mux {
-                       groups = "GPIOX_16", "GPIOX_7";
-                       function = "gpio_periphs";
-               };
-       };
        spicc0_pins_x: spicc0_pins_x {
                mux {
                        drive-strength = <3>;

diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
index 8af1efe62f2f084396fb3386bebe33814472b7f8..3465149d799c3bd8bf960ae09b81fe769baa3d26 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
@@ -18,7 +18,10 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo            \
                                        lineout.dtbo            \
                                        esp8089.dtbo            \
                                        sdio.dtbo               \
-                                       fanspeed-full.dtbo
+                                       fanspeed-full.dtbo      \
+                                       pwm_ab.dtbo             \
+                                       pwm_cd.dtbo             \
+                                       pwm_ef.dtbo
 
 targets        += $(dtbo-y)
 always := $(dtbo-y)

diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ab.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ab.dts
new file mode 100644 (file)
index 0000000..9176e48
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ab.dts
@@ -0,0 +1,16 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+       fragment@0 {
+               // pwm_ab
+               // This activates pwm_ab.
+               target = <&pwm_ab>;
+
+               __overlay__ {
+                       status = "okay";
+                       pinctrl-names = "pwm_pins";
+                       pinctrl-0 = <&pwm_a_pins &pwm_b_pins2>;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_cd.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_cd.dts
new file mode 100644 (file)
index 0000000..fa3c042
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_cd.dts
@@ -0,0 +1,16 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+       fragment@0 {
+               // pwm_cd
+               // This activates pwm_cd.
+               target = <&pwm_cd>;
+
+               __overlay__ {
+                       status = "okay";
+                       pinctrl-names = "pwm_pins";
+                       pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins1>;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ef.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ef.dts
new file mode 100644 (file)
index 0000000..ad25c9e
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ef.dts
@@ -0,0 +1,16 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+       fragment@0 {
+               // pwm_ef
+               // This activates pwm_ef.
+               target = <&pwm_ef>;
+
+               __overlay__ {
+                       status = "okay";
+                       pinctrl-names = "pwm_pins";
+                       pinctrl-0 = <&pwm_e_pins &pwm_f_pins1>;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
index 899d3dba71a20368ff4ee78b497e4c2da57ba3d7..ee196f5ce31741c94d607350d80411f34fb7f447 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
@@ -14,7 +14,9 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDN2) += spi0.dtbo             \
                                        onewire.dtbo            \
                                        can0.dtbo               \
                                        fanspeed-full.dtbo      \
-                                       gpio_spdif.dtbo
+                                       gpio_spdif.dtbo \
+                                       pwm_cd.dtbo             \
+                                       pwm_ef.dtbo
 
 targets        += $(dtbo-y)
 always := $(dtbo-y)

diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_cd.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_cd.dts
new file mode 100644 (file)
index 0000000..6f2ca0a
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_cd.dts
@@ -0,0 +1,16 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+       fragment@0 {
+               // pwm_cd
+               // This activates pwm_cd.
+               target = <&pwm_cd>;
+
+               __overlay__ {
+                       status = "okay";
+                       pinctrl-names = "pwm_pins";
+                       pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins2>;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_ef.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_ef.dts
new file mode 100644 (file)
index 0000000..ad25c9e
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_ef.dts
@@ -0,0 +1,16 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+       fragment@0 {
+               // pwm_ef
+               // This activates pwm_ef.
+               target = <&pwm_ef>;
+
+               __overlay__ {
+                       status = "okay";
+                       pinctrl-names = "pwm_pins";
+                       pinctrl-0 = <&pwm_e_pins &pwm_f_pins1>;
+               };
+       };
+};