[PATCH v4 4/4] arm64: dts: rockchip: Handle pcie wake in pcie driver for Gru

2017-08-21 Thread Jeffy Chen
Currently we are handling pcie wake irq in mrvl wifi driver.
Move it to rockchip pcie driver for Gru boards.

Signed-off-by: Jeffy Chen 
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi 
b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index d48e98b62d09..42158512e979 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -712,7 +712,15 @@ ap_i2c_audio:  {
 
ep-gpios = < 27 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
-   pinctrl-0 = <_clkreqn_cpm>, <_perst_l>;
+   pinctrl-0 = <_clkreqn_cpm>, <_host_wake_l>, <_perst_l>;
+
+   interrupts-extended = < GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH 0>,
+ < GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH 0>,
+ < GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH 0>,
+ < 8 IRQ_TYPE_LEVEL_LOW>;
+   interrupt-names = "sys", "legacy", "client", "wake";
+   /delete-property/ interrupts;
+
vpcie3v3-supply = <_wifi_bt>;
vpcie1v8-supply = <_pd_n>; /* HACK: see _pd_n */
vpcie0v9-supply = <_pcie>;
@@ -727,11 +735,6 @@ ap_i2c_audio:  {
compatible = "pci1b4b,2b42";
reg = <0x8301 0x0 0x 0x0 0x0010
   0x8301 0x0 0x0010 0x0 0x0010>;
-   interrupt-parent = <>;
-   interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
-   pinctrl-names = "default";
-   pinctrl-0 = <_host_wake_l>;
-   wakeup-source;
};
};
 };
-- 
2.11.0




[PATCH v4 4/4] arm64: dts: rockchip: Handle pcie wake in pcie driver for Gru

2017-08-21 Thread Jeffy Chen
Currently we are handling pcie wake irq in mrvl wifi driver.
Move it to rockchip pcie driver for Gru boards.

Signed-off-by: Jeffy Chen 
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi 
b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index d48e98b62d09..42158512e979 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -712,7 +712,15 @@ ap_i2c_audio:  {
 
ep-gpios = < 27 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
-   pinctrl-0 = <_clkreqn_cpm>, <_perst_l>;
+   pinctrl-0 = <_clkreqn_cpm>, <_host_wake_l>, <_perst_l>;
+
+   interrupts-extended = < GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH 0>,
+ < GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH 0>,
+ < GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH 0>,
+ < 8 IRQ_TYPE_LEVEL_LOW>;
+   interrupt-names = "sys", "legacy", "client", "wake";
+   /delete-property/ interrupts;
+
vpcie3v3-supply = <_wifi_bt>;
vpcie1v8-supply = <_pd_n>; /* HACK: see _pd_n */
vpcie0v9-supply = <_pcie>;
@@ -727,11 +735,6 @@ ap_i2c_audio:  {
compatible = "pci1b4b,2b42";
reg = <0x8301 0x0 0x 0x0 0x0010
   0x8301 0x0 0x0010 0x0 0x0010>;
-   interrupt-parent = <>;
-   interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
-   pinctrl-names = "default";
-   pinctrl-0 = <_host_wake_l>;
-   wakeup-source;
};
};
 };
-- 
2.11.0