linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 0/4] Add the eDP/VOP device node for rk3399
@ 2016-06-22  2:53 Yakir Yang
  2016-06-22  2:54 ` [PATCH v3 1/4] arm64: dts: rockchip: add VOP and VOP iommu " Yakir Yang
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Yakir Yang @ 2016-06-22  2:53 UTC (permalink / raw)
  To: Heiko Stuebner, Kumar Gala, Rob Herring, Olof Johansson, Ian Campbell
  Cc: Mark Yao, devicetree, linux-kernel, linux-rockchip,
	linux-arm-kernel, Yakir Yang

This thread is rely on Mark's VOP thread[1] and Yakir's eDP thread[2].

[1]: https://lkml.org/lkml/2016/4/20/36
[2]: https://patchwork.kernel.org/patch/9175613/

Changes in v3:
- Add this patch in v3, due to another patch[0] need.
  [0]: https://patchwork.kernel.org/patch/9191737/

Changes in v2:
- provide some minimal patch description (Heiko)
- provide some minimal patch description (Heiko)
- provide some minimal patch description (Heiko)

Mark Yao (1):
  arm64: dts: rockchip: add VOP and VOP iommu node for rk3399

Yakir Yang (3):
  arm64: dts: rockchip: add eDP device node for rk3399
  arm64: dts: rockchip: add backlight support for rk3399 evb board
  arm64: dtsi: rockchip: introduce pclk_vio_grf in eDP device node

 arch/arm64/boot/dts/rockchip/rk3399-evb.dts |  40 ++++++++++
 arch/arm64/boot/dts/rockchip/rk3399.dtsi    | 110 ++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

-- 
1.9.1

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v3 1/4] arm64: dts: rockchip: add VOP and VOP iommu node for rk3399
  2016-06-22  2:53 [PATCH v3 0/4] Add the eDP/VOP device node for rk3399 Yakir Yang
@ 2016-06-22  2:54 ` Yakir Yang
  2016-06-30 17:45   ` Doug Anderson
  2016-06-22  2:54 ` [PATCH v3 2/4] arm64: dts: rockchip: add eDP device " Yakir Yang
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 8+ messages in thread
From: Yakir Yang @ 2016-06-22  2:54 UTC (permalink / raw)
  To: Heiko Stuebner, Kumar Gala, Rob Herring, Olof Johansson, Ian Campbell
  Cc: Mark Yao, devicetree, linux-kernel, linux-rockchip,
	linux-arm-kernel, Yakir Yang

From: Mark Yao <mark.yao@rock-chips.com>

Add the core display-subsystem node and the two display controllers
available on the rk3399.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
Changes in v3: None
Changes in v2:
- provide some minimal patch description (Heiko)

 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 58 ++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 46f325a..54e5c25 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -543,6 +543,64 @@
 		status = "disabled";
 	};
 
