ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
diff mbox series

Message ID f4fdca95dfe54569b4e2b430c69d56c3@dh-electronics.com
State New
Headers show
Series
  • ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
Related show

Commit Message

Christoph Niedermaier Dec. 5, 2019, 9:38 a.m. UTC
After the commit 8267ff89b713 ("ARM: imx: Add serial number support for i.MX6/7 SoCs")
the kernel doesn't start on i.MX6ULL/ULZ SoC.
Tested on next-20191205.

For i.MX6ULL/ULZ the variable "ocotp_compat" is set to "fsl,imx6ul-ocotp", but with commit
ffbc34bf0e9c ("nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support") and commit
f243bc821ee3 ("ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible") the value
"fsl,imx6ull-ocotp" is already defined and set in device tree...

By setting "ocotp_compat" to "fsl,imx6ull-ocotp" the kernel does boot.

Fixes: 8267ff89b713 ("ARM: imx: Add serial number support for i.MX6/7 SoCs")
Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
---
 arch/arm/mach-imx/cpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Fabio Estevam Dec. 6, 2019, 12:27 p.m. UTC | #1
Hi Christoph,

On Thu, Dec 5, 2019 at 6:39 AM Christoph Niedermaier
<cniedermaier@dh-electronics.com> wrote:

> Tested on next-20191205.

Just a nit: this information should be better removed from the commit
log and put under the --- line.

>
> For i.MX6ULL/ULZ the variable "ocotp_compat" is set to "fsl,imx6ul-ocotp", but with commit
> ffbc34bf0e9c ("nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support") and commit
> f243bc821ee3 ("ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible") the value
> "fsl,imx6ull-ocotp" is already defined and set in device tree...
>
> By setting "ocotp_compat" to "fsl,imx6ull-ocotp" the kernel does boot.
>
> Fixes: 8267ff89b713 ("ARM: imx: Add serial number support for i.MX6/7 SoCs")
> Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>

Thanks for the fix.

Reviewed-by: Fabio Estevam <festevam@gmail.com>
Shawn Guo Dec. 11, 2019, 6:59 a.m. UTC | #2
On Thu, Dec 05, 2019 at 09:38:51AM +0000, Christoph Niedermaier wrote:
> After the commit 8267ff89b713 ("ARM: imx: Add serial number support for i.MX6/7 SoCs")
> the kernel doesn't start on i.MX6ULL/ULZ SoC.
> Tested on next-20191205.
> 
> For i.MX6ULL/ULZ the variable "ocotp_compat" is set to "fsl,imx6ul-ocotp", but with commit
> ffbc34bf0e9c ("nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support") and commit
> f243bc821ee3 ("ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible") the value
> "fsl,imx6ull-ocotp" is already defined and set in device tree...
> 
> By setting "ocotp_compat" to "fsl,imx6ull-ocotp" the kernel does boot.
> 
> Fixes: 8267ff89b713 ("ARM: imx: Add serial number support for i.MX6/7 SoCs")
> Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>

Applied, thanks.

Patch
diff mbox series

diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index d8118031c51f..0fb0c4a264c3 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -148,11 +148,11 @@  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:
-		ocotp_compat = "fsl,imx6ul-ocotp";
+		ocotp_compat = "fsl,imx6ull-ocotp";
 		soc_id = "i.MX6ULZ";
 		break;
 	case MXC_CPU_IMX6SLL: