diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi index 0431be459..daa9b7aa2 100644 --- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi @@ -1425,8 +1425,8 @@ canvas: canvas{ compatible = "amlogic, meson, canvas"; dev_name = "amlogic-canvas"; - status = "disabled"; - reg = <0x0 0xff638000 0x0 0x2000>; + status = "okay"; + reg = <0x0 0xff638048 0x0 0x2000>; }; ge2d { @@ -1453,32 +1453,27 @@ }; codec_io: codec_io { - compatible = "amlogic, codec_io"; - status = "disabled"; + compatible = "amlogic, meson-sm1, codec-io"; + status = "okay"; #address-cells=<2>; #size-cells=<2>; ranges; - io_cbus_base{ - reg = <0x0 0xffd00000 0x0 0x100000>; - }; - io_dos_base{ - reg = <0x0 0xff620000 0x0 0x10000>; - }; - io_hiubus_base{ - reg = <0x0 0xff63c000 0x0 0x2000>; - }; - io_aobus_base{ - reg = <0x0 0xff800000 0x0 0x10000>; - }; - io_vcbus_base{ - reg = <0x0 0xff900000 0x0 0x40000>; - }; - io_dmc_base{ - reg = <0x0 0xff638000 0x0 0x2000>; - }; - io_efuse_base{ - reg = <0x0 0xff630000 0x0 0x2000>; - }; + reg = <0x0 0xffd00000 0x0 0x100000>, + <0x0 0xff620000 0x0 0x10000>, + <0x0 0xff63c000 0x0 0x2000>, + <0x0 0xff800000 0x0 0x10000>, + <0x0 0xff900000 0x0 0x40000>, + <0x0 0xff638000 0x0 0x2000>, + <0x0 0xff630000 0x0 0x2000>, + <0x0 0x0 0x0 0x0>; + reg-names = "cbus", + "dosbus", + "hiubus", + "aobus", + "vcbus", + "dmcbus", + "efusebus", + "nocbus"; }; mesonstream { @@ -1573,7 +1568,7 @@ rdma{ compatible = "amlogic, meson, rdma"; dev_name = "amlogic-rdma"; - status = "disabled"; + status = "okay"; interrupts = <0 89 1>; interrupt-names = "rdma"; };