Re: [PATCH] ARM: dts: rockchip: convert rk3288 device tree files to 64 bits

[Heiko Stuebner]

Am Donnerstag, 3. August 2017, 11:21:36 CEST schrieb Tao Huang:
> In order to be able to use more than 4GB of RAM when the LPAE is
> activated, the dts must be converted in 64 bits.
> 
> Signed-off-by: Tao Huang 

applied for 4.14


Thanks
Heiko

Re: [PATCH] ARM: dts: rockchip: convert rk3288 device tree files to 64 bits

[Heiko Stuebner]

Am Donnerstag, 3. August 2017, 11:21:36 CEST schrieb Tao Huang:
> In order to be able to use more than 4GB of RAM when the LPAE is
> activated, the dts must be converted in 64 bits.
> 
> Signed-off-by: Tao Huang 

applied for 4.14


Thanks
Heiko

[PATCH] ARM: dts: rockchip: convert rk3288 device tree files to 64 bits

[Tao Huang]

In order to be able to use more than 4GB of RAM when the LPAE is
activated, the dts must be converted in 64 bits.

Signed-off-by: Tao Huang 
---

Another way to support 64-bit memory is create a soc subnode, and move all
peripherals to this subnode. But it will break userspace compatibility.
For example,
/sys/devices/platform/ff0f.dwmmc
will be
/sys/devices/platform/soc/ff0f.dwmmc
Some system will stop work. So I selected this way.

Most of the changes by the following commands:
sed -e 's/0xff/0x0 0xff/g' -e 's/0x0 0xff[[:xdigit:]]\{6\}/& 0x0/g'
sed 's/reg = <0x0 0x8000>/reg = <0x0 0x0 0x0 0x8000>/'
sed 's/reg = <0 0x8000>/reg = <0x0 0x0 0x0 0x8000>/'
sed 's/reg = <0 0x800>/reg = <0x0 0x0 0x0 0x800>/'

 arch/arm/boot/dts/rk3288-evb.dtsi |   2 +-
 arch/arm/boot/dts/rk3288-fennec.dts   |   2 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi |   2 +-
 arch/arm/boot/dts/rk3288-firefly.dtsi |   2 +-
 arch/arm/boot/dts/rk3288-miqi.dts |   2 +-
 arch/arm/boot/dts/rk3288-phycore-som.dtsi |   2 +-
 arch/arm/boot/dts/rk3288-popmetal.dts |   2 +-
 arch/arm/boot/dts/rk3288-r89.dts  |   2 +-
 arch/arm/boot/dts/rk3288-rock2-som.dtsi   |   2 +-
 arch/arm/boot/dts/rk3288-tinker.dts   |   2 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi  |   2 +-
 arch/arm/boot/dts/rk3288.dtsi | 178 +++---
 12 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi 
