Commit 14176e94bb35d ("arm64: dts: mediatek: mt8195: Fix ranges for jpeg
enc/decoder nodes") redefined jpeg encoder/decoder children node ranges.
Update the related device tree binding yaml definition to match
mediatek/mt8195.dtsi, as this is currently the only one using it.
Signed-off-by: Ariel D'Alessandro <ariel.dalessan...@collabora.com>
---
.../media/mediatek,mt8195-jpegdec.yaml | 31 ++++++++++---------
.../media/mediatek,mt8195-jpegenc.yaml | 15 ++++-----
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git
a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml
b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml
index e5448c60e3eb5..b1f3df258dc87 100644
--- a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml
+++ b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml
@@ -36,7 +36,7 @@ properties:
# Required child node:
patternProperties:
- "^jpgdec@[0-9a-f]+$":
+ "^jpgdec@[0-9],[0-9a-f]+$":
type: object
description:
The jpeg decoder hardware device node which should be added as subnodes
to
@@ -100,22 +100,23 @@ examples:
#address-cells = <2>;
#size-cells = <2>;
- jpgdec-master {
+ jpeg-decoder@1a040000 {
compatible = "mediatek,mt8195-jpgdec";
power-domains = <&spm MT8195_POWER_DOMAIN_VDEC1>;
- iommus = <&iommu_vpp M4U_PORT_L19_JPGDEC_WDMA0>,
- <&iommu_vpp M4U_PORT_L19_JPGDEC_BSDMA0>,
- <&iommu_vpp M4U_PORT_L19_JPGDEC_WDMA1>,
- <&iommu_vpp M4U_PORT_L19_JPGDEC_BSDMA1>,
- <&iommu_vpp M4U_PORT_L19_JPGDEC_BUFF_OFFSET1>,
- <&iommu_vpp M4U_PORT_L19_JPGDEC_BUFF_OFFSET0>;
+ iommus = <&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA0>,
+ <&iommu_vdo M4U_PORT_L19_JPGDEC_BSDMA0>,
+ <&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA1>,
+ <&iommu_vdo M4U_PORT_L19_JPGDEC_BSDMA1>,
+ <&iommu_vdo M4U_PORT_L19_JPGDEC_BUFF_OFFSET1>,
+ <&iommu_vdo M4U_PORT_L19_JPGDEC_BUFF_OFFSET0>;
#address-cells = <2>;
#size-cells = <2>;
- ranges;
+ ranges = <0 0 0 0x1a040000 0 0x20000>,
+ <1 0 0 0x1b040000 0 0x10000>;
- jpgdec@1a040000 {
+ jpgdec@0,0 {
compatible = "mediatek,mt8195-jpgdec-hw";
- reg = <0 0x1a040000 0 0x10000>;/* JPGDEC_C0 */
+ reg = <0 0 0 0x10000>;/* JPGDEC_C0 */
iommus = <&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA0>,
<&iommu_vdo M4U_PORT_L19_JPGDEC_BSDMA0>,
<&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA1>,
@@ -128,9 +129,9 @@ examples:
power-domains = <&spm MT8195_POWER_DOMAIN_VDEC0>;
};
- jpgdec@1a050000 {
+ jpgdec@0,10000 {
compatible = "mediatek,mt8195-jpgdec-hw";
- reg = <0 0x1a050000 0 0x10000>;/* JPGDEC_C1 */
+ reg = <0 0 0x10000 0x10000>;/* JPGDEC_C1 */
iommus = <&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA0>,
<&iommu_vdo M4U_PORT_L19_JPGDEC_BSDMA0>,
<&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA1>,
@@ -143,9 +144,9 @@ examples:
power-domains = <&spm MT8195_POWER_DOMAIN_VDEC1>;
};
- jpgdec@1b040000 {
+ jpgdec@1,0 {
compatible = "mediatek,mt8195-jpgdec-hw";
- reg = <0 0x1b040000 0 0x10000>;/* JPGDEC_C2 */
+ reg = <1 0 0 0x10000>;/* JPGDEC_C2 */
iommus = <&iommu_vpp M4U_PORT_L20_JPGDEC_WDMA0>,
<&iommu_vpp M4U_PORT_L20_JPGDEC_BSDMA0>,
<&iommu_vpp M4U_PORT_L20_JPGDEC_WDMA1>,
diff --git
a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml
b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml
index 596186497b684..190e4e7470195 100644
--- a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml
+++ b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml
@@ -36,7 +36,7 @@ properties:
# Required child node:
patternProperties:
- "^jpgenc@[0-9a-f]+$":
+ "^jpgenc@[0-9],[0-9a-f]+$":
type: object
description:
The jpeg encoder hardware device node which should be added as subnodes
to
@@ -100,7 +100,7 @@ examples:
#address-cells = <2>;
#size-cells = <2>;
- jpgenc-master {
+ jpeg-encoder@1a030000 {
compatible = "mediatek,mt8195-jpgenc";
power-domains = <&spm MT8195_POWER_DOMAIN_VENC_CORE1>;
iommus = <&iommu_vpp M4U_PORT_L20_JPGENC_Y_RDMA>,
@@ -109,11 +109,12 @@ examples:
<&iommu_vpp M4U_PORT_L20_JPGENC_BSDMA>;
#address-cells = <2>;
#size-cells = <2>;
- ranges;
+ ranges = <0 0 0 0x1a030000 0 0x10000>,
+ <1 0 0 0x1b030000 0 0x10000>;
- jpgenc@1a030000 {
+ jpgenc@0,0 {
compatible = "mediatek,mt8195-jpgenc-hw";
- reg = <0 0x1a030000 0 0x10000>;
+ reg = <0 0 0 0x10000>;
iommus = <&iommu_vdo M4U_PORT_L19_JPGENC_Y_RDMA>,
<&iommu_vdo M4U_PORT_L19_JPGENC_C_RDMA>,
<&iommu_vdo M4U_PORT_L19_JPGENC_Q_TABLE>,
@@ -124,9 +125,9 @@ examples:
power-domains = <&spm MT8195_POWER_DOMAIN_VENC>;
};
- jpgenc@1b030000 {
+ jpgenc@1,0 {
compatible = "mediatek,mt8195-jpgenc-hw";
- reg = <0 0x1b030000 0 0x10000>;
+ reg = <1 0 0 0x10000>;
iommus = <&iommu_vpp M4U_PORT_L20_JPGENC_Y_RDMA>,
<&iommu_vpp M4U_PORT_L20_JPGENC_C_RDMA>,
<&iommu_vpp M4U_PORT_L20_JPGENC_Q_TABLE>,
--
2.50.1
