Commit 66ee9359 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-soc-5.8' of... 

Merge tag 'imx-soc-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc

i.MX SoC changes for 5.8:

- Add soc device support for Vybrid/VF platform.
- Move the i.MX soc device registration code from mach-imx to
  drivers/soc/imx for possible future consolidation with i.MX8 code.
- A small fixup to make pcm970_sja1000_platform_data static.

* tag 'imx-soc-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx: move cpu code to drivers/soc/imx
  ARM: imx: move cpu definitions into a header
  ARM: imx: use device_initcall for imx_soc_device_init
  ARM: imx: pcm037: make pcm970_sja1000_platform_data static
  ARM: vf610: report soc info via soc device

Link: https://lore.kernel.org/r/20200523032516.11016-2-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 97a2f40e 52102a3b

arch/arm/mach-imx/common.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ void imx_aips_allow_unprivileged_access(const char *compat); 
int mxc_device_init(void);

void imx_set_soc_revision(unsigned int rev);

void imx_init_revision_from_anatop(void);

struct device *imx_soc_device_init(void);

void imx6_enable_rbc(bool enable);

void imx_gpc_check_dt(void);

void imx_gpc_set_arm_power_in_lpm(bool power_off);

arch/arm/mach-imx/cpu.c

+0 −159
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/err.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/io.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/regmap.h>

#include <linux/slab.h>

#include <linux/sys_soc.h>



#include "hardware.h"

#include "common.h"



#define OCOTP_UID_H	0x420

#define OCOTP_UID_L	0x410



#define OCOTP_ULP_UID_1		0x4b0

#define OCOTP_ULP_UID_2		0x4c0

#define OCOTP_ULP_UID_3		0x4d0

#define OCOTP_ULP_UID_4		0x4e0



unsigned int __mxc_cpu_type;

static unsigned int imx_soc_revision;
@@ -82,150 +70,3 @@ void __init imx_aips_allow_unprivileged_access( 
		imx_set_aips(aips_base_addr);

	}

}
 


struct device * __init imx_soc_device_init(void)

{

	struct soc_device_attribute *soc_dev_attr;

	const char *ocotp_compat = NULL;

	struct soc_device *soc_dev;

	struct device_node *root;

	struct regmap *ocotp = NULL;

	const char *soc_id;

	u64 soc_uid = 0;

	u32 val;

