rockchip: mmc: rockchip_dw_mmc: add rk3066/rk3188 support
Subsystems (2)
PATCH v2 1/2 rockchip: mmc: rockchip_dw_mmc: add rk3066/rk3188 support
The Rockchip SoCs rk3066/rk3188 have mmc DT nodes with as compatible string "rockchip,rk2928-dw-mshc". Add support to the existing driver with help of a DM_DRIVER_ALIAS.
---
Changed V2:
remove fifo_mode changes
--- drivers/mmc/rockchip_dw_mmc.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/rockchip_dw_mmc.c +1 -0
@@ -180,5 +180,6 @@ U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = { .plat_auto = sizeof(struct rockchip_mmc_plat), }; +DM_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk2928_dw_mshc) DM_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk3328_dw_mshc)DM_DRIVER_ALIAS (rockchip_rk3288_dw_mshc, rockchip_rk3368_dw_mshc)
Signature · 1 line
2.20.1
PATCH v2 2/2 mmc: dw_mmc: support transfer mode auto detection
From: Paweł Jarosz <[email protected]>
dw_mmc supports two transfer modes in u-boot: IDMA and FIFO. This patch adds auto detection of transfer mode and eliminates the need to set this in host config struct. Allow handling for a u-boot,spl-fifo-mode host property in the logic to not put the MMC controllers into FIFO mode for all time.
---
Changed V2:
use bitfield_extract
remove use_dma variable
include fifo_mode from host in logic
--- drivers/mmc/dw_mmc.c | 6 ++++++ include/dwmmc.h | 5 +++++ 2 files changed, 11 insertions(+)
drivers/mmc/dw_mmc.c +6 -0
@@ -536,6 +536,12 @@ static int dwmci_init(struct mmc *mmc)return -EIO ; } +if (!host->fifo_mode && +SDMMC_GET_TRANS_MODE (dwmci_readl (host,DWMCI_HCON )) ==DMA_INTERFACE_IDMA ) + host->fifo_mode =0 ; +else + host->fifo_mode =1 ; +/* Enumerate at 400KHz */ dwmci_setup_bus (host, mmc->cfg->f_min);
include/dwmmc.h +5 -0
@@ -9,6 +9,7 @@#include <asm/cache.h> #include <asm/io.h> +#include <bitfield.h> #include <mmc.h> #include <linux/bitops.h>
@@ -119,6 +120,10 @@#define RX_WMARK_SHIFT 16#define RX_WMARK_MASK (0xfff << RX_WMARK_SHIFT) +/* HCON Register */ +#define DMA_INTERFACE_IDMA (0x0) +#define SDMMC_GET_TRANS_MODE (x) bitfield_extract(x, 16, 2) +#define DWMCI_IDMAC_OWN (1 << 31)#define DWMCI_IDMAC_CH (1 << 4)#define DWMCI_IDMAC_FS (1 << 3)
Signature · 1 line
2.20.1
Re: [PATCH v2 2/2] mmc: dw_mmc: support transfer mode auto detection
Quoted 8 lines · Johan Jonker
From: Paweł Jarosz <[email protected]>
dw_mmcsupports two transfer modes in u-boot: IDMA and FIFO. This patch adds auto detection of transfer mode and eliminates the need to set this in host config struct. Allow handling for a u-boot,spl-fifo-mode host property in the logic to not put the MMC controllers into FIFO mode for all time.
Does it mean fifo-mode property is not useful in SPI and U-Boot proper? If yes better drop that change as part of this patch.
Quoted 19 lines
Signed-off-by Paweł Jarosz <[email protected]>Signed-off-by Johan Jonker <[email protected]>---
Changed V2:
usebitfield_extract
removeuse_dmavariable
includefifo_modefrom host in logic--- drivers/mmc/dw_mmc.c | 6 ++++++ include/dwmmc.h | 5 +++++ 2 files changed, 11 insertions(+)drivers/mmc/dw_mmc.c +0
-0
drivers/mmc/dw_mmc.c static int dwmci_init(struct mmc *mmc) · line 543
Quoted 8 lines
drivers/mmc/dw_mmc.c +5
-0@@ -536,6 +536,12 @@ static int dwmci_init(struct mmc *mmc)return -EIO ; } +if (!host->fifo_mode && +SDMMC_GET_TRANS_MODE (dwmci_readl (host,DWMCI_HCON )) ==DMA_INTERFACE_IDMA ) + host->fifo_mode =0 ; +else + host->fifo_mode =1 ;
fifo_mode is bool so use true/false.
Jagan.
Re: [PATCH v2 2/2] mmc: dw_mmc: support transfer mode auto detection
Quoted 11 lines · Jagan Teki
Quoted 8 lines · Johan Jonker
From: Paweł Jarosz <[email protected]>
dw_mmcsupports two transfer modes in u-boot: IDMA and FIFO. This patch adds auto detection of transfer mode and eliminates the need to set this in host config struct. Allow handling for a u-boot,spl-fifo-mode host property in the logic to not put the MMC controllers into FIFO mode for all time.
Quoted 2 lines
Does it mean fifo-mode property is not useful in SPI and U-Boot proper? If yes better drop that change as part of this patch.
This is about setting the fifo-mode for rk3066/rk3188 without DT as these early models don't seem to have IDMA.
Handling of the fifo_mode variable is still needed for the Rockchip exception that needs to be included in the logic.
rockchip: dwmmc: add handling for u-boot, spl-fifo-mode
https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/commit/c8dd0e42d709c9734f313c547d0707e27ca0de51
We could remove normal fifo-mode parsing, but as this is a generic file for multiple SoC families I'm a little bit reluctant to change that for other drivers then Rockchip.
Otherwise patch V1 does the job without changing dw_mmc.c
Please advise what direction we should go or what changes should be made.
Kind regards,
Johan Jonker
Quoted 31 lines
Quoted 19 lines
Signed-off-by Paweł Jarosz <[email protected]>Signed-off-by Johan Jonker <[email protected]>---
Changed V2:
usebitfield_extract
removeuse_dmavariable
includefifo_modefrom host in logic--- drivers/mmc/dw_mmc.c | 6 ++++++ include/dwmmc.h | 5 +++++ 2 files changed, 11 insertions(+)drivers/mmc/dw_mmc.c +0
-0drivers/mmc/dw_mmc.c static int dwmci_init(struct mmc *mmc) · line 543
Quoted 8 lines
drivers/mmc/dw_mmc.c +5
-0@@ -536,6 +536,12 @@ static int dwmci_init(struct mmc *mmc)return -EIO ; } +if (!host->fifo_mode && +SDMMC_GET_TRANS_MODE (dwmci_readl (host,DWMCI_HCON )) ==DMA_INTERFACE_IDMA ) + host->fifo_mode =0 ; +else + host->fifo_mode =1 ;
fifo_modeis bool so use true/false.Jagan.