Message ID | 20211217173908.3201517-1-robh@kernel.org |
---|---|
State | Accepted |
Commit | 84a7f5a98346e14831025e0f86c809924816424a |
Headers | show |
Series | arm64: dts: imx8qm: Drop CPU 'arm,armv8' compatible | expand |
On Fri, Dec 17, 2021 at 11:39 AM Rob Herring <robh@kernel.org> wrote: > > The CPU 'arm,armv8' compatible is only for s/w models, so remove it from > i.MX8QM CPU nodes. > > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: NXP Linux Team <linux-imx@nxp.com> > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > Note that the PMU node is also wrong as it should have separate A72 and > A53 nodes to get uarch specific events, but that needs some GIC changes. > --- > arch/arm64/boot/dts/freescale/imx8qm.dtsi | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) Ping > > diff --git a/arch/arm64/boot/dts/freescale/imx8qm.dtsi b/arch/arm64/boot/dts/freescale/imx8qm.dtsi > index aebbe2b84aa1..b13f09ca0404 100644 > --- a/arch/arm64/boot/dts/freescale/imx8qm.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8qm.dtsi > @@ -54,7 +54,7 @@ core1 { > > A53_0: cpu@0 { > device_type = "cpu"; > - compatible = "arm,cortex-a53", "arm,armv8"; > + compatible = "arm,cortex-a53"; > reg = <0x0 0x0>; > enable-method = "psci"; > next-level-cache = <&A53_L2>; > @@ -62,7 +62,7 @@ A53_0: cpu@0 { > > A53_1: cpu@1 { > device_type = "cpu"; > - compatible = "arm,cortex-a53", "arm,armv8"; > + compatible = "arm,cortex-a53"; > reg = <0x0 0x1>; > enable-method = "psci"; > next-level-cache = <&A53_L2>; > @@ -70,7 +70,7 @@ A53_1: cpu@1 { > > A53_2: cpu@2 { > device_type = "cpu"; > - compatible = "arm,cortex-a53", "arm,armv8"; > + compatible = "arm,cortex-a53"; > reg = <0x0 0x2>; > enable-method = "psci"; > next-level-cache = <&A53_L2>; > @@ -78,7 +78,7 @@ A53_2: cpu@2 { > > A53_3: cpu@3 { > device_type = "cpu"; > - compatible = "arm,cortex-a53", "arm,armv8"; > + compatible = "arm,cortex-a53"; > reg = <0x0 0x3>; > enable-method = "psci"; > next-level-cache = <&A53_L2>; > @@ -86,7 +86,7 @@ A53_3: cpu@3 { > > A72_0: cpu@100 { > device_type = "cpu"; > - compatible = "arm,cortex-a72", "arm,armv8"; > + compatible = "arm,cortex-a72"; > reg = <0x0 0x100>; > enable-method = "psci"; > next-level-cache = <&A72_L2>; > @@ -94,7 +94,7 @@ A72_0: cpu@100 { > > A72_1: cpu@101 { > device_type = "cpu"; > - compatible = "arm,cortex-a72", "arm,armv8"; > + compatible = "arm,cortex-a72"; > reg = <0x0 0x101>; > enable-method = "psci"; > next-level-cache = <&A72_L2>; > -- > 2.32.0 >
On Fri, Dec 17, 2021 at 11:39:08AM -0600, Rob Herring wrote: > The CPU 'arm,armv8' compatible is only for s/w models, so remove it from > i.MX8QM CPU nodes. > > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: NXP Linux Team <linux-imx@nxp.com> > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Rob Herring <robh@kernel.org> Applied, thanks!
diff --git a/arch/arm64/boot/dts/freescale/imx8qm.dtsi b/arch/arm64/boot/dts/freescale/imx8qm.dtsi index aebbe2b84aa1..b13f09ca0404 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qm.dtsi @@ -54,7 +54,7 @@ core1 { A53_0: cpu@0 { device_type = "cpu"; - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x0 0x0>; enable-method = "psci"; next-level-cache = <&A53_L2>; @@ -62,7 +62,7 @@ A53_0: cpu@0 { A53_1: cpu@1 { device_type = "cpu"; - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x0 0x1>; enable-method = "psci"; next-level-cache = <&A53_L2>; @@ -70,7 +70,7 @@ A53_1: cpu@1 { A53_2: cpu@2 { device_type = "cpu"; - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x0 0x2>; enable-method = "psci"; next-level-cache = <&A53_L2>; @@ -78,7 +78,7 @@ A53_2: cpu@2 { A53_3: cpu@3 { device_type = "cpu"; - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; reg = <0x0 0x3>; enable-method = "psci"; next-level-cache = <&A53_L2>; @@ -86,7 +86,7 @@ A53_3: cpu@3 { A72_0: cpu@100 { device_type = "cpu"; - compatible = "arm,cortex-a72", "arm,armv8"; + compatible = "arm,cortex-a72"; reg = <0x0 0x100>; enable-method = "psci"; next-level-cache = <&A72_L2>; @@ -94,7 +94,7 @@ A72_0: cpu@100 { A72_1: cpu@101 { device_type = "cpu"; - compatible = "arm,cortex-a72", "arm,armv8"; + compatible = "arm,cortex-a72"; reg = <0x0 0x101>; enable-method = "psci"; next-level-cache = <&A72_L2>;
The CPU 'arm,armv8' compatible is only for s/w models, so remove it from i.MX8QM CPU nodes. Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Rob Herring <robh@kernel.org> --- Note that the PMU node is also wrong as it should have separate A72 and A53 nodes to get uarch specific events, but that needs some GIC changes. --- arch/arm64/boot/dts/freescale/imx8qm.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)