dts: modified t962ex_ab311 319 and t962x3_a309,pxp dts [1/1]

PD#SWPL-6560

Problem:
Need to change dts

Solution:
modified ab311 ab319 and ab309 and pxp

Verify:
test pass at skt_tm2

Change-Id: Iabc21582910f66b321b55928ce86d0958cb83503
Signed-off-by: pan yang<pan.yang@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/mesontm2.dtsi b/arch/arm/boot/dts/amlogic/mesontm2.dtsi
index a4ec8e4..af94200 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesontm2.dtsi
@@ -951,7 +951,7 @@
 
                ion_dev {
                        compatible = "amlogic, ion_dev";
-                       status = "disabled";
+                       status = "okay";
                        memory-region = <&ion_cma_reserved>;
                };/* end of ion_dev*/
        }; /* end of soc*/

diff --git a/arch/arm/boot/dts/amlogic/tm2_pxp.dts b/arch/arm/boot/dts/amlogic/tm2_pxp.dts
index 25010e7..f6c072b 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tm2_pxp.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_pxp.dts
@@ -37,7 +37,7 @@
 
        memory@00000000 {
                device_type = "memory";
-               linux,usable-memory = <0x000000 0x40000000>;
+               linux,usable-memory = <0x000000 0x80000000>;
        };
 
        reserved-memory {
@@ -76,7 +76,7 @@
                        reusable;
                        size = <0x800000>;
                        alignment = <0x400000>;
-                       alloc-ranges = <0x3f800000 0x800000>;
+                       alloc-ranges = <0x7f800000 0x800000>;
                };
 
                ion_cma_reserved:linux,ion-dev {

diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
index 9a11a67..6f69409 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -19,7 +19,6 @@
 
 #include "mesontm2.dtsi"
 #include "partition_mbox_normal.dtsi"
-#include "mesontl1_x301-panel.dtsi"
 
 / {
        model = "Amlogic TM2 T962E2 AB311";
@@ -1154,7 +1153,7 @@
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_ao_d_pins3>;
-               status = "okay";
+               status = "disabled";
        };
 
        tuner: tuner {

diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
index 4e951cc..65240dd 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
@@ -19,7 +19,6 @@
 
 #include "mesontm2.dtsi"
 #include "partition_mbox_normal.dtsi"
-#include "mesontl1_skt-panel.dtsi"
 
 / {
        model = "Amlogic TM2 T962E2 AB319";
@@ -1126,7 +1125,7 @@
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_ao_d_pins3>;
-               status = "okay";
+               status = "disabled";
        };
 
        tuner: tuner {

diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
index ffeef0d..aece557 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -19,7 +19,6 @@
 
 #include "mesontm2.dtsi"
 #include "partition_mbox_normal.dtsi"
-#include "mesontl1_skt-panel.dtsi"
 
 / {
        model = "Amlogic TM2 T962X3 AB309";
@@ -1126,7 +1125,7 @@
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_ao_d_pins3>;
-               status = "okay";
+               status = "disabled";
        };
 
        tuner: tuner {

diff --git a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
index a3dc50a..2a2ff84 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
@@ -931,7 +931,7 @@
 
                ion_dev {
                        compatible = "amlogic, ion_dev";
-                       status = "disabled";
+                       status = "okay";
                        memory-region = <&ion_cma_reserved>;
                };/* end of ion_dev*/
        }; /* end of soc*/

diff --git a/arch/arm64/boot/dts/amlogic/tm2_pxp.dts b/arch/arm64/boot/dts/amlogic/tm2_pxp.dts
index 5a7bd66..07e24ae 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tm2_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_pxp.dts
@@ -37,7 +37,7 @@
 
        memory@00000000 {
                device_type = "memory";
-               linux,usable-memory = <0x0 0x0 0x0 0x40000000>;
+               linux,usable-memory = <0x0 0x0 0x0 0x80000000>;
        };
 
        reserved-memory {
@@ -75,7 +75,7 @@
                        reusable;
                        size = <0x0 0x800000>;
                        alignment = <0x0 0x400000>;
-                       alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
+                       alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
                };
 
                ion_cma_reserved:linux,ion-dev {

diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
index 429fcac..c6163e3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -19,7 +19,6 @@
 
 #include "mesontm2.dtsi"
 #include "partition_mbox_normal.dtsi"
-#include "mesontl1_x301-panel.dtsi"
 
 / {
        model = "Amlogic TM2 T962E2 AB311";
@@ -1149,7 +1148,7 @@
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_ao_d_pins3>;
-               status = "okay";
+               status = "disabled";
        };
 
        tuner: tuner {

diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
index 6ce2ebe..375bb38 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
@@ -19,7 +19,6 @@
 
 #include "mesontm2.dtsi"
 #include "partition_mbox_normal.dtsi"
-#include "mesontl1_skt-panel.dtsi"
 
 / {
        model = "Amlogic TM2 T962E2 AB319";
@@ -1125,7 +1124,7 @@
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_ao_d_pins3>;
-               status = "okay";
+               status = "disabled";
        };
 
        tuner: tuner {

diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
index 95785a7..d4bcc4d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -19,7 +19,6 @@
 
 #include "mesontm2.dtsi"
 #include "partition_mbox_normal.dtsi"
-#include "mesontl1_skt-panel.dtsi"
 
 / {
        model = "Amlogic TM2 T962E2 AB319";
@@ -1125,7 +1124,7 @@
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_ao_d_pins3>;
-               status = "okay";
+               status = "disabled";
        };
 
        tuner: tuner {