+	vopl: vop@ff8f0000 {
+		compatible = "rockchip,rk3399-vop-lit";
+		reg = <0x0 0xff8f0000 0x0 0x3efc>;
+		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_VOP1>, <&cru DCLK_VOP1>, <&cru HCLK_VOP1>;
+		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+		resets = <&cru SRST_A_VOP1>, <&cru SRST_H_VOP1>, <&cru SRST_D_VOP1>;
+		reset-names = "axi", "ahb", "dclk";
+		iommus = <&vopl_mmu>;
+		status = "disabled";
+
+		vopl_out: port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+
+	vopl_mmu: iommu@ff8f3f00 {
+		compatible = "rockchip,iommu";
+		reg = <0x0 0xff8f3f00 0x0 0x100>;
+		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "vopl_mmu";
+		#iommu-cells = <0>;
+		status = "disabled";
+	};
+
+	vopb: vop@ff900000 {
+		compatible = "rockchip,rk3399-vop-big";
+		reg = <0x0 0xff900000 0x0 0x3efc>;
+		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
+		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+		resets = <&cru SRST_A_VOP0>, <&cru SRST_H_VOP0>, <&cru SRST_D_VOP0>;
+		reset-names = "axi", "ahb", "dclk";
+		iommus = <&vopb_mmu>;
+		status = "disabled";
+
+		vopb_out: port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+
+	vopb_mmu: iommu@ff903f00 {
+		compatible = "rockchip,iommu";
+		reg = <0x0 0xff903f00 0x0 0x100>;
+		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "vopb_mmu";
+		#iommu-cells = <0>;
+		status = "disabled";
+	};
+
+	display_subsystem: display-subsystem {
+		compatible = "rockchip,display-subsystem";
+		ports = <&vopl_out>, <&vopb_out>;
+		status = "disabled";
+	};
+
 	pinctrl: pinctrl {
 		compatible = "rockchip,rk3399-pinctrl";
 		rockchip,grf = <&grf>;
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 2/4] arm64: dts: rockchip: add eDP device node for rk3399
  2016-06-22  2:53 [PATCH v3 0/4] Add the eDP/VOP device node for rk3399 Yakir Yang
  2016-06-22  2:54 ` [PATCH v3 1/4] arm64: dts: rockchip: add VOP and VOP iommu " Yakir Yang
@ 2016-06-22  2:54 ` Yakir Yang
  2016-06-22  2:54 ` [PATCH v3 3/4] arm64: dts: rockchip: add backlight support for rk3399 evb board Yakir Yang
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Yakir Yang @ 2016-06-22  2:54 UTC (permalink / raw)
  To: Heiko Stuebner, Kumar Gala, Rob Herring, Olof Johansson, Ian Campbell
  Cc: Mark Yao, devicetree, linux-kernel, linux-rockchip,
	linux-arm-kernel, Yakir Yang

Add rk3399 eDP device node, and connect to VOP device node with
remote endpoint.

Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
Changes in v3: None
Changes in v2:
- provide some minimal patch description (Heiko)

 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 52 ++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 54e5c25..be322db 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -557,6 +557,11 @@
 		vopl_out: port {
 			#address-cells = <1>;
 			#size-cells = <0>;
+
+			vopl_out_edp: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&edp_in_vopl>;
+			};
 		};
 	};
 
@@ -583,6 +588,11 @@
 		vopb_out: port {
 			#address-cells = <1>;
 			#size-cells = <0>;
+
+			vopb_out_edp: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&edp_in_vopb>;
+			};
 		};
 	};
 
@@ -595,6 +605,41 @@
 		status = "disabled";
 	};
 
+	edp: edp@ff970000 {
+		compatible = "rockchip,rk3399-edp";
+		reg = <0x0 0xff970000 0x0 0x8000>;
+		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>;
+		clock-names = "dp", "pclk";
+		resets = <&cru SRST_P_EDP_CTRL>;
+		reset-names = "dp";
+		rockchip,grf = <&grf>;
+		status = "disabled";
+		pinctrl-names = "default";
+		pinctrl-0 = <&edp_hpd>;
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			edp_in: port@0 {
+				reg = <0>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				edp_in_vopb: endpoint@0 {
+					reg = <0>;
+					remote-endpoint = <&vopb_out_edp>;
+				};
+
+				edp_in_vopl: endpoint@1 {
+					reg = <1>;
+					remote-endpoint = <&vopl_out_edp>;
+				};
+			};
+		};
+	};
+
 	display_subsystem: display-subsystem {
 		compatible = "rockchip,display-subsystem";
 		ports = <&vopl_out>, <&vopb_out>;
@@ -1067,5 +1112,12 @@
 					<1 14 RK_FUNC_1 &pcfg_pull_none>;
 			};
 		};
+
+		edp {
+			edp_hpd: edp-hpd {
+				rockchip,pins =
+					<4 23 RK_FUNC_2 &pcfg_pull_none>;
+			};
+		};
 	};
 };
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 3/4] arm64: dts: rockchip: add backlight support for rk3399 evb board
  2016-06-22  2:53 [PATCH v3 0/4] Add the eDP/VOP device node for rk3399 Yakir Yang
  2016-06-22  2:54 ` [PATCH v3 1/4] arm64: dts: rockchip: add VOP and VOP iommu " Yakir Yang
  2016-06-22  2:54 ` [PATCH v3 2/4] arm64: dts: rockchip: add eDP device " Yakir Yang
@ 2016-06-22  2:54 ` Yakir Yang
  2016-06-22  2:54 ` [PATCH v3 4/4] arm64: dtsi: rockchip: introduce pclk_vio_grf in eDP device node Yakir Yang
  2016-06-22  3:01 ` [PATCH v3.1 4/4] arm64: dts: " Yakir Yang
  4 siblings, 0 replies; 8+ messages in thread
From: Yakir Yang @ 2016-06-22  2:54 UTC (permalink / raw)
  To: Heiko Stuebner, Kumar Gala, Rob Herring, Olof Johansson, Ian Campbell
  Cc: Mark Yao, devicetree, linux-kernel, linux-rockchip,
	linux-arm-kernel, Yakir Yang

Add backlight node for evb board, perpare for panel device node.

Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
Changes in v3: None
Changes in v2:
- provide some minimal patch description (Heiko)

 arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 40 +++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
index 1a3eb14..31d9e27 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
@@ -75,6 +75,46 @@
 		regulator-always-on;
 		regulator-boot-on;
 	};
+
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		pwms = <&pwm0 0 25000 0>;
+		brightness-levels = <
+			  0   1   2   3   4   5   6   7
+			  8   9  10  11  12  13  14  15
+			 16  17  18  19  20  21  22  23
+			 24  25  26  27  28  29  30  31
+			 32  33  34  35  36  37  38  39
+			 40  41  42  43  44  45  46  47
+			 48  49  50  51  52  53  54  55
+			 56  57  58  59  60  61  62  63
+			 64  65  66  67  68  69  70  71
+			 72  73  74  75  76  77  78  79
+			 80  81  82  83  84  85  86  87
+			 88  89  90  91  92  93  94  95
+			 96  97  98  99 100 101 102 103
+			104 105 106 107 108 109 110 111
+			112 113 114 115 116 117 118 119
+			120 121 122 123 124 125 126 127
+			128 129 130 131 132 133 134 135
+			136 137 138 139 140 141 142 143
+			144 145 146 147 148 149 150 151
+			152 153 154 155 156 157 158 159
+			160 161 162 163 164 165 166 167
+			168 169 170 171 172 173 174 175
+			176 177 178 179 180 181 182 183
+			184 185 186 187 188 189 190 191
+			192 193 194 195 196 197 198 199
+			200 201 202 203 204 205 206 207
+			208 209 210 211 212 213 214 215
+			216 217 218 219 220 221 222 223
+			224 225 226 227 228 229 230 231
+			232 233 234 235 236 237 238 239
+			240 241 242 243 244 245 246 247
+			248 249 250 251 252 253 254 255>;
+		default-brightness-level = <200>;
+		enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &pwm0 {
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 4/4] arm64: dtsi: rockchip: introduce pclk_vio_grf in eDP device node
  2016-06-22  2:53 [PATCH v3 0/4] Add the eDP/VOP device node for rk3399 Yakir Yang
                   ` (2 preceding siblings ...)
  2016-06-22  2:54 ` [PATCH v3 3/4] arm64: dts: rockchip: add backlight support for rk3399 evb board Yakir Yang
@ 2016-06-22  2:54 ` Yakir Yang
  2016-06-22  3:01 ` [PATCH v3.1 4/4] arm64: dts: " Yakir Yang
  4 siblings, 0 replies; 8+ messages in thread
From: Yakir Yang @ 2016-06-22  2:54 UTC (permalink / raw)
  To: Heiko Stuebner, Kumar Gala, Rob Herring, Olof Johansson, Ian Campbell
  Cc: Mark Yao, devicetree, linux-kernel, linux-rockchip,
	linux-arm-kernel, Yakir Yang

The pclk_vio_grf supply power for VIO GRF IOs, if it is disabled, driver
would failed to operate the VIO GRF registers.

Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
Changes in v3:
- Add this patch in v3, due to another patch[0] need.
  [0]: https://patchwork.kernel.org/patch/9191737/

Changes in v2: None

 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index be322db..e3e0cb6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -609,8 +609,8 @@
 		compatible = "rockchip,rk3399-edp";
 		reg = <0x0 0xff970000 0x0 0x8000>;
 		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>;
-		clock-names = "dp", "pclk";
+		clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>, <&cru PCLK_VIO_GRF>;
+		clock-names = "dp", "pclk", "grf";
 		resets = <&cru SRST_P_EDP_CTRL>;
 		reset-names = "dp";
 		rockchip,grf = <&grf>;
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3.1 4/4] arm64: dts: rockchip: introduce pclk_vio_grf in eDP device node
  2016-06-22  2:53 [PATCH v3 0/4] Add the eDP/VOP device node for rk3399 Yakir Yang
                   ` (3 preceding siblings ...)
  2016-06-22  2:54 ` [PATCH v3 4/4] arm64: dtsi: rockchip: introduce pclk_vio_grf in eDP device node Yakir Yang
