[U-Boot,v2,4/5] fdtdec: switch GENERIC_SPI_FLASH to jedec, spi-nor

Message ID 20181206095122.7117-5-narmstrong@baylibre.com
State New
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series
  • spi-flash: switch to "jedec, spi-nor" binding
Related show

Commit Message

Neil Armstrong Dec. 6, 2018, 9:51 a.m.
The x86 code uses "spi-flash" to detect a flash node, switch to
"jedec,spi-nor" since the DTS files has been switched already.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 lib/fdtdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Goldschmidt Dec. 6, 2018, 10:06 a.m. | #1
On Thu, Dec 6, 2018 at 10:51 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> The x86 code uses "spi-flash" to detect a flash node, switch to
> "jedec,spi-nor" since the DTS files has been switched already.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  lib/fdtdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/fdtdec.c b/lib/fdtdec.c
> index cbdc077825..043b96b17b 100644
> --- a/lib/fdtdec.c
> +++ b/lib/fdtdec.c
> @@ -49,7 +49,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
>         COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"),
>         COMPAT(SAMSUNG_EXYNOS_DWMMC, "samsung,exynos-dwmmc"),
>         COMPAT(SAMSUNG_EXYNOS_MMC, "samsung,exynos-mmc"),
> -       COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
> +       COMPAT(GENERIC_SPI_FLASH, "jedec,spi-nor"),

I'm not familiar with this code and where it is used, but to keep
U-Boot buildable and runnable (e.g. for 'git bisect'), do we need to
move this patch to before removing the "spi-flash" compatible or even
into patch 2 where the device trees are changed?

Regards,
Simon

>         COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"),
>         COMPAT(SAMSUNG_EXYNOS5_I2C, "samsung,exynos5-hsi2c"),
>         COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
> --
> 2.19.2
>
Neil Armstrong Dec. 6, 2018, 10:08 a.m. | #2
On 06/12/2018 11:06, Simon Goldschmidt wrote:
> On Thu, Dec 6, 2018 at 10:51 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>>
>> The x86 code uses "spi-flash" to detect a flash node, switch to
>> "jedec,spi-nor" since the DTS files has been switched already.
>>
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>> ---
>>  lib/fdtdec.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/fdtdec.c b/lib/fdtdec.c
>> index cbdc077825..043b96b17b 100644
>> --- a/lib/fdtdec.c
>> +++ b/lib/fdtdec.c
>> @@ -49,7 +49,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
>>         COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"),
>>         COMPAT(SAMSUNG_EXYNOS_DWMMC, "samsung,exynos-dwmmc"),
>>         COMPAT(SAMSUNG_EXYNOS_MMC, "samsung,exynos-mmc"),
>> -       COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
>> +       COMPAT(GENERIC_SPI_FLASH, "jedec,spi-nor"),
> 
> I'm not familiar with this code and where it is used, but to keep
> U-Boot buildable and runnable (e.g. for 'git bisect'), do we need to
> move this patch to before removing the "spi-flash" compatible or even
> into patch 2 where the device trees are changed?

Yep, it should even go in the same patch as the x86 dts changes.

Neil


> 
> Regards,
> Simon
> 
>>         COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"),
>>         COMPAT(SAMSUNG_EXYNOS5_I2C, "samsung,exynos5-hsi2c"),
>>         COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
>> --
>> 2.19.2
>>
Bin Meng Dec. 6, 2018, 10:09 a.m. | #3
On Thu, Dec 6, 2018 at 6:08 PM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> On 06/12/2018 11:06, Simon Goldschmidt wrote:
> > On Thu, Dec 6, 2018 at 10:51 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
> >>
> >> The x86 code uses "spi-flash" to detect a flash node, switch to
> >> "jedec,spi-nor" since the DTS files has been switched already.
> >>
> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> >> ---
> >>  lib/fdtdec.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/lib/fdtdec.c b/lib/fdtdec.c
> >> index cbdc077825..043b96b17b 100644
> >> --- a/lib/fdtdec.c
> >> +++ b/lib/fdtdec.c
> >> @@ -49,7 +49,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
> >>         COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"),
> >>         COMPAT(SAMSUNG_EXYNOS_DWMMC, "samsung,exynos-dwmmc"),
> >>         COMPAT(SAMSUNG_EXYNOS_MMC, "samsung,exynos-mmc"),
> >> -       COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
> >> +       COMPAT(GENERIC_SPI_FLASH, "jedec,spi-nor"),
> >
> > I'm not familiar with this code and where it is used, but to keep
> > U-Boot buildable and runnable (e.g. for 'git bisect'), do we need to
> > move this patch to before removing the "spi-flash" compatible or even
> > into patch 2 where the device trees are changed?
>
> Yep, it should even go in the same patch as the x86 dts changes.

Yes, I think so. Thanks for doing this!

Regards,
Bin

Patch

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index cbdc077825..043b96b17b 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -49,7 +49,7 @@  static const char * const compat_names[COMPAT_COUNT] = {
 	COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"),
 	COMPAT(SAMSUNG_EXYNOS_DWMMC, "samsung,exynos-dwmmc"),
 	COMPAT(SAMSUNG_EXYNOS_MMC, "samsung,exynos-mmc"),
-	COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
+	COMPAT(GENERIC_SPI_FLASH, "jedec,spi-nor"),
 	COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"),
 	COMPAT(SAMSUNG_EXYNOS5_I2C, "samsung,exynos5-hsi2c"),
 	COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),