Commit dceb213c authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Shawn Guo
Browse files

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.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-imx@nxp.com
Tested-by: default avatarChris Healy <cphealy@gmail.com>
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 8f3d9f35

arch/arm/mach-imx/cpu.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -172,6 +172,22 @@ struct device * __init imx_soc_device_init(void) 
		ocotp_compat = "fsl,imx7ulp-ocotp";

		ocotp_compat = "fsl,imx7ulp-ocotp";

		soc_id = "i.MX7ULP";

		soc_id = "i.MX7ULP";

		break;

		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:

	default:

		soc_id = "Unknown";

		soc_id = "Unknown";

	}

	}

arch/arm/mach-imx/mach-vf610.c

+53 −0
Original line number Original line Diff line number Diff line
@@ -3,11 +3,63 @@ 
 * Copyright 2012-2013 Freescale Semiconductor, Inc.

 * Copyright 2012-2013 Freescale Semiconductor, Inc.

 */

 */





#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/io.h>



#include <linux/irqchip.h>

#include <linux/irqchip.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/hardware/cache-l2x0.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 = {

static const char * const vf610_dt_compat[] __initconst = {

	"fsl,vf500",

	"fsl,vf500",

	"fsl,vf510",

	"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)")

DT_MACHINE_START(VYBRID_VF610, "Freescale Vybrid VF5xx/VF6xx (Device Tree)")

	.l2c_aux_val	= 0,

	.l2c_aux_val	= 0,

	.l2c_aux_mask	= ~0,

	.l2c_aux_mask	= ~0,

	.init_machine   = vf610_init_machine,

	.dt_compat	= vf610_dt_compat,

	.dt_compat	= vf610_dt_compat,

MACHINE_END
 
MACHINE_END

arch/arm/mach-imx/mxc.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,12 @@ 
#define MXC_CPU_IMX7D		0x72

#define MXC_CPU_IMX7D		0x72

#define MXC_CPU_IMX7ULP		0xff

#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

#define IMX_DDR_TYPE_LPDDR2		1





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__