configs: Resync with savedefconfig

[people/ms/u-boot.git] / include / dwmmc.h

diff --git a/include/dwmmc.h b/include/dwmmc.h
index 0199def2638e0be8d1be461b8024d6ac5066c426..a9058824e0d97869a827a4451b18ab2787578aa9 100644 (file)
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -105,7 +105,7 @@
 
 /* Status Register */
 #define DWMCI_BUSY             (1 << 9)
-#define DWMCI_FIFO_MASK                0x1ff
+#define DWMCI_FIFO_MASK                0x1fff
 #define DWMCI_FIFO_SHIFT       17
 
 /* FIFOTH Register */
@@ -253,14 +253,12 @@ static inline u8 dwmci_readb(struct dwmci_host *host, int reg)
  * See rockchip_dw_mmc.c for an example.
  *
  * @cfg:       Configuration structure to fill in (generally &plat->mmc)
- * @name:      Device name (normally dev->name)
- * @buswidth:  Bus width (in bits, such as 4 or 8)
- * @caps:      Host capabilities (MMC_MODE_...)
- * @max_clk:   Maximum supported clock speed in HZ (e.g. 400000)
- * @min_clk:   Minimum supported clock speed in HZ (e.g. 150000000)
+ * @host:      DWMMC host
+ * @max_clk:   Maximum supported clock speed in HZ (e.g. 150000000)
+ * @min_clk:   Minimum supported clock speed in HZ (e.g. 400000)
  */
-void dwmci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth,
-                    uint caps, u32 max_clk, u32 min_clk);
+void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host,
+               u32 max_clk, u32 min_clk);
 
 /**
  * dwmci_bind() - Set up a new MMC block device
@@ -286,11 +284,17 @@ int dwmci_bind(struct udevice *dev, struct mmc *mmc, struct mmc_config *cfg);
  * This is used when you are not using CONFIG_BLK. Convert your driver over!
  *
  * @host:      DWMMC host structure
- * @max_clk:   Maximum supported clock speed in HZ (e.g. 400000)
- * @min_clk:   Minimum supported clock speed in HZ (e.g. 150000000)
+ * @max_clk:   Maximum supported clock speed in HZ (e.g. 150000000)
+ * @min_clk:   Minimum supported clock speed in HZ (e.g. 400000)
  * @return 0 if OK, -ve on error
  */
 int add_dwmci(struct dwmci_host *host, u32 max_clk, u32 min_clk);
 #endif /* !CONFIG_BLK */
 
+#ifdef CONFIG_DM_MMC
+/* Export the operations to drivers */
+int dwmci_probe(struct udevice *dev);
+extern const struct dm_mmc_ops dm_dwmci_ops;
+#endif
+
 #endif /* __DWMMC_HW_H */