diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-07 12:44:01 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-08 08:33:31 +0200 |
| commit | 73c0c0e5a923d918bd4460a93395a49c28c312c3 (patch) | |
| tree | b995ba2f0bfe18e60209894ac038a2ba6b960eb8 /drivers | |
| parent | 1570f8d8d87ef482279e9176fd952cf051bc4f8e (diff) | |
| download | barebox-73c0c0e5a923d918bd4460a93395a49c28c312c3.tar.gz barebox-73c0c0e5a923d918bd4460a93395a49c28c312c3.tar.xz | |
mci: sdhci: Add and use SDHCI_CAPABILITIES_1 defines
Linux has defines for the SDHCI_CAPABILITIES_1 register at offset 0x44.
Add these and convert the only user so far to use the defines.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.barebox.org/20210607104411.23071-3-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mci/atmel-sdhci-common.c | 7 | ||||
| -rw-r--r-- | drivers/mci/sdhci.h | 15 |
2 files changed, 17 insertions, 5 deletions
diff --git a/drivers/mci/atmel-sdhci-common.c b/drivers/mci/atmel-sdhci-common.c index 92013feb95..6b7fca7f34 100644 --- a/drivers/mci/atmel-sdhci-common.c +++ b/drivers/mci/atmel-sdhci-common.c @@ -11,6 +11,7 @@ #include <common.h> #include <mci.h> +#include <linux/bitfield.h> #include <mach/early_udelay.h> @@ -24,8 +25,6 @@ #include "atmel-sdhci.h" -#define AT91_SDHCI_CA1R 0x44 /* Capabilities 1 Register */ - #define AT91_SDHCI_MC1R 0x204 #define AT91_SDHCI_MC1_FCD BIT(7) #define AT91_SDHCI_CALCR 0x240 @@ -237,9 +236,9 @@ static int at91_sdhci_set_clock(struct at91_sdhci *host, unsigned clock) if (clock == 0) return 0; - caps = sdhci_read32(sdhci, AT91_SDHCI_CA1R); + caps = sdhci_read32(sdhci, SDHCI_CAPABILITIES_1); - caps_clk_mult = (caps & SDHCI_CLOCK_MUL_MASK) >> SDHCI_CLOCK_MUL_SHIFT; + caps_clk_mult = FIELD_GET(SDHCI_CLOCK_MUL_MASK, caps); if (caps_clk_mult) { for (clk_div = 1; clk_div <= 1024; clk_div++) { diff --git a/drivers/mci/sdhci.h b/drivers/mci/sdhci.h index 9bd9749dd6..fd63cd84de 100644 --- a/drivers/mci/sdhci.h +++ b/drivers/mci/sdhci.h @@ -123,7 +123,20 @@ #define SDHCI_CAN_64BIT_V4 0x08000000 #define SDHCI_CAN_64BIT 0x10000000 -#define SDHCI_CLOCK_MUL_MASK 0x00FF0000 +#define SDHCI_CAPABILITIES_1 0x44 +#define SDHCI_SUPPORT_SDR50 0x00000001 +#define SDHCI_SUPPORT_SDR104 0x00000002 +#define SDHCI_SUPPORT_DDR50 0x00000004 +#define SDHCI_DRIVER_TYPE_A 0x00000010 +#define SDHCI_DRIVER_TYPE_C 0x00000020 +#define SDHCI_DRIVER_TYPE_D 0x00000040 +#define SDHCI_RETUNING_TIMER_COUNT_MASK GENMASK(11, 8) +#define SDHCI_USE_SDR50_TUNING 0x00002000 +#define SDHCI_RETUNING_MODE_MASK GENMASK(15, 14) +#define SDHCI_CLOCK_MUL_MASK GENMASK(23, 16) +#define SDHCI_CAN_DO_ADMA3 0x08000000 +#define SDHCI_SUPPORT_HS400 0x80000000 /* Non-standard */ + #define SDHCI_CLOCK_MUL_SHIFT 16 #define SDHCI_SPEC_200_MAX_CLK_DIVIDER 256 |