| Message ID | 20200228084827.16198-1-jbx6244@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 98faae2b4b2d575a11c82735460caae225288d7c |
| Headers | show |
| Series | arm64: dts: rockchip: fix cpu compatible property for rk3308 | expand |
On 28/02/2020 8:48 am, Johan Jonker wrote: > A test with the command below gives for example these errors: > > arch/arm64/boot/dts/rockchip/rk3308-evb.dt.yaml: cpu@0: compatible: > Additional items are not allowed ('arm,armv8' was unexpected) > arch/arm64/boot/dts/rockchip/rk3308-evb.dt.yaml: cpu@0: compatible: > ['arm,cortex-a35', 'arm,armv8'] > is too long > > Fix these errors by removing the last argument of > the cpu compatible property in rk3308.dtsi. Bah, seems this snuck in a couple of releases after we blitzed the last of these from the tree :) Reviewed-by: Robin Murphy <robin.murphy@arm.com> > make ARCH=arm64 > dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/cpus.yaml > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > --- > arch/arm64/boot/dts/rockchip/rk3308.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi > index 116f1900e..3bd5bc860 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi > @@ -40,7 +40,7 @@ > > cpu0: cpu@0 { > device_type = "cpu"; > - compatible = "arm,cortex-a35", "arm,armv8"; > + compatible = "arm,cortex-a35"; > reg = <0x0 0x0>; > enable-method = "psci"; > clocks = <&cru ARMCLK>; > @@ -53,7 +53,7 @@ > > cpu1: cpu@1 { > device_type = "cpu"; > - compatible = "arm,cortex-a35", "arm,armv8"; > + compatible = "arm,cortex-a35"; > reg = <0x0 0x1>; > enable-method = "psci"; > operating-points-v2 = <&cpu0_opp_table>; > @@ -63,7 +63,7 @@ > > cpu2: cpu@2 { > device_type = "cpu"; > - compatible = "arm,cortex-a35", "arm,armv8"; > + compatible = "arm,cortex-a35"; > reg = <0x0 0x2>; > enable-method = "psci"; > operating-points-v2 = <&cpu0_opp_table>; > @@ -73,7 +73,7 @@ > > cpu3: cpu@3 { > device_type = "cpu"; > - compatible = "arm,cortex-a35", "arm,armv8"; > + compatible = "arm,cortex-a35"; > reg = <0x0 0x3>; > enable-method = "psci"; > operating-points-v2 = <&cpu0_opp_table>; >
Am Freitag, 28. Februar 2020, 09:48:27 CET schrieb Johan Jonker: > A test with the command below gives for example these errors: > > arch/arm64/boot/dts/rockchip/rk3308-evb.dt.yaml: cpu@0: compatible: > Additional items are not allowed ('arm,armv8' was unexpected) > arch/arm64/boot/dts/rockchip/rk3308-evb.dt.yaml: cpu@0: compatible: > ['arm,cortex-a35', 'arm,armv8'] > is too long > > Fix these errors by removing the last argument of > the cpu compatible property in rk3308.dtsi. > > make ARCH=arm64 > dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/cpus.yaml > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> applied for 5.7 with Robins Rb Thanks Heiko
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi index 116f1900e..3bd5bc860 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi @@ -40,7 +40,7 @@ cpu0: cpu@0 { device_type = "cpu"; - compatible = "arm,cortex-a35", "arm,armv8"; + compatible = "arm,cortex-a35"; reg = <0x0 0x0>; enable-method = "psci"; clocks = <&cru ARMCLK>; @@ -53,7 +53,7 @@ cpu1: cpu@1 { device_type = "cpu"; - compatible = "arm,cortex-a35", "arm,armv8"; + compatible = "arm,cortex-a35"; reg = <0x0 0x1>; enable-method = "psci"; operating-points-v2 = <&cpu0_opp_table>; @@ -63,7 +63,7 @@ cpu2: cpu@2 { device_type = "cpu"; - compatible = "arm,cortex-a35", "arm,armv8"; + compatible = "arm,cortex-a35"; reg = <0x0 0x2>; enable-method = "psci"; operating-points-v2 = <&cpu0_opp_table>; @@ -73,7 +73,7 @@ cpu3: cpu@3 { device_type = "cpu"; - compatible = "arm,cortex-a35", "arm,armv8"; + compatible = "arm,cortex-a35"; reg = <0x0 0x3>; enable-method = "psci"; operating-points-v2 = <&cpu0_opp_table>;
A test with the command below gives for example these errors: arch/arm64/boot/dts/rockchip/rk3308-evb.dt.yaml: cpu@0: compatible: Additional items are not allowed ('arm,armv8' was unexpected) arch/arm64/boot/dts/rockchip/rk3308-evb.dt.yaml: cpu@0: compatible: ['arm,cortex-a35', 'arm,armv8'] is too long Fix these errors by removing the last argument of the cpu compatible property in rk3308.dtsi. make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/arm/cpus.yaml Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- arch/arm64/boot/dts/rockchip/rk3308.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)