Merge tag 'char-misc-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[platform/kernel/linux-starfive.git] / drivers / mmc / host / sdhci-of-arasan.c
index d01f762..db9b544 100644 (file)
 #include "sdhci-pltfm.h"
 
 #define SDHCI_ARASAN_VENDOR_REGISTER   0x78
+
+#define SDHCI_ARASAN_ITAPDLY_REGISTER  0xF0F8
+#define SDHCI_ARASAN_OTAPDLY_REGISTER  0xF0FC
+
 #define SDHCI_ARASAN_CQE_BASE_ADDR     0x200
 #define VENDOR_ENHANCED_STROBE         BIT(0)
 
 #define PHY_CLK_TOO_SLOW_HZ            400000
 
+#define SDHCI_ITAPDLY_CHGWIN           0x200
+#define SDHCI_ITAPDLY_ENABLE           0x100
+#define SDHCI_OTAPDLY_ENABLE           0x40
+
 /* Default settings for ZynqMP Clock Phases */
 #define ZYNQMP_ICLK_PHASE {0, 63, 63, 0, 63,  0,   0, 183, 54,  0, 0}
 #define ZYNQMP_OCLK_PHASE {0, 72, 60, 0, 60, 72, 135, 48, 72, 135, 0}
 
+#define VERSAL_ICLK_PHASE {0, 132, 132, 0, 132, 0, 0, 162, 90, 0, 0}
+#define VERSAL_OCLK_PHASE {0,  60, 48, 0, 48, 72, 90, 36, 60, 90, 0}
+
 /*
  * On some SoCs the syscon area has a feature where the upper 16-bits of
  * each 32-bit register act as a write mask for the lower 16-bits.  This allows
@@ -62,22 +73,36 @@ struct sdhci_arasan_soc_ctl_field {
 /**
  * struct sdhci_arasan_soc_ctl_map - Map in syscon to corecfg registers
  *
- * It's up to the licensee of the Arsan IP block to make these available
- * somewhere if needed.  Presumably these will be scattered somewhere that's
- * accessible via the syscon API.
- *
  * @baseclkfreq:       Where to find corecfg_baseclkfreq
  * @clockmultiplier:   Where to find corecfg_clockmultiplier
+ * @support64b:                Where to find SUPPORT64B bit
  * @hiword_update:     If true, use HIWORD_UPDATE to access the syscon
+ *
+ * It's up to the licensee of the Arsan IP block to make these available
+ * somewhere if needed.  Presumably these will be scattered somewhere that's
+ * accessible via the syscon API.
  */
 struct sdhci_arasan_soc_ctl_map {
        struct sdhci_arasan_soc_ctl_field       baseclkfreq;
        struct sdhci_arasan_soc_ctl_field       clockmultiplier;
+       struct sdhci_arasan_soc_ctl_field       support64b;
        bool                                    hiword_update;
 };
 
 /**
- * struct sdhci_arasan_clk_data
+ * struct sdhci_arasan_clk_ops - Clock Operations for Arasan SD controller
+ *
+ * @sdcardclk_ops:     The output clock related operations
+ * @sampleclk_ops:     The sample clock related operations
+ */
+struct sdhci_arasan_clk_ops {
+       const struct clk_ops *sdcardclk_ops;
+       const struct clk_ops *sampleclk_ops;
+};
+
+/**
+ * struct sdhci_arasan_clk_data - Arasan Controller Clock Data.
+ *
  * @sdcardclk_hw:      Struct for the clock we might provide to a PHY.
  * @sdcardclk:         Pointer to normal 'struct clock' for sdcardclk_hw.
  * @sampleclk_hw:      Struct for the clock we might provide to a PHY.
@@ -99,14 +124,18 @@ struct sdhci_arasan_clk_data {
 };
 
 /**
- * struct sdhci_arasan_data
+ * struct sdhci_arasan_data - Arasan Controller Data
+ *
  * @host:              Pointer to the main SDHCI host structure.
  * @clk_ahb:           Pointer to the AHB clock
  * @phy:               Pointer to the generic phy
  * @is_phy_on:         True if the PHY is on; false if not.
+ * @has_cqe:           True if controller has command queuing engine.
  * @clk_data:          Struct for the Arasan Controller Clock Data.
+ * @clk_ops:           Struct for the Arasan Controller Clock Operations.
  * @soc_ctl_base:      Pointer to regmap for syscon for soc_ctl registers.
  * @soc_ctl_map:       Map to get offsets into soc_ctl registers.
+ * @quirks:            Arasan deviations from spec.
  */
 struct sdhci_arasan_data {
        struct sdhci_host *host;
@@ -116,10 +145,11 @@ struct sdhci_arasan_data {
 
        bool            has_cqe;
        struct sdhci_arasan_clk_data clk_data;
+       const struct sdhci_arasan_clk_ops *clk_ops;
 
        struct regmap   *soc_ctl_base;
        const struct sdhci_arasan_soc_ctl_map *soc_ctl_map;
-       unsigned int    quirks; /* Arasan deviations from spec */
+       unsigned int    quirks;
 
 /* Controller does not have CD wired and will not function normally without */
 #define SDHCI_ARASAN_QUIRK_FORCE_CDTEST        BIT(0)
@@ -131,6 +161,7 @@ struct sdhci_arasan_data {
 struct sdhci_arasan_of_data {
        const struct sdhci_arasan_soc_ctl_map *soc_ctl_map;
        const struct sdhci_pltfm_data *pdata;
+       const struct sdhci_arasan_clk_ops *clk_ops;
 };
 
 static const struct sdhci_arasan_soc_ctl_map rk3399_soc_ctl_map = {
@@ -151,17 +182,26 @@ static const struct sdhci_arasan_soc_ctl_map intel_lgm_sdxc_soc_ctl_map = {
        .hiword_update = false,
 };
 
+static const struct sdhci_arasan_soc_ctl_map intel_keembay_soc_ctl_map = {
+       .baseclkfreq = { .reg = 0x0, .width = 8, .shift = 14 },
+       .clockmultiplier = { .reg = 0x4, .width = 8, .shift = 14 },
+       .support64b = { .reg = 0x4, .width = 1, .shift = 24 },
+       .hiword_update = false,
+};
+
 /**
  * sdhci_arasan_syscon_write - Write to a field in soc_ctl registers
  *
+ * @host:      The sdhci_host
+ * @fld:       The field to write to
+ * @val:       The value to write
+ *
  * This function allows writing to fields in sdhci_arasan_soc_ctl_map.
  * Note that if a field is specified as not available (shift < 0) then
  * this function will silently return an error code.  It will be noisy
  * and print errors for any other (unexpected) errors.
  *
- * @host:      The sdhci_host
- * @fld:       The field to write to
- * @val:       The value to write
+ * Return: 0 on success and error value on error
  */
 static int sdhci_arasan_syscon_write(struct sdhci_host *host,
                                   const struct sdhci_arasan_soc_ctl_field *fld,
@@ -331,29 +371,6 @@ static const struct sdhci_ops sdhci_arasan_ops = {
        .set_power = sdhci_set_power_and_bus_voltage,
 };
 
-static const struct sdhci_pltfm_data sdhci_arasan_pdata = {
-       .ops = &sdhci_arasan_ops,
-       .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-       .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
-                       SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN |
-                       SDHCI_QUIRK2_STOP_WITH_TC,
-};
-
-static struct sdhci_arasan_of_data sdhci_arasan_data = {
-       .pdata = &sdhci_arasan_pdata,
-};
-
-static const struct sdhci_pltfm_data sdhci_arasan_zynqmp_pdata = {
-       .ops = &sdhci_arasan_ops,
-       .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
-                       SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN |
-                       SDHCI_QUIRK2_STOP_WITH_TC,
-};
-
-static struct sdhci_arasan_of_data sdhci_arasan_zynqmp_data = {
-       .pdata = &sdhci_arasan_zynqmp_pdata,
-};
-
 static u32 sdhci_arasan_cqhci_irq(struct sdhci_host *host, u32 intmask)
 {
        int cmd_error = 0;
@@ -410,28 +427,14 @@ static const struct sdhci_pltfm_data sdhci_arasan_cqe_pdata = {
                        SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN,
 };
 
-static struct sdhci_arasan_of_data sdhci_arasan_rk3399_data = {
-       .soc_ctl_map = &rk3399_soc_ctl_map,
-       .pdata = &sdhci_arasan_cqe_pdata,
-};
-
-static struct sdhci_arasan_of_data intel_lgm_emmc_data = {
-       .soc_ctl_map = &intel_lgm_emmc_soc_ctl_map,
-       .pdata = &sdhci_arasan_cqe_pdata,
-};
-
-static struct sdhci_arasan_of_data intel_lgm_sdxc_data = {
-       .soc_ctl_map = &intel_lgm_sdxc_soc_ctl_map,
-       .pdata = &sdhci_arasan_cqe_pdata,
-};
-
 #ifdef CONFIG_PM_SLEEP
 /**
  * sdhci_arasan_suspend - Suspend method for the driver
  * @dev:       Address of the device structure
- * Returns 0 on success and error value on error
  *
  * Put the device in a low power state.
+ *
+ * Return: 0 on success and error value on error
  */
 static int sdhci_arasan_suspend(struct device *dev)
 {
@@ -472,9 +475,10 @@ static int sdhci_arasan_suspend(struct device *dev)
 /**
  * sdhci_arasan_resume - Resume method for the driver
  * @dev:       Address of the device structure
- * Returns 0 on success and error value on error
  *
  * Resume operation after suspend
+ *
+ * Return: 0 on success and error value on error
  */
 static int sdhci_arasan_resume(struct device *dev)
 {
@@ -520,54 +524,19 @@ static int sdhci_arasan_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(sdhci_arasan_dev_pm_ops, sdhci_arasan_suspend,
                         sdhci_arasan_resume);
 
-static const struct of_device_id sdhci_arasan_of_match[] = {
-       /* SoC-specific compatible strings w/ soc_ctl_map */
-       {
-               .compatible = "rockchip,rk3399-sdhci-5.1",
-               .data = &sdhci_arasan_rk3399_data,
-       },
-       {
-               .compatible = "intel,lgm-sdhci-5.1-emmc",
-               .data = &intel_lgm_emmc_data,
-       },
-       {
-               .compatible = "intel,lgm-sdhci-5.1-sdxc",
-               .data = &intel_lgm_sdxc_data,
-       },
-       /* Generic compatible below here */
-       {
-               .compatible = "arasan,sdhci-8.9a",
-               .data = &sdhci_arasan_data,
-       },
-       {
-               .compatible = "arasan,sdhci-5.1",
-               .data = &sdhci_arasan_data,
-       },
-       {
-               .compatible = "arasan,sdhci-4.9a",
-               .data = &sdhci_arasan_data,
-       },
-       {
-               .compatible = "xlnx,zynqmp-8.9a",
-               .data = &sdhci_arasan_zynqmp_data,
-       },
-       { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, sdhci_arasan_of_match);
-
 /**
  * sdhci_arasan_sdcardclk_recalc_rate - Return the card clock rate
  *
+ * @hw:                        Pointer to the hardware clock structure.
+ * @parent_rate:               The parent rate (should be rate of clk_xin).
+ *
  * Return the current actual rate of the SD card clock.  This can be used
  * to communicate with out PHY.
  *
- * @hw:                        Pointer to the hardware clock structure.
- * @parent_rate                The parent rate (should be rate of clk_xin).
- * Returns the card clock rate.
+ * Return: The card clock rate.
  */
 static unsigned long sdhci_arasan_sdcardclk_recalc_rate(struct clk_hw *hw,
                                                      unsigned long parent_rate)
-
 {
        struct sdhci_arasan_clk_data *clk_data =
                container_of(hw, struct sdhci_arasan_clk_data, sdcardclk_hw);
@@ -585,16 +554,16 @@ static const struct clk_ops arasan_sdcardclk_ops = {
 /**
  * sdhci_arasan_sampleclk_recalc_rate - Return the sampling clock rate
  *
+ * @hw:                        Pointer to the hardware clock structure.
+ * @parent_rate:               The parent rate (should be rate of clk_xin).
+ *
  * Return the current actual rate of the sampling clock.  This can be used
  * to communicate with out PHY.
  *
- * @hw:                        Pointer to the hardware clock structure.
- * @parent_rate                The parent rate (should be rate of clk_xin).
- * Returns the sample clock rate.
+ * Return: The sample clock rate.
  */
 static unsigned long sdhci_arasan_sampleclk_recalc_rate(struct clk_hw *hw,
                                                      unsigned long parent_rate)
-
 {
        struct sdhci_arasan_clk_data *clk_data =
                container_of(hw, struct sdhci_arasan_clk_data, sampleclk_hw);
@@ -612,14 +581,14 @@ static const struct clk_ops arasan_sampleclk_ops = {
 /**
  * sdhci_zynqmp_sdcardclk_set_phase - Set the SD Output Clock Tap Delays
  *
+ * @hw:                        Pointer to the hardware clock structure.
+ * @degrees:           The clock phase shift between 0 - 359.
+ *
  * Set the SD Output Clock Tap Delays for Output path
  *
- * @hw:                        Pointer to the hardware clock structure.
- * @degrees            The clock phase shift between 0 - 359.
  * Return: 0 on success and error value on error
  */
 static int sdhci_zynqmp_sdcardclk_set_phase(struct clk_hw *hw, int degrees)
-
 {
        struct sdhci_arasan_clk_data *clk_data =
                container_of(hw, struct sdhci_arasan_clk_data, sdcardclk_hw);
@@ -680,14 +649,14 @@ static const struct clk_ops zynqmp_sdcardclk_ops = {
 /**
  * sdhci_zynqmp_sampleclk_set_phase - Set the SD Input Clock Tap Delays
  *
+ * @hw:                        Pointer to the hardware clock structure.
+ * @degrees:           The clock phase shift between 0 - 359.
+ *
  * Set the SD Input Clock Tap Delays for Input path
  *
- * @hw:                        Pointer to the hardware clock structure.
- * @degrees            The clock phase shift between 0 - 359.
  * Return: 0 on success and error value on error
  */
 static int sdhci_zynqmp_sampleclk_set_phase(struct clk_hw *hw, int degrees)
-
 {
        struct sdhci_arasan_clk_data *clk_data =
                container_of(hw, struct sdhci_arasan_clk_data, sampleclk_hw);
@@ -745,6 +714,152 @@ static const struct clk_ops zynqmp_sampleclk_ops = {
        .set_phase = sdhci_zynqmp_sampleclk_set_phase,
 };
 
+/**
+ * sdhci_versal_sdcardclk_set_phase - Set the SD Output Clock Tap Delays
+ *
+ * @hw:                        Pointer to the hardware clock structure.
+ * @degrees:           The clock phase shift between 0 - 359.
+ *
+ * Set the SD Output Clock Tap Delays for Output path
+ *
+ * Return: 0 on success and error value on error
+ */
+static int sdhci_versal_sdcardclk_set_phase(struct clk_hw *hw, int degrees)
+{
+       struct sdhci_arasan_clk_data *clk_data =
+               container_of(hw, struct sdhci_arasan_clk_data, sdcardclk_hw);
+       struct sdhci_arasan_data *sdhci_arasan =
+               container_of(clk_data, struct sdhci_arasan_data, clk_data);
+       struct sdhci_host *host = sdhci_arasan->host;
+       u8 tap_delay, tap_max = 0;
+
+       /*
+        * This is applicable for SDHCI_SPEC_300 and above
+        * Versal does not set phase for <=25MHz clock.
+        * If degrees is zero, no need to do anything.
+        */
+       if (host->version < SDHCI_SPEC_300 ||
+           host->timing == MMC_TIMING_LEGACY ||
+           host->timing == MMC_TIMING_UHS_SDR12 || !degrees)
+               return 0;
+
+       switch (host->timing) {
+       case MMC_TIMING_MMC_HS:
+       case MMC_TIMING_SD_HS:
+       case MMC_TIMING_UHS_SDR25:
+       case MMC_TIMING_UHS_DDR50:
+       case MMC_TIMING_MMC_DDR52:
+               /* For 50MHz clock, 30 Taps are available */
+               tap_max = 30;
+               break;
+       case MMC_TIMING_UHS_SDR50:
+               /* For 100MHz clock, 15 Taps are available */
+               tap_max = 15;
+               break;
+       case MMC_TIMING_UHS_SDR104:
+       case MMC_TIMING_MMC_HS200:
+               /* For 200MHz clock, 8 Taps are available */
+               tap_max = 8;
+       default:
+               break;
+       }
+
+       tap_delay = (degrees * tap_max) / 360;
+
+       /* Set the Clock Phase */
+       if (tap_delay) {
+               u32 regval;
+
+               regval = sdhci_readl(host, SDHCI_ARASAN_OTAPDLY_REGISTER);
+               regval |= SDHCI_OTAPDLY_ENABLE;
+               sdhci_writel(host, regval, SDHCI_ARASAN_OTAPDLY_REGISTER);
+               regval |= tap_delay;
+               sdhci_writel(host, regval, SDHCI_ARASAN_OTAPDLY_REGISTER);
+       }
+
+       return 0;
+}
+
+static const struct clk_ops versal_sdcardclk_ops = {
+       .recalc_rate = sdhci_arasan_sdcardclk_recalc_rate,
+       .set_phase = sdhci_versal_sdcardclk_set_phase,
+};
+
+/**
+ * sdhci_versal_sampleclk_set_phase - Set the SD Input Clock Tap Delays
+ *
+ * @hw:                        Pointer to the hardware clock structure.
+ * @degrees:           The clock phase shift between 0 - 359.
+ *
+ * Set the SD Input Clock Tap Delays for Input path
+ *
+ * Return: 0 on success and error value on error
+ */
+static int sdhci_versal_sampleclk_set_phase(struct clk_hw *hw, int degrees)
+{
+       struct sdhci_arasan_clk_data *clk_data =
+               container_of(hw, struct sdhci_arasan_clk_data, sampleclk_hw);
+       struct sdhci_arasan_data *sdhci_arasan =
+               container_of(clk_data, struct sdhci_arasan_data, clk_data);
+       struct sdhci_host *host = sdhci_arasan->host;
+       u8 tap_delay, tap_max = 0;
+
+       /*
+        * This is applicable for SDHCI_SPEC_300 and above
+        * Versal does not set phase for <=25MHz clock.
+        * If degrees is zero, no need to do anything.
+        */
+       if (host->version < SDHCI_SPEC_300 ||
+           host->timing == MMC_TIMING_LEGACY ||
+           host->timing == MMC_TIMING_UHS_SDR12 || !degrees)
+               return 0;
+
+       switch (host->timing) {
+       case MMC_TIMING_MMC_HS:
+       case MMC_TIMING_SD_HS:
+       case MMC_TIMING_UHS_SDR25:
+       case MMC_TIMING_UHS_DDR50:
+       case MMC_TIMING_MMC_DDR52:
+               /* For 50MHz clock, 120 Taps are available */
+               tap_max = 120;
+               break;
+       case MMC_TIMING_UHS_SDR50:
+               /* For 100MHz clock, 60 Taps are available */
+               tap_max = 60;
+               break;
+       case MMC_TIMING_UHS_SDR104:
+       case MMC_TIMING_MMC_HS200:
+               /* For 200MHz clock, 30 Taps are available */
+               tap_max = 30;
+       default:
+               break;
+       }
+
+       tap_delay = (degrees * tap_max) / 360;
+
+       /* Set the Clock Phase */
+       if (tap_delay) {
+               u32 regval;
+
+               regval = sdhci_readl(host, SDHCI_ARASAN_ITAPDLY_REGISTER);
+               regval |= SDHCI_ITAPDLY_CHGWIN;
+               sdhci_writel(host, regval, SDHCI_ARASAN_ITAPDLY_REGISTER);
+               regval |= SDHCI_ITAPDLY_ENABLE;
+               sdhci_writel(host, regval, SDHCI_ARASAN_ITAPDLY_REGISTER);
+               regval |= tap_delay;
+               sdhci_writel(host, regval, SDHCI_ARASAN_ITAPDLY_REGISTER);
+               regval &= ~SDHCI_ITAPDLY_CHGWIN;
+               sdhci_writel(host, regval, SDHCI_ARASAN_ITAPDLY_REGISTER);
+       }
+
+       return 0;
+}
+
+static const struct clk_ops versal_sampleclk_ops = {
+       .recalc_rate = sdhci_arasan_sampleclk_recalc_rate,
+       .set_phase = sdhci_versal_sampleclk_set_phase,
+};
+
 static void arasan_zynqmp_dll_reset(struct sdhci_host *host, u32 deviceid)
 {
        u16 clk;
@@ -786,6 +901,9 @@ static int arasan_zynqmp_execute_tuning(struct mmc_host *mmc, u32 opcode)
 /**
  * sdhci_arasan_update_clockmultiplier - Set corecfg_clockmultiplier
  *
+ * @host:              The sdhci_host
+ * @value:             The value to write
+ *
  * The corecfg_clockmultiplier is supposed to contain clock multiplier
  * value of programmable clock generator.
  *
@@ -797,8 +915,6 @@ static int arasan_zynqmp_execute_tuning(struct mmc_host *mmc, u32 opcode)
  * - The value of corecfg_clockmultiplier should sync with that of corresponding
  *   value reading from sdhci_capability_register. So this function is called
  *   once at probe time and never called again.
- *
- * @host:              The sdhci_host
  */
 static void sdhci_arasan_update_clockmultiplier(struct sdhci_host *host,
                                                u32 value)
@@ -825,6 +941,8 @@ static void sdhci_arasan_update_clockmultiplier(struct sdhci_host *host,
 /**
  * sdhci_arasan_update_baseclkfreq - Set corecfg_baseclkfreq
  *
+ * @host:              The sdhci_host
+ *
  * The corecfg_baseclkfreq is supposed to contain the MHz of clk_xin.  This
  * function can be used to make that happen.
  *
@@ -836,8 +954,6 @@ static void sdhci_arasan_update_clockmultiplier(struct sdhci_host *host,
  * - It's assumed that clk_xin is not dynamic and that we use the SDHCI divider
  *   to achieve lower clock rates.  That means that this function is called once
  *   at probe time and never called again.
- *
- * @host:              The sdhci_host
  */
 static void sdhci_arasan_update_baseclkfreq(struct sdhci_host *host)
 {
@@ -901,10 +1017,10 @@ static void arasan_dt_read_clk_phase(struct device *dev,
 /**
  * arasan_dt_parse_clk_phases - Read Clock Delay values from DT
  *
- * Called at initialization to parse the values of Clock Delays.
- *
  * @dev:               Pointer to our struct device.
  * @clk_data:          Pointer to the Clock Data structure
+ *
+ * Called at initialization to parse the values of Clock Delays.
  */
 static void arasan_dt_parse_clk_phases(struct device *dev,
                                       struct sdhci_arasan_clk_data *clk_data)
@@ -936,6 +1052,16 @@ static void arasan_dt_parse_clk_phases(struct device *dev,
                }
        }
 
+       if (of_device_is_compatible(dev->of_node, "xlnx,versal-8.9a")) {
+               iclk_phase = (int [MMC_TIMING_MMC_HS400 + 1]) VERSAL_ICLK_PHASE;
+               oclk_phase = (int [MMC_TIMING_MMC_HS400 + 1]) VERSAL_OCLK_PHASE;
+
+               for (i = 0; i <= MMC_TIMING_MMC_HS400; i++) {
+                       clk_data->clk_phase_in[i] = iclk_phase[i];
+                       clk_data->clk_phase_out[i] = oclk_phase[i];
+               }
+       }
+
        arasan_dt_read_clk_phase(dev, clk_data, MMC_TIMING_LEGACY,
                                 "clk-phase-legacy");
        arasan_dt_read_clk_phase(dev, clk_data, MMC_TIMING_MMC_HS,
@@ -960,17 +1086,191 @@ static void arasan_dt_parse_clk_phases(struct device *dev,
                                 "clk-phase-mmc-hs400");
 }
 
+static const struct sdhci_pltfm_data sdhci_arasan_pdata = {
+       .ops = &sdhci_arasan_ops,
+       .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
+       .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+                       SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN |
+                       SDHCI_QUIRK2_STOP_WITH_TC,
+};
+
+static const struct sdhci_arasan_clk_ops arasan_clk_ops = {
+       .sdcardclk_ops = &arasan_sdcardclk_ops,
+       .sampleclk_ops = &arasan_sampleclk_ops,
+};
+
+static struct sdhci_arasan_of_data sdhci_arasan_generic_data = {
+       .pdata = &sdhci_arasan_pdata,
+       .clk_ops = &arasan_clk_ops,
+};
+
+static const struct sdhci_pltfm_data sdhci_keembay_emmc_pdata = {
+       .ops = &sdhci_arasan_cqe_ops,
+       .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
+               SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC |
+               SDHCI_QUIRK_NO_LED |
+               SDHCI_QUIRK_32BIT_DMA_ADDR |
+               SDHCI_QUIRK_32BIT_DMA_SIZE |
+               SDHCI_QUIRK_32BIT_ADMA_SIZE,
+       .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+               SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN |
+               SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400 |
+               SDHCI_QUIRK2_STOP_WITH_TC |
+               SDHCI_QUIRK2_BROKEN_64_BIT_DMA,
+};
+
+static const struct sdhci_pltfm_data sdhci_keembay_sd_pdata = {
+       .ops = &sdhci_arasan_ops,
+       .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
+               SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC |
+               SDHCI_QUIRK_NO_LED |
+               SDHCI_QUIRK_32BIT_DMA_ADDR |
+               SDHCI_QUIRK_32BIT_DMA_SIZE |
+               SDHCI_QUIRK_32BIT_ADMA_SIZE,
+       .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+               SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN |
+               SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON |
+               SDHCI_QUIRK2_STOP_WITH_TC |
+               SDHCI_QUIRK2_BROKEN_64_BIT_DMA,
+};
+
+static const struct sdhci_pltfm_data sdhci_keembay_sdio_pdata = {
+       .ops = &sdhci_arasan_ops,
+       .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
+               SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC |
+               SDHCI_QUIRK_NO_LED |
+               SDHCI_QUIRK_32BIT_DMA_ADDR |
+               SDHCI_QUIRK_32BIT_DMA_SIZE |
+               SDHCI_QUIRK_32BIT_ADMA_SIZE,
+       .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+               SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN |
+               SDHCI_QUIRK2_HOST_OFF_CARD_ON |
+               SDHCI_QUIRK2_BROKEN_64_BIT_DMA,
+};
+
+static struct sdhci_arasan_of_data sdhci_arasan_rk3399_data = {
+       .soc_ctl_map = &rk3399_soc_ctl_map,
+       .pdata = &sdhci_arasan_cqe_pdata,
+       .clk_ops = &arasan_clk_ops,
+};
+
+static struct sdhci_arasan_of_data intel_lgm_emmc_data = {
+       .soc_ctl_map = &intel_lgm_emmc_soc_ctl_map,
+       .pdata = &sdhci_arasan_cqe_pdata,
+       .clk_ops = &arasan_clk_ops,
+};
+
+static struct sdhci_arasan_of_data intel_lgm_sdxc_data = {
+       .soc_ctl_map = &intel_lgm_sdxc_soc_ctl_map,
+       .pdata = &sdhci_arasan_cqe_pdata,
+       .clk_ops = &arasan_clk_ops,
+};
+
+static const struct sdhci_pltfm_data sdhci_arasan_zynqmp_pdata = {
+       .ops = &sdhci_arasan_ops,
+       .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+                       SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN |
+                       SDHCI_QUIRK2_STOP_WITH_TC,
+};
+
+static const struct sdhci_arasan_clk_ops zynqmp_clk_ops = {
+       .sdcardclk_ops = &zynqmp_sdcardclk_ops,
+       .sampleclk_ops = &zynqmp_sampleclk_ops,
+};
+
+static struct sdhci_arasan_of_data sdhci_arasan_zynqmp_data = {
+       .pdata = &sdhci_arasan_zynqmp_pdata,
+       .clk_ops = &zynqmp_clk_ops,
+};
+
+static const struct sdhci_arasan_clk_ops versal_clk_ops = {
+       .sdcardclk_ops = &versal_sdcardclk_ops,
+       .sampleclk_ops = &versal_sampleclk_ops,
+};
+
+static struct sdhci_arasan_of_data sdhci_arasan_versal_data = {
+       .pdata = &sdhci_arasan_zynqmp_pdata,
+       .clk_ops = &versal_clk_ops,
+};
+
+static struct sdhci_arasan_of_data intel_keembay_emmc_data = {
+       .soc_ctl_map = &intel_keembay_soc_ctl_map,
+       .pdata = &sdhci_keembay_emmc_pdata,
+};
+
+static struct sdhci_arasan_of_data intel_keembay_sd_data = {
+       .soc_ctl_map = &intel_keembay_soc_ctl_map,
+       .pdata = &sdhci_keembay_sd_pdata,
+};
+
+static struct sdhci_arasan_of_data intel_keembay_sdio_data = {
+       .soc_ctl_map = &intel_keembay_soc_ctl_map,
+       .pdata = &sdhci_keembay_sdio_pdata,
+};
+
+static const struct of_device_id sdhci_arasan_of_match[] = {
+       /* SoC-specific compatible strings w/ soc_ctl_map */
+       {
+               .compatible = "rockchip,rk3399-sdhci-5.1",
+               .data = &sdhci_arasan_rk3399_data,
+       },
+       {
+               .compatible = "intel,lgm-sdhci-5.1-emmc",
+               .data = &intel_lgm_emmc_data,
+       },
+       {
+               .compatible = "intel,lgm-sdhci-5.1-sdxc",
+               .data = &intel_lgm_sdxc_data,
+       },
+       {
+               .compatible = "intel,keembay-sdhci-5.1-emmc",
+               .data = &intel_keembay_emmc_data,
+       },
+       {
+               .compatible = "intel,keembay-sdhci-5.1-sd",
+               .data = &intel_keembay_sd_data,
+       },
+       {
+               .compatible = "intel,keembay-sdhci-5.1-sdio",
+               .data = &intel_keembay_sdio_data,
+       },
+       /* Generic compatible below here */
+       {
+               .compatible = "arasan,sdhci-8.9a",
+               .data = &sdhci_arasan_generic_data,
+       },
+       {
+               .compatible = "arasan,sdhci-5.1",
+               .data = &sdhci_arasan_generic_data,
+       },
+       {
+               .compatible = "arasan,sdhci-4.9a",
+               .data = &sdhci_arasan_generic_data,
+       },
+       {
+               .compatible = "xlnx,zynqmp-8.9a",
+               .data = &sdhci_arasan_zynqmp_data,
+       },
+       {
+               .compatible = "xlnx,versal-8.9a",
+               .data = &sdhci_arasan_versal_data,
+       },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, sdhci_arasan_of_match);
+
 /**
  * sdhci_arasan_register_sdcardclk - Register the sdcardclk for a PHY to use
  *
+ * @sdhci_arasan:      Our private data structure.
+ * @clk_xin:           Pointer to the functional clock
+ * @dev:               Pointer to our struct device.
+ *
  * Some PHY devices need to know what the actual card clock is.  In order for
  * them to find out, we'll provide a clock through the common clock framework
  * for them to query.
  *
- * @sdhci_arasan:      Our private data structure.
- * @clk_xin:           Pointer to the functional clock
- * @dev:               Pointer to our struct device.
- * Returns 0 on success and error value on error
+ * Return: 0 on success and error value on error
  */
 static int
 sdhci_arasan_register_sdcardclk(struct sdhci_arasan_data *sdhci_arasan,
@@ -994,10 +1294,7 @@ sdhci_arasan_register_sdcardclk(struct sdhci_arasan_data *sdhci_arasan,
        sdcardclk_init.parent_names = &parent_clk_name;
        sdcardclk_init.num_parents = 1;
        sdcardclk_init.flags = CLK_GET_RATE_NOCACHE;
-       if (of_device_is_compatible(np, "xlnx,zynqmp-8.9a"))
-               sdcardclk_init.ops = &zynqmp_sdcardclk_ops;
-       else
-               sdcardclk_init.ops = &arasan_sdcardclk_ops;
+       sdcardclk_init.ops = sdhci_arasan->clk_ops->sdcardclk_ops;
 
        clk_data->sdcardclk_hw.init = &sdcardclk_init;
        clk_data->sdcardclk =
@@ -1015,14 +1312,15 @@ sdhci_arasan_register_sdcardclk(struct sdhci_arasan_data *sdhci_arasan,
 /**
  * sdhci_arasan_register_sampleclk - Register the sampleclk for a PHY to use
  *
+ * @sdhci_arasan:      Our private data structure.
+ * @clk_xin:           Pointer to the functional clock
+ * @dev:               Pointer to our struct device.
+ *
  * Some PHY devices need to know what the actual card clock is.  In order for
  * them to find out, we'll provide a clock through the common clock framework
  * for them to query.
  *
- * @sdhci_arasan:      Our private data structure.
- * @clk_xin:           Pointer to the functional clock
- * @dev:               Pointer to our struct device.
- * Returns 0 on success and error value on error
+ * Return: 0 on success and error value on error
  */
 static int
 sdhci_arasan_register_sampleclk(struct sdhci_arasan_data *sdhci_arasan,
@@ -1046,10 +1344,7 @@ sdhci_arasan_register_sampleclk(struct sdhci_arasan_data *sdhci_arasan,
        sampleclk_init.parent_names = &parent_clk_name;
        sampleclk_init.num_parents = 1;
        sampleclk_init.flags = CLK_GET_RATE_NOCACHE;
-       if (of_device_is_compatible(np, "xlnx,zynqmp-8.9a"))
-               sampleclk_init.ops = &zynqmp_sampleclk_ops;
-       else
-               sampleclk_init.ops = &arasan_sampleclk_ops;
+       sampleclk_init.ops = sdhci_arasan->clk_ops->sampleclk_ops;
 
        clk_data->sampleclk_hw.init = &sampleclk_init;
        clk_data->sampleclk =
@@ -1067,10 +1362,10 @@ sdhci_arasan_register_sampleclk(struct sdhci_arasan_data *sdhci_arasan,
 /**
  * sdhci_arasan_unregister_sdclk - Undoes sdhci_arasan_register_sdclk()
  *
+ * @dev:               Pointer to our struct device.
+ *
  * Should be called any time we're exiting and sdhci_arasan_register_sdclk()
  * returned success.
- *
- * @dev:               Pointer to our struct device.
  */
 static void sdhci_arasan_unregister_sdclk(struct device *dev)
 {
@@ -1083,8 +1378,46 @@ static void sdhci_arasan_unregister_sdclk(struct device *dev)
 }
 
 /**
+ * sdhci_arasan_update_support64b - Set SUPPORT_64B (64-bit System Bus Support)
+ *
+ * This should be set based on the System Address Bus.
+ * 0: the Core supports only 32-bit System Address Bus.
+ * 1: the Core supports 64-bit System Address Bus.
+ *
+ * NOTES:
+ * - For Keem Bay, it is required to clear this bit. Its default value is 1'b1.
+ *   Keem Bay does not support 64-bit access.
+ *
+ * @host               The sdhci_host
+ */
+static void sdhci_arasan_update_support64b(struct sdhci_host *host, u32 value)
+{
+       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+       struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
+       const struct sdhci_arasan_soc_ctl_map *soc_ctl_map =
+               sdhci_arasan->soc_ctl_map;
+
+       /* Having a map is optional */
+       if (!soc_ctl_map)
+               return;
+
+       /* If we have a map, we expect to have a syscon */
+       if (!sdhci_arasan->soc_ctl_base) {
+               pr_warn("%s: Have regmap, but no soc-ctl-syscon\n",
+                       mmc_hostname(host->mmc));
+               return;
+       }
+
+       sdhci_arasan_syscon_write(host, &soc_ctl_map->support64b, value);
+}
+
+/**
  * sdhci_arasan_register_sdclk - Register the sdcardclk for a PHY to use
  *
+ * @sdhci_arasan:      Our private data structure.
+ * @clk_xin:           Pointer to the functional clock
+ * @dev:               Pointer to our struct device.
+ *
  * Some PHY devices need to know what the actual card clock is.  In order for
  * them to find out, we'll provide a clock through the common clock framework
  * for them to query.
@@ -1097,10 +1430,7 @@ static void sdhci_arasan_unregister_sdclk(struct device *dev)
  * to create nice clean device tree bindings and later (if needed) we can try
  * re-architecting SDHCI if we see some benefit to it.
  *
- * @sdhci_arasan:      Our private data structure.
- * @clk_xin:           Pointer to the functional clock
- * @dev:               Pointer to our struct device.
- * Returns 0 on success and error value on error
+ * Return: 0 on success and error value on error
  */
 static int sdhci_arasan_register_sdclk(struct sdhci_arasan_data *sdhci_arasan,
                                       struct clk *clk_xin,
@@ -1197,6 +1527,7 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
        sdhci_arasan->host = host;
 
        sdhci_arasan->soc_ctl_map = data->soc_ctl_map;
+       sdhci_arasan->clk_ops = data->clk_ops;
 
        node = of_parse_phandle(pdev->dev.of_node, "arasan,soc-ctl-syscon", 0);
        if (node) {
@@ -1252,6 +1583,15 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
                                    "rockchip,rk3399-sdhci-5.1"))
                sdhci_arasan_update_clockmultiplier(host, 0x0);
 
+       if (of_device_is_compatible(np, "intel,keembay-sdhci-5.1-emmc") ||
+           of_device_is_compatible(np, "intel,keembay-sdhci-5.1-sd") ||
+           of_device_is_compatible(np, "intel,keembay-sdhci-5.1-sdio")) {
+               sdhci_arasan_update_clockmultiplier(host, 0x0);
+               sdhci_arasan_update_support64b(host, 0x0);
+
+               host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
+       }
+
        sdhci_arasan_update_baseclkfreq(host);
 
        ret = sdhci_arasan_register_sdclk(sdhci_arasan, clk_xin, &pdev->dev);