Message ID | CACdvmAhd8GA=7wpF=b4nMG3pKRX7XV8NMBZLvT+DDR27CPuOGg@mail.gmail.com |
---|---|
State | Accepted |
Commit | 8c6d8c32192049f8dafaaafae68eb9124b21c1e0 |
Delegated to: | Neil Armstrong |
Headers | show |
Series | configs: libretech: set SPI mode to 0 | expand |
On 02/07/2021 23:11, Da Xue wrote: > Kconfig defaults to mode 3 if CONFIG_SF_DEFAULT_MODE is not set. > It becomes an issue since meson_spifc does not support SPI_CPHA. > Needed after commit e2e95e5e25421fbef499e21bf94a5339701f9a99. > > Signed-off-by:Da Xue <da@libre.computer> > --- > configs/libretech-ac_defconfig | 1 + > configs/libretech-cc_v2_defconfig | 1 + > configs/libretech-s905d-pc_defconfig | 1 + > configs/libretech-s912-pc_defconfig | 1 + > 4 files changed, 4 insertions(+) > > diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig > index ec51f2ad38..9abbcad3c0 100644 > --- a/configs/libretech-ac_defconfig > +++ b/configs/libretech-ac_defconfig > @@ -39,6 +39,7 @@ CONFIG_MMC_MESON_GX=y > CONFIG_MTD=y > CONFIG_DM_MTD=y > CONFIG_DM_SPI_FLASH=y > +CONFIG_SF_DEFAULT_MODE=0x0 > CONFIG_SPI_FLASH_GIGADEVICE=y > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_PHY_MESON_GXL=y > diff --git a/configs/libretech-cc_v2_defconfig b/configs/libretech-cc_v2_defconfig > index 97c8a9e47b..7dc6ed2f29 100644 > --- a/configs/libretech-cc_v2_defconfig > +++ b/configs/libretech-cc_v2_defconfig > @@ -35,6 +35,7 @@ CONFIG_MMC_MESON_GX=y > CONFIG_MTD=y > CONFIG_DM_MTD=y > CONFIG_DM_SPI_FLASH=y > +CONFIG_SF_DEFAULT_MODE=0x0 > CONFIG_SPI_FLASH_GIGADEVICE=y > CONFIG_PHY_MESON_GXL=y > CONFIG_DM_ETH=y > diff --git a/configs/libretech-s905d-pc_defconfig b/configs/libretech-s905d-pc_defconfig > index c0301a0aa0..93523c23cf 100644 > --- a/configs/libretech-s905d-pc_defconfig > +++ b/configs/libretech-s905d-pc_defconfig > @@ -36,6 +36,7 @@ CONFIG_SARADC_MESON=y > CONFIG_MMC_MESON_GX=y > CONFIG_MTD=y > CONFIG_DM_SPI_FLASH=y > +CONFIG_SF_DEFAULT_MODE=0x0 > CONFIG_SPI_FLASH_GIGADEVICE=y > CONFIG_PHY_REALTEK=y > CONFIG_DM_ETH=y > diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig > index e2faea6242..669f000f7f 100644 > --- a/configs/libretech-s912-pc_defconfig > +++ b/configs/libretech-s912-pc_defconfig > @@ -35,6 +35,7 @@ CONFIG_SARADC_MESON=y > CONFIG_MMC_MESON_GX=y > CONFIG_MTD=y > CONFIG_DM_SPI_FLASH=y > +CONFIG_SF_DEFAULT_MODE=0x0 > CONFIG_SPI_FLASH_GIGADEVICE=y > CONFIG_PHY_REALTEK=y > CONFIG_DM_ETH=y > -- > 2.30.2 > > Thanks, Applying to u-boot-amlogic & sending PR to have it in this release Neil
On 7/3/21 12:01 AM, Neil Armstrong wrote: [...] >> diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig >> index e2faea6242..669f000f7f 100644 >> --- a/configs/libretech-s912-pc_defconfig >> +++ b/configs/libretech-s912-pc_defconfig >> @@ -35,6 +35,7 @@ CONFIG_SARADC_MESON=y >> CONFIG_MMC_MESON_GX=y >> CONFIG_MTD=y >> CONFIG_DM_SPI_FLASH=y >> +CONFIG_SF_DEFAULT_MODE=0x0 >> CONFIG_SPI_FLASH_GIGADEVICE=y >> CONFIG_PHY_REALTEK=y >> CONFIG_DM_ETH=y >> -- >> 2.30.2 >> >> > > Thanks, > Applying to u-boot-amlogic & sending PR to have it in this release I have a feeling the real fix would be to revisit 14453fbfad ("Convert CONFIG_SF_DEFAULT_* to Kconfig") change the default mode to 0 in Kconfig and fix up the few boards which use SPI mode 3 . But that can wait after the release, since I think most of the board configs did get updated with SF_DEFAULT_MODE=0 config. CCing Patrick.
On Sat, Jul 03, 2021 at 12:26:51AM +0200, Marek Vasut wrote: > On 7/3/21 12:01 AM, Neil Armstrong wrote: > > [...] > > > > diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig > > > index e2faea6242..669f000f7f 100644 > > > --- a/configs/libretech-s912-pc_defconfig > > > +++ b/configs/libretech-s912-pc_defconfig > > > @@ -35,6 +35,7 @@ CONFIG_SARADC_MESON=y > > > CONFIG_MMC_MESON_GX=y > > > CONFIG_MTD=y > > > CONFIG_DM_SPI_FLASH=y > > > +CONFIG_SF_DEFAULT_MODE=0x0 > > > CONFIG_SPI_FLASH_GIGADEVICE=y > > > CONFIG_PHY_REALTEK=y > > > CONFIG_DM_ETH=y > > > -- > > > 2.30.2 > > > > > > > > > > Thanks, > > Applying to u-boot-amlogic & sending PR to have it in this release > > I have a feeling the real fix would be to revisit > > 14453fbfad ("Convert CONFIG_SF_DEFAULT_* to Kconfig") > > change the default mode to 0 in Kconfig and fix up the few boards which use > SPI mode 3 . > > But that can wait after the release, since I think most of the board configs > did get updated with SF_DEFAULT_MODE=0 config. CCing Patrick. So, lets do a little forensic work. Stepping back to 14453fbfad and none of the broken but fixed here boards existed. So, picking on configs/libretech-cc_v2_defconfig for a minute, ade0100a9162 introduced that board and.. it wasn't setting SF_DEFAULT_MODE anywhere. Digging around a bit more right now, I don't see meson platforms setting that value anywhere, ever (and aside, I see a few config.h files that need a kick right now, sigh). That means it was getting the default of SPI_MODE_3. Which means, are there other platforms that were using the default before, but needed to really be using something else and e2e95e5e2542 should have waited? I'm not sure. Does that also mean that other amlogic platforms need a change here? Not sure if my le potato would show the problem off-hand.
diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig index ec51f2ad38..9abbcad3c0 100644 --- a/configs/libretech-ac_defconfig +++ b/configs/libretech-ac_defconfig @@ -39,6 +39,7 @@ CONFIG_MMC_MESON_GX=y CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_DM_SPI_FLASH=y +CONFIG_SF_DEFAULT_MODE=0x0 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MESON_GXL=y diff --git a/configs/libretech-cc_v2_defconfig b/configs/libretech-cc_v2_defconfig index 97c8a9e47b..7dc6ed2f29 100644 --- a/configs/libretech-cc_v2_defconfig +++ b/configs/libretech-cc_v2_defconfig @@ -35,6 +35,7 @@ CONFIG_MMC_MESON_GX=y CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_DM_SPI_FLASH=y +CONFIG_SF_DEFAULT_MODE=0x0 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_PHY_MESON_GXL=y CONFIG_DM_ETH=y diff --git a/configs/libretech-s905d-pc_defconfig b/configs/libretech-s905d-pc_defconfig index c0301a0aa0..93523c23cf 100644 --- a/configs/libretech-s905d-pc_defconfig +++ b/configs/libretech-s905d-pc_defconfig @@ -36,6 +36,7 @@ CONFIG_SARADC_MESON=y CONFIG_MMC_MESON_GX=y CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y +CONFIG_SF_DEFAULT_MODE=0x0 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_PHY_REALTEK=y CONFIG_DM_ETH=y diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig index e2faea6242..669f000f7f 100644 --- a/configs/libretech-s912-pc_defconfig +++ b/configs/libretech-s912-pc_defconfig @@ -35,6 +35,7 @@ CONFIG_SARADC_MESON=y CONFIG_MMC_MESON_GX=y CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y +CONFIG_SF_DEFAULT_MODE=0x0 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_PHY_REALTEK=y CONFIG_DM_ETH=y