dts: expand isp cma and mv pinmux to dts

PD#165090: 1.expand isp cma to 256M
2.mv clk12_24_z_pins from dtsi to dts

Change-Id: I3b17ee594967ea95e28bb2edc9d8eaaf7d8349dd
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
index 3040ff3..d253603 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -148,7 +148,7 @@
                        compatible = "shared-dma-pool";
                        reusable;
                        status = "okay";
-                       size = <0x0 0x08000000>;
+                       size = <0x0 0x10000000>;
                        alignment = <0x0 0x400000>;
                };
 
@@ -980,6 +980,14 @@
                };
        };
 
+       clk12_24_z_pins:clk12_24_z_pins {
+               mux {
+                       groups = "clk12_24_z";
+                       function = "clk12_24_ee";
+                       drive-strength = <3>;
+               };
+       };
+
        tdmout_c:tdmout_c {
                mux { /* GPIOA_12, GPIOA_13, GPIOA_8, GPIOA_7*/
                        groups = "tdmc_sclk_a",

diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
index 7f16e09..dfda1aa 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -2384,14 +2384,6 @@
                };
        };
 
-       clk12_24_z_pins:clk12_24_z_pins {
-               mux {
-                       groups = "clk12_24_z";
-                       function = "clk12_24_ee";
-                       drive-strength = <3>;
-               };
-       };
-
        spicc0_pins_x: spicc0_pins_x {
                mux {
                        groups = "spi0_mosi_x",