| Message ID | 20180620122827.14165-2-mperttunen@nvidia.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] dt-bindings: arm: Add compatible string for NVIDIA Carmel | expand |
On Wed, Jun 20, 2018 at 03:28:27PM +0300, Mikko Perttunen wrote: > Add CPU and PSCI nodes to device tree. The Tegra194 SoC contains > eight NVIDIA Carmel CPUs. > > Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> > --- > arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 40 +++++++++++++++++++ > arch/arm64/boot/dts/nvidia/tegra194.dtsi | 53 ++++++++++++++++++++++++++ > 2 files changed, 93 insertions(+) > > diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > index ecb034177fc2..859ab5af17c1 100644 > --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > @@ -229,6 +229,46 @@ > }; > }; > > + cpus { > + cpu@0 { > + enable-method = "psci"; > + }; Kind of strange to have this separated out. I guess you have non-PSCI firmware too? In any case, unless things have changed, upstream is only supporting spin-table or PSCI for arm64. So please combine this with the rest of the cpu nodes. Rob -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 27.06.2018 19:57, Rob Herring wrote: > On Wed, Jun 20, 2018 at 03:28:27PM +0300, Mikko Perttunen wrote: >> Add CPU and PSCI nodes to device tree. The Tegra194 SoC contains >> eight NVIDIA Carmel CPUs. >> >> Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> >> --- >> arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 40 +++++++++++++++++++ >> arch/arm64/boot/dts/nvidia/tegra194.dtsi | 53 ++++++++++++++++++++++++++ >> 2 files changed, 93 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi >> index ecb034177fc2..859ab5af17c1 100644 >> --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi >> +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi >> @@ -229,6 +229,46 @@ >> }; >> }; >> >> + cpus { >> + cpu@0 { >> + enable-method = "psci"; >> + }; > > Kind of strange to have this separated out. I guess you have non-PSCI > firmware too? In any case, unless things have changed, upstream is only > supporting spin-table or PSCI for arm64. So please combine this with the > rest of the cpu nodes. This was copied from older Tegras - we might have had some systems in the past with non-PSCI firmware, but certainly don't have that anymore. I'll combine the nodes. Mikko > > Rob > -- > To unsubscribe from this list: send the line "unsubscribe linux-tegra" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi index ecb034177fc2..859ab5af17c1 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi @@ -229,6 +229,46 @@ }; }; + cpus { + cpu@0 { + enable-method = "psci"; + }; + + cpu@1 { + enable-method = "psci"; + }; + + cpu@2 { + enable-method = "psci"; + }; + + cpu@3 { + enable-method = "psci"; + }; + + cpu@4 { + enable-method = "psci"; + }; + + cpu@5 { + enable-method = "psci"; + }; + + cpu@6 { + enable-method = "psci"; + }; + + cpu@7 { + enable-method = "psci"; + }; + }; + + psci { + compatible = "arm,psci-1.0"; + status = "okay"; + method = "smc"; + }; + regulators { compatible = "simple-bus"; #address-cells = <1>; diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi index 6322ef265c2f..6d699815a84f 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi @@ -329,6 +329,59 @@ }; }; + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + compatible = "nvidia,tegra194-carmel", "arm,armv8"; + device_type = "cpu"; + reg = <0x10000>; + }; + + cpu@1 { + compatible = "nvidia,tegra194-carmel", "arm,armv8"; + device_type = "cpu"; + reg = <0x10001>; + }; + + cpu@2 { + compatible = "nvidia,tegra194-carmel", "arm,armv8"; + device_type = "cpu"; + reg = <0x100>; + }; + + cpu@3 { + compatible = "nvidia,tegra194-carmel", "arm,armv8"; + device_type = "cpu"; + reg = <0x101>; + }; + + cpu@4 { + compatible = "nvidia,tegra194-carmel", "arm,armv8"; + device_type = "cpu"; + reg = <0x200>; + }; + + cpu@5 { + compatible = "nvidia,tegra194-carmel", "arm,armv8"; + device_type = "cpu"; + reg = <0x201>; + }; + + cpu@6 { + compatible = "nvidia,tegra194-carmel", "arm,armv8"; + device_type = "cpu"; + reg = <0x10300>; + }; + + cpu@7 { + compatible = "nvidia,tegra194-carmel", "arm,armv8"; + device_type = "cpu"; + reg = <0x10301>; + }; + }; + timer { compatible = "arm,armv8-timer"; interrupts = <GIC_PPI 13
Add CPU and PSCI nodes to device tree. The Tegra194 SoC contains eight NVIDIA Carmel CPUs. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> --- arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 40 +++++++++++++++++++ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 53 ++++++++++++++++++++++++++ 2 files changed, 93 insertions(+)