]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: rockchip: add pwm nodes
authorBeniamino Galvani <b.galvani@gmail.com>
Thu, 26 Jun 2014 18:03:41 +0000 (20:03 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Sat, 26 Jul 2014 22:24:16 +0000 (00:24 +0200)
This adds the necessary nodex and pinctrl settings for the Rockchip PWM-driver.

Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
Modified to use the new clock defines and added rk3066 pins.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
arch/arm/boot/dts/rk3066a.dtsi
arch/arm/boot/dts/rk3188.dtsi
arch/arm/boot/dts/rk3xxx.dtsi

index 18e802c08a91f0a8a28c72ca880319eb0a056006..9c34da4d8aad124e8117ec129642683c477fc126 100644 (file)
@@ -214,6 +214,30 @@ i2c4_xfer: i2c4-xfer {
                        };
                };
 
+               pwm0 {
+                       pwm0_out: pwm0-out {
+                               rockchip,pins = <RK_GPIO0 3 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+               };
+
+               pwm1 {
+                       pwm1_out: pwm1-out {
+                               rockchip,pins = <RK_GPIO0 4 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+               };
+
+               pwm2 {
+                       pwm2_out: pwm2-out {
+                               rockchip,pins = <RK_GPIO0 30 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+               };
+
+               pwm3 {
+                       pwm3_out: pwm3-out {
+                               rockchip,pins = <RK_GPIO0 31 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+               };
+
                uart0 {
                        uart0_xfer: uart0-xfer {
                                rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_default>,
@@ -362,6 +386,26 @@ &mmc1 {
        pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>;
 };
 
+&pwm0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm0_out>;
+};
+
+&pwm1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm1_out>;
+};
+
+&pwm2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm2_out>;
+};
+
+&pwm3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm3_out>;
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_xfer>;
index ba1193ca00a734ea44b59bd5780060d17e3f0d34..27215e0b5c3b5d21f2595a8c4f8d44f78d291240 100644 (file)
@@ -182,6 +182,30 @@ i2c4_xfer: i2c4-xfer {
                        };
                };
 
+               pwm0 {
+                       pwm0_out: pwm0-out {
+                               rockchip,pins = <RK_GPIO3 27 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+               };
+
+               pwm1 {
+                       pwm1_out: pwm1-out {
+                               rockchip,pins = <RK_GPIO3 28 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+               };
+
+               pwm2 {
+                       pwm2_out: pwm2-out {
+                               rockchip,pins = <RK_GPIO3 29 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+               };
+
+               pwm3 {
+                       pwm3_out: pwm3-out {
+                               rockchip,pins = <RK_GPIO3 30 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+               };
+
                uart0 {
                        uart0_xfer: uart0-xfer {
                                rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>,
@@ -337,6 +361,26 @@ &i2c4 {
        pinctrl-0 = <&i2c4_xfer>;
 };
 
+&pwm0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm0_out>;
+};
+
+&pwm1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm1_out>;
+};
+
+&pwm2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm2_out>;
+};
+
+&pwm3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm3_out>;
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_xfer>;
index 989c33785ec456010c04438c5f41b5e150789d60..c6f05610ed2d231478d6f913463d60251cc0d44b 100644 (file)
@@ -158,6 +158,38 @@ i2c1: i2c@2002f000 {
                status = "disabled";
        };
 
+       pwm0: pwm@20030000 {
+               compatible = "rockchip,rk2928-pwm";
+               reg = <0x20030000 0x10>;
+               #pwm-cells = <2>;
+               clocks = <&cru PCLK_PWM01>;
+               status = "disabled";
+       };
+
+       pwm1: pwm@20030010 {
+               compatible = "rockchip,rk2928-pwm";
+               reg = <0x20030010 0x10>;
+               #pwm-cells = <2>;
+               clocks = <&cru PCLK_PWM01>;
+               status = "disabled";
+       };
+
+       pwm2: pwm@20050020 {
+               compatible = "rockchip,rk2928-pwm";
+               reg = <0x20050020 0x10>;
+               #pwm-cells = <2>;
+               clocks = <&cru PCLK_PWM23>;
+               status = "disabled";
+       };
+
+       pwm3: pwm@20050030 {
+               compatible = "rockchip,rk2928-pwm";
+               reg = <0x20050030 0x10>;
+               #pwm-cells = <2>;
+               clocks = <&cru PCLK_PWM23>;
+               status = "disabled";
+       };
+
        i2c2: i2c@20056000 {
                compatible = "rockchip,rk3066-i2c";
                reg = <0x20056000 0x1000>;