Message ID | 20181122081704.8926-1-yinbo.zhu@nxp.com |
---|---|
State | Superseded |
Delegated to: | York Sun |
Headers | show |
Series | [U-Boot,v1] LS2080ardb: MMC: disable esdhc for dspi | expand |
Hi Yinbo, > -----Original Message----- > From: Yinbo Zhu <yinbo.zhu@nxp.com> > Sent: Thursday, November 22, 2018 4:17 PM > To: yorksun@freescale.com; Y.B. LU <yangbo.lu@nxp.com>; > u-boot@lists.denx.de > Cc: Yinbo Zhu <yinbo.zhu@nxp.com>; Xiaobo Xie <xiaobo.xie@nxp.com>; > Chuanhua Han <chuanhua.han@nxp.com> > Subject: [PATCH v1] LS2080ardb: MMC: disable esdhc for dspi > > esdhc and dspi have Multiplexed pins, if dspi is enabled and esdhc need to be > disabled, This patch is to disable esdhc when rcw config dspi enabled. [Y.b. Lu] The title and commit message is confusing. From the code changes, I think you can rephrase like, armv8: ls2080ardb: enable eSDHC pin mux support CONFIG_FSL_ESDHC_PIN_MUX should be enabled for ls2080ardb whose eSDHC has pin mux with DSPI. This config makes sure esdhc dts node would be fixed with disabled status if DSPI is used, in case of any mmc issue in linux. Also, esdhc should be added in default hwconfig since eSDHC is used in default. > > Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> > --- > include/configs/ls2080ardb.h | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index > f6aa4ed..d2e80a8 100644 > --- a/include/configs/ls2080ardb.h > +++ b/include/configs/ls2080ardb.h > @@ -331,6 +331,7 @@ unsigned long get_board_sys_clk(void); > /* MMC */ > #ifdef CONFIG_MMC > #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 > +#define CONFIG_FSL_ESDHC_PIN_MUX > #endif > > #define BOOT_TARGET_DEVICES(func) \ > @@ -390,7 +391,7 @@ unsigned long get_board_sys_clk(void); #undef > CONFIG_EXTRA_ENV_SETTINGS #ifdef CONFIG_TFABOOT > #define CONFIG_EXTRA_ENV_SETTINGS \ > - "hwconfig=fsl_ddr:bank_intlv=auto\0" \ > + "hwconfig=fsl_ddr:bank_intlv=auto;esdhc\0" \ > "ramdisk_addr=0x800000\0" \ > "ramdisk_size=0x2000000\0" \ > "fdt_high=0xa0000000\0" \ > @@ -459,7 +460,7 @@ unsigned long get_board_sys_clk(void); > "bootm $load_addr#$board\0" > #else > #define CONFIG_EXTRA_ENV_SETTINGS \ > - "hwconfig=fsl_ddr:bank_intlv=auto\0" \ > + "hwconfig=fsl_ddr:bank_intlv=auto;esdhc\0" \ > "ramdisk_addr=0x800000\0" \ > "ramdisk_size=0x2000000\0" \ > "fdt_high=0xa0000000\0" \ > -- > 1.7.1
On 11/22/18 12:23 AM, Yinbo Zhu wrote: > esdhc and dspi have Multiplexed pins, if dspi is enabled > and esdhc need to be disabled, This patch is to disable > esdhc when rcw config dspi enabled. > > Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> > --- > include/configs/ls2080ardb.h | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h > index f6aa4ed..d2e80a8 100644 > --- a/include/configs/ls2080ardb.h > +++ b/include/configs/ls2080ardb.h > @@ -331,6 +331,7 @@ unsigned long get_board_sys_clk(void); > /* MMC */ > #ifdef CONFIG_MMC > #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 > +#define CONFIG_FSL_ESDHC_PIN_MUX > #endif > We are moving to TFA boot flow. Please consider to detect the pin mux at runtime. York
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index f6aa4ed..d2e80a8 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -331,6 +331,7 @@ unsigned long get_board_sys_clk(void); /* MMC */ #ifdef CONFIG_MMC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 +#define CONFIG_FSL_ESDHC_PIN_MUX #endif #define BOOT_TARGET_DEVICES(func) \ @@ -390,7 +391,7 @@ unsigned long get_board_sys_clk(void); #undef CONFIG_EXTRA_ENV_SETTINGS #ifdef CONFIG_TFABOOT #define CONFIG_EXTRA_ENV_SETTINGS \ - "hwconfig=fsl_ddr:bank_intlv=auto\0" \ + "hwconfig=fsl_ddr:bank_intlv=auto;esdhc\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ "fdt_high=0xa0000000\0" \ @@ -459,7 +460,7 @@ unsigned long get_board_sys_clk(void); "bootm $load_addr#$board\0" #else #define CONFIG_EXTRA_ENV_SETTINGS \ - "hwconfig=fsl_ddr:bank_intlv=auto\0" \ + "hwconfig=fsl_ddr:bank_intlv=auto;esdhc\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ "fdt_high=0xa0000000\0" \
esdhc and dspi have Multiplexed pins, if dspi is enabled and esdhc need to be disabled, This patch is to disable esdhc when rcw config dspi enabled. Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> --- include/configs/ls2080ardb.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)