diff mbox series

ARM: imx: linux-next 20191203 kernel does not start on an i.MX6ULL due to the SoC serial number fetch.

Message ID 1ef39c29b35d48cea0f8a98aabcfef29@dh-electronics.com
State New
Headers show
Series ARM: imx: linux-next 20191203 kernel does not start on an i.MX6ULL due to the SoC serial number fetch. | expand

Commit Message

Christoph Niedermaier Dec. 3, 2019, 10:59 a.m. UTC 
Hi,

My i.MX6ULL SoC doesn't start on the linux-next 20191203 Kernel.
Reason is the commit "ARM: imx: Add serial number support for i.MX6/7 SoCs" (8267ff89b713).
For i.MX6ULL the variable "ocotp_compat" is set to "fsl,imx6ul-ocotp", but with commit
"nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support" (ffbc34bf0e9c) and commit
"ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible" (f243bc821ee3) the value
"fsl,imx6ull-ocotp" is already defined and set in device tree...

With the follwing change the kernel starts on my i.MX6ULL SoC.

Best regards,
Christoph

Comments

Fabio Estevam Dec. 3, 2019, 4:30 p.m. UTC | #1 
Hi Christoph,

Em ter, 3 de dez de 2019 08:00, Christoph Niedermaier
<cniedermaier@dh-electronics.com> escreveu:
>
> Hi,
>
> My i.MX6ULL SoC doesn't start on the linux-next 20191203 Kernel.
> Reason is the commit "ARM: imx: Add serial number support for i.MX6/7 SoCs" (8267ff89b713).
> For i.MX6ULL the variable "ocotp_compat" is set to "fsl,imx6ul-ocotp", but with commit
> "nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support" (ffbc34bf0e9c) and commit
> "ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible" (f243bc821ee3) the value
> "fsl,imx6ull-ocotp" is already defined and set in device tree...
>
> With the follwing change the kernel starts on my i.MX6ULL SoC.
> diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
> index d8118031c51f..1ff73d1ac869 100644
> --- a/arch/arm/mach-imx/cpu.c
> +++ b/arch/arm/mach-imx/cpu.c
> @@ -148,7 +148,7 @@ struct device * __init imx_soc_device_init(void)
>                 soc_id = "i.MX6UL";
>                 break;
>         case MXC_CPU_IMX6ULL:
> -               ocotp_compat = "fsl,imx6ul-ocotp";
> +               ocotp_compat = "fsl,imx6ull-ocotp";

Your change looks good.

Please send it as a formal patch.

Thanks
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index d8118031c51f..1ff73d1ac869 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -148,7 +148,7 @@  struct device * __init imx_soc_device_init(void)
 		soc_id = "i.MX6UL";
 		break;
 	case MXC_CPU_IMX6ULL:
-		ocotp_compat = "fsl,imx6ul-ocotp";
+		ocotp_compat = "fsl,imx6ull-ocotp";
 		soc_id = "i.MX6ULL";
 		break;
 	case MXC_CPU_IMX6ULZ: