* [PATCH 1/3] dt-bindings: display: amlogic,meson-vpu: Add G12A compatible and ports
2019-03-13 14:10 [PATCH 0/3] dt-bindings: meson: Add G12A display bindings Neil Armstrong
@ 2019-03-13 14:10 ` Neil Armstrong
2019-03-28 15:17 ` [PATCH 1/3] dt-bindings: display: amlogic, meson-vpu: " Rob Herring
2019-03-13 14:10 ` [PATCH 2/3] dt-bindings: display: amlogic,meson-dw-hdmi: " Neil Armstrong
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Neil Armstrong @ 2019-03-13 14:10 UTC (permalink / raw)
To: dri-devel, devicetree
Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel
The Amlogic G12A VPU is very similar to the Amlogic GXM VPU but with :
- an enhanced plane blender, with up to 3 OSD planes
- support for AFBC 1.2 decoder (for Bifrost GPU)
- support display mode up to 4k60@75Hz
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
.../devicetree/bindings/display/amlogic,meson-vpu.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
index 419444e2b4d3..be40a780501c 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
@@ -57,6 +57,7 @@ Required properties:
- GXL (S905X, S905D) : "amlogic,meson-gxl-vpu"
- GXM (S912) : "amlogic,meson-gxm-vpu"
followed by the common "amlogic,meson-gx-vpu"
+ - G12A (S905X2, S905Y2, S905D2) : "amlogic,meson-g12a-vpu"
- reg: base address and size of he following memory-mapped regions :
- vpu
- hhi
@@ -83,6 +84,9 @@ corresponding to each VPU output.
S905X (GXL) CVBS VDAC HDMI-TX
S905D (GXL) CVBS VDAC HDMI-TX
S912 (GXM) CVBS VDAC HDMI-TX
+ S905X2 (G12A) CVBS VDAC HDMI-TX
+ S905Y2 (G12A) CVBS VDAC HDMI-TX
+ S905D2 (G12A) CVBS VDAC HDMI-TX
Example:
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] dt-bindings: display: amlogic, meson-vpu: Add G12A compatible and ports
2019-03-13 14:10 ` [PATCH 1/3] dt-bindings: display: amlogic,meson-vpu: Add G12A compatible and ports Neil Armstrong
@ 2019-03-28 15:17 ` Rob Herring
0 siblings, 0 replies; 9+ messages in thread
From: Rob Herring @ 2019-03-28 15:17 UTC (permalink / raw)
To: Neil Armstrong
Cc: dri-devel, devicetree, linux-amlogic, linux-kernel,
linux-arm-kernel, Neil Armstrong
On Wed, 13 Mar 2019 15:10:28 +0100, Neil Armstrong wrote:
> The Amlogic G12A VPU is very similar to the Amlogic GXM VPU but with :
> - an enhanced plane blender, with up to 3 OSD planes
> - support for AFBC 1.2 decoder (for Bifrost GPU)
> - support display mode up to 4k60@75Hz
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> .../devicetree/bindings/display/amlogic,meson-vpu.txt | 4 ++++
> 1 file changed, 4 insertions(+)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/3] dt-bindings: display: amlogic,meson-dw-hdmi: Add G12A compatible and ports
2019-03-13 14:10 [PATCH 0/3] dt-bindings: meson: Add G12A display bindings Neil Armstrong
2019-03-13 14:10 ` [PATCH 1/3] dt-bindings: display: amlogic,meson-vpu: Add G12A compatible and ports Neil Armstrong
@ 2019-03-13 14:10 ` Neil Armstrong
2019-03-28 15:17 ` Rob Herring
2019-03-13 14:10 ` [PATCH 3/3] dt-bindings: power: amlogic,meson-gx-pwrc: Add G12A compatible Neil Armstrong
2019-04-09 9:13 ` [PATCH 0/3] dt-bindings: meson: Add G12A display bindings Neil Armstrong
3 siblings, 1 reply; 9+ messages in thread
From: Neil Armstrong @ 2019-03-13 14:10 UTC (permalink / raw)
To: dri-devel, devicetree
Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel
The Amlogic G12A SoC has a slighly modified DW-HDMI Glue with
support for HDMI 2.1 and a different DW-HDMI register access.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
.../devicetree/bindings/display/amlogic,meson-dw-hdmi.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
index bf4a18047309..3a50a7862cf3 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
@@ -37,6 +37,7 @@ Required properties:
- GXL (S905X, S905D) : "amlogic,meson-gxl-dw-hdmi"
- GXM (S912) : "amlogic,meson-gxm-dw-hdmi"
followed by the common "amlogic,meson-gx-dw-hdmi"
+ - G12A (S905X2, S905Y2, S905D2) : "amlogic,meson-g12a-dw-hdmi"
- reg: Physical base address and length of the controller's registers.
- interrupts: The HDMI interrupt number
- clocks, clock-names : must have the phandles to the HDMI iahb and isfr clocks,
@@ -66,6 +67,9 @@ corresponding to each HDMI output and input.
S905X (GXL) VENC Input TMDS Output
S905D (GXL) VENC Input TMDS Output
S912 (GXM) VENC Input TMDS Output
+ S905X2 (G12A) VENC Input TMDS Output
+ S905Y2 (G12A) VENC Input TMDS Output
+ S905D2 (G12A) VENC Input TMDS Output
Example:
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] dt-bindings: display: amlogic,meson-dw-hdmi: Add G12A compatible and ports
2019-03-13 14:10 ` [PATCH 2/3] dt-bindings: display: amlogic,meson-dw-hdmi: " Neil Armstrong
@ 2019-03-28 15:17 ` Rob Herring
0 siblings, 0 replies; 9+ messages in thread
From: Rob Herring @ 2019-03-28 15:17 UTC (permalink / raw)
To: Neil Armstrong
Cc: dri-devel, devicetree, Neil Armstrong, linux-amlogic,
linux-arm-kernel, linux-kernel
On Wed, 13 Mar 2019 15:10:29 +0100, Neil Armstrong wrote:
> The Amlogic G12A SoC has a slighly modified DW-HDMI Glue with
> support for HDMI 2.1 and a different DW-HDMI register access.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> .../devicetree/bindings/display/amlogic,meson-dw-hdmi.txt | 4 ++++
> 1 file changed, 4 insertions(+)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] dt-bindings: power: amlogic,meson-gx-pwrc: Add G12A compatible
2019-03-13 14:10 [PATCH 0/3] dt-bindings: meson: Add G12A display bindings Neil Armstrong
2019-03-13 14:10 ` [PATCH 1/3] dt-bindings: display: amlogic,meson-vpu: Add G12A compatible and ports Neil Armstrong
2019-03-13 14:10 ` [PATCH 2/3] dt-bindings: display: amlogic,meson-dw-hdmi: " Neil Armstrong
@ 2019-03-13 14:10 ` Neil Armstrong
2019-03-28 15:18 ` [PATCH 3/3] dt-bindings: power: amlogic, meson-gx-pwrc: " Rob Herring
2019-04-09 9:13 ` [PATCH 0/3] dt-bindings: meson: Add G12A display bindings Neil Armstrong
3 siblings, 1 reply; 9+ messages in thread
From: Neil Armstrong @ 2019-03-13 14:10 UTC (permalink / raw)
To: dri-devel, devicetree
Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel
The Amlogic G12A has a slighly different Power Control, but uses the
same address space and sysctrl registers.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
.../devicetree/bindings/power/amlogic,meson-gx-pwrc.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt b/Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt
index 1cd050b4054c..0fdc3dd1125e 100644
--- a/Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt
+++ b/Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt
@@ -16,7 +16,9 @@ Device Tree Bindings:
---------------------
Required properties:
-- compatible: should be "amlogic,meson-gx-pwrc-vpu" for the Meson GX SoCs
+- compatible: should be one of the following :
+ - "amlogic,meson-gx-pwrc-vpu" for the Meson GX SoCs
+ - "amlogic,meson-g12a-pwrc-vpu" for the Meson G12A SoCs
- #power-domain-cells: should be 0
- amlogic,hhi-sysctrl: phandle to the HHI sysctrl node
- resets: phandles to the reset lines needed for this power demain sequence
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] dt-bindings: power: amlogic, meson-gx-pwrc: Add G12A compatible
2019-03-13 14:10 ` [PATCH 3/3] dt-bindings: power: amlogic,meson-gx-pwrc: Add G12A compatible Neil Armstrong
@ 2019-03-28 15:18 ` Rob Herring
0 siblings, 0 replies; 9+ messages in thread
From: Rob Herring @ 2019-03-28 15:18 UTC (permalink / raw)
To: Neil Armstrong
Cc: dri-devel, devicetree, linux-amlogic, linux-kernel,
linux-arm-kernel, Neil Armstrong
On Wed, 13 Mar 2019 15:10:30 +0100, Neil Armstrong wrote:
> The Amlogic G12A has a slighly different Power Control, but uses the
> same address space and sysctrl registers.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> .../devicetree/bindings/power/amlogic,meson-gx-pwrc.txt | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] dt-bindings: meson: Add G12A display bindings
2019-03-13 14:10 [PATCH 0/3] dt-bindings: meson: Add G12A display bindings Neil Armstrong
` (2 preceding siblings ...)
2019-03-13 14:10 ` [PATCH 3/3] dt-bindings: power: amlogic,meson-gx-pwrc: Add G12A compatible Neil Armstrong
@ 2019-04-09 9:13 ` Neil Armstrong
2019-04-15 22:22 ` Kevin Hilman
3 siblings, 1 reply; 9+ messages in thread
From: Neil Armstrong @ 2019-04-09 9:13 UTC (permalink / raw)
To: Kevin Hilman
Cc: dri-devel, devicetree, linux-amlogic, linux-arm-kernel, linux-kernel
On 13/03/2019 15:10, Neil Armstrong wrote:
> This patchset adds the G12A specific bindings for the Display VPU
> and VPU Power Control.
>
> The Amlogic Meson G12A Display module is based on the Meson GXM SoC
> with an updated Plane Blender, thus VPU architecture and interconnect
> is the same.
>
> Implementation then DT nodes will come in a further patchsets.
>
> Neil Armstrong (3):
> dt-bindings: display: amlogic,meson-vpu: Add G12A compatible and ports
> dt-bindings: display: amlogic,meson-dw-hdmi: Add G12A compatible and
> ports
> dt-bindings: power: amlogic,meson-gx-pwrc: Add G12A compatible
>
> .../devicetree/bindings/display/amlogic,meson-dw-hdmi.txt | 4 ++++
> .../devicetree/bindings/display/amlogic,meson-vpu.txt | 4 ++++
> .../devicetree/bindings/power/amlogic,meson-gx-pwrc.txt | 4 +++-
> 3 files changed, 11 insertions(+), 1 deletion(-)
>
Kevin,
I applied Patches 1 & 2 to drm-misc-next, can you take Patch 3 along :
- https://patchwork.kernel.org/patch/10879285/
- https://patchwork.kernel.org/patch/10879293/
Thanks !
Neil
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/3] dt-bindings: meson: Add G12A display bindings
2019-04-09 9:13 ` [PATCH 0/3] dt-bindings: meson: Add G12A display bindings Neil Armstrong
@ 2019-04-15 22:22 ` Kevin Hilman
0 siblings, 0 replies; 9+ messages in thread
From: Kevin Hilman @ 2019-04-15 22:22 UTC (permalink / raw)
To: Neil Armstrong
Cc: dri-devel, devicetree, linux-amlogic, linux-arm-kernel, linux-kernel
Neil Armstrong <narmstrong@baylibre.com> writes:
> On 13/03/2019 15:10, Neil Armstrong wrote:
>> This patchset adds the G12A specific bindings for the Display VPU
>> and VPU Power Control.
>>
>> The Amlogic Meson G12A Display module is based on the Meson GXM SoC
>> with an updated Plane Blender, thus VPU architecture and interconnect
>> is the same.
>>
>> Implementation then DT nodes will come in a further patchsets.
>>
>> Neil Armstrong (3):
>> dt-bindings: display: amlogic,meson-vpu: Add G12A compatible and ports
>> dt-bindings: display: amlogic,meson-dw-hdmi: Add G12A compatible and
>> ports
>> dt-bindings: power: amlogic,meson-gx-pwrc: Add G12A compatible
>>
>> .../devicetree/bindings/display/amlogic,meson-dw-hdmi.txt | 4 ++++
>> .../devicetree/bindings/display/amlogic,meson-vpu.txt | 4 ++++
>> .../devicetree/bindings/power/amlogic,meson-gx-pwrc.txt | 4 +++-
>> 3 files changed, 11 insertions(+), 1 deletion(-)
>>
>
> Kevin,
>
> I applied Patches 1 & 2 to drm-misc-next, can you take Patch 3 along :
Queued for v5.2,
Thanks,
Kevin
^ permalink raw reply [flat|nested] 9+ messages in thread