Add support for MMC higher speed modes for TI's am65x, j721e and j7200 platforms
Subsystems (2)
cover Add support for MMC higher speed modes for TI's am65x, j721e and j7200 platforms
The following patches add support for higher speeds in the SD card and eMMC for TI's am65x, j721e, j7200 platforms.
After these patches j721e and j7200 will support ultra high speed while am65x will support upto high speed modes.
Faiz Abbas (17):
mmc: sdhci: Add helper functions for UHS modes
mmc: am654_sdhci: Unconditionally switch off DLL in the beginning of
ios_post()
mmc: am654_sdhci: Convert flag fields to BIT macro
mmc: am654_sdhci: Add flag for PHY calibration
mmc: am654_sdhci: Add support for AM65x SR2.0
mmc: am654_sdhci: Add support for input tap delay
mmc: am654_sdhci: Add support for writing to clkbuf_sel
mmc: am654_sdhci: Add support for software tuning
mmc: am654_sdhci: Fix HISPD bit configuration in some lower speed
modes
mmc: am654_sdhci: Use sdhci_set_control_reg()
arm: dts: k3-am65: Fix mmc nodes
arm: dts: k3-j721e-main: Update otap-delay values
arm: dts: k3-j721e-common-proc-board: Add support for UHS modes for SD
card
arm: dts: k3-j7200-main: Add support for gpio0
arm: dts: k3-j7200-common-proc-board: Enable support for UHS modes
configs: j721e_evm: Add support for UHS modes
configs: j7200_evm: Add support for UHS modes
arch/arm/dts/k3-am65-main.dtsi | 22 + arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 67 +-- arch/arm/dts/k3-am654-base-board.dts | 25 ++ arch/arm/dts/k3-am654-r5-base-board.dts | 20 +- arch/arm/dts/k3-j7200-common-proc-board.dts | 49 ++- arch/arm/dts/k3-j7200-main.dtsi | 22 + .../arm/dts/k3-j7200-r5-common-proc-board.dts | 15 + arch/arm/dts/k3-j721e-common-proc-board.dts | 32 ++ arch/arm/dts/k3-j721e-main.dtsi | 5 +- configs/j7200_evm_a72_defconfig | 8 + configs/j7200_evm_r5_defconfig | 1 + configs/j721e_evm_a72_defconfig | 8 + configs/j721e_evm_r5_defconfig | 1 + drivers/mmc/Kconfig | 1 + drivers/mmc/am654_sdhci.c | 384 +++++++++++++----- drivers/mmc/sdhci.c | 49 +++ include/sdhci.h | 1 + 17 files changed, 537 insertions(+), 173 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/17 mmc: sdhci: Add helper functions for UHS modes
Add a set_voltage() function which handles the switch from 3.3V to 1.8V for SD card UHS modes.
--- drivers/mmc/sdhci.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ include/sdhci.h | 1 + 2 files changed, 50 insertions(+)
drivers/mmc/sdhci.c +49 -0
@@ -20,6 +20,7 @@#include <linux/delay.h> #include <linux/dma-mapping.h> #include <phys2bus.h> +#include <power/regulator.h> static void sdhci_reset (struct sdhci_host *host,u8 mask) {
@@ -556,6 +557,54 @@ void sdhci_set_uhs_timing(struct sdhci_host *host)sdhci_writew (host, reg,SDHCI_HOST_CONTROL2 ); } +#if CONFIG_IS_ENABLED (MMC_IO_VOLTAGE ) +static void sdhci_set_voltage (struct sdhci_host *host) +{ +struct mmc *mmc = (struct mmc *)host->mmc; +u32 ctrl; + + ctrl =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); + +switch (mmc->signal_voltage) { +case MMC_SIGNAL_VOLTAGE_330 : +if (mmc->vqmmc_supply) { +regulator_set_enable (mmc->vqmmc_supply, false); +regulator_set_value (mmc->vqmmc_supply,3300000 ); +regulator_set_enable (mmc->vqmmc_supply, true); + } + +mdelay (5 ); +if (IS_SD (mmc)) { + ctrl &= ~SDHCI_CTRL_VDD_180 ; +sdhci_writew (host, ctrl,SDHCI_HOST_CONTROL2 ); + } +break ; +case MMC_SIGNAL_VOLTAGE_180 : +if (mmc->vqmmc_supply) { +regulator_set_enable (mmc->vqmmc_supply, false); +regulator_set_value (mmc->vqmmc_supply,1800000 ); +regulator_set_enable (mmc->vqmmc_supply, true); + } + +if (IS_SD (mmc)) { + ctrl |=SDHCI_CTRL_VDD_180 ; +sdhci_writew (host, ctrl,SDHCI_HOST_CONTROL2 ); + } +break ; +default : +/* No signal voltage switch required */ +return ; + } +} +#else +static void sdhci_set_voltage (struct sdhci_host *host) { } +#endif +void sdhci_set_control_reg (struct sdhci_host *host) +{ +sdhci_set_voltage (host); +sdhci_set_uhs_timing (host); +} +#ifdef CONFIG_DM_MMC static int sdhci_set_ios (struct udevice *dev) {
include/sdhci.h +1 -0
@@ -492,6 +492,7 @@ void sdhci_set_uhs_timing(struct sdhci_host *host);/* Export the operations to drivers */ int sdhci_probe (struct udevice *dev);int sdhci_set_clock (struct mmc *mmc,unsigned int clock); +void sdhci_set_control_reg (struct sdhci_host *host);extern const struct dm_mmc_ops sdhci_ops;#else #endif
Signature · 1 line
2.17.1
PATCH 1/17 mmc: sdhci: Add helper functions for UHS modes
Hi,
Quoted 5 lines · Faiz Abbas
Add a
set_voltage()function which handles the switch from 3.3V to 1.8V for SD card UHS modes.Signed-off-by Faiz Abbas <[email protected]>---
Travisci is showing build issues for this patch with some boards. Will fix and repost for v2.
Thanks,
Faiz
PATCH 2/17 mmc: am654_sdhci: Unconditionally switch off DLL in the beginning of ios_post()
In reply to Faiz AbbasThere are some speed modes that work without switching the dll on. Unconditionally switch off the DLL before setting clock frequency to support this case. The software will automatically enable DLL for speed modes that require it. This also means the dll_on priv data member is no longer required.
--- drivers/mmc/am654_sdhci.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/mmc/am654_sdhci.c +1 -9
@@ -84,7 +84,6 @@ struct am654_sdhci_plat {#define IOMUX_PRESENT (1 << 1)#define FREQSEL_2_BIT (1 << 2)#define STRBSEL_4_BIT (1 << 3) -bool dll_on; };struct timing_data {
@@ -141,12 +140,7 @@ static int am654_sdhci_set_ios_post(struct sdhci_host *host) val &= ~SDHCI_CLOCK_CARD_EN ;sdhci_writew (host, val,SDHCI_CLOCK_CONTROL ); -/* power off phy */ -if (plat->dll_on) { -regmap_update_bits (plat->base,PHY_CTRL1 ,ENDLL_MASK ,0 ); - - plat->dll_on = false; - } +regmap_update_bits (plat->base,PHY_CTRL1 ,ENDLL_MASK ,0 );/* restart clock */ sdhci_set_clock (host->mmc, speed);
@@ -212,8 +206,6 @@ static int am654_sdhci_set_ios_post(struct sdhci_host *host) val & DLLRDY_MASK, 1000, 1000000);if (ret)return ret; - - plat->dll_on = true; }return 0 ;
Signature · 1 line
2.17.1
PATCH 3/17 mmc: am654_sdhci: Convert flag fields to BIT macro
In reply to Faiz AbbasConvert the flags field defines to use the BIT() macro.
--- drivers/mmc/am654_sdhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mmc/am654_sdhci.c +4 -4
@@ -80,10 +80,10 @@ struct am654_sdhci_plat {u32 drv_strength;u32 strb_sel;u32 flags; -#define DLL_PRESENT (1 << 0) -#define IOMUX_PRESENT (1 << 1) -#define FREQSEL_2_BIT (1 << 2) -#define STRBSEL_4_BIT (1 << 3) +#define DLL_PRESENT BIT(0) +#define IOMUX_PRESENT BIT(1) +#define FREQSEL_2_BIT BIT(2) +#define STRBSEL_4_BIT BIT(3) };struct timing_data {
Signature · 1 line
2.17.1
PATCH 4/17 mmc: am654_sdhci: Add flag for PHY calibration
In reply to Faiz AbbasNot all controllers need calibration for the PHY DLL. Add a DLL_CALIB flag to indicate the same.
Also move the write of trm_icp and driver strength to the set_clock() function to match the kernel configuration flow.
--- drivers/mmc/am654_sdhci.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
drivers/mmc/am654_sdhci.c +14 -12
@@ -84,6 +84,7 @@ struct am654_sdhci_plat {#define IOMUX_PRESENT BIT(1)#define FREQSEL_2_BIT BIT(2)#define STRBSEL_4_BIT BIT(3) +#define DLL_CALIB BIT(4) };struct timing_data {
@@ -195,6 +196,15 @@ static int am654_sdhci_set_ios_post(struct sdhci_host *host) freqsel << FREQSEL_SHIFT); } +/* Configure DLL TRIM */ + mask =DLL_TRIM_ICP_MASK ; + val = plat->trm_icp <<DLL_TRIM_ICP_SHIFT ; + +/* Configure DLL driver strength */ + mask |=DR_TY_MASK ; + val |= plat->drv_strength <<DR_TY_SHIFT ; +regmap_update_bits (plat->base,PHY_CTRL1 , mask, val); +/* Enable DLL */ regmap_update_bits (plat->base,PHY_CTRL1 ,ENDLL_MASK ,0x1 <<ENDLL_SHIFT );
@@ -221,7 +231,7 @@ int am654_sdhci_init(struct am654_sdhci_plat *plat) mask =OTAPDLYENA_MASK |OTAPDLYSEL_MASK ;regmap_update_bits (plat->base,PHY_CTRL4 , mask,0x0 ); -if (plat->flags &DLL_PRESENT ) { +if (plat->flags &DLL_CALIB ) {regmap_read (plat->base,PHY_STAT1 , &val);if (~val &CALDONE_MASK ) {/* Calibrate IO lines */
@@ -233,15 +243,6 @@ int am654_sdhci_init(struct am654_sdhci_plat *plat)if (ret)return ret; } - -/* Configure DLL TRIM */ - mask =DLL_TRIM_ICP_MASK ; - val = plat->trm_icp <<DLL_TRIM_ICP_SHIFT ; - -/* Configure DLL driver strength */ - mask |=DR_TY_MASK ; - val |= plat->drv_strength <<DR_TY_SHIFT ; -regmap_update_bits (plat->base,PHY_CTRL1 , mask, val); }/* Enable pins by setting IO mux to 0 */
@@ -292,12 +293,13 @@ const struct sdhci_ops am654_sdhci_ops = {const struct am654_driver_data am654_drv_data = { .ops = &am654_sdhci_ops, - .flags =IOMUX_PRESENT |FREQSEL_2_BIT |DLL_PRESENT |STRBSEL_4_BIT , + .flags =IOMUX_PRESENT |FREQSEL_2_BIT |DLL_PRESENT |DLL_CALIB | +STRBSEL_4_BIT , };const struct am654_driver_data j721e_8bit_drv_data = { .ops = &am654_sdhci_ops, - .flags =DLL_PRESENT , + .flags =DLL_PRESENT |DLL_CALIB , };static int j721e_4bit_sdhci_set_ios_post (struct sdhci_host *host)
Signature · 1 line
2.17.1
PATCH 5/17 mmc: am654_sdhci: Add support for AM65x SR2.0
In reply to Faiz AbbasAdd Support for AM65x PG2.0. Use the SoC bus framework to fixup the platform data and do DLL calibration if the revision is 1.0
--- drivers/mmc/am654_sdhci.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/mmc/am654_sdhci.c +30 -0
@@ -12,6 +12,7 @@#include <power-domain.h> #include <regmap.h> #include <sdhci.h> +#include <soc.h> #include <dm/device_compat.h> #include <linux/bitops.h> #include <linux/err.h>
@@ -292,6 +293,11 @@ const struct sdhci_ops am654_sdhci_ops = { };const struct am654_driver_data am654_drv_data = { + .ops = &am654_sdhci_ops, + .flags =DLL_PRESENT |IOMUX_PRESENT |FREQSEL_2_BIT |STRBSEL_4_BIT , +}; + +const struct am654_driver_data am654_sr1_drv_data = { .ops = &am654_sdhci_ops, .flags =IOMUX_PRESENT |FREQSEL_2_BIT |DLL_PRESENT |DLL_CALIB |STRBSEL_4_BIT ,
@@ -326,6 +332,11 @@ const struct am654_driver_data j721e_4bit_drv_data = { .flags = IOMUX_PRESENT, }; +const struct soc_attr am654_sdhci_soc_attr[] = { + { .family ="AM65X" , .revision ="SR1.0" , .data = &am654_sr1_drv_data}, + {/* sentinel */ } +}; +static int sdhci_am654_get_otap_delay (struct udevice *dev,struct mmc_config *cfg) {
@@ -365,6 +376,8 @@ static int am654_sdhci_probe(struct udevice *dev)struct mmc_uclass_priv *upriv =dev_get_uclass_priv (dev);struct sdhci_host *host =dev_get_priv (dev);struct mmc_config *cfg = &plat->cfg; +const struct soc_attr *soc; +const struct am654_driver_data *soc_drv_data;struct clk clk;unsigned long clock;int ret;
@@ -394,6 +407,14 @@ static int am654_sdhci_probe(struct udevice *dev)return ret; host->ops = drv_data->ops; + +/* Update ops based on SoC revision */ + soc =soc_device_match (am654_sdhci_soc_attr); +if (soc && soc->data) { + soc_drv_data = soc->data; + host->ops = soc_drv_data->ops; + } + host->mmc->priv = host; upriv->mmc = host->mmc;
@@ -458,9 +479,18 @@ static int am654_sdhci_bind(struct udevice *dev)struct am654_driver_data *drv_data = (struct am654_driver_data *)dev_get_driver_data (dev);struct am654_sdhci_plat *plat =dev_get_platdata (dev); +const struct soc_attr *soc; +const struct am654_driver_data *soc_drv_data; plat->flags = drv_data->flags; +/* Update flags based on SoC revision */ + soc =soc_device_match (am654_sdhci_soc_attr); +if (soc && soc->data) { + soc_drv_data = soc->data; + plat->flags = soc_drv_data->flags; + } +return sdhci_bind (dev, &plat->mmc, &plat->cfg); }
Signature · 1 line
2.17.1
PATCH 6/17 mmc: am654_sdhci: Add support for input tap delay
In reply to Faiz AbbasDLL need only be enabled for speed modes and clock frequencies at or above 50 MHz. For speed modes that don't enable the DLL, we need to configure a static input delay value. This involves reading an optional itap-del-sel-* value from the device tree and configuring it for the appropriate speed mode.
Therefore, move all dll configurations to their own functions and gate it with 50 MHz speed and a minimum mode. If both these conditions are not satisfied then configure delay chain modes.
--- drivers/mmc/am654_sdhci.c | 241 +++++++++++++++++++++++++------------- 1 file changed, 161 insertions(+), 80 deletions(-)
drivers/mmc/am654_sdhci.c +161 -80
@@ -62,6 +62,16 @@#define CALDONE_MASK BIT(CALDONE_SHIFT)#define RETRIM_SHIFT 17#define RETRIM_MASK BIT(RETRIM_SHIFT) +#define SELDLYTXCLK_SHIFT 17 +#define SELDLYTXCLK_MASK BIT(SELDLYTXCLK_SHIFT) +#define SELDLYRXCLK_SHIFT 16 +#define SELDLYRXCLK_MASK BIT(SELDLYRXCLK_SHIFT) +#define ITAPDLYSEL_SHIFT 0 +#define ITAPDLYSEL_MASK GENMASK(4, 0) +#define ITAPDLYENA_SHIFT 8 +#define ITAPDLYENA_MASK BIT(ITAPDLYENA_SHIFT) +#define ITAPCHGWIN_SHIFT 9 +#define ITAPCHGWIN_MASK BIT(ITAPCHGWIN_SHIFT)#define DRIVER_STRENGTH_50_OHM 0x0#define DRIVER_STRENGTH_33_OHM 0x1
@@ -70,6 +80,7 @@#define DRIVER_STRENGTH_40_OHM 0x4#define AM654_SDHCI_MIN_FREQ 400000 +#define CLOCK_TOO_SLOW_HZ 50000000struct am654_sdhci_plat {struct mmc_config cfg;
@@ -77,6 +88,7 @@ struct am654_sdhci_plat {struct regmap *base;bool non_removable;u32 otap_del_sel[MMC_MODES_END ]; +u32 itap_del_sel[MMC_MODES_END ];u32 trm_icp;u32 drv_strength;u32 strb_sel;
@@ -89,22 +101,45 @@ struct am654_sdhci_plat { };struct timing_data { -const char *binding; +const char *otap_binding; +const char *itap_binding;u32 capability; };static const struct timing_data td[] = { - [MMC_LEGACY ] = {"ti,otap-del-sel-legacy" ,0 }, - [MMC_HS ] = {"ti,otap-del-sel-mmc-hs" ,MMC_CAP (MMC_HS )}, - [SD_HS ] = {"ti,otap-del-sel-sd-hs" ,MMC_CAP (SD_HS )}, - [UHS_SDR12 ] = {"ti,otap-del-sel-sdr12" ,MMC_CAP (UHS_SDR12 )}, - [UHS_SDR25 ] = {"ti,otap-del-sel-sdr25" ,MMC_CAP (UHS_SDR25 )}, - [UHS_SDR50 ] = {"ti,otap-del-sel-sdr50" ,MMC_CAP (UHS_SDR50 )}, - [UHS_SDR104 ] = {"ti,otap-del-sel-sdr104" ,MMC_CAP (UHS_SDR104 )}, - [UHS_DDR50 ] = {"ti,otap-del-sel-ddr50" ,MMC_CAP (UHS_DDR50 )}, - [MMC_DDR_52 ] = {"ti,otap-del-sel-ddr52" ,MMC_CAP (MMC_DDR_52 )}, - [MMC_HS_200 ] = {"ti,otap-del-sel-hs200" ,MMC_CAP (MMC_HS_200 )}, - [MMC_HS_400 ] = {"ti,otap-del-sel-hs400" ,MMC_CAP (MMC_HS_400 )}, + [MMC_LEGACY ] = {"ti,otap-del-sel-legacy" , +"ti,itap-del-sel-legacy" , +0 }, + [MMC_HS ] = {"ti,otap-del-sel-mmc-hs" , +"ti,itap-del-sel-mms-hs" , +MMC_CAP (MMC_HS )}, + [SD_HS ] = {"ti,otap-del-sel-sd-hs" , +"ti,itap-del-sel-sd-hs" , +MMC_CAP (SD_HS )}, + [UHS_SDR12 ] = {"ti,otap-del-sel-sdr12" , +"ti,itap-del-sel-sdr12" , +MMC_CAP (UHS_SDR12 )}, + [UHS_SDR25 ] = {"ti,otap-del-sel-sdr25" , +"ti,itap-del-sel-sdr25" , +MMC_CAP (UHS_SDR25 )}, + [UHS_SDR50 ] = {"ti,otap-del-sel-sdr50" , +NULL , +MMC_CAP (UHS_SDR50 )}, + [UHS_SDR104 ] = {"ti,otap-del-sel-sdr104" , +NULL , +MMC_CAP (UHS_SDR104 )}, + [UHS_DDR50 ] = {"ti,otap-del-sel-ddr50" , +NULL , +MMC_CAP (UHS_DDR50 )}, + [MMC_DDR_52 ] = {"ti,otap-del-sel-ddr52" , +"ti,itap-del-sel-ddr52" , +MMC_CAP (MMC_DDR_52 )}, + [MMC_HS_200 ] = {"ti,otap-del-sel-hs200" , +NULL , +MMC_CAP (MMC_HS_200 )}, + [MMC_HS_400 ] = {"ti,otap-del-sel-hs400" , +NULL , +MMC_CAP (MMC_HS_400 )}, };struct am654_driver_data {
@@ -127,12 +162,99 @@ static void am654_sdhci_set_control_reg(struct sdhci_host *host)sdhci_set_uhs_timing (host); } +static int am654_sdhci_setup_dll (struct am654_sdhci_plat *plat, +unsigned int speed) +{ +int sel50, sel100, freqsel; +u32 mask, val; +int ret; + +/* Disable delay chain mode */ +regmap_update_bits (plat->base,PHY_CTRL5 , +SELDLYTXCLK_MASK |SELDLYRXCLK_MASK ,0 ); + +if (plat->flags &FREQSEL_2_BIT ) { +switch (speed) { +case 200000000 : + sel50 =0 ; + sel100 =0 ; +break ; +case 100000000 : + sel50 =0 ; + sel100 =1 ; +break ; +default : + sel50 =1 ; + sel100 =0 ; + } + +/* Configure PHY DLL frequency */ + mask =SEL50_MASK |SEL100_MASK ; + val = (sel50 <<SEL50_SHIFT ) | (sel100 <<SEL100_SHIFT ); +regmap_update_bits (plat->base,PHY_CTRL5 , mask, val); + }else { +switch (speed) { +case 200000000 : + freqsel =0x0 ; +break ; +default : + freqsel =0x4 ; + } +regmap_update_bits (plat->base,PHY_CTRL5 ,FREQSEL_MASK , + freqsel <<FREQSEL_SHIFT ); + } + +/* Configure DLL TRIM */ + mask =DLL_TRIM_ICP_MASK ; + val = plat->trm_icp <<DLL_TRIM_ICP_SHIFT ; + +/* Configure DLL driver strength */ + mask |=DR_TY_MASK ; + val |= plat->drv_strength <<DR_TY_SHIFT ; +regmap_update_bits (plat->base,PHY_CTRL1 , mask, val); + +/* Enable DLL */ +regmap_update_bits (plat->base,PHY_CTRL1 ,ENDLL_MASK , +0x1 <<ENDLL_SHIFT ); +/* +* Poll for DLL ready. Use a one second timeout. +* Works in all experiments done so far +*/ + ret =regmap_read_poll_timeout (plat->base,PHY_STAT1 , val, + val &DLLRDY_MASK ,1000 ,1000000 ); + +return ret; +} + +static void am654_sdhci_write_itapdly (struct am654_sdhci_plat *plat, +u32 itapdly) +{ +/* Set ITAPCHGWIN before writing to ITAPDLY */ +regmap_update_bits (plat->base,PHY_CTRL4 ,ITAPCHGWIN_MASK , +1 <<ITAPCHGWIN_SHIFT ); +regmap_update_bits (plat->base,PHY_CTRL4 ,ITAPDLYSEL_MASK , + itapdly <<ITAPDLYSEL_SHIFT ); +regmap_update_bits (plat->base,PHY_CTRL4 ,ITAPCHGWIN_MASK ,0 ); +} + +static void am654_sdhci_setup_delay_chain (struct am654_sdhci_plat *plat, +int mode) +{ +u32 mask, val; + + val =1 <<SELDLYTXCLK_SHIFT |1 <<SELDLYRXCLK_SHIFT ; + mask =SELDLYTXCLK_MASK |SELDLYRXCLK_MASK ; +regmap_update_bits (plat->base,PHY_CTRL5 , mask, val); + +am654_sdhci_write_itapdly (plat, plat->itap_del_sel[mode]); +} +static int am654_sdhci_set_ios_post (struct sdhci_host *host) {struct udevice *dev = host->mmc->dev;struct am654_sdhci_plat *plat =dev_get_platdata (dev);unsigned int speed = host->mmc->clock; -int sel50, sel100, freqsel; +int mode = host->mmc->selected_mode;u32 otap_del_sel;u32 mask, val;int ret;
@@ -148,75 +270,29 @@ static int am654_sdhci_set_ios_post(struct sdhci_host *host)sdhci_set_clock (host->mmc, speed);/* switch phy back on */ -if (speed >AM654_SDHCI_MIN_FREQ ) { - otap_del_sel = plat->otap_del_sel[host->mmc->selected_mode]; - mask =OTAPDLYENA_MASK |OTAPDLYSEL_MASK ; - val = (1 <<OTAPDLYENA_SHIFT ) | - (otap_del_sel <<OTAPDLYSEL_SHIFT ); - -/* Write to STRBSEL for HS400 speed mode */ -if (host->mmc->selected_mode ==MMC_HS_400 ) { -if (plat->flags &STRBSEL_4_BIT ) - mask |=STRBSEL_4BIT_MASK ; -else - mask |=STRBSEL_8BIT_MASK ; - - val |= plat->strb_sel <<STRBSEL_SHIFT ; - } + otap_del_sel = plat->otap_del_sel[mode]; + mask =OTAPDLYENA_MASK |OTAPDLYSEL_MASK ; + val = (1 <<OTAPDLYENA_SHIFT ) | + (otap_del_sel <<OTAPDLYSEL_SHIFT ); -regmap_update_bits (plat->base,PHY_CTRL4 , mask, val); - -if (plat->flags &FREQSEL_2_BIT ) { -switch (speed) { -case 200000000 : - sel50 =0 ; - sel100 =0 ; -break ; -case 100000000 : - sel50 =0 ; - sel100 =1 ; -break ; -default : - sel50 =1 ; - sel100 =0 ; - } - -/* Configure PHY DLL frequency */ - mask =SEL50_MASK |SEL100_MASK ; - val = (sel50 <<SEL50_SHIFT ) | (sel100 <<SEL100_SHIFT ); -regmap_update_bits (plat->base,PHY_CTRL5 , mask, val); - }else { -switch (speed) { -case 200000000 : - freqsel =0x0 ; -break ; -default : - freqsel =0x4 ; - } -regmap_update_bits (plat->base,PHY_CTRL5 ,FREQSEL_MASK , - freqsel <<FREQSEL_SHIFT ); - } +/* Write to STRBSEL for HS400 speed mode */ +if (host->mmc->selected_mode ==MMC_HS_400 ) { +if (plat->flags &STRBSEL_4_BIT ) + mask |=STRBSEL_4BIT_MASK ; +else + mask |=STRBSEL_8BIT_MASK ; -/* Configure DLL TRIM */ - mask =DLL_TRIM_ICP_MASK ; - val = plat->trm_icp <<DLL_TRIM_ICP_SHIFT ; - -/* Configure DLL driver strength */ - mask |=DR_TY_MASK ; - val |= plat->drv_strength <<DR_TY_SHIFT ; -regmap_update_bits (plat->base,PHY_CTRL1 , mask, val); - -/* Enable DLL */ -regmap_update_bits (plat->base,PHY_CTRL1 ,ENDLL_MASK , -0x1 <<ENDLL_SHIFT ); -/* -* Poll for DLL ready. Use a one second timeout. -* Works in all experiments done so far -*/ - ret =regmap_read_poll_timeout (plat->base,PHY_STAT1 , val, - val &DLLRDY_MASK ,1000 ,1000000 ); + val |= plat->strb_sel <<STRBSEL_SHIFT ; + } + +regmap_update_bits (plat->base,PHY_CTRL4 , mask, val); + +if (mode >UHS_SDR25 && speed >=CLOCK_TOO_SLOW_HZ ) { + ret =am654_sdhci_setup_dll (plat, speed);if (ret)return ret; + }else { +am654_sdhci_setup_delay_chain (plat, mode); }return 0 ;
@@ -354,15 +430,20 @@ static int sdhci_am654_get_otap_delay(struct udevice *dev,* value is not found */ for (i =MMC_HS ; i <=MMC_HS_400 ; i++) { - ret =dev_read_u32 (dev, td[i].binding, &plat->otap_del_sel[i]); + ret =dev_read_u32 (dev, td[i].otap_binding, + &plat->otap_del_sel[i]);if (ret) { -dev_dbg (dev,"Couldn't find %s\n" , td[i].binding); +dev_dbg (dev,"Couldn't find %s\n" , td[i].otap_binding);/* * Remove the corresponding capability * if an otap-del-sel value is not found */ cfg->host_caps &= ~td[i].capability; } + +if (td[i].itap_binding) +dev_read_u32 (dev, td[i].itap_binding, + &plat->itap_del_sel[i]); }return 0 ;
Signature · 1 line
2.17.1
PATCH 7/17 mmc: am654_sdhci: Add support for writing to clkbuf_sel
In reply to Faiz AbbasAdd support for writing new clock buffer select property for both the am654x and j721e 4 bit IPs
--- drivers/mmc/am654_sdhci.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/mmc/am654_sdhci.c +11 -0
@@ -48,6 +48,8 @@#define SEL100_MASK BIT(SEL100_SHIFT)#define FREQSEL_SHIFT 8#define FREQSEL_MASK GENMASK(10, 8) +#define CLKBUFSEL_SHIFT 0 +#define CLKBUFSEL_MASK GENMASK(2, 0)#define DLL_TRIM_ICP_SHIFT 4#define DLL_TRIM_ICP_MASK GENMASK(7, 4)#define DR_TY_SHIFT 20
@@ -92,6 +94,7 @@ struct am654_sdhci_plat {u32 trm_icp;u32 drv_strength;u32 strb_sel; +u32 clkbuf_sel;u32 flags;#define DLL_PRESENT BIT(0)#define IOMUX_PRESENT BIT(1)
@@ -295,6 +298,9 @@ static int am654_sdhci_set_ios_post(struct sdhci_host *host)am654_sdhci_setup_delay_chain (plat, mode); } +regmap_update_bits (plat->base,PHY_CTRL5 ,CLKBUFSEL_MASK , + plat->clkbuf_sel); +return 0 ; }
@@ -395,6 +401,9 @@ static int j721e_4bit_sdhci_set_ios_post(struct sdhci_host *host) val = (1 <<OTAPDLYENA_SHIFT ) | (otap_del_sel <<OTAPDLYSEL_SHIFT );regmap_update_bits (plat->base,PHY_CTRL4 , mask, val); +regmap_update_bits (plat->base,PHY_CTRL5 ,CLKBUFSEL_MASK , + plat->clkbuf_sel); +return 0 ; }
@@ -548,6 +557,8 @@ static int am654_sdhci_ofdata_to_platdata(struct udevice *dev) } } +dev_read_u32 (dev,"ti,clkbuf-sel" , &plat->clkbuf_sel); + ret =mmc_of_parse (dev, cfg);if (ret)return ret;
Signature · 1 line
2.17.1
PATCH 8/17 mmc: am654_sdhci: Add support for software tuning
In reply to Faiz AbbasWith the new SW tuning App note[1], a custom tuning algorithm is required for eMMC HS200, HS400 and SD card UHS modes. The algorithm involves running through the 32 possible input tap delay values and sending the appropriate tuning command (CMD19/21) for each of them to get a fail or pass result for each of the values. Typically, the range will have a small contiguous failing window. Considering the tuning range as a circular buffer, the algorithm then sets a final tuned value directly opposite to the failing window.
[1] https://www.ti.com/lit/pdf/spract9
--- drivers/mmc/am654_sdhci.c | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
drivers/mmc/am654_sdhci.c +45 -0
@@ -9,6 +9,7 @@#include <common.h> #include <dm.h> #include <malloc.h> +#include <mmc.h> #include <power-domain.h> #include <regmap.h> #include <sdhci.h>
@@ -368,7 +369,48 @@ static int am654_sdhci_deferred_probe(struct sdhci_host *host)return sdhci_probe (dev); } +#ifdef MMC_SUPPORTS_TUNING +#define ITAP_MAX 32 +static int am654_sdhci_execute_tuning (struct mmc *mmc,u8 opcode) +{ +struct udevice *dev = mmc->dev; +struct am654_sdhci_plat *plat =dev_get_platdata (dev); +int cur_val, prev_val =1 , fail_len =0 , pass_window =0 , pass_len; +u32 itap; + +/* Enable ITAPDLY */ +regmap_update_bits (plat->base,PHY_CTRL4 ,ITAPDLYENA_MASK , +1 <<ITAPDLYENA_SHIFT ); + +for (itap =0 ; itap <ITAP_MAX ; itap++) { +am654_sdhci_write_itapdly (plat, itap); + + cur_val = !mmc_send_tuning (mmc, opcode,NULL ); +if (cur_val && !prev_val) + pass_window = itap; + +if (!cur_val) + fail_len++; + + prev_val = cur_val; + } +/* +* Having determined the length of the failing window and start of +* the passing window calculate the length of the passing window and +* set the final value halfway through it considering the range as a +* circular buffer +*/ + pass_len =ITAP_MAX - fail_len; + itap = (pass_window + (pass_len >>1 )) %ITAP_MAX ; +am654_sdhci_write_itapdly (plat, itap); + +return 0 ; +} +#endif const struct sdhci_ops am654_sdhci_ops = { +#ifdef MMC_SUPPORTS_TUNING + .platform_execute_tuning = am654_sdhci_execute_tuning, +#endif .deferred_probe = am654_sdhci_deferred_probe, .set_ios_post = &am654_sdhci_set_ios_post, .set_control_reg = &am654_sdhci_set_control_reg,
@@ -408,6 +450,9 @@ static int j721e_4bit_sdhci_set_ios_post(struct sdhci_host *host) }const struct sdhci_ops j721e_4bit_sdhci_ops = { +#ifdef MMC_SUPPORTS_TUNING + .platform_execute_tuning = am654_sdhci_execute_tuning, +#endif .deferred_probe = am654_sdhci_deferred_probe, .set_ios_post = &j721e_4bit_sdhci_set_ios_post, };
Signature · 1 line
2.17.1
PATCH 9/17 mmc: am654_sdhci: Fix HISPD bit configuration in some lower speed modes
In reply to Faiz AbbasAccording to the AM654x Data Manual[1], the setup timing in lower speed modes can only be met if the controller uses a falling edge data launch.
To ensure this, the HIGH_SPEED_ENA (HOST_CONTROL[2]) bit should be cleared in default speed, SD high speed, MMC high speed, SDR12 and SDR25 speed modes.
Use the sdhci writeb callback to implement this condition.
[1] http://www.ti.com/lit/gpn/am6546 Section 5.10.5.16.1
--- drivers/mmc/Kconfig | 1 + drivers/mmc/am654_sdhci.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)
drivers/mmc/Kconfig +1 -0
@@ -521,6 +521,7 @@ config MMC_SDHCI_AM654 depends on MMC_SDHCI depends on DM_MMC && OF_CONTROL && BLK depends on REGMAP + select MMC_SDHCI_IO_ACCESSORS help Support for Secure Digital Host Controller Interface (SDHCI) controllers present on TI's AM654 SOCs.
drivers/mmc/am654_sdhci.c +23 -2
@@ -369,6 +369,26 @@ static int am654_sdhci_deferred_probe(struct sdhci_host *host)return sdhci_probe (dev); } +static void am654_sdhci_write_b (struct sdhci_host *host,u8 val,int reg) +{ +if (reg ==SDHCI_HOST_CONTROL ) { +switch (host->mmc->selected_mode) { +/* +* According to the data manual, HISPD bit +* should not be set in these speed modes. +*/ +case SD_HS : +case MMC_HS : +case UHS_SDR12 : +case UHS_SDR25 : + val &= ~SDHCI_CTRL_HISPD ; +default : +break ; + } + } + +writeb (val, host->ioaddr + reg); +}#ifdef MMC_SUPPORTS_TUNING #define ITAP_MAX 32static int am654_sdhci_execute_tuning (struct mmc *mmc,u8 opcode)
@@ -414,6 +434,7 @@ const struct sdhci_ops am654_sdhci_ops = { .deferred_probe = am654_sdhci_deferred_probe, .set_ios_post = &am654_sdhci_set_ios_post, .set_control_reg = &am654_sdhci_set_control_reg, + .write_b = am654_sdhci_write_b, };const struct am654_driver_data am654_drv_data = {
@@ -455,6 +476,7 @@ const struct sdhci_ops j721e_4bit_sdhci_ops = {#endif .deferred_probe = am654_sdhci_deferred_probe, .set_ios_post = &j721e_4bit_sdhci_set_ios_post, + .write_b = am654_sdhci_write_b, };const struct am654_driver_data j721e_4bit_drv_data = {
@@ -532,6 +554,7 @@ static int am654_sdhci_probe(struct udevice *dev) host->max_clk = clock; host->mmc = &plat->mmc; host->mmc->dev = dev; + host->ops = drv_data->ops; ret =sdhci_setup_cfg (cfg, host, cfg->f_max,AM654_SDHCI_MIN_FREQ );if (ret)
@@ -541,8 +564,6 @@ static int am654_sdhci_probe(struct udevice *dev)if (ret)return ret; - host->ops = drv_data->ops; -/* Update ops based on SoC revision */ soc =soc_device_match (am654_sdhci_soc_attr);if (soc && soc->data) {
Signature · 1 line
2.17.1
PATCH 10/17 mmc: am654_sdhci: Use sdhci_set_control_reg()
In reply to Faiz AbbasUse the generic sdhci_set_control_reg() instead of duplicating in platform driver.
--- drivers/mmc/am654_sdhci.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/mmc/am654_sdhci.c +2 -16
@@ -151,21 +151,6 @@ struct am654_driver_data {u32 flags; }; -static void am654_sdhci_set_control_reg (struct sdhci_host *host) -{ -struct mmc *mmc = (struct mmc *)host->mmc; -u32 reg; - -if (IS_SD (host->mmc) && - mmc->signal_voltage ==MMC_SIGNAL_VOLTAGE_180 ) { - reg =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); - reg |=SDHCI_CTRL_VDD_180 ; -sdhci_writew (host, reg,SDHCI_HOST_CONTROL2 ); - } - -sdhci_set_uhs_timing (host); -} -static int am654_sdhci_setup_dll (struct am654_sdhci_plat *plat,unsigned int speed) {
@@ -433,7 +418,7 @@ const struct sdhci_ops am654_sdhci_ops = {#endif .deferred_probe = am654_sdhci_deferred_probe, .set_ios_post = &am654_sdhci_set_ios_post, - .set_control_reg = &am654_sdhci_set_control_reg, + .set_control_reg = sdhci_set_control_reg, .write_b = am654_sdhci_write_b, };
@@ -476,6 +461,7 @@ const struct sdhci_ops j721e_4bit_sdhci_ops = {#endif .deferred_probe = am654_sdhci_deferred_probe, .set_ios_post = &j721e_4bit_sdhci_set_ios_post, + .set_control_reg = sdhci_set_control_reg, .write_b = am654_sdhci_write_b, };
Signature · 1 line
2.17.1
PATCH 11/17 arm: dts: k3-am65: Fix mmc nodes
In reply to Faiz AbbasBecause of fundamental interface issues in am65x pg1, only the initial sdhci1 node at 25 MHz was added in the u-boot.dtsi from which both the base-board.dts and r5-base-board.dts inherit the node. Move the node out to k3-am65-main.dtsi where it belongs and add the board specific properties in base-board.dts and r5-base-board.dts
This ensures dts compatibility with the kernel dts in the base-board.dts and enables the SD card interface at 50 MHz and High Speed mode
While we are here, also fix the main_mmc0_pins_default property to be included and inherit from the base-board.dts instead of the u-boot.dtsi
--- arch/arm/dts/k3-am65-main.dtsi | 22 +++++++ arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 67 +++----------------- arch/arm/dts/k3-am654-base-board.dts | 25 ++++++++ arch/arm/dts/k3-am654-r5-base-board.dts | 20 +++++- 4 files changed, 74 insertions(+), 60 deletions(-)
arch/arm/dts/k3-am65-main.dtsi +22 -0
@@ -113,6 +113,28 @@ dma-coherent; }; + sdhci1: sdhci at 4fa0000 { + compatible = "ti,am654-sdhci-5.1"; + reg = <0x0 0x4fa0000 0x0 0x260>, <0x0 0x4fb0000 0x0 0x134>; + power-domains = <&k3_pds 48 TI_SCI_PD_EXCLUSIVE>; + clocks = <&k3_clks 48 0>, <&k3_clks 48 1>; + clock-names = "clk_ahb", "clk_xin"; + interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>; + ti,otap-del-sel-legacy = <0x0>; + ti,otap-del-sel-mmc-hs = <0x0>; + ti,otap-del-sel-sd-hs = <0x0>; + ti,otap-del-sel-sdr12 = <0x0>; + ti,otap-del-sel-sdr25 = <0x0>; + ti,otap-del-sel-sdr50 = <0x8>; + ti,otap-del-sel-sdr104 = <0x7>; + ti,otap-del-sel-ddr50 = <0x4>; + ti,otap-del-sel-ddr52 = <0x4>; + ti,otap-del-sel-hs200 = <0x7>; + ti,clkbuf-sel = <0x7>; + ti,trm-icp = <0x8>; + dma-coherent; + }; + main_i2c0: i2c at 2000000 { compatible = "ti,am654-i2c", "ti,omap4-i2c"; reg = <0x0 0x2000000 0x0 0x100>;
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +8 -59
91 lines not on this page · raw message
arch/arm/dts/k3-am654-base-board.dts +25 -0
@@ -59,6 +59,19 @@ >; }; + main_mmc1_pins_default: main_mmc1_pins_default { + pinctrl-single,pins = < + AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* (C27) MMC1_CLK */ + AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /* (C28) MMC1_CMD */ + AM65X_IOPAD(0x02d0, PIN_INPUT_PULLUP, 0) /* (D28) MMC1_DAT0 */ + AM65X_IOPAD(0x02cc, PIN_INPUT_PULLUP, 0) /* (E27) MMC1_DAT1 */ + AM65X_IOPAD(0x02c8, PIN_INPUT_PULLUP, 0) /* (D26) MMC1_DAT2 */ + AM65X_IOPAD(0x02c4, PIN_INPUT_PULLUP, 0) /* (D27) MMC1_DAT3 */ + AM65X_IOPAD(0x02dc, PIN_INPUT_PULLUP, 0) /* (B24) MMC1_SDCD */ + AM65X_IOPAD(0x02e0, PIN_INPUT, 0) /* (C24) MMC1_SDWP */ + >; + }; + usb1_pins_default: usb1_pins_default { pinctrl-single,pins = < AM65X_IOPAD(0x02c0, PIN_OUTPUT, 0) /* (AC8) USB1_DRVVBUS */
@@ -122,6 +135,18 @@ ti,driver-strength-ohm = <50>; }; +/* + * Because of erratas i2025 and i2026 for silicon revision 1.0, the + * SD card interface might fail. Boards with sr1.0 are recommended to + * disable sdhci1 + */ +&sdhci1 { + pinctrl-names = "default"; + pinctrl-0 = <&main_mmc1_pins_default>; + ti,driver-strength-ohm = <50>; + disable-wp; +}; + &wkup_i2c0 { pinctrl-names = "default"; pinctrl-0 = <&wkup_i2c0_pins_default>;
arch/arm/dts/k3-am654-r5-base-board.dts +19 -1
@@ -6,7 +6,6 @@ /dts-v1/; #include "k3-am654.dtsi" -#include "k3-am654-base-board-u-boot.dtsi" #include "k3-am654-base-board-ddr4-1600MTs.dtsi" #include "k3-am654-ddr.dtsi"
@@ -213,6 +212,21 @@ AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP, 0) /* (D25) MMC0_DAT7 */ AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* (C25) MMC0_DS */ >; + u-boot,dm-spl; + }; + + main_mmc1_pins_default: main_mmc1_pins_default { + pinctrl-single,pins = < + AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* (C27) MMC1_CLK */ + AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /* (C28) MMC1_CMD */ + AM65X_IOPAD(0x02d0, PIN_INPUT_PULLUP, 0) /* (D28) MMC1_DAT0 */ + AM65X_IOPAD(0x02cc, PIN_INPUT_PULLUP, 0) /* (E27) MMC1_DAT1 */ + AM65X_IOPAD(0x02c8, PIN_INPUT_PULLUP, 0) /* (D26) MMC1_DAT2 */ + AM65X_IOPAD(0x02c4, PIN_INPUT_PULLUP, 0) /* (D27) MMC1_DAT3 */ + AM65X_IOPAD(0x02dc, PIN_INPUT_PULLUP, 0) /* (B24) MMC1_SDCD */ + AM65X_IOPAD(0x02e0, PIN_INPUT, 0) /* (C24) MMC1_SDWP */ + >; + u-boot,dm-spl; }; };
@@ -225,6 +239,7 @@ &sdhci0 { clock-names = "clk_xin"; clocks = <&clk_200mhz>; + pinctrl-0 = <&main_mmc0_pins_default>; /delete-property/ power-domains; ti,driver-strength-ohm = <50>; };
@@ -232,6 +247,7 @@ &sdhci1 { clock-names = "clk_xin"; clocks = <&clk_200mhz>; + pinctrl-0 = <&main_mmc1_pins_default>; /delete-property/ power-domains; ti,driver-strength-ohm = <50>; };
@@ -313,3 +329,5 @@ &scm_conf { u-boot,dm-spl; }; + +#include "k3-am654-base-board-u-boot.dtsi"
Signature · 1 line
2.17.1
PATCH 12/17 arm: dts: k3-j721e-main: Update otap-delay values
In reply to Faiz AbbasUpdate otap delay values to match with the latest Data Manual[1].
[1] https://www.ti.com/lit/gpn/dra829v
--- arch/arm/dts/k3-j721e-main.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/arm/dts/k3-j721e-main.dtsi +2 -3
@@ -235,8 +235,8 @@ ti,trm-icp = <0x8>; dma-coherent; mmc-ddr-1_8v; - ti,otap-del-sel-legacy = <0x0>; - ti,otap-del-sel-mmc-hs = <0x0>; + ti,otap-del-sel-legacy = <0xf>; + ti,otap-del-sel-mmc-hs = <0xf>; ti,otap-del-sel-ddr52 = <0x5>; ti,otap-del-sel-hs200 = <0x6>; ti,otap-del-sel-hs400 = <0x0>;
@@ -256,7 +256,6 @@ ti,otap-del-sel-sdr12 = <0xf>; ti,otap-del-sel-sdr25 = <0xf>; ti,otap-del-sel-sdr50 = <0xc>; - ti,otap-del-sel-sdr104 = <0x5>; ti,otap-del-sel-ddr50 = <0xc>; ti,trm-icp = <0x8>; dma-coherent;
Signature · 1 line
2.17.1
PATCH 13/17 arm: dts: k3-j721e-common-proc-board: Add support for UHS modes for SD card
In reply to Faiz AbbasAdd support for regulators to power cycle and switch IO voltage to the SD card. This enables support for UHS modes.
--- arch/arm/dts/k3-j721e-common-proc-board.dts | 32 +++++++++++++++++++++ 1 file changed, 32 insertions(+)
arch/arm/dts/k3-j721e-common-proc-board.dts +32 -0
@@ -6,6 +6,7 @@ /dts-v1/; #include "k3-j721e-som-p0.dtsi" +#include <dt-bindings/gpio/gpio.h> / { chosen {
@@ -24,6 +25,29 @@ remoteproc7 = &c66_1; remoteproc8 = &c71_0; }; + + vdd_mmc1: fixedregulator-sd { + compatible = "regulator-fixed"; + regulator-name = "vdd_mmc1"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + enable-active-high; + gpio = <&exp2 2 GPIO_ACTIVE_HIGH>; + }; + + vdd_sd_dv_alt: gpio-regulator-TLV71033 { + compatible = "regulator-gpio"; + pinctrl-names = "default"; + pinctrl-0 = <&vdd_sd_dv_alt_pins_default>; + regulator-name = "tlv71033"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + gpios = <&main_gpio0 117 GPIO_ACTIVE_HIGH>; + states = <1800000 0x0 + 3300000 0x1>; + }; }; &wkup_uart0 {
@@ -79,6 +103,12 @@ J721E_IOPAD(0x25c, PIN_INPUT, 0) /* (R28) MMC1_SDWP */ >; }; + + vdd_sd_dv_alt_pins_default: vdd_sd_dv_alt_pins_default { + pinctrl-single,pins = < + J721E_IOPAD(0x1d8, PIN_INPUT, 7) /* (W4) SPI1_CS1.GPIO0_117 */ + >; + }; }; &main_sdhci0 {
@@ -92,6 +122,8 @@ pinctrl-names = "default"; pinctrl-0 = <&main_mmc1_pins_default>; ti,driver-strength-ohm = <50>; + vmmc-supply = <&vdd_mmc1>; + vqmmc-supply = <&vdd_sd_dv_alt>; }; &main_pmx0 {
Signature · 1 line
2.17.1
PATCH 14/17 arm: dts: k3-j7200-main: Add support for gpio0
In reply to Faiz AbbasAdd support for the main_gpio0 node
--- arch/arm/dts/k3-j7200-main.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm/dts/k3-j7200-main.dtsi +22 -0
@@ -197,6 +197,28 @@ clock-names = "fclk"; }; + main_gpio0: gpio at 600000 { + compatible = "ti,j721e-gpio", "ti,keystone-gpio"; + reg = <0x0 0x00600000 0x0 0x100>; + gpio-controller; + #gpio-cells = <2>; + interrupts = <105 0 IRQ_TYPE_EDGE_RISING>, + <105 1 IRQ_TYPE_EDGE_RISING>, + <105 2 IRQ_TYPE_EDGE_RISING>, + <105 3 IRQ_TYPE_EDGE_RISING>, + <105 4 IRQ_TYPE_EDGE_RISING>, + <105 5 IRQ_TYPE_EDGE_RISING>, + <105 6 IRQ_TYPE_EDGE_RISING>, + <105 7 IRQ_TYPE_EDGE_RISING>; + interrupt-controller; + #interrupt-cells = <2>; + ti,ngpio = <69>; + ti,davinci-gpio-unbanked = <0>; + power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>; + clocks = <&k3_clks 105 0>; + clock-names = "gpio"; + }; + main_sdhci0: sdhci at 4f80000 { compatible = "ti,j721e-sdhci-8bit"; reg = <0x0 0x04f80000 0x0 0x260>, <0x0 0x4f88000 0x0 0x134>;
Signature · 1 line
2.17.1
PATCH 15/17 arm: dts: k3-j7200-common-proc-board: Enable support for UHS modes
In reply to Faiz AbbasAdd support for UHS modes by adding the regulators to power cycle and voltage switch the card. Also add pinmuxes required for each node.
--- arch/arm/dts/k3-j7200-common-proc-board.dts | 49 ++++++++++++++++++- .../arm/dts/k3-j7200-r5-common-proc-board.dts | 15 ++++++ 2 files changed, 62 insertions(+), 2 deletions(-)
arch/arm/dts/k3-j7200-common-proc-board.dts +47 -2
@@ -7,6 +7,7 @@ #include <dt-bindings/net/ti-dp83867.h> #include "k3-j7200-som-p0.dtsi" +#include <dt-bindings/gpio/gpio.h> / { chosen {
@@ -20,6 +21,29 @@ remoteproc2 = &main_r5fss0_core0; remoteproc3 = &main_r5fss0_core1; }; + + vdd_mmc1: fixedregulator-sd { + compatible = "regulator-fixed"; + regulator-name = "vdd_mmc1"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + enable-active-high; + gpio = <&exp2 2 GPIO_ACTIVE_HIGH>; + }; + + vdd_sd_dv: gpio-regulator-vdd-sd-dv { + compatible = "regulator-gpio"; + regulator-name = "vdd_sd_dv"; + pinctrl-names = "default"; + pinctrl-0 = <&vdd_sd_dv_pins_default>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + gpios = <&main_gpio0 55 GPIO_ACTIVE_HIGH>; + states = <1800000 0x0 + 3300000 0x1>; + }; }; &wkup_pmx0 {
@@ -69,6 +93,25 @@ >; }; + main_mmc1_pins_default: main_mmc1_pins_default { + pinctrl-single,pins = < + J721E_IOPAD(0x104, PIN_INPUT, 0) /* (M20) MMC1_CMD */ + J721E_IOPAD(0x100, PIN_INPUT, 0) /* (P21) MMC1_CLK */ + J721E_IOPAD(0xfc, PIN_INPUT, 0) /* (P25) MMC1_CLKLB */ + J721E_IOPAD(0xf8, PIN_INPUT, 0) /* (M19) MMC1_DAT0 */ + J721E_IOPAD(0xf4, PIN_INPUT, 0) /* (N21) MMC1_DAT1 */ + J721E_IOPAD(0xf0, PIN_INPUT, 0) /* (N20) MMC1_DAT2 */ + J721E_IOPAD(0xec, PIN_INPUT, 0) /* (N19) MMC1_DAT3 */ + J721E_IOPAD(0xe4, PIN_INPUT, 8) /* (V1) TIMER_IO0.MMC1_SDCD */ + >; + }; + + vdd_sd_dv_pins_default: vdd_sd_dv_pins_default { + pinctrl-single,pins = < + J721E_IOPAD(0xd0, PIN_INPUT, 7) /* (T5) SPI0_D1.GPIO0_55 */ + >; + }; + main_usbss0_pins_default: main_usbss0_pins_default { pinctrl-single,pins = < J721E_IOPAD(0x120, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */
@@ -140,10 +183,12 @@ &main_sdhci1 { /* SD card */ + pinctrl-0 = <&main_mmc1_pins_default>; + pinctrl-names = "default"; + vmmc-supply = <&vdd_mmc1>; + vqmmc-supply = <&vdd_sd_dv>; ti,driver-strength-ohm = <50>; disable-wp; - no-1-8-v; - sdhci-caps-mask = <0x8000000F 0x0>; }; &main_i2c0 {
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +15 -0
@@ -161,6 +161,19 @@ >; }; + main_mmc1_pins_default: main_mmc1_pins_default { + pinctrl-single,pins = < + J721E_IOPAD(0x104, PIN_INPUT, 0) /* (M20) MMC1_CMD */ + J721E_IOPAD(0x100, PIN_INPUT, 0) /* (P21) MMC1_CLK */ + J721E_IOPAD(0xfc, PIN_INPUT, 0) /* (P25) MMC1_CLKLB */ + J721E_IOPAD(0xf8, PIN_INPUT, 0) /* (M19) MMC1_DAT0 */ + J721E_IOPAD(0xf4, PIN_INPUT, 0) /* (N21) MMC1_DAT1 */ + J721E_IOPAD(0xf0, PIN_INPUT, 0) /* (N20) MMC1_DAT2 */ + J721E_IOPAD(0xec, PIN_INPUT, 0) /* (N19) MMC1_DAT3 */ + J721E_IOPAD(0xe4, PIN_INPUT, 8) /* (V1) TIMER_IO0.MMC1_SDCD */ + >; + }; + main_usbss0_pins_default: main_usbss0_pins_default { pinctrl-single,pins = < J721E_IOPAD(0x120, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */
@@ -197,6 +210,8 @@ /delete-property/ power-domains; /delete-property/ assigned-clocks; /delete-property/ assigned-clock-parents; + pinctrl-0 = <&main_mmc1_pins_default>; + pinctrl-names = "default"; clock-names = "clk_xin"; clocks = <&clk_200mhz>; ti,driver-strength-ohm = <50>;
Signature · 1 line
2.17.1
PATCH 16/17 configs: j721e_evm: Add support for UHS modes
In reply to Faiz AbbasAdd configs to support UHS modes for the SD card and HS200 for the eMMC.
--- configs/j721e_evm_a72_defconfig | 8 ++++++++ configs/j721e_evm_r5_defconfig | 1 + 2 files changed, 9 insertions(+)
configs/j721e_evm_a72_defconfig +8 -0
@@ -107,11 +107,16 @@ CONFIG_TI_SCI_PROTOCOL=y CONFIG_DA8XX_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y +CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS200_SUPPORT=y +CONFIG_SPL_MMC_HS200_SUPPORT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ADMA=y CONFIG_SPL_MMC_SDHCI_ADMA=y
@@ -140,6 +145,9 @@ CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_POWER_DOMAIN=y CONFIG_TI_SCI_POWER_DOMAIN=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_REMOTEPROC_TI_K3_DSP=y
configs/j721e_evm_r5_defconfig +1 -0
@@ -89,6 +89,7 @@ CONFIG_K3_AVS0=y CONFIG_ESM_PMIC=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_SPL_MMC_HS200_SUPPORT=y CONFIG_MMC_SDHCI=y CONFIG_SPL_MMC_SDHCI_ADMA=y CONFIG_MMC_SDHCI_AM654=y
Signature · 1 line
2.17.1
PATCH 17/17 configs: j7200_evm: Add support for UHS modes
In reply to Faiz AbbasAdd configs to support UHS modes for the SD card and HS200 for the eMMC.
--- configs/j7200_evm_a72_defconfig | 8 ++++++++ configs/j7200_evm_r5_defconfig | 1 + 2 files changed, 9 insertions(+)
configs/j7200_evm_a72_defconfig +8 -0
@@ -110,11 +110,16 @@ CONFIG_TI_SCI_PROTOCOL=y CONFIG_DA8XX_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y +CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS200_SUPPORT=y +CONFIG_SPL_MMC_HS200_SUPPORT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ADMA=y CONFIG_SPL_MMC_SDHCI_ADMA=y
@@ -142,6 +147,9 @@ CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_POWER_DOMAIN=y CONFIG_TI_SCI_POWER_DOMAIN=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_REMOTEPROC_TI_K3_R5F=y
configs/j7200_evm_r5_defconfig +1 -0
@@ -89,6 +89,7 @@ CONFIG_K3_SEC_PROXY=y CONFIG_FS_LOADER=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_SPL_MMC_HS200_SUPPORT=y CONFIG_MMC_SDHCI=y CONFIG_SPL_MMC_SDHCI_ADMA=y CONFIG_MMC_SDHCI_AM654=y
Signature · 1 line
2.17.1
cover Add support for MMC higher speed modes for TI's am65x, j721e and j7200 platforms
In reply to Faiz AbbasHi Peng,
Quoted 10 lines · Faiz Abbas
The following patches add support for higher speeds in the SD card and eMMC for TI's am65x, j721e, j7200 platforms.
After these patches j721e and j7200 will support ultra high speed while am65x will support upto high speed modes.
Faiz Abbas (17):
mmc: sdhci: Add helper functions for UHS modes
mmc:am654_sdhci: Unconditionally switch off DLL in the beginning ofios_post()
Quoted 9 lines
mmc:
am654_sdhci: Convert flag fields to BIT macro
mmc:am654_sdhci: Add flag for PHY calibration
mmc:am654_sdhci: Add support for AM65x SR2.0
mmc:am654_sdhci: Add support for input tap delay
mmc:am654_sdhci: Add support for writing toclkbuf_sel
mmc:am654_sdhci: Add support for software tuning
mmc:am654_sdhci: Fix HISPD bit configuration in some lower speed
modes
mmc:am654_sdhci: Usesdhci_set_control_reg()
Can you please review the first 10 patches.
Thanks and regards,
Lokesh
cover Add support for MMC higher speed modes for TI's am65x, j721e and j7200 platforms
Quoted 26 lines
Subject: Re: [PATCH 00/17] Add support for MMC higher speed modes for TI's am65x, j721e and j7200 platforms
Hi Peng,
Quoted 10 lines · Faiz Abbas
The following patches add support for higher speeds in the SD card and eMMC for TI's am65x, j721e, j7200 platforms.
After these patches j721e and j7200 will support ultra high speed while am65x will support upto high speed modes.
Faiz Abbas (17):
mmc: sdhci: Add helper functions for UHS modes
mmc:am654_sdhci: Unconditionally switch off DLL in the beginning ofios_post()Quoted 9 lines
mmc:
am654_sdhci: Convert flag fields to BIT macro
mmc:am654_sdhci: Add flag for PHY calibration
mmc:am654_sdhci: Add support for AM65x SR2.0
mmc:am654_sdhci: Add support for input tap delay
mmc:am654_sdhci: Add support for writing toclkbuf_sel
mmc:am654_sdhci: Add support for software tuning
mmc:am654_sdhci: Fix HISPD bit configuration in some lower speed
modes
mmc:am654_sdhci: Usesdhci_set_control_reg()
Quoted 1 line
Can you please review the first 10 patches.
This patchset is not in my patchwork list, so missed it. I'll wait v2.
Thanks,
Peng.
Quoted 3 lines
Thanks and regards,
Lokesh