arm: mach-k3: j7200: Add support for SOC detection

The J7200 SoC is a part of the K3 Multicore SoC architecture platform.
It is targeted for automotive gateway, vehicle compute systems,
Vehicle-to-Vehicle (V2V) and Vehicle-to-Everything (V2X) applications.
The SoC aims to meet the complex processing needs of modern embedded
products.

Some highlights of this SoC are:
* Dual Cortex-A72s in a single cluster, two clusters of lockstep
  capable dual Cortex-R5F MCUs and a Centralized Device Management and
  Security Controller (DMSC).
* Configurable L3 Cache and IO-coherent architecture with high data
  throughput capable distributed DMA architecture under NAVSS.
* Integrated Ethernet switch supporting up to a total of 4 external ports
  in addition to legacy Ethernet switch of up to 2 ports.
* Upto 1 PCIe-GEN3 controller, 1 USB3.0 Dual-role device subsystems,
  20 MCANs, 3 McASP, eMMC and SD, OSPI/HyperBus memory controller, I3C and
  I2C, eCAP/eQEP, eHRPWM among other peripherals.
* One hardware accelerator block containing AES/DES/SHA/MD5 called SA2UL
  management.

See J7200 Technical Reference Manual (SPRUIU1, June 2020)
for further details: https://www.ti.com/lit/pdf/spruiu1

Add support for detection J7200 SoC

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>

diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 4e366f8fffa6164e86cf87ab66ec3f51a095842a..f4d7c3d71e6d2ac943293d8baefc07cb7eba6d51 100644 (file)
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -355,6 +355,16 @@ bool soc_is_j721e(void)
        return soc == J721E;
 }
 
+bool soc_is_j7200(void)
+{
+       u32 soc;
+
+       soc = (readl(CTRLMMR_WKUP_JTAG_ID) &
+               JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT;
+
+       return soc == J7200;
+}
+
 #ifdef CONFIG_ARM64
 void board_prep_linux(bootm_headers_t *images)
 {

diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h
index 9c6c3595a28dc582826cb6b78339fd06e9418c4e..32d07340bfd1796b0300518d8c5927e93f4559ea 100644 (file)
--- a/arch/arm/mach-k3/common.h
+++ b/arch/arm/mach-k3/common.h
@@ -9,6 +9,7 @@
 #include <asm/armv7_mpu.h>
 
 #define J721E  0xbb64
+#define J7200  0xbb6d
 
 struct fwl_data {
        const char *name;

diff --git a/arch/arm/mach-k3/include/mach/sys_proto.h b/arch/arm/mach-k3/include/mach/sys_proto.h
index 48b11178c372abdf57ab657d56e30ed7df7a7b7c..60287b261c8e8e25a35d64eafc039db32e391684 100644 (file)
--- a/arch/arm/mach-k3/include/mach/sys_proto.h
+++ b/arch/arm/mach-k3/include/mach/sys_proto.h
@@ -17,5 +17,6 @@ void release_resources_for_core_shutdown(void);
 int fdt_disable_node(void *blob, char *node_path);
 
 bool soc_is_j721e(void);
+bool soc_is_j7200(void);
 
 #endif