diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts index 8d4c886b0d52..fa16a2891ae1 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts @@ -19,6 +19,7 @@ #include "mesonaxg.dtsi" #include "mesonaxg_s400-panel.dtsi" +#include "partition_mbox_normal.dtsi" / { model = "Amlogic"; amlogic-dt-id = "axg_s400_1g"; @@ -709,7 +710,7 @@ }; partitions: partitions{ - parts = <12>; + parts = <14>; part-0 = <&logo>; part-1 = <&recovery>; part-2 = <&rsv>; @@ -718,10 +719,12 @@ part-5 = <&misc>; part-6 = <&instaboot>; part-7 = <&boot>; - part-8 = <&system>; - part-9 = <&cache>; - part-10 = <&udisk>; - part-11 = <&data>; + part-8 = <&vendor>; + part-9 = <&odm>; + part-10 = <&system>; + part-11 = <&cache>; + part-12 = <&udisk>; + part-13 = <&data>; logo:logo{ pname = "logo"; @@ -764,6 +767,18 @@ size = <0x0 0x2000000>; mask = <1>; }; + vendor:vendor + { + pname = "vendor"; + size = <0x0 0x10000000>; + mask = <1>; + }; + odm:odm + { + pname = "odm"; + size = <0x0 0x10000000>; + mask = <1>; + }; system:system { pname = "system"; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts index 9bf75da14f9e..e4a447d75036 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts @@ -710,7 +710,7 @@ }; partitions: partitions{ - parts = <12>; + parts = <14>; part-0 = <&logo>; part-1 = <&recovery>; part-2 = <&rsv>; @@ -719,10 +719,12 @@ part-5 = <&misc>; part-6 = <&instaboot>; part-7 = <&boot>; - part-8 = <&system>; - part-9 = <&cache>; - part-10 = <&udisk>; - part-11 = <&data>; + part-8 = <&vendor>; + part-9 = <&odm>; + part-10 = <&system>; + part-11 = <&cache>; + part-12 = <&udisk>; + part-13 = <&data>; logo:logo{ pname = "logo"; @@ -765,6 +767,18 @@ size = <0x0 0x2000000>; mask = <1>; }; + vendor:vendor + { + pname = "vendor"; + size = <0x0 0x10000000>; + mask = <1>; + }; + odm:odm + { + pname = "odm"; + size = <0x0 0x10000000>; + mask = <1>; + }; system:system { pname = "system"; diff --git a/drivers/amlogic/media/common/arch/registers/register_ops_m8.c b/drivers/amlogic/media/common/arch/registers/register_ops_m8.c index a98ba71e7b7d..3623edea62bf 100644 --- a/drivers/amlogic/media/common/arch/registers/register_ops_m8.c +++ b/drivers/amlogic/media/common/arch/registers/register_ops_m8.c @@ -28,6 +28,7 @@ MESON_CPU_MAJOR_ID_GXM, \ MESON_CPU_MAJOR_ID_TXL, \ MESON_CPU_MAJOR_ID_TXLX, \ + MESON_CPU_MAJOR_ID_AXG, \ MESON_CPU_MAJOR_ID_G12A, \ 0} #define REGISTER_FOR_GXCPU {\ @@ -37,6 +38,7 @@ MESON_CPU_MAJOR_ID_GXM, \ MESON_CPU_MAJOR_ID_TXL, \ MESON_CPU_MAJOR_ID_TXLX, \ + MESON_CPU_MAJOR_ID_AXG, \ MESON_CPU_MAJOR_ID_G12A, \ 0} int codec_apb_read(unsigned int reg)