diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2019-08-23 09:02:36 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2019-08-29 16:13:33 -0700 |
| commit | 5e975c5dab1e272fc758f26fd777d063951030b1 (patch) | |
| tree | c398dcbb5482d00b73d6b80a995f5c1dc7783c1a | |
| parent | 3ad6c9e357561111c0d4699975f0b58364b5d3c4 (diff) | |
| download | linux-stable-5e975c5dab1e272fc758f26fd777d063951030b1.tar.gz linux-stable-5e975c5dab1e272fc758f26fd777d063951030b1.tar.bz2 linux-stable-5e975c5dab1e272fc758f26fd777d063951030b1.zip | |
arm64: dts: meson-gx: drop the vpu dmc memory cell
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>
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index f3ae5a3685f9..239ec08b3023 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -544,9 +544,8 @@ 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>; |