@ 2016-06-22  3:01 ` Yakir Yang
  4 siblings, 0 replies; 8+ messages in thread
From: Yakir Yang @ 2016-06-22  3:01 UTC (permalink / raw)
  To: Heiko Stuebner, Kumar Gala, Rob Herring, Olof Johansson, Ian Campbell
  Cc: Mark Yao, devicetree, linux-kernel, linux-rockchip,
	linux-arm-kernel, Yakir Yang

The pclk_vio_grf supply power for VIO GRF IOs, if it is disabled, driver
would failed to operate the VIO GRF registers.

Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
Changes in v3.1:
- Correct the commit message.
  "arm64: dtsi: ..."   --->   "arm64: dts: ..."

Changes in v3:
- Add this patch in v3, due to another patch[0] need.
  [0]: https://patchwork.kernel.org/patch/9191737/

Changes in v2: None

 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index be322db..e3e0cb6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -609,8 +609,8 @@
 		compatible = "rockchip,rk3399-edp";
 		reg = <0x0 0xff970000 0x0 0x8000>;
 		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>;
-		clock-names = "dp", "pclk";
+		clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>, <&cru PCLK_VIO_GRF>;
+		clock-names = "dp", "pclk", "grf";
 		resets = <&cru SRST_P_EDP_CTRL>;
 		reset-names = "dp";
 		rockchip,grf = <&grf>;
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/4] arm64: dts: rockchip: add VOP and VOP iommu node for rk3399
  2016-06-22  2:54 ` [PATCH v3 1/4] arm64: dts: rockchip: add VOP and VOP iommu " Yakir Yang
