diff mbox series

[9/9] arm64: tegra: Initial Tegra234 VDK support

Message ID 20200716141856.544718-10-thierry.reding@gmail.com
State New
Headers show
Series arm64: tegra: Initial Tegra234 VDK support | expand

Commit Message

Thierry Reding July 16, 2020, 2:18 p.m. UTC
From: Thierry Reding <treding@nvidia.com>

The NVIDIA Tegra234 VDK is a simulation platform for the Orin SoC. It
supports a subset of the peripherals that will be available in the final
chip and serves as a bootstrapping platform.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm64/boot/dts/nvidia/Makefile           |   1 +
 .../boot/dts/nvidia/tegra234-sim-vdk.dts      |  40 ++++
 arch/arm64/boot/dts/nvidia/tegra234.dtsi      | 191 ++++++++++++++++++
 drivers/soc/tegra/Kconfig                     |  10 +
 include/dt-bindings/clock/tegra234-clock.h    |  14 ++
 include/dt-bindings/reset/tegra234-reset.h    |  10 +
 6 files changed, 266 insertions(+)
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra234.dtsi
 create mode 100644 include/dt-bindings/clock/tegra234-clock.h
 create mode 100644 include/dt-bindings/reset/tegra234-reset.h

Comments

Jon Hunter Sept. 7, 2020, 7:46 p.m. UTC | #1
On 16/07/2020 15:18, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> The NVIDIA Tegra234 VDK is a simulation platform for the Orin SoC. It
> supports a subset of the peripherals that will be available in the final
> chip and serves as a bootstrapping platform.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  arch/arm64/boot/dts/nvidia/Makefile           |   1 +
>  .../boot/dts/nvidia/tegra234-sim-vdk.dts      |  40 ++++
>  arch/arm64/boot/dts/nvidia/tegra234.dtsi      | 191 ++++++++++++++++++
>  drivers/soc/tegra/Kconfig                     |  10 +
>  include/dt-bindings/clock/tegra234-clock.h    |  14 ++
>  include/dt-bindings/reset/tegra234-reset.h    |  10 +
>  6 files changed, 266 insertions(+)
>  create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
>  create mode 100644 arch/arm64/boot/dts/nvidia/tegra234.dtsi
>  create mode 100644 include/dt-bindings/clock/tegra234-clock.h
>  create mode 100644 include/dt-bindings/reset/tegra234-reset.h
> 
> diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile
> index 2273fc5db19c..9296d12d11e9 100644
> --- a/arch/arm64/boot/dts/nvidia/Makefile
> +++ b/arch/arm64/boot/dts/nvidia/Makefile
> @@ -9,3 +9,4 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2894-0050-a08.dtb
>  dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb
>  dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p2972-0000.dtb
>  dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0000.dtb
> +dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-sim-vdk.dtb
> diff --git a/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
> new file mode 100644
> index 000000000000..f6e6a24829af
> --- /dev/null
> +++ b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
> @@ -0,0 +1,40 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/dts-v1/;
> +
> +#include "tegra234.dtsi"
> +
> +/ {
> +	model = "NVIDIA Tegra234 VDK";
> +	compatible = "nvidia,tegra234-vdk", "nvidia,tegra234";
> +
> +	aliases {
> +		sdhci3 = "/cbb@0/sdhci@3460000";
> +		serial0 = &uarta;
> +	};
> +
> +	chosen {
> +		bootargs = "console=ttyS0,115200n8 earlycon=uart8250,mmio32,0x03100000";
> +		stdout-path = "serial0:115200n8";
> +	};
> +
> +	cbb@0 {
> +		serial@3100000 {
> +			status = "okay";
> +		};
> +
> +		sdhci@3460000 {
> +			status = "okay";
> +			bus-width = <8>;
> +			non-removable;
> +			only-1-8-v;
> +		};
> +
> +		rtc@c2a0000 {
> +			status = "okay";
> +		};
> +
> +		pmc@c360000 {
> +			nvidia,invert-interrupt;
> +		};
> +	};
> +};
> diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> new file mode 100644
> index 000000000000..3509687441a1
> --- /dev/null
> +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> @@ -0,0 +1,191 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +#include <dt-bindings/clock/tegra234-clock.h>
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
> +#include <dt-bindings/mailbox/tegra186-hsp.h>
> +#include <dt-bindings/reset/tegra234-reset.h>
> +
> +/ {
> +	compatible = "nvidia,tegra234";
> +	interrupt-parent = <&gic>;
> +	#address-cells = <2>;
> +	#size-cells = <2>;
> +
> +	bus@0 {
> +		compatible = "simple-bus";
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +
> +		ranges = <0x0 0x0 0x0 0x40000000>;
> +
> +		misc@100000 {
> +			compatible = "nvidia,tegra234-misc";
> +			reg = <0x00100000 0xf000>,
> +			      <0x0010f000 0x1000>;
> +			status = "okay";
> +		};


Is there meant to be a fallback option here, because I don't see
anything to match the above compatible string?

Cheers
Jon
Thierry Reding Sept. 15, 2020, 12:44 p.m. UTC | #2
On Mon, Sep 07, 2020 at 08:46:48PM +0100, Jon Hunter wrote:
> 
> On 16/07/2020 15:18, Thierry Reding wrote:
> > From: Thierry Reding <treding@nvidia.com>
> > 
> > The NVIDIA Tegra234 VDK is a simulation platform for the Orin SoC. It
> > supports a subset of the peripherals that will be available in the final
> > chip and serves as a bootstrapping platform.
> > 
> > Signed-off-by: Thierry Reding <treding@nvidia.com>
> > ---
> >  arch/arm64/boot/dts/nvidia/Makefile           |   1 +
> >  .../boot/dts/nvidia/tegra234-sim-vdk.dts      |  40 ++++
> >  arch/arm64/boot/dts/nvidia/tegra234.dtsi      | 191 ++++++++++++++++++
> >  drivers/soc/tegra/Kconfig                     |  10 +
> >  include/dt-bindings/clock/tegra234-clock.h    |  14 ++
> >  include/dt-bindings/reset/tegra234-reset.h    |  10 +
> >  6 files changed, 266 insertions(+)
> >  create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
> >  create mode 100644 arch/arm64/boot/dts/nvidia/tegra234.dtsi
> >  create mode 100644 include/dt-bindings/clock/tegra234-clock.h
> >  create mode 100644 include/dt-bindings/reset/tegra234-reset.h
> > 
> > diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile
> > index 2273fc5db19c..9296d12d11e9 100644
> > --- a/arch/arm64/boot/dts/nvidia/Makefile
> > +++ b/arch/arm64/boot/dts/nvidia/Makefile
> > @@ -9,3 +9,4 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2894-0050-a08.dtb
> >  dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb
> >  dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p2972-0000.dtb
> >  dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0000.dtb
> > +dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-sim-vdk.dtb
> > diff --git a/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
> > new file mode 100644
> > index 000000000000..f6e6a24829af
> > --- /dev/null
> > +++ b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
> > @@ -0,0 +1,40 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/dts-v1/;
> > +
> > +#include "tegra234.dtsi"
> > +
> > +/ {
> > +	model = "NVIDIA Tegra234 VDK";
> > +	compatible = "nvidia,tegra234-vdk", "nvidia,tegra234";
> > +
> > +	aliases {
> > +		sdhci3 = "/cbb@0/sdhci@3460000";
> > +		serial0 = &uarta;
> > +	};
> > +
> > +	chosen {
> > +		bootargs = "console=ttyS0,115200n8 earlycon=uart8250,mmio32,0x03100000";
> > +		stdout-path = "serial0:115200n8";
> > +	};
> > +
> > +	cbb@0 {
> > +		serial@3100000 {
> > +			status = "okay";
> > +		};
> > +
> > +		sdhci@3460000 {
> > +			status = "okay";
> > +			bus-width = <8>;
> > +			non-removable;
> > +			only-1-8-v;
> > +		};
> > +
> > +		rtc@c2a0000 {
> > +			status = "okay";
> > +		};
> > +
> > +		pmc@c360000 {
> > +			nvidia,invert-interrupt;
> > +		};
> > +	};
> > +};
> > diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> > new file mode 100644
> > index 000000000000..3509687441a1
> > --- /dev/null
> > +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> > @@ -0,0 +1,191 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +
> > +#include <dt-bindings/clock/tegra234-clock.h>
> > +#include <dt-bindings/interrupt-controller/arm-gic.h>
> > +#include <dt-bindings/mailbox/tegra186-hsp.h>
> > +#include <dt-bindings/reset/tegra234-reset.h>
> > +
> > +/ {
> > +	compatible = "nvidia,tegra234";
> > +	interrupt-parent = <&gic>;
> > +	#address-cells = <2>;
> > +	#size-cells = <2>;
> > +
> > +	bus@0 {
> > +		compatible = "simple-bus";
> > +		#address-cells = <1>;
> > +		#size-cells = <1>;
> > +
> > +		ranges = <0x0 0x0 0x0 0x40000000>;
> > +
> > +		misc@100000 {
> > +			compatible = "nvidia,tegra234-misc";
> > +			reg = <0x00100000 0xf000>,
> > +			      <0x0010f000 0x1000>;
> > +			status = "okay";
> > +		};
> 
> 
> Is there meant to be a fallback option here, because I don't see
> anything to match the above compatible string?

I've got the below patch in my tree that's meant to add that code, but
it's in the wrong order in my local branch, so it didn't make it into
this subset. I'll reorder the patches to include the APBMISC support
patch in this series.

While this block is generally very similar, there are enough variations
for them not to count as compatible, in my opinion, so I don't think
adding a fallback is the right option.

Thierry
Jon Hunter Sept. 15, 2020, 1:17 p.m. UTC | #3
On 15/09/2020 13:44, Thierry Reding wrote:
> On Mon, Sep 07, 2020 at 08:46:48PM +0100, Jon Hunter wrote:
>>
>> On 16/07/2020 15:18, Thierry Reding wrote:
>>> From: Thierry Reding <treding@nvidia.com>
>>>
>>> The NVIDIA Tegra234 VDK is a simulation platform for the Orin SoC. It
>>> supports a subset of the peripherals that will be available in the final
>>> chip and serves as a bootstrapping platform.
>>>
>>> Signed-off-by: Thierry Reding <treding@nvidia.com>
>>> ---
>>>  arch/arm64/boot/dts/nvidia/Makefile           |   1 +
>>>  .../boot/dts/nvidia/tegra234-sim-vdk.dts      |  40 ++++
>>>  arch/arm64/boot/dts/nvidia/tegra234.dtsi      | 191 ++++++++++++++++++
>>>  drivers/soc/tegra/Kconfig                     |  10 +
>>>  include/dt-bindings/clock/tegra234-clock.h    |  14 ++
>>>  include/dt-bindings/reset/tegra234-reset.h    |  10 +
>>>  6 files changed, 266 insertions(+)
>>>  create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
>>>  create mode 100644 arch/arm64/boot/dts/nvidia/tegra234.dtsi
>>>  create mode 100644 include/dt-bindings/clock/tegra234-clock.h
>>>  create mode 100644 include/dt-bindings/reset/tegra234-reset.h
>>>
>>> diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile
>>> index 2273fc5db19c..9296d12d11e9 100644
>>> --- a/arch/arm64/boot/dts/nvidia/Makefile
>>> +++ b/arch/arm64/boot/dts/nvidia/Makefile
>>> @@ -9,3 +9,4 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2894-0050-a08.dtb
>>>  dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb
>>>  dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p2972-0000.dtb
>>>  dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0000.dtb
>>> +dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-sim-vdk.dtb
>>> diff --git a/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
>>> new file mode 100644
>>> index 000000000000..f6e6a24829af
>>> --- /dev/null
>>> +++ b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
>>> @@ -0,0 +1,40 @@
>>> +// SPDX-License-Identifier: GPL-2.0
>>> +/dts-v1/;
>>> +
>>> +#include "tegra234.dtsi"
>>> +
>>> +/ {
>>> +	model = "NVIDIA Tegra234 VDK";
>>> +	compatible = "nvidia,tegra234-vdk", "nvidia,tegra234";
>>> +
>>> +	aliases {
>>> +		sdhci3 = "/cbb@0/sdhci@3460000";
>>> +		serial0 = &uarta;
>>> +	};
>>> +
>>> +	chosen {
>>> +		bootargs = "console=ttyS0,115200n8 earlycon=uart8250,mmio32,0x03100000";
>>> +		stdout-path = "serial0:115200n8";
>>> +	};
>>> +
>>> +	cbb@0 {
>>> +		serial@3100000 {
>>> +			status = "okay";
>>> +		};
>>> +
>>> +		sdhci@3460000 {
>>> +			status = "okay";
>>> +			bus-width = <8>;
>>> +			non-removable;
>>> +			only-1-8-v;
>>> +		};
>>> +
>>> +		rtc@c2a0000 {
>>> +			status = "okay";
>>> +		};
>>> +
>>> +		pmc@c360000 {
>>> +			nvidia,invert-interrupt;
>>> +		};
>>> +	};
>>> +};
>>> diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
>>> new file mode 100644
>>> index 000000000000..3509687441a1
>>> --- /dev/null
>>> +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
>>> @@ -0,0 +1,191 @@
>>> +// SPDX-License-Identifier: GPL-2.0
>>> +
>>> +#include <dt-bindings/clock/tegra234-clock.h>
>>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>>> +#include <dt-bindings/mailbox/tegra186-hsp.h>
>>> +#include <dt-bindings/reset/tegra234-reset.h>
>>> +
>>> +/ {
>>> +	compatible = "nvidia,tegra234";
>>> +	interrupt-parent = <&gic>;
>>> +	#address-cells = <2>;
>>> +	#size-cells = <2>;
>>> +
>>> +	bus@0 {
>>> +		compatible = "simple-bus";
>>> +		#address-cells = <1>;
>>> +		#size-cells = <1>;
>>> +
>>> +		ranges = <0x0 0x0 0x0 0x40000000>;
>>> +
>>> +		misc@100000 {
>>> +			compatible = "nvidia,tegra234-misc";
>>> +			reg = <0x00100000 0xf000>,
>>> +			      <0x0010f000 0x1000>;
>>> +			status = "okay";
>>> +		};
>>
>>
>> Is there meant to be a fallback option here, because I don't see
>> anything to match the above compatible string?
> 
> I've got the below patch in my tree that's meant to add that code, but
> it's in the wrong order in my local branch, so it didn't make it into
> this subset. I'll reorder the patches to include the APBMISC support
> patch in this series.

OK, I think that the same also applies to efuse, pmc, rtc and bpmp-shmem
from looking at this patch.

Jon
Thierry Reding Sept. 15, 2020, 1:49 p.m. UTC | #4
On Tue, Sep 15, 2020 at 02:17:39PM +0100, Jon Hunter wrote:
> 
> 
> On 15/09/2020 13:44, Thierry Reding wrote:
> > On Mon, Sep 07, 2020 at 08:46:48PM +0100, Jon Hunter wrote:
> >>
> >> On 16/07/2020 15:18, Thierry Reding wrote:
> >>> From: Thierry Reding <treding@nvidia.com>
> >>>
> >>> The NVIDIA Tegra234 VDK is a simulation platform for the Orin SoC. It
> >>> supports a subset of the peripherals that will be available in the final
> >>> chip and serves as a bootstrapping platform.
> >>>
> >>> Signed-off-by: Thierry Reding <treding@nvidia.com>
> >>> ---
> >>>  arch/arm64/boot/dts/nvidia/Makefile           |   1 +
> >>>  .../boot/dts/nvidia/tegra234-sim-vdk.dts      |  40 ++++
> >>>  arch/arm64/boot/dts/nvidia/tegra234.dtsi      | 191 ++++++++++++++++++
> >>>  drivers/soc/tegra/Kconfig                     |  10 +
> >>>  include/dt-bindings/clock/tegra234-clock.h    |  14 ++
> >>>  include/dt-bindings/reset/tegra234-reset.h    |  10 +
> >>>  6 files changed, 266 insertions(+)
> >>>  create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
> >>>  create mode 100644 arch/arm64/boot/dts/nvidia/tegra234.dtsi
> >>>  create mode 100644 include/dt-bindings/clock/tegra234-clock.h
> >>>  create mode 100644 include/dt-bindings/reset/tegra234-reset.h
> >>>
> >>> diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile
> >>> index 2273fc5db19c..9296d12d11e9 100644
> >>> --- a/arch/arm64/boot/dts/nvidia/Makefile
> >>> +++ b/arch/arm64/boot/dts/nvidia/Makefile
> >>> @@ -9,3 +9,4 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2894-0050-a08.dtb
> >>>  dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb
> >>>  dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p2972-0000.dtb
> >>>  dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0000.dtb
> >>> +dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-sim-vdk.dtb
> >>> diff --git a/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
> >>> new file mode 100644
> >>> index 000000000000..f6e6a24829af
> >>> --- /dev/null
> >>> +++ b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
> >>> @@ -0,0 +1,40 @@
> >>> +// SPDX-License-Identifier: GPL-2.0
> >>> +/dts-v1/;
> >>> +
> >>> +#include "tegra234.dtsi"
> >>> +
> >>> +/ {
> >>> +	model = "NVIDIA Tegra234 VDK";
> >>> +	compatible = "nvidia,tegra234-vdk", "nvidia,tegra234";
> >>> +
> >>> +	aliases {
> >>> +		sdhci3 = "/cbb@0/sdhci@3460000";
> >>> +		serial0 = &uarta;
> >>> +	};
> >>> +
> >>> +	chosen {
> >>> +		bootargs = "console=ttyS0,115200n8 earlycon=uart8250,mmio32,0x03100000";
> >>> +		stdout-path = "serial0:115200n8";
> >>> +	};
> >>> +
> >>> +	cbb@0 {
> >>> +		serial@3100000 {
> >>> +			status = "okay";
> >>> +		};
> >>> +
> >>> +		sdhci@3460000 {
> >>> +			status = "okay";
> >>> +			bus-width = <8>;
> >>> +			non-removable;
> >>> +			only-1-8-v;
> >>> +		};
> >>> +
> >>> +		rtc@c2a0000 {
> >>> +			status = "okay";
> >>> +		};
> >>> +
> >>> +		pmc@c360000 {
> >>> +			nvidia,invert-interrupt;
> >>> +		};
> >>> +	};
> >>> +};
> >>> diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> >>> new file mode 100644
> >>> index 000000000000..3509687441a1
> >>> --- /dev/null
> >>> +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> >>> @@ -0,0 +1,191 @@
> >>> +// SPDX-License-Identifier: GPL-2.0
> >>> +
> >>> +#include <dt-bindings/clock/tegra234-clock.h>
> >>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
> >>> +#include <dt-bindings/mailbox/tegra186-hsp.h>
> >>> +#include <dt-bindings/reset/tegra234-reset.h>
> >>> +
> >>> +/ {
> >>> +	compatible = "nvidia,tegra234";
> >>> +	interrupt-parent = <&gic>;
> >>> +	#address-cells = <2>;
> >>> +	#size-cells = <2>;
> >>> +
> >>> +	bus@0 {
> >>> +		compatible = "simple-bus";
> >>> +		#address-cells = <1>;
> >>> +		#size-cells = <1>;
> >>> +
> >>> +		ranges = <0x0 0x0 0x0 0x40000000>;
> >>> +
> >>> +		misc@100000 {
> >>> +			compatible = "nvidia,tegra234-misc";
> >>> +			reg = <0x00100000 0xf000>,
> >>> +			      <0x0010f000 0x1000>;
> >>> +			status = "okay";
> >>> +		};
> >>
> >>
> >> Is there meant to be a fallback option here, because I don't see
> >> anything to match the above compatible string?
> > 
> > I've got the below patch in my tree that's meant to add that code, but
> > it's in the wrong order in my local branch, so it didn't make it into
> > this subset. I'll reorder the patches to include the APBMISC support
> > patch in this series.
> 
> OK, I think that the same also applies to efuse, pmc, rtc and bpmp-shmem
> from looking at this patch.

efuse is addressed in another of the patches that I have locally. I'll
add it to the series. For PMC I think we can just add a minimum version
of driver support for simulation, but there are a few registers that are
already known to be different from previous chips.

RTC needs the fallback for nvidia,tegra20-rtc. I'll add that in the next
version.

As for bpmp-shmem, that's something we can remove altogether since we
removed it recently from existing device trees. Turns out those regions
don't actually need any compatible strings.

Thierry
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile
index 2273fc5db19c..9296d12d11e9 100644
--- a/arch/arm64/boot/dts/nvidia/Makefile
+++ b/arch/arm64/boot/dts/nvidia/Makefile
@@ -9,3 +9,4 @@  dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2894-0050-a08.dtb
 dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb
 dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p2972-0000.dtb
 dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0000.dtb
+dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-sim-vdk.dtb
diff --git a/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
new file mode 100644
index 000000000000..f6e6a24829af
--- /dev/null
+++ b/arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
@@ -0,0 +1,40 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "tegra234.dtsi"
+
+/ {
+	model = "NVIDIA Tegra234 VDK";
+	compatible = "nvidia,tegra234-vdk", "nvidia,tegra234";
+
+	aliases {
+		sdhci3 = "/cbb@0/sdhci@3460000";
+		serial0 = &uarta;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8 earlycon=uart8250,mmio32,0x03100000";
+		stdout-path = "serial0:115200n8";
+	};
+
+	cbb@0 {
+		serial@3100000 {
+			status = "okay";
+		};
+
+		sdhci@3460000 {
+			status = "okay";
+			bus-width = <8>;
+			non-removable;
+			only-1-8-v;
+		};
+
+		rtc@c2a0000 {
+			status = "okay";
+		};
+
+		pmc@c360000 {
+			nvidia,invert-interrupt;
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
new file mode 100644
index 000000000000..3509687441a1
--- /dev/null
+++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
@@ -0,0 +1,191 @@ 
+// SPDX-License-Identifier: GPL-2.0
+
+#include <dt-bindings/clock/tegra234-clock.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/mailbox/tegra186-hsp.h>
+#include <dt-bindings/reset/tegra234-reset.h>
+
+/ {
+	compatible = "nvidia,tegra234";
+	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	bus@0 {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		ranges = <0x0 0x0 0x0 0x40000000>;
+
+		misc@100000 {
+			compatible = "nvidia,tegra234-misc";
+			reg = <0x00100000 0xf000>,
+			      <0x0010f000 0x1000>;
+			status = "okay";
+		};
+
+		uarta: serial@3100000 {
+			compatible = "nvidia,tegra234-uart", "nvidia,tegra20-uart";
+			reg = <0x03100000 0x10000>;
+			interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&bpmp TEGRA234_CLK_UARTA>;
+			clock-names = "serial";
+			resets = <&bpmp TEGRA234_RESET_UARTA>;
+			reset-names = "serial";
+			status = "disabled";
+		};
+
+		mmc@3460000 {
+			compatible = "nvidia,tegra234-sdhci", "nvidia,tegra186-sdhci";
+			reg = <0x03460000 0x20000>;
+			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&bpmp TEGRA234_CLK_SDMMC4>;
+			clock-names = "sdhci";
+			resets = <&bpmp TEGRA234_RESET_SDMMC4>;
+			reset-names = "sdhci";
+			dma-coherent;
+			status = "disabled";
+		};
+
+		fuse@3810000 {
+			compatible = "nvidia,tegra234-efuse";
+			reg = <0x03810000 0x10000>;
+			clocks = <&bpmp TEGRA234_CLK_FUSE>;
+			clock-names = "fuse";
+		};
+
+		hsp_top0: hsp@3c00000 {
+			compatible = "nvidia,tegra234-hsp", "nvidia,tegra194-hsp";
+			reg = <0x03c00000 0xa0000>;
+			interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "doorbell", "shared0", "shared1", "shared2",
+					  "shared3", "shared4", "shared5", "shared6",
+					  "shared7";
+			#mbox-cells = <2>;
+		};
+
+		hsp_aon: hsp@c150000 {
+			compatible = "nvidia,tegra234-hsp", "nvidia,tegra194-hsp";
+			reg = <0x0c150000 0x90000>;
+			interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
+			/*
+			 * Shared interrupt 0 is routed only to AON/SPE, so
+			 * we only have 4 shared interrupts for the CCPLEX.
+			 */
+			interrupt-names = "shared1", "shared2", "shared3", "shared4";
+			#mbox-cells = <2>;
+		};
+
+		rtc@c2a0000 {
+			compatible = "nvidia,tegra234-rtc";
+			reg = <0x0c2a0000 0x10000>;
+			interrupt-parent = <&pmc>;
+			interrupts = <73 IRQ_TYPE_LEVEL_HIGH>;
+			status = "disabled";
+		};
+
+		pmc: pmc@c360000 {
+			compatible = "nvidia,tegra234-pmc";
+			reg = <0x0c360000 0x10000>,
+			      <0x0c370000 0x10000>,
+			      <0x0c380000 0x10000>,
+			      <0x0c390000 0x10000>,
+			      <0x0c3a0000 0x10000>;
+			reg-names = "pmc", "wake", "aotag", "scratch", "misc";
+
+			#interrupt-cells = <2>;
+			interrupt-controller;
+		};
+
+		gic: interrupt-controller@f400000 {
+			compatible = "arm,gic-v3";
+			reg = <0x0f400000 0x010000>, /* GICD */
+			      <0x0f440000 0x200000>; /* GICR */
+			interrupt-parent = <&gic>;
+			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+
+			#redistributor-regions = <1>;
+			#interrupt-cells = <3>;
+			interrupt-controller;
+		};
+	};
+
+	sysram@40000000 {
+		compatible = "nvidia,tegra234-sysram", "mmio-sram";
+		reg = <0x0 0x40000000 0x0 0x50000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0x0 0x0 0x40000000 0x50000>;
+
+		cpu_bpmp_tx: shmem@4e000 {
+			compatible = "nvidia,tegra234-bpmp-shmem";
+			reg = <0x4e000 0x1000>;
+			label = "cpu-bpmp-tx";
+			pool;
+		};
+
+		cpu_bpmp_rx: shmem@4f000 {
+			compatible = "nvidia,tegra234-bpmp-shmem";
+			reg = <0x4f000 0x1000>;
+			label = "cpu-bpmp-rx";
+			pool;
+		};
+	};
+
+	bpmp: bpmp {
+		compatible = "nvidia,tegra234-bpmp", "nvidia,tegra186-bpmp";
+		mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_DB
+				    TEGRA_HSP_DB_MASTER_BPMP>;
+		shmem = <&cpu_bpmp_tx &cpu_bpmp_rx>;
+		#clock-cells = <1>;
+		#reset-cells = <1>;
+		#power-domain-cells = <1>;
+
+		bpmp_i2c: i2c {
+			compatible = "nvidia,tegra186-bpmp-i2c";
+			nvidia,bpmp-bus-id = <5>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			reg = <0x000>;
+
+			enable-method = "psci";
+		};
+	};
+
+	psci {
+		compatible = "arm,psci-1.0";
+		status = "okay";
+		method = "smc";
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+		interrupt-parent = <&gic>;
+		always-on;
+	};
+};
diff --git a/drivers/soc/tegra/Kconfig b/drivers/soc/tegra/Kconfig
index 6bc603d0b9d9..976dee036470 100644
--- a/drivers/soc/tegra/Kconfig
+++ b/drivers/soc/tegra/Kconfig
@@ -119,6 +119,16 @@  config ARCH_TEGRA_194_SOC
 	help
 	  Enable support for the NVIDIA Tegra194 SoC.
 
+config ARCH_TEGRA_234_SOC
+	bool "NVIDIA Tegra234 SoC"
+	select MAILBOX
+	select TEGRA_BPMP
+	select TEGRA_HSP_MBOX
+	select TEGRA_IVC
+	select SOC_TEGRA_PMC
+	help
+	  Enable support for the NVIDIA Tegra234 SoC.
+
 endif
 endif
 
diff --git a/include/dt-bindings/clock/tegra234-clock.h b/include/dt-bindings/clock/tegra234-clock.h
new file mode 100644
index 000000000000..2c82072950ee
--- /dev/null
+++ b/include/dt-bindings/clock/tegra234-clock.h
@@ -0,0 +1,14 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved. */
+
+#ifndef DT_BINDINGS_CLOCK_TEGRA234_CLOCK_H
+#define DT_BINDINGS_CLOCK_TEGRA234_CLOCK_H
+
+/** @brief output of gate CLK_ENB_FUSE */
+#define TEGRA234_CLK_FUSE			40
+/** @brief output of mux controlled by CLK_RST_CONTROLLER_CLK_SOURCE_SDMMC4 */
+#define TEGRA234_CLK_SDMMC4			123
+/** @brief output of mux controlled by CLK_RST_CONTROLLER_CLK_SOURCE_UARTA */
+#define TEGRA234_CLK_UARTA			155
+
+#endif
diff --git a/include/dt-bindings/reset/tegra234-reset.h b/include/dt-bindings/reset/tegra234-reset.h
new file mode 100644
index 000000000000..b3c63be06d2d
--- /dev/null
+++ b/include/dt-bindings/reset/tegra234-reset.h
@@ -0,0 +1,10 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2018-2020, NVIDIA CORPORATION. All rights reserved. */
+
+#ifndef DT_BINDINGS_RESET_TEGRA234_RESET_H
+#define DT_BINDINGS_RESET_TEGRA234_RESET_H
+
+#define TEGRA234_RESET_SDMMC4			85
+#define TEGRA234_RESET_UARTA			100
+
+#endif