ARM: imx: Add msl code support for imx6qp
The i.MX6QP is a different SOC, but internally we treate it as i.MX6Q Rev_2.0 to maximum the code reusability. The chip silicon number we read from the ANADIG_DIGPROG is 0x630100. This patch add code to identify it as i.MX6QP Rev_1.0 when print out the silicon version. Signed-off-by: Bai Ping <ping.bai@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
parent
26e30c6489
commit
c5a890a445
|
@ -129,7 +129,14 @@ void __init imx_init_revision_from_anatop(void)
|
||||||
|
|
||||||
switch (digprog & 0xff) {
|
switch (digprog & 0xff) {
|
||||||
case 0:
|
case 0:
|
||||||
revision = IMX_CHIP_REVISION_1_0;
|
/*
|
||||||
|
* For i.MX6QP, most of the code for i.MX6Q can be resued,
|
||||||
|
* so internally, we identify it as i.MX6Q Rev 2.0
|
||||||
|
*/
|
||||||
|
if (digprog >> 8 & 0x01)
|
||||||
|
revision = IMX_CHIP_REVISION_2_0;
|
||||||
|
else
|
||||||
|
revision = IMX_CHIP_REVISION_1_0;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
revision = IMX_CHIP_REVISION_1_1;
|
revision = IMX_CHIP_REVISION_1_1;
|
||||||
|
|
|
@ -266,8 +266,11 @@ static void __init imx6q_init_machine(void)
|
||||||
{
|
{
|
||||||
struct device *parent;
|
struct device *parent;
|
||||||
|
|
||||||
imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
|
if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0)
|
||||||
imx_get_soc_revision());
|
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();
|
parent = imx_soc_device_init();
|
||||||
if (parent == NULL)
|
if (parent == NULL)
|
||||||
|
@ -399,6 +402,7 @@ static void __init imx6q_init_irq(void)
|
||||||
static const char * const imx6q_dt_compat[] __initconst = {
|
static const char * const imx6q_dt_compat[] __initconst = {
|
||||||
"fsl,imx6dl",
|
"fsl,imx6dl",
|
||||||
"fsl,imx6q",
|
"fsl,imx6q",
|
||||||
|
"fsl,imx6qp",
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue