Pull request for u-boot-nand-20230104

[Roger Quadros]

On 07/01/2023 16:19, Roger Quadros wrote:
> Hi,
> 
> On 06/01/2023 20:59, Tom Rini wrote:
>> On Thu, Jan 05, 2023 at 09:10:55AM +0100, Dario Binacchi wrote:
>>
>>> Hi Tom,
>>>
>>> The following changes since commit a95410696d21d38b629c61a09c100197c5fc533a:
>>>
>>>   Merge branch '2023-01-02-platform-updates' into next (2023-01-02
>>> 18:07:41 -0500)
>>>
>>> are available in the Git repository at:
>>>
>>>   https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git
>>> tags/u-boot-nand-20230104
>>>
>>> for you to fetch changes up to 48f219cb16f88cd2e392e2f438409a00d3ddff54:
>>>
>>>   mtd: rawnand: omap_elm: u-boot driver model support (2023-01-04
>>> 17:24:30 +0100)
>>>
>>> Gitlab CI showed no issues:
>>> https://source.denx.de/u-boot/custodians/u-boot-nand-flash/-/pipelines/14597
>>>
>>
>> NAK. This commit:
>> commit 48f219cb16f88cd2e392e2f438409a00d3ddff54
>> Author: Roger Quadros <rogerq at kernel.org>
>> Date:   Tue Dec 20 12:22:03 2022 +0200
>>
>>     mtd: rawnand: omap_elm: u-boot driver model support
>>
>>     Support u-boot driver model. We still retain
>>     support legacy way of doing things if ELM_BASE
>>     is defined in <asm/arch/hardware.h>
>>
>>     We could completely get rid of that if all
>>     platforms defining ELM_BASE get rid of that definition
>>     and enable CONFIG_SYS_NAND_SELF_INIT and are verified
>>     to work.
>>
>>     Signed-off-by: Roger Quadros <rogerq at kernel.org>
>>     Signed-off-by: Michael Trimarchi <michael at amarulasolutions.com>
>>
>> Breaks am335x_evm thusly:
>> U-Boot SPL 2023.01-rc4-00388-g48f219cb16f8-dirty (Jan 06 2023 - 13:56:52 -0500)
>> Trying to boot from MMC1
>>
>>
>> U-Boot 2023.01-rc4-00388-g48f219cb16f8-dirty (Jan 06 2023 - 13:56:52 -0500)
>>
>> CPU  : AM335X-GP rev 2.1
>> Model: TI AM335x EVM
>> DRAM:  1 GiB
>> Error binding driver 'omap-elm': -96
>> Some drivers failed to bind
>> Error binding driver 'ti_sysc': -96
>> Some drivers failed to bind
>> Error binding driver 'simple_bus': -96
>> Some drivers failed to bind
>> Error binding driver 'simple_bus': -96
>> Some drivers failed to bind
>> Error binding driver 'simple_bus': -96
>> Some drivers failed to bind
>> initcall sequence bffdbbe0 failed at call 808155a9 (err=-96)
>> ### ERROR ### Please RESET the board ###
>>
> 
> Sorry about that. My broken am335x-evm has suddenly come alive.
> I will come up with a fix in a day or two.

The below patch fixes boot on am335x-evm for me.

Does it look reasonable?

>From 06e2695f8420a1fa6eaf3fcf2e5dbbf28c73a34d Mon Sep 17 00:00:00 2001
From: Roger Quadros <rogerq at kernel.org>
Date: Sat, 7 Jan 2023 16:40:52 +0200
Subject: [PATCH] mtd: rawnand: omap_elm: Fix boot on am335x-evm

Prevent registering with Driver Model if CONFIG_SYS_NAND_SELF_INIT
is not enabled.

Legacy OMAP2+ systems do not use driver model yet for
NAND/ELM and don't define CONFIG_SYS_NAND_SELF_INIT.

Signed-off-by: Roger Quadros <rogerq at kernel.org>
---
 drivers/mtd/nand/raw/omap_elm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c
index e528a5348d5..56a2c39e4f6 100644
--- a/drivers/mtd/nand/raw/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
@@ -199,6 +199,8 @@ void elm_init(void)
 }
 #endif
 
+#if CONFIG_IS_ENABLED(SYS_NAND_SELF_INIT)
+
 static int elm_probe(struct udevice *dev)
 {
 #ifndef ELM_BASE
@@ -224,3 +226,4 @@ U_BOOT_DRIVER(gpmc_elm) = {
 	.of_match       = elm_ids,
 	.probe          = elm_probe,
 };
+#endif /* CONFIG_SYS_NAND_SELF_INIT */
-- 
2.34.1

cheers,
-roger