Skip to contentSkip to conversation

ARM: vf610: report soc info via soc device

PATCH Applied Andrey Smirnov 4 participants 4 messages Mar 26, 2020 – Apr 23, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: vf610: report soc info via soc device

The patch adds plumbing to soc device info code necessary to support Vybrid devices. Use case in mind for this is CAAM driver, which utilizes said API.

---
 arch/arm/mach-imx/cpu.c        | 16 ++++++++++
 arch/arm/mach-imx/mach-vf610.c | 53 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-imx/mxc.h        |  6 ++++
 3 files changed, 75 insertions(+)
arch/arm/mach-imx/cpu.c +16 -0
index 06f8d64b65af..e3d12b21d6f6 100644
@@ -172,6 +172,22 @@ struct device * __init imx_soc_device_init(void)
 		ocotp_compat = "fsl,imx7ulp-ocotp";
 		soc_id = "i.MX7ULP";
 		break;
+	case MXC_CPU_VF500:
+		ocotp_compat = "fsl,vf610-ocotp";
+		soc_id = "VF500";
+		break;
+	case MXC_CPU_VF510:
+		ocotp_compat = "fsl,vf610-ocotp";
+		soc_id = "VF510";
+		break;
+	case MXC_CPU_VF600:
+		ocotp_compat = "fsl,vf610-ocotp";
+		soc_id = "VF600";
+		break;
+	case MXC_CPU_VF610:
+		ocotp_compat = "fsl,vf610-ocotp";
+		soc_id = "VF610";
+		break;
 	default:
 		soc_id = "Unknown";
 	}
arch/arm/mach-imx/mach-vf610.c +53 -0

69 lines not on this page · raw message

arch/arm/mach-imx/mxc.h +6 -0
index 2bfd2d59b4a6..48e6d781f15b 100644
@@ -33,6 +33,12 @@
 #define MXC_CPU_IMX7D		0x72
 #define MXC_CPU_IMX7ULP		0xff
 
+#define MXC_CPU_VFx10		0x010
+#define MXC_CPU_VF500		0x500
+#define MXC_CPU_VF510		(MXC_CPU_VF500 | MXC_CPU_VFx10)
+#define MXC_CPU_VF600		0x600
+#define MXC_CPU_VF610		(MXC_CPU_VF600 | MXC_CPU_VFx10)
+
 #define IMX_DDR_TYPE_LPDDR2		1
 
 #ifndef __ASSEMBLY__

--
2.21.0

Tested-by on v1 1/1
#1 lore raw

On a VF610 Vybrid:

Quoted 139 lines · Andrey Smirnov

The patch adds plumbing to soc device info code necessary to support Vybrid devices. Use case in mind for this is CAAM driver, which utilizes said API.

---
 arch/arm/mach-imx/cpu.c        | 16 ++++++++++
 arch/arm/mach-imx/mach-vf610.c | 53 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-imx/mxc.h        |  6 ++++
 3 files changed, 75 insertions(+)
arch/arm/mach-imx/cpu.c +16 -0
index 06f8d64b65af..e3d12b21d6f6 100644
@@ -172,6 +172,22 @@ struct device * __init imx_soc_device_init(void)
                ocotp_compat = "fsl,imx7ulp-ocotp";
                soc_id = "i.MX7ULP";
                break;
+       case MXC_CPU_VF500:
+               ocotp_compat = "fsl,vf610-ocotp";
+               soc_id = "VF500";
+               break;
+       case MXC_CPU_VF510:
+               ocotp_compat = "fsl,vf610-ocotp";
+               soc_id = "VF510";
+               break;
+       case MXC_CPU_VF600:
+               ocotp_compat = "fsl,vf610-ocotp";
+               soc_id = "VF600";
+               break;
+       case MXC_CPU_VF610:
+               ocotp_compat = "fsl,vf610-ocotp";
+               soc_id = "VF610";
+               break;
        default:
                soc_id = "Unknown";
        }
arch/arm/mach-imx/mach-vf610.c +53 -0
index 9c929b09310c..565dc08412a2 100644
@@ -3,11 +3,63 @@
  * Copyright 2012-2013 Freescale Semiconductor, Inc.
  */
 
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
+#include <linux/io.h>
+
 #include <linux/irqchip.h>
 #include <asm/mach/arch.h>
 #include <asm/hardware/cache-l2x0.h>
 
+#include "common.h"
+#include "hardware.h"
+
+#define MSCM_CPxCOUNT          0x00c
+#define MSCM_CPxCFG1           0x014
+
+static void __init vf610_detect_cpu(void)
+{
+       struct device_node *np;
+       u32 cpxcount, cpxcfg1;
+       unsigned int cpu_type;
+       void __iomem *mscm;
+
+       np = of_find_compatible_node(NULL, NULL, "fsl,vf610-mscm-cpucfg");
+       if (WARN_ON(!np))
+               return;
+
+       mscm = of_iomap(np, 0);
+       of_node_put(np);
+
+       if (WARN_ON(!mscm))
+               return;
+
+       cpxcount = readl_relaxed(mscm + MSCM_CPxCOUNT);
+       cpxcfg1  = readl_relaxed(mscm + MSCM_CPxCFG1);
+
+       iounmap(mscm);
+
+       cpu_type = cpxcount ? MXC_CPU_VF600 : MXC_CPU_VF500;
+
+       if (cpxcfg1)
+               cpu_type |= MXC_CPU_VFx10;
+
+       mxc_set_cpu_type(cpu_type);
+}
+
+static void __init vf610_init_machine(void)
+{
+       struct device *parent;
+
+       vf610_detect_cpu();
+
+       parent = imx_soc_device_init();
+       if (parent == NULL)
+               pr_warn("failed to initialize soc device\n");
+
+       of_platform_default_populate(NULL, NULL, parent);
+}
+
 static const char * const vf610_dt_compat[] __initconst = {
        "fsl,vf500",
        "fsl,vf510",
@@ -20,5 +72,6 @@ static const char * const vf610_dt_compat[] __initconst = {
 DT_MACHINE_START(VYBRID_VF610, "Freescale Vybrid VF5xx/VF6xx (Device Tree)")
        .l2c_aux_val    = 0,
        .l2c_aux_mask   = ~0,
+       .init_machine   = vf610_init_machine,
        .dt_compat      = vf610_dt_compat,
 MACHINE_END
arch/arm/mach-imx/mxc.h +6 -1
index 2bfd2d59b4a6..48e6d781f15b 100644
@@ -33,6 +33,12 @@
 #define MXC_CPU_IMX7D          0x72
 #define MXC_CPU_IMX7ULP                0xff
 
+#define MXC_CPU_VFx10          0x010
+#define MXC_CPU_VF500          0x500
+#define MXC_CPU_VF510          (MXC_CPU_VF500 | MXC_CPU_VFx10)
+#define MXC_CPU_VF600          0x600
+#define MXC_CPU_VF610          (MXC_CPU_VF600 | MXC_CPU_VFx10)
+
 #define IMX_DDR_TYPE_LPDDR2            1
 
 #ifndef __ASSEMBLY__
--

2.21.0