]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
arm64: dts: meson-gx: drop the vpu dmc memory cell
authorNeil Armstrong <narmstrong@baylibre.com>
Fri, 23 Aug 2019 07:02:36 +0000 (09:02 +0200)
committerKevin Hilman <khilman@baylibre.com>
Thu, 29 Aug 2019 23:13:33 +0000 (16:13 -0700)
This fixes the following DT schemas check errors:
meson-gxl-s805x-libretech-ac.dt.yaml: vpu@d0100000: reg-names: Additional items are not allowed ('dmc' was unexpected)
meson-gxl-s805x-libretech-ac.dt.yaml: vpu@d0100000: reg-names: ['vpu', 'hhi', 'dmc'] is too long

The 'dmc' register area was replaced by the amlogic,canvas property
which was introduced in commit f1726043426c73 ("arm64: dts: meson-gx:
add dmcbus and canvas nodes.") and commit cf34287986d0b6 ("arm64: dts:
meson-gx: Add canvas provider node to the vpu")

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
arch/arm64/boot/dts/amlogic/meson-gx.dtsi

index f3ae5a3685f964992e2054f2eabcbc7988a4c274..239ec08b3023cf6e3cb2b162794fb289cde4b7c5 100644 (file)
@@ -544,9 +544,8 @@ sd_emmc_c: mmc@74000 {
                vpu: vpu@d0100000 {
                        compatible = "amlogic,meson-gx-vpu";
                        reg = <0x0 0xd0100000 0x0 0x100000>,
-                             <0x0 0xc883c000 0x0 0x1000>,
-                             <0x0 0xc8838000 0x0 0x1000>;
-                       reg-names = "vpu", "hhi", "dmc";
+                             <0x0 0xc883c000 0x0 0x1000>;
+                       reg-names = "vpu", "hhi";
                        interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
                        #address-cells = <1>;
                        #size-cells = <0>;