diff --git a/arch/arm/boot/dts/amlogic/c3_c302x_aw409-emmc_256m.dts b/arch/arm/boot/dts/amlogic/c3_c302x_aw409-emmc_256m.dts index 2fb3eaab8..0845cd28d 100644 --- a/arch/arm/boot/dts/amlogic/c3_c302x_aw409-emmc_256m.dts +++ b/arch/arm/boot/dts/amlogic/c3_c302x_aw409-emmc_256m.dts @@ -28,3 +28,11 @@ disable-wp; bus-width = <8>; }; + +&secmon_reserved { + reg = <0x07F00000 0x100000>; +}; + +&pmz_a1_reserved { + reg = <0x08000000 0x8000000>; +}; diff --git a/arch/arm/boot/dts/amlogic/c3_c302x_aw409_256m_spinor_tee.dts b/arch/arm/boot/dts/amlogic/c3_c302x_aw409_256m_spinor_tee.dts index bbae1c2d6..6fa69bee8 100644 --- a/arch/arm/boot/dts/amlogic/c3_c302x_aw409_256m_spinor_tee.dts +++ b/arch/arm/boot/dts/amlogic/c3_c302x_aw409_256m_spinor_tee.dts @@ -20,3 +20,7 @@ &secmon_reserved { reg = <0x0F700000 0x900000>; }; + +&pmz_a1_reserved { + reg = <0x05F00000 0x9800000>; +}; diff --git a/arch/arm/boot/dts/amlogic/c3_c302x_aw409_256m_tee.dts b/arch/arm/boot/dts/amlogic/c3_c302x_aw409_256m_tee.dts index af11e68cd..ca6f11b05 100644 --- a/arch/arm/boot/dts/amlogic/c3_c302x_aw409_256m_tee.dts +++ b/arch/arm/boot/dts/amlogic/c3_c302x_aw409_256m_tee.dts @@ -20,3 +20,7 @@ &secmon_reserved { reg = <0x0F700000 0x900000>; }; + +&pmz_a1_reserved { + reg = <0x05F00000 0x9800000>; +}; diff --git a/arch/arm/boot/dts/amlogic/c3_c308l_aw429_128m.dts b/arch/arm/boot/dts/amlogic/c3_c308l_aw429_128m.dts index d733fde19..be6aad215 100644 --- a/arch/arm/boot/dts/amlogic/c3_c308l_aw429_128m.dts +++ b/arch/arm/boot/dts/amlogic/c3_c308l_aw429_128m.dts @@ -10,3 +10,9 @@ amlogic-dt-id = "c3_c308l_aw429-128m"; compatible = "c3_c308l_aw429-128m"; }; + +&spifc { + spi-nand@0 { + status = "okay"; + }; +}; diff --git a/arch/arm/boot/dts/amlogic/c3_c308l_aw429_256m_tee.dts b/arch/arm/boot/dts/amlogic/c3_c308l_aw429_256m_tee.dts index 97046d06e..adafc6994 100644 --- a/arch/arm/boot/dts/amlogic/c3_c308l_aw429_256m_tee.dts +++ b/arch/arm/boot/dts/amlogic/c3_c308l_aw429_256m_tee.dts @@ -20,3 +20,7 @@ &secmon_reserved { reg = <0x0F700000 0x900000>; }; + +&pmz_a1_reserved { + reg = <0x05F00000 0x9800000>; +}; diff --git a/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_128m.dtsi b/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_128m.dtsi index c646a9ca3..ceac91edc 100644 --- a/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_128m.dtsi +++ b/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_128m.dtsi @@ -106,6 +106,7 @@ dmc_reserved:linux,dmc_monitor { compatible = "amlogic,dmc_monitor-reserved"; reg = <0x0 0x0>; + status = "disabled"; }; debug_reserved:linux,iotrace { @@ -118,34 +119,26 @@ smc-size = <0x1000>; misc-size = <0x1000>; }; + + pmz_a1_reserved:anonymous { + compatible = "shared-dma-pool"; + //reusable; + //size = <0x8000000>; + alignment = <0x100000>; + reg = <0x03F00000 0x04000000>; + no-map; + status = "okay"; + }; + linux,cma { compatible = "shared-dma-pool"; reusable; size = <0x400000>; alignment = <0x400000>; - alloc-ranges = <0x07000000 0x7800000>; + alloc-ranges = <0x03800000 0x3E00000>; linux,cma-default; }; - pmz_cma_a1_reserved:anonymous { - compatible = "shared-dma-pool"; - //reusable; - no-map; - size = <0x4400000>; - alignment = <0x400000>; - alloc-ranges = <0x3000000 0x7400000>; - }; - - pmz_cma_a2_reserved:anonymous_ext{ - compatible = "shared-dma-pool"; - //reusable; - no-map; - size = <0x1000000>; - alignment = <0x400000>; - status = "disabled"; - //alloc-ranges = <0x0 0x7B00000>; - }; - codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -205,17 +198,10 @@ pmz_a1_dev { compatible = "amlogic, pmz_dev"; - memory-region = <&pmz_cma_a1_reserved>; + memory-region = <&pmz_a1_reserved>; pmz-allocator = "priv"; }; - pmz_a2_dev { - compatible = "amlogic, pmz_dev"; - memory-region = <&pmz_cma_a2_reserved>; - pmz-allocator = "priv"; - status = "disabled"; - }; - hantro { compatible = "hantro"; status = "okay"; diff --git a/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_256m.dtsi b/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_256m.dtsi index cbef3ced7..b27e44aea 100644 --- a/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_256m.dtsi +++ b/arch/arm/boot/dts/amlogic/c3_c30xx_aw409_256m.dtsi @@ -106,6 +106,7 @@ dmc_reserved:linux,dmc_monitor { compatible = "amlogic,dmc_monitor-reserved"; reg = <0x0 0x0>; + status = "disabled"; }; debug_reserved:linux,iotrace { @@ -116,19 +117,20 @@ irq-size = <0x1000>; smc-size = <0x1000>; misc-size = <0x1000>; + status = "disabled"; }; - pmz_cma_a1_reserved:anonymous { + pmz_a1_reserved:anonymous { compatible = "shared-dma-pool"; //reusable; //size = <0x8000000>; alignment = <0x100000>; - reg = <0x07F00000 0x8000000>; + reg = <0x05F00000 0x0A000000>; no-map; status = "okay"; }; - pmz_cma_a2_reserved:anonymous_ext{ + pmz_a2_reserved:anonymous_ext{ compatible = "shared-dma-pool"; //reusable; size = <0x1000000>; @@ -142,7 +144,7 @@ reusable; size = <0x400000>; alignment = <0x400000>; - alloc-ranges = <0x05000000 0x7E00000>; + alloc-ranges = <0x03800000 0x5E00000>; linux,cma-default; }; @@ -205,15 +207,15 @@ pmz_a1_dev { compatible = "amlogic, pmz_dev"; - memory-region = <&pmz_cma_a1_reserved>; + memory-region = <&pmz_a1_reserved>; pmz-allocator = "priv"; }; pmz_a2_dev { compatible = "amlogic, pmz_dev"; - memory-region = <&pmz_cma_a2_reserved>; + memory-region = <&pmz_a2_reserved>; pmz-allocator = "priv"; - //status = "disabled"; + status = "disabled"; }; hantro {