Message ID | 20200914162231.2535-6-lokeshvutla@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm64: Initial support for Texas Instrument's J7200 Platform | expand |
On 9/14/20 11:22 AM, Lokesh Vutla wrote: > Add support for J7200 Common Processor Board. > The EVM architecture is very similar to J721E as follows: > > +------------------------------------------------------+ > | +-------------------------------------------+ | > | | | | > | | Add-on Card 1 Options | | > | | | | > | +-------------------------------------------+ | > | | > | | > | +-------------------+ | > | | | | > | | SOM | | > | +--------------+ | | | > | | | | | | > | | Add-on | +-------------------+ | > | | Card 2 | | Power Supply > | | Options | | | > | | | | | > | +--------------+ | <--- > +------------------------------------------------------+ > Common Processor Board > > Common Processor board is the baseboard that has most of the actual > connectors, power supply etc. A SOM (System on Module) is plugged on > to the common processor board and this contains the SoC, PMIC, DDR and > basic high speed components necessary for functionality. > > Note: > * The minimum configuration required to boot up the board is System On > Module(SOM) + Common Processor Board. > * Since there is just a single SOM and Common Processor Board, we are > maintaining common processor board as the base dts and SOM as the dtsi > that we include. In the future as more SOM's appear, we should move > common processor board as a dtsi and include configurations as dts. > * All daughter cards beyond the basic boards shall be maintained as > overlays. > > Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com> > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > --- > arch/arm64/boot/dts/ti/Makefile | 2 + > .../dts/ti/k3-j7200-common-proc-board.dts | 64 +++++++++++++++++++ > arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 29 +++++++++ > 3 files changed, 95 insertions(+) > create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts > create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi > > diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile > index 7f28be62b8da..65506f21ba30 100644 > --- a/arch/arm64/boot/dts/ti/Makefile > +++ b/arch/arm64/boot/dts/ti/Makefile > @@ -9,3 +9,5 @@ > dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb > > dtb-$(CONFIG_ARCH_K3) += k3-j721e-common-proc-board.dtb > + > +dtb-$(CONFIG_ARCH_K3) += k3-j7200-common-proc-board.dtb > diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts > new file mode 100644 > index 000000000000..e27069317c4e > --- /dev/null > +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts > @@ -0,0 +1,64 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/ > + */ > + > +/dts-v1/; > + > +#include "k3-j7200-som-p0.dtsi" > + > +/ { > + chosen { > + stdout-path = "serial2:115200n8"; > + bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000"; > + }; > +}; > + > +&wkup_uart0 { > + /* Wakeup UART is used by System firmware */ > + status = "disabled"; > +}; > + > +&main_uart0 { > + power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; Perhaps a comment here to explain why this is being overwritten to use PD_SHARED. I don't see anything in the Changelog either. Otherwise, looks good. regards Suman > +}; > + > +&main_uart2 { > + /* MAIN UART 2 is used by R5F firmware */ > + status = "disabled"; > +}; > + > +&main_uart3 { > + /* UART not brought out */ > + status = "disabled"; > +}; > + > +&main_uart4 { > + /* UART not brought out */ > + status = "disabled"; > +}; > + > +&main_uart5 { > + /* UART not brought out */ > + status = "disabled"; > +}; > + > +&main_uart6 { > + /* UART not brought out */ > + status = "disabled"; > +}; > + > +&main_uart7 { > + /* UART not brought out */ > + status = "disabled"; > +}; > + > +&main_uart8 { > + /* UART not brought out */ > + status = "disabled"; > +}; > + > +&main_uart9 { > + /* UART not brought out */ > + status = "disabled"; > +}; > diff --git a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi > new file mode 100644 > index 000000000000..f7e271c442a0 > --- /dev/null > +++ b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi > @@ -0,0 +1,29 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/ > + */ > + > +/dts-v1/; > + > +#include "k3-j7200.dtsi" > + > +/ { > + memory@80000000 { > + device_type = "memory"; > + /* 4G RAM */ > + reg = <0x00 0x80000000 0x00 0x80000000>, > + <0x08 0x80000000 0x00 0x80000000>; > + }; > + > + reserved_memory: reserved-memory { > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + secure_ddr: optee@9e800000 { > + reg = <0x00 0x9e800000 0x00 0x01800000>; > + alignment = <0x1000>; > + no-map; > + }; > + }; > +}; >
On 10:33-20200915, Suman Anna wrote: > On 9/14/20 11:22 AM, Lokesh Vutla wrote: > > Add support for J7200 Common Processor Board. > > The EVM architecture is very similar to J721E as follows: > > > > +------------------------------------------------------+ > > | +-------------------------------------------+ | > > | | | | > > | | Add-on Card 1 Options | | > > | | | | > > | +-------------------------------------------+ | > > | | > > | | > > | +-------------------+ | > > | | | | > > | | SOM | | > > | +--------------+ | | | > > | | | | | | > > | | Add-on | +-------------------+ | > > | | Card 2 | | Power Supply > > | | Options | | | > > | | | | | > > | +--------------+ | <--- > > +------------------------------------------------------+ > > Common Processor Board > > > > Common Processor board is the baseboard that has most of the actual > > connectors, power supply etc. A SOM (System on Module) is plugged on > > to the common processor board and this contains the SoC, PMIC, DDR and > > basic high speed components necessary for functionality. > > > > Note: > > * The minimum configuration required to boot up the board is System On > > Module(SOM) + Common Processor Board. > > * Since there is just a single SOM and Common Processor Board, we are > > maintaining common processor board as the base dts and SOM as the dtsi > > that we include. In the future as more SOM's appear, we should move > > common processor board as a dtsi and include configurations as dts. > > * All daughter cards beyond the basic boards shall be maintained as > > overlays. > > > > Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com> > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > > --- > > arch/arm64/boot/dts/ti/Makefile | 2 + > > .../dts/ti/k3-j7200-common-proc-board.dts | 64 +++++++++++++++++++ > > arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 29 +++++++++ > > 3 files changed, 95 insertions(+) > > create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts > > create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi > > > > diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile > > index 7f28be62b8da..65506f21ba30 100644 > > --- a/arch/arm64/boot/dts/ti/Makefile > > +++ b/arch/arm64/boot/dts/ti/Makefile > > @@ -9,3 +9,5 @@ > > dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb > > > > dtb-$(CONFIG_ARCH_K3) += k3-j721e-common-proc-board.dtb > > + > > +dtb-$(CONFIG_ARCH_K3) += k3-j7200-common-proc-board.dtb > > diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts > > new file mode 100644 > > index 000000000000..e27069317c4e > > --- /dev/null > > +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts > > @@ -0,0 +1,64 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/ > > + */ > > + > > +/dts-v1/; > > + > > +#include "k3-j7200-som-p0.dtsi" > > + > > +/ { > > + chosen { > > + stdout-path = "serial2:115200n8"; > > + bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000"; > > + }; > > +}; > > + > > +&wkup_uart0 { > > + /* Wakeup UART is used by System firmware */ > > + status = "disabled"; > > +}; > > + > > +&main_uart0 { > > + power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; > > Perhaps a comment here to explain why this is being overwritten to use > PD_SHARED. I don't see anything in the Changelog either. Shared with ATF on this platform -> I can add this comment on applying. > > Otherwise, looks good. Would that be a reviewed-by?
On 9/15/20 8:15 PM, Nishanth Menon wrote: > On 10:33-20200915, Suman Anna wrote: >> On 9/14/20 11:22 AM, Lokesh Vutla wrote: >>> Add support for J7200 Common Processor Board. >>> The EVM architecture is very similar to J721E as follows: >>> >>> +------------------------------------------------------+ >>> | +-------------------------------------------+ | >>> | | | | >>> | | Add-on Card 1 Options | | >>> | | | | >>> | +-------------------------------------------+ | >>> | | >>> | | >>> | +-------------------+ | >>> | | | | >>> | | SOM | | >>> | +--------------+ | | | >>> | | | | | | >>> | | Add-on | +-------------------+ | >>> | | Card 2 | | Power Supply >>> | | Options | | | >>> | | | | | >>> | +--------------+ | <--- >>> +------------------------------------------------------+ >>> Common Processor Board >>> >>> Common Processor board is the baseboard that has most of the actual >>> connectors, power supply etc. A SOM (System on Module) is plugged on >>> to the common processor board and this contains the SoC, PMIC, DDR and >>> basic high speed components necessary for functionality. >>> >>> Note: >>> * The minimum configuration required to boot up the board is System On >>> Module(SOM) + Common Processor Board. >>> * Since there is just a single SOM and Common Processor Board, we are >>> maintaining common processor board as the base dts and SOM as the dtsi >>> that we include. In the future as more SOM's appear, we should move >>> common processor board as a dtsi and include configurations as dts. >>> * All daughter cards beyond the basic boards shall be maintained as >>> overlays. >>> >>> Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com> >>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> >>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> >>> --- >>> arch/arm64/boot/dts/ti/Makefile | 2 + >>> .../dts/ti/k3-j7200-common-proc-board.dts | 64 +++++++++++++++++++ >>> arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 29 +++++++++ >>> 3 files changed, 95 insertions(+) >>> create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts >>> create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi >>> >>> diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile >>> index 7f28be62b8da..65506f21ba30 100644 >>> --- a/arch/arm64/boot/dts/ti/Makefile >>> +++ b/arch/arm64/boot/dts/ti/Makefile >>> @@ -9,3 +9,5 @@ >>> dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb >>> >>> dtb-$(CONFIG_ARCH_K3) += k3-j721e-common-proc-board.dtb >>> + >>> +dtb-$(CONFIG_ARCH_K3) += k3-j7200-common-proc-board.dtb >>> diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts >>> new file mode 100644 >>> index 000000000000..e27069317c4e >>> --- /dev/null >>> +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts >>> @@ -0,0 +1,64 @@ >>> +// SPDX-License-Identifier: GPL-2.0 >>> +/* >>> + * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/ >>> + */ >>> + >>> +/dts-v1/; >>> + >>> +#include "k3-j7200-som-p0.dtsi" >>> + >>> +/ { >>> + chosen { >>> + stdout-path = "serial2:115200n8"; >>> + bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000"; >>> + }; >>> +}; >>> + >>> +&wkup_uart0 { >>> + /* Wakeup UART is used by System firmware */ >>> + status = "disabled"; >>> +}; >>> + >>> +&main_uart0 { >>> + power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; >> >> Perhaps a comment here to explain why this is being overwritten to use >> PD_SHARED. I don't see anything in the Changelog either. > Shared with ATF on this platform -> I can add this comment on applying. >> >> Otherwise, looks good. > > Would that be a reviewed-by? > Yes, with the comment added, Reviewed-by: Suman Anna <s-anna@ti.com> regards Suman
diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile index 7f28be62b8da..65506f21ba30 100644 --- a/arch/arm64/boot/dts/ti/Makefile +++ b/arch/arm64/boot/dts/ti/Makefile @@ -9,3 +9,5 @@ dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb dtb-$(CONFIG_ARCH_K3) += k3-j721e-common-proc-board.dtb + +dtb-$(CONFIG_ARCH_K3) += k3-j7200-common-proc-board.dtb diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts new file mode 100644 index 000000000000..e27069317c4e --- /dev/null +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts @@ -0,0 +1,64 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/ + */ + +/dts-v1/; + +#include "k3-j7200-som-p0.dtsi" + +/ { + chosen { + stdout-path = "serial2:115200n8"; + bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000"; + }; +}; + +&wkup_uart0 { + /* Wakeup UART is used by System firmware */ + status = "disabled"; +}; + +&main_uart0 { + power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; +}; + +&main_uart2 { + /* MAIN UART 2 is used by R5F firmware */ + status = "disabled"; +}; + +&main_uart3 { + /* UART not brought out */ + status = "disabled"; +}; + +&main_uart4 { + /* UART not brought out */ + status = "disabled"; +}; + +&main_uart5 { + /* UART not brought out */ + status = "disabled"; +}; + +&main_uart6 { + /* UART not brought out */ + status = "disabled"; +}; + +&main_uart7 { + /* UART not brought out */ + status = "disabled"; +}; + +&main_uart8 { + /* UART not brought out */ + status = "disabled"; +}; + +&main_uart9 { + /* UART not brought out */ + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi new file mode 100644 index 000000000000..f7e271c442a0 --- /dev/null +++ b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/ + */ + +/dts-v1/; + +#include "k3-j7200.dtsi" + +/ { + memory@80000000 { + device_type = "memory"; + /* 4G RAM */ + reg = <0x00 0x80000000 0x00 0x80000000>, + <0x08 0x80000000 0x00 0x80000000>; + }; + + reserved_memory: reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + secure_ddr: optee@9e800000 { + reg = <0x00 0x9e800000 0x00 0x01800000>; + alignment = <0x1000>; + no-map; + }; + }; +};