@ 2016-06-30 17:45   ` Doug Anderson
  2016-06-30 17:52     ` Heiko Stuebner
  0 siblings, 1 reply; 8+ messages in thread
From: Doug Anderson @ 2016-06-30 17:45 UTC (permalink / raw)
  To: Yakir Yang
  Cc: Heiko Stuebner, Kumar Gala, Rob Herring, Olof Johansson,
	Ian Campbell, devicetree, linux-kernel,
	open list:ARM/Rockchip SoC...,
	linux-arm-kernel, Mark Yao, Caesar Wang

Hi

On Tue, Jun 21, 2016 at 7:54 PM, Yakir Yang <ykk@rock-chips.com> wrote:
> From: Mark Yao <mark.yao@rock-chips.com>
>
> Add the core display-subsystem node and the two display controllers
> available on the rk3399.
>
> Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
> Signed-off-by: Yakir Yang <ykk@rock-chips.com>
> ---
> Changes in v3: None
> Changes in v2:
> - provide some minimal patch description (Heiko)
>
>  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 58 ++++++++++++++++++++++++++++++++
>  1 file changed, 58 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 46f325a..54e5c25 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -543,6 +543,64 @@
>                 status = "disabled";
>         };
>
> +       vopl: vop@ff8f0000 {
> +               compatible = "rockchip,rk3399-vop-lit";
> +               reg = <0x0 0xff8f0000 0x0 0x3efc>;
> +               interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
> +               clocks = <&cru ACLK_VOP1>, <&cru DCLK_VOP1>, <&cru HCLK_VOP1>;
> +               clock-names = "aclk_vop", "dclk_vop", "hclk_vop";

Note that if this lands after Elaine / Caesar's patch ("arm64: dts:
rockchip: add the power domain node for rk3399")
<https://patchwork.kernel.org/patch/9206415/> then you need to respin
adding powerdomain references here for correctness.

If this lands before Elaine / Caesar's patch then the other patch
needs to be re-spun.  ;)


> +               resets = <&cru SRST_A_VOP1>, <&cru SRST_H_VOP1>, <&cru SRST_D_VOP1>;
> +               reset-names = "axi", "ahb", "dclk";
> +               iommus = <&vopl_mmu>;
> +               status = "disabled";
> +
> +               vopl_out: port {
> +                       #address-cells = <1>;
> +                       #size-cells = <0>;
> +               };
> +       };
> +
> +       vopl_mmu: iommu@ff8f3f00 {
> +               compatible = "rockchip,iommu";
> +               reg = <0x0 0xff8f3f00 0x0 0x100>;
> +               interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
> +               interrupt-names = "vopl_mmu";
> +               #iommu-cells = <0>;
> +               status = "disabled";
> +       };
> +
> +       vopb: vop@ff900000 {
> +               compatible = "rockchip,rk3399-vop-big";
> +               reg = <0x0 0xff900000 0x0 0x3efc>;
> +               interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
> +               clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
> +               clock-names = "aclk_vop", "dclk_vop", "hclk_vop";

Here too, obviously.


See <http://crosreview.com/356623> for reference.


-Doug

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/4] arm64: dts: rockchip: add VOP and VOP iommu node for rk3399
  2016-06-30 17:45   ` Doug Anderson
@ 2016-06-30 17:52     ` Heiko Stuebner
  0 siblings, 0 replies; 8+ messages in thread
