linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
       [not found] <20191205092713.58314-1-cniedermaier@dh-electronics.com>
@ 2019-12-05  9:38 ` Christoph Niedermaier
  2019-12-06 12:27   ` Fabio Estevam
  2019-12-11  6:59   ` Shawn Guo
  0 siblings, 2 replies; 3+ messages in thread
From: Christoph Niedermaier @ 2019-12-05  9:38 UTC (permalink / raw)
  To: linux-arm-kernel, shawnguo, s.hauer
  Cc: aisheng.dong, Anson Huang, linux, linux-imx, kernel, festevam

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

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:
-- 
2.11.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
  2019-12-05  9:38 ` [PATCH] ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs Christoph Niedermaier
@ 2019-12-06 12:27   ` Fabio Estevam
  2019-12-11  6:59   ` Shawn Guo
  1 sibling, 0 replies; 3+ messages in thread
From: Fabio Estevam @ 2019-12-06 12:27 UTC (permalink / raw)
  To: Christoph Niedermaier
  Cc: aisheng.dong, Anson Huang, s.hauer, linux, linux-imx, kernel,
	shawnguo, linux-arm-kernel

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>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
  2019-12-05  9:38 ` [PATCH] ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs Christoph Niedermaier
  2019-12-06 12:27   ` Fabio Estevam
@ 2019-12-11  6:59   ` Shawn Guo
  1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2019-12-11  6:59 UTC (permalink / raw)
  To: Christoph Niedermaier
  Cc: aisheng.dong, Anson Huang, s.hauer, linux, linux-imx, kernel,
	festevam, linux-arm-kernel

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.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-12-11  7:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20191205092713.58314-1-cniedermaier@dh-electronics.com>
2019-12-05  9:38 ` [PATCH] ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs Christoph Niedermaier
2019-12-06 12:27   ` Fabio Estevam
2019-12-11  6:59   ` Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).