From: David Wu <wdc@rock-chips.com>
Date: Sun, 6 Sep 2015 10:05:01 +0000 (+0800)
Subject: rk3288: pwm: rkpwm use same interrupt, voppwm would not use capture mode
X-Git-Tag: firefly_0821_release~3800
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=577f1219dda73bf48d2fc4d00693dabbf626af30;p=firefly-linux-kernel-4.4.55.git

rk3288: pwm: rkpwm use same interrupt, voppwm would not use capture mode

Change-Id: Ic4d27adeb800406efa1efa5b34fc78677b4def72
Signed-off-by: David Wu <wdc@rock-chips.com>
---

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 9c13e3706f5c..d3a4563730e5 100755
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -839,8 +839,6 @@
 		compatible = "rockchip,vop-pwm";
 		reg = <0xff9401a0 0x10>;
 
-		/* used by driver on remotectl'pwm */
-		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
 		#pwm-cells = <2>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&vop1_pwm_pin>;
@@ -853,8 +851,6 @@
 		compatible = "rockchip,vop-pwm";
 		reg = <0xff9301a0 0x10>;
 
-		/* used by driver on remotectl'pwm */
-		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 		#pwm-cells = <2>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&vop0_pwm_pin>;
@@ -868,7 +864,7 @@
 		reg = <0xff680000 0x10>;
 
 		/* used by driver on remotectl'pwm */
-		interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
 		#pwm-cells = <2>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pwm0_pin>;
@@ -882,7 +878,7 @@
 		reg = <0xff680010 0x10>;
 
 		/* used by driver on remotectl'pwm */
-		interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
 		#pwm-cells = <2>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pwm1_pin>;
@@ -896,7 +892,7 @@
 		reg = <0xff680020 0x10>;
 
 		/* used by driver on remotectl'pwm */
-		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
 		#pwm-cells = <2>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pwm2_pin>;
@@ -910,7 +906,7 @@
 		reg = <0xff680030 0x10>;
 
 		/* used by driver on remotectl'pwm */
-		interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
 		#pwm-cells = <2>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pwm3_pin>;