	int ret;



	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);

	if (!soc_dev_attr)

		return NULL;



	soc_dev_attr->family = "Freescale i.MX";



	root = of_find_node_by_path("/");

	ret = of_property_read_string(root, "model", &soc_dev_attr->machine);

	of_node_put(root);

	if (ret)

		goto free_soc;



	switch (__mxc_cpu_type) {

	case MXC_CPU_MX1:

		soc_id = "i.MX1";

		break;

	case MXC_CPU_MX21:

		soc_id = "i.MX21";

		break;

	case MXC_CPU_MX25:

		soc_id = "i.MX25";

		break;

	case MXC_CPU_MX27:

		soc_id = "i.MX27";

		break;

	case MXC_CPU_MX31:

		soc_id = "i.MX31";

		break;

	case MXC_CPU_MX35:

		soc_id = "i.MX35";

		break;

	case MXC_CPU_MX51:

		soc_id = "i.MX51";

		break;

	case MXC_CPU_MX53:

		soc_id = "i.MX53";

		break;

	case MXC_CPU_IMX6SL:

		ocotp_compat = "fsl,imx6sl-ocotp";

		soc_id = "i.MX6SL";

		break;

	case MXC_CPU_IMX6DL:

		ocotp_compat = "fsl,imx6q-ocotp";

		soc_id = "i.MX6DL";

		break;

	case MXC_CPU_IMX6SX:

		ocotp_compat = "fsl,imx6sx-ocotp";

		soc_id = "i.MX6SX";

		break;

	case MXC_CPU_IMX6Q:

		ocotp_compat = "fsl,imx6q-ocotp";

		soc_id = "i.MX6Q";

		break;

	case MXC_CPU_IMX6UL:

		ocotp_compat = "fsl,imx6ul-ocotp";

		soc_id = "i.MX6UL";

		break;

	case MXC_CPU_IMX6ULL:

		ocotp_compat = "fsl,imx6ull-ocotp";

		soc_id = "i.MX6ULL";

		break;

	case MXC_CPU_IMX6ULZ:

		ocotp_compat = "fsl,imx6ull-ocotp";

		soc_id = "i.MX6ULZ";

		break;

	case MXC_CPU_IMX6SLL:

		ocotp_compat = "fsl,imx6sll-ocotp";

		soc_id = "i.MX6SLL";

		break;

	case MXC_CPU_IMX7D:

		ocotp_compat = "fsl,imx7d-ocotp";

		soc_id = "i.MX7D";

		break;

	case MXC_CPU_IMX7ULP:

		ocotp_compat = "fsl,imx7ulp-ocotp";

		soc_id = "i.MX7ULP";

		break;

	default:

		soc_id = "Unknown";

	}

	soc_dev_attr->soc_id = soc_id;



	if (ocotp_compat) {

		ocotp = syscon_regmap_lookup_by_compatible(ocotp_compat);

		if (IS_ERR(ocotp))

			pr_err("%s: failed to find %s regmap!\n", __func__, ocotp_compat);

	}



	if (!IS_ERR_OR_NULL(ocotp)) {

		if (__mxc_cpu_type == MXC_CPU_IMX7ULP) {

			regmap_read(ocotp, OCOTP_ULP_UID_4, &val);

			soc_uid = val & 0xffff;

			regmap_read(ocotp, OCOTP_ULP_UID_3, &val);

			soc_uid <<= 16;

			soc_uid |= val & 0xffff;

			regmap_read(ocotp, OCOTP_ULP_UID_2, &val);

			soc_uid <<= 16;

			soc_uid |= val & 0xffff;

			regmap_read(ocotp, OCOTP_ULP_UID_1, &val);

			soc_uid <<= 16;

			soc_uid |= val & 0xffff;

		} else {

			regmap_read(ocotp, OCOTP_UID_H, &val);

			soc_uid = val;

			regmap_read(ocotp, OCOTP_UID_L, &val);

			soc_uid <<= 32;

			soc_uid |= val;

		}

	}



	soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d.%d",

					   (imx_soc_revision >> 4) & 0xf,

					   imx_soc_revision & 0xf);

	if (!soc_dev_attr->revision)

		goto free_soc;



	soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX", soc_uid);

	if (!soc_dev_attr->serial_number)

		goto free_rev;



	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR(soc_dev))

		goto free_serial_number;



	return soc_device_to_device(soc_dev);



free_serial_number:

	kfree(soc_dev_attr->serial_number);

free_rev:

	kfree(soc_dev_attr->revision);

free_soc:

	kfree(soc_dev_attr);

	return NULL;

}

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

+1 −7
Original line number Diff line number Diff line
@@ -245,21 +245,15 @@ static void __init imx6q_axi_init(void) 


static void __init imx6q_init_machine(void)

{

	struct device *parent;



	if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0)

		imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0);

	else

		imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",

				imx_get_soc_revision());



	parent = imx_soc_device_init();

	if (parent == NULL)

		pr_warn("failed to initialize soc device\n");



	imx6q_enet_phy_init();



	of_platform_default_populate(NULL, NULL, parent);

	of_platform_default_populate(NULL, NULL, NULL);



	imx_anatop_init();

	cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init();

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

+1 −7
Original line number Diff line number Diff line
@@ -45,13 +45,7 @@ static void __init imx6sl_init_late(void) 


static void __init imx6sl_init_machine(void)

{

	struct device *parent;



	parent = imx_soc_device_init();

	if (parent == NULL)

		pr_warn("failed to initialize soc device\n");



	of_platform_default_populate(NULL, NULL, parent);

	of_platform_default_populate(NULL, NULL, NULL);



	if (cpu_is_imx6sl())

		imx6sl_fec_init();

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

+1 −7
Original line number Diff line number Diff line
@@ -63,13 +63,7 @@ static inline void imx6sx_enet_init(void) 


static void __init imx6sx_init_machine(void)

{

	struct device *parent;



	parent = imx_soc_device_init();

	if (parent == NULL)

		pr_warn("failed to initialize soc device\n");



	of_platform_default_populate(NULL, NULL, parent);

	of_platform_default_populate(NULL, NULL, NULL);



	imx6sx_enet_init();

	imx_anatop_init();