b/arch/arm/boot/dts/rk3288-evb.dtsi
index 0dec94c3583b..3b2255812ab5 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -45,7 +45,7 @@
 / {
memory@0 {
device_type = "memory";
-   reg = <0x0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
backlight: backlight {
diff --git a/arch/arm/boot/dts/rk3288-fennec.dts 
b/arch/arm/boot/dts/rk3288-fennec.dts
index 61d1c1028317..306ac78e1e1b 100644
--- a/arch/arm/boot/dts/rk3288-fennec.dts
+++ b/arch/arm/boot/dts/rk3288-fennec.dts
@@ -47,7 +47,7 @@
compatible = "rockchip,rk3288-fennec", "rockchip,rk3288";
 
memory@0 {
-   reg = <0x0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
device_type = "memory";
};
 
diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi 
b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
index 813496618d08..63f3b92d78db 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
@@ -47,7 +47,7 @@
 / {
memory@0 {
device_type = "memory";
-   reg = <0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
ext_gmac: external-gmac-clock {
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi 
b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 32dabae12e67..e3520220406a 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -46,7 +46,7 @@
 / {
memory@0 {
device_type = "memory";
-   reg = <0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
adc-keys {
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts 
b/arch/arm/boot/dts/rk3288-miqi.dts
index 30e93f694ae8..413ab859e3ea 100644
--- a/arch/arm/boot/dts/rk3288-miqi.dts
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
@@ -54,7 +54,7 @@
 
memory@0 {
device_type = "memory";
-   reg = <0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
ext_gmac: external-gmac-clock {
diff --git a/arch/arm/boot/dts/rk3288-phycore-som.dtsi 
b/arch/arm/boot/dts/rk3288-phycore-som.dtsi
index 26cd3ad45160..0c7a54c59652 100644
--- a/arch/arm/boot/dts/rk3288-phycore-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-phycore-som.dtsi
@@ -55,7 +55,7 @@
 */
memory {
device_type = "memory";
-   reg = <0 0x800>;
+   reg = <0x0 0x0 0x0 0x800>;
};
 
aliases {
diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts 
b/arch/arm/boot/dts/rk3288-popmetal.dts
index aa1f9ecff231..eaaadbc43e7a 100644
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -50,7 +50,7 @@
 
memory@0 {
device_type = "memory";
-   reg = <0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
ext_gmac: external-gmac-clock {
diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index 1145b62edde7..c1a535321efc 100644
--- a/arch/arm/boot/dts/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rk3288-r89.dts
@@ -50,7 +50,7 @@
 
memory@0 {
device_type = "memory";
-   reg = <0x0 0x8000>;
+   reg = <0x0 0x0 

[PATCH] ARM: dts: rockchip: convert rk3288 device tree files to 64 bits

[Tao Huang]

In order to be able to use more than 4GB of RAM when the LPAE is
activated, the dts must be converted in 64 bits.

Signed-off-by: Tao Huang 
---

Another way to support 64-bit memory is create a soc subnode, and move all
peripherals to this subnode. But it will break userspace compatibility.
For example,
/sys/devices/platform/ff0f.dwmmc
will be
/sys/devices/platform/soc/ff0f.dwmmc
Some system will stop work. So I selected this way.

Most of the changes by the following commands:
sed -e 's/0xff/0x0 0xff/g' -e 's/0x0 0xff[[:xdigit:]]\{6\}/& 0x0/g'
sed 's/reg = <0x0 0x8000>/reg = <0x0 0x0 0x0 0x8000>/'
sed 's/reg = <0 0x8000>/reg = <0x0 0x0 0x0 0x8000>/'
sed 's/reg = <0 0x800>/reg = <0x0 0x0 0x0 0x800>/'

 arch/arm/boot/dts/rk3288-evb.dtsi |   2 +-
 arch/arm/boot/dts/rk3288-fennec.dts   |   2 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi |   2 +-
 arch/arm/boot/dts/rk3288-firefly.dtsi |   2 +-
 arch/arm/boot/dts/rk3288-miqi.dts |   2 +-
 arch/arm/boot/dts/rk3288-phycore-som.dtsi |   2 +-
 arch/arm/boot/dts/rk3288-popmetal.dts |   2 +-
 arch/arm/boot/dts/rk3288-r89.dts  |   2 +-
 arch/arm/boot/dts/rk3288-rock2-som.dtsi   |   2 +-
 arch/arm/boot/dts/rk3288-tinker.dts   |   2 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi  |   2 +-
 arch/arm/boot/dts/rk3288.dtsi | 178 +++---
 12 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi 
b/arch/arm/boot/dts/rk3288-evb.dtsi
index 0dec94c3583b..3b2255812ab5 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -45,7 +45,7 @@
 / {
memory@0 {
device_type = "memory";
-   reg = <0x0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
backlight: backlight {
diff --git a/arch/arm/boot/dts/rk3288-fennec.dts 
b/arch/arm/boot/dts/rk3288-fennec.dts
index 61d1c1028317..306ac78e1e1b 100644
--- a/arch/arm/boot/dts/rk3288-fennec.dts
+++ b/arch/arm/boot/dts/rk3288-fennec.dts
@@ -47,7 +47,7 @@
compatible = "rockchip,rk3288-fennec", "rockchip,rk3288";
 
memory@0 {
-   reg = <0x0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
device_type = "memory";
};
 
diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi 
b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
index 813496618d08..63f3b92d78db 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
@@ -47,7 +47,7 @@
 / {
memory@0 {
device_type = "memory";
-   reg = <0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
ext_gmac: external-gmac-clock {
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi 
b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 32dabae12e67..e3520220406a 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -46,7 +46,7 @@
 / {
memory@0 {
device_type = "memory";
-   reg = <0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
adc-keys {
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts 
b/arch/arm/boot/dts/rk3288-miqi.dts
index 30e93f694ae8..413ab859e3ea 100644
--- a/arch/arm/boot/dts/rk3288-miqi.dts
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
@@ -54,7 +54,7 @@
 
memory@0 {
device_type = "memory";
-   reg = <0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
ext_gmac: external-gmac-clock {
diff --git a/arch/arm/boot/dts/rk3288-phycore-som.dtsi 
b/arch/arm/boot/dts/rk3288-phycore-som.dtsi
index 26cd3ad45160..0c7a54c59652 100644
--- a/arch/arm/boot/dts/rk3288-phycore-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-phycore-som.dtsi
@@ -55,7 +55,7 @@
 */
memory {
device_type = "memory";
-   reg = <0 0x800>;
+   reg = <0x0 0x0 0x0 0x800>;
};
 
aliases {
diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts 
b/arch/arm/boot/dts/rk3288-popmetal.dts
index aa1f9ecff231..eaaadbc43e7a 100644
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -50,7 +50,7 @@
 
memory@0 {
device_type = "memory";
-   reg = <0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;
};
 
ext_gmac: external-gmac-clock {
diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index 1145b62edde7..c1a535321efc 100644
--- a/arch/arm/boot/dts/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rk3288-r89.dts
@@ -50,7 +50,7 @@
 
memory@0 {
device_type = "memory";
-   reg = <0x0 0x8000>;
+   reg = <0x0 0x0 0x0 0x8000>;