ARM: dts: rockchip: Fix gic/efuse sort ordering for rk3288
Subsystems (2)
PATCH 1/4 ARM: dts: rockchip: Fix gic/efuse sort ordering for rk3288
It can be seen that 0xffb40000 < 0xffc01000, thus efuse comes first.
---
arch/arm/boot/dts/rk3288.dtsi | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +13 -13
@@ -1378,19 +1378,6 @@ reg = <0x0 0xffaf0080 0x0 0x20>; }; - gic: interrupt-controller@ffc01000 { - compatible = "arm,gic-400"; - interrupt-controller; - #interrupt-cells = <3>; - #address-cells = <0>; - - reg = <0x0 0xffc01000 0x0 0x1000>, - <0x0 0xffc02000 0x0 0x2000>, - <0x0 0xffc04000 0x0 0x2000>, - <0x0 0xffc06000 0x0 0x2000>; - interrupts = <GIC_PPI 9 0xf04>; - }; - efuse: efuse@ffb40000 { compatible = "rockchip,rk3288-efuse"; reg = <0x0 0xffb40000 0x0 0x20>;
@@ -1404,6 +1391,19 @@ }; }; + gic: interrupt-controller@ffc01000 { + compatible = "arm,gic-400"; + interrupt-controller; + #interrupt-cells = <3>; + #address-cells = <0>; + + reg = <0x0 0xffc01000 0x0 0x1000>, + <0x0 0xffc02000 0x0 0x2000>, + <0x0 0xffc04000 0x0 0x2000>, + <0x0 0xffc06000 0x0 0x2000>; + interrupts = <GIC_PPI 9 0xf04>; + }; + pinctrl: pinctrl { compatible = "rockchip,rk3288-pinctrl"; rockchip,grf = <&grf>;
Signature · 1 line
2.21.0.225.g810b269d1ac-goog
PATCH 2/4 ARM: dts: rockchip: Fix gpu opp node names for rk3288
The device tree compiler yells like this:
Warning (unit_address_vs_reg):
/gpu-opp-table/opp@100000000:
node has a unit name, but no reg property
Let's match the cpu opp node names and use a dash.
---
arch/arm/boot/dts/rk3288.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +6 -6
@@ -1282,27 +1282,27 @@ gpu_opp_table: gpu-opp-table { compatible = "operating-points-v2"; - opp@100000000 { + opp-100000000 { opp-hz = /bits/ 64 <100000000>; opp-microvolt = <950000>; }; - opp@200000000 { + opp-200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <950000>; }; - opp@300000000 { + opp-300000000 { opp-hz = /bits/ 64 <300000000>; opp-microvolt = <1000000>; }; - opp@400000000 { + opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <1100000>; }; - opp@500000000 { + opp-500000000 { opp-hz = /bits/ 64 <500000000>; opp-microvolt = <1200000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <1250000>; };
Signature · 1 line
2.21.0.225.g810b269d1ac-goog
Re: [PATCH 2/4] ARM: dts: rockchip: Fix gpu opp node names for rk3288
Quoted 41 lines · Douglas Anderson
The device tree compiler yells like this:
Warning (unit_address_vs_reg):
/gpu-opp-table/opp@100000000:
node has a unit name, but no reg propertyLet's match the cpu opp node names and use a dash.
Signed-off-by Douglas Anderson <[email protected]>---
arch/arm/boot/dts/rk3288.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/boot/dts/rk3288.dtsi +4
-4@@ -1282,27 +1282,27 @@ gpu_opp_table: gpu-opp-table { compatible = "operating-points-v2"; - opp@100000000 { + opp-100000000 { opp-hz = /bits/ 64 <100000000>; opp-microvolt = <950000>; }; - opp@200000000 { + opp-200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <950000>; }; - opp@300000000 { + opp-300000000 { opp-hz = /bits/ 64 <300000000>; opp-microvolt = <1000000>; }; - opp@400000000 { + opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <1100000>; };
arch/arm/boot/dts/rk3288.dtsi line 1308
Quoted 10 lines
arch/arm/boot/dts/rk3288.dtsi +2
-2- opp@500000000 { + opp-500000000 { opp-hz = /bits/ 64 <500000000>; opp-microvolt = <1200000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <1250000>; };
PATCH 3/4 ARM: dts: rockchip: Remove #address/#size-cells from rk3288 mipi_dsi
In reply to Douglas AndersonThey are pointless. As dtc points out:
Warning (avoid_unnecessary_addr_size):
/mipi@ff960000:
unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Let's remove them.
---
arch/arm/boot/dts/rk3288.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +0 -2
@@ -1119,8 +1119,6 @@ clock-names = "ref", "pclk"; power-domains = <&power RK3288_PD_VIO>; rockchip,grf = <&grf>; - #address-cells = <1>; - #size-cells = <0>; status = "disabled"; ports {
Signature · 1 line
2.21.0.225.g810b269d1ac-goog
Re: [PATCH 3/4] ARM: dts: rockchip: Remove #address/#size-cells from rk3288 mipi_dsi
Quoted 18 lines · Douglas Anderson
They are pointless. As dtc points out:
Warning (avoid_unnecessary_addr_size):
/mipi@ff960000:
unnecessary #address-cells/#size-cells without "ranges" or child "reg" propertyLet's remove them.
Signed-off-by Douglas Anderson <[email protected]>---
arch/arm/boot/dts/rk3288.dtsi | 2 -- 1 file changed, 2 deletions(-)arch/arm/boot/dts/rk3288.dtsi +0
-0
arch/arm/boot/dts/rk3288.dtsi line 1124
Quoted 8 lines
arch/arm/boot/dts/rk3288.dtsi +0
-2@@ -1119,8 +1119,6 @@ clock-names = "ref", "pclk"; power-domains = <&power RK3288_PD_VIO>; rockchip,grf = <&grf>; - #address-cells = <1>; - #size-cells = <0>; status = "disabled"; ports {
PATCH 4/4 ARM: dts: rockchip: Remove #address/#size-cells from rk3288-veyron gpio-keys
In reply to Douglas AndersonThey are pointless. As dtc points out:
Warning (avoid_unnecessary_addr_size):
/gpio-keys:
unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Let's remove them.
---
arch/arm/boot/dts/rk3288-veyron.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm/boot/dts/rk3288-veyron.dtsi +0 -2
@@ -25,8 +25,6 @@ gpio_keys: gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&pwr_key_l>;
Signature · 1 line
2.21.0.225.g810b269d1ac-goog
Re: [PATCH 4/4] ARM: dts: rockchip: Remove #address/#size-cells from rk3288-veyron gpio-keys
Quoted 18 lines · Douglas Anderson
They are pointless. As dtc points out:
Warning (avoid_unnecessary_addr_size):
/gpio-keys:
unnecessary #address-cells/#size-cells without "ranges" or child "reg" propertyLet's remove them.
Signed-off-by Douglas Anderson <[email protected]>---
arch/arm/boot/dts/rk3288-veyron.dtsi | 2 -- 1 file changed, 2 deletions(-)arch/arm/boot/dts/rk3288-veyron.dtsi +0
-0
arch/arm/boot/dts/rk3288-veyron.dtsi line 30
Quoted 8 lines
arch/arm/boot/dts/rk3288-veyron.dtsi +0
-2@@ -25,8 +25,6 @@ gpio_keys: gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&pwr_key_l>;
Quoted 42 lines · Douglas Anderson
It can be seen that
0xffb40000<0xffc01000, thus efuse comes first.Signed-off-by Douglas Anderson <[email protected]>---
arch/arm/boot/dts/rk3288.dtsi | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)arch/arm/boot/dts/rk3288.dtsi +6
-13@@ -1378,19 +1378,6 @@ reg = <0x0 0xffaf0080 0x0 0x20>; }; - gic: interrupt-controller@ffc01000 { - compatible = "arm,gic-400"; - interrupt-controller; - #interrupt-cells = <3>; - #address-cells = <0>; - - reg = <0x0 0xffc01000 0x0 0x1000>, - <0x0 0xffc02000 0x0 0x2000>, - <0x0 0xffc04000 0x0 0x2000>, - <0x0 0xffc06000 0x0 0x2000>; - interrupts = <GIC_PPI 9 0xf04>; - }; - efuse: efuse@ffb40000 { compatible = "rockchip,rk3288-efuse"; reg = <0x0 0xffb40000 0x0 0x20>;@@ -1404,6 +1391,19 @@ }; }; + gic: interrupt-controller@ffc01000 { + compatible = "arm,gic-400"; + interrupt-controller; + #interrupt-cells = <3>; + #address-cells = <0>; +
arch/arm/boot/dts/rk3288.dtsi line 1409
Quoted 10 lines
arch/arm/boot/dts/rk3288.dtsi +7
-0+ reg = <0x0 0xffc01000 0x0 0x1000>, + <0x0 0xffc02000 0x0 0x2000>, + <0x0 0xffc04000 0x0 0x2000>, + <0x0 0xffc06000 0x0 0x2000>; + interrupts = <GIC_PPI 9 0xf04>; + }; + pinctrl: pinctrl { compatible = "rockchip,rk3288-pinctrl"; rockchip,grf = <&grf>;
Heiko Stuebner
maintainerAm Mittwoch, 20. März 2019, 21:13:59 CET schrieb Douglas Anderson:
Quoted 3 lines
It can be seen that
0xffb40000<0xffc01000, thus efuse comes first.Signed-off-by Douglas Anderson <[email protected]>
applied patch1 for 5.2 and the other 3 as fixes for 5.1
Thanks
Heiko