From: Heiko Stuebner @ 2016-06-30 17:52 UTC (permalink / raw)
  To: Doug Anderson, Mark Yao
  Cc: Yakir Yang, Kumar Gala, Rob Herring, Olof Johansson,
	Ian Campbell, devicetree, linux-kernel,
	open list:ARM/Rockchip SoC...,
	linux-arm-kernel, Caesar Wang

Am Donnerstag, 30. Juni 2016, 10:45:21 schrieb Doug Anderson:
> Hi
> 
> On Tue, Jun 21, 2016 at 7:54 PM, Yakir Yang <ykk@rock-chips.com> wrote:
> > From: Mark Yao <mark.yao@rock-chips.com>
> > 
> > Add the core display-subsystem node and the two display controllers
> > available on the rk3399.
> > 
> > Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
> > Signed-off-by: Yakir Yang <ykk@rock-chips.com>
> > ---
> > Changes in v3: None
> > Changes in v2:
> > - provide some minimal patch description (Heiko)
> > 
> >  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 58
> >  ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> > b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 46f325a..54e5c25
> > 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> > @@ -543,6 +543,64 @@
> > 
> >                 status = "disabled";
> >         
> >         };
> > 
> > +       vopl: vop@ff8f0000 {
> > +               compatible = "rockchip,rk3399-vop-lit";
> > +               reg = <0x0 0xff8f0000 0x0 0x3efc>;
> > +               interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
> > +               clocks = <&cru ACLK_VOP1>, <&cru DCLK_VOP1>, <&cru
> > HCLK_VOP1>; +               clock-names = "aclk_vop", "dclk_vop",
> > "hclk_vop";
> Note that if this lands after Elaine / Caesar's patch ("arm64: dts:
> rockchip: add the power domain node for rk3399")
> <https://patchwork.kernel.org/patch/9206415/> then you need to respin
> adding powerdomain references here for correctness.
> 
> If this lands before Elaine / Caesar's patch then the other patch
> needs to be re-spun.  ;)

so far I haven't seen any activity on the drm-driver patches.
Mark (Yao), what happened to your rk3399 vop patches back from April?

Timing-wise I guess we'll do power-domains first, then display. Especially 
as neither vop nor edp patches have so far appeared in linux-next.


Heiko


> 
> > +               resets = <&cru SRST_A_VOP1>, <&cru SRST_H_VOP1>, <&cru
> > SRST_D_VOP1>; +               reset-names = "axi", "ahb", "dclk";
> > +               iommus = <&vopl_mmu>;
> > +               status = "disabled";
> > +
> > +               vopl_out: port {
> > +                       #address-cells = <1>;
> > +                       #size-cells = <0>;
> > +               };
> > +       };
> > +
> > +       vopl_mmu: iommu@ff8f3f00 {
> > +               compatible = "rockchip,iommu";
> > +               reg = <0x0 0xff8f3f00 0x0 0x100>;
> > +               interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
> > +               interrupt-names = "vopl_mmu";
> > +               #iommu-cells = <0>;
> > +               status = "disabled";
> > +       };
> > +
> > +       vopb: vop@ff900000 {
> > +               compatible = "rockchip,rk3399-vop-big";
> > +               reg = <0x0 0xff900000 0x0 0x3efc>;
> > +               interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
> > +               clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru
> > HCLK_VOP0>; +               clock-names = "aclk_vop", "dclk_vop",
> > "hclk_vop";
> Here too, obviously.
> 
> 
> See <http://crosreview.com/356623> for reference.
> 
> 
> -Doug

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-06-30 17:53 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-22  2:53 [PATCH v3 0/4] Add the eDP/VOP device node for rk3399 Yakir Yang
2016-06-22  2:54 ` [PATCH v3 1/4] arm64: dts: rockchip: add VOP and VOP iommu " Yakir Yang
2016-06-30 17:45   ` Doug Anderson
2016-06-30 17:52     ` Heiko Stuebner
2016-06-22  2:54 ` [PATCH v3 2/4] arm64: dts: rockchip: add eDP device " Yakir Yang
2016-06-22  2:54 ` [PATCH v3 3/4] arm64: dts: rockchip: add backlight support for rk3399 evb board Yakir Yang
2016-06-22  2:54 ` [PATCH v3 4/4] arm64: dtsi: rockchip: introduce pclk_vio_grf in eDP device node Yakir Yang
2016-06-22  3:01 ` [PATCH v3.1 4/4] arm64: dts: " Yakir Yang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).