Merge tag 'for-linus-20170904' of git://git.infradead.org/linux-mtd

[sfrench/cifs-2.6.git] / include / linux / mfd / tmio.h

diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index 357b6cfdf34a988938facebb64ce457cc7eef887..15646740e2a8ce38654a87371bf19522b340d974 100644 (file)
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -107,6 +107,9 @@
  */
 #define TMIO_MMC_CLK_ACTUAL            BIT(10)
 
  */
 #define TMIO_MMC_CLK_ACTUAL            BIT(10)
 

+/* Some controllers have a CBSY bit */
+#define TMIO_MMC_HAVE_CBSY             BIT(11)
+

 int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);
 int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);
 void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);
 int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);
 int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);
 void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);


@@ -128,6 +131,8 @@ struct tmio_mmc_data {
        unsigned int                    cd_gpio;
        int                             alignment_shift;
        dma_addr_t                      dma_rx_offset;
        unsigned int                    cd_gpio;
        int                             alignment_shift;
        dma_addr_t                      dma_rx_offset;

+       unsigned int                    max_blk_count;
+       unsigned short                  max_segs;

        void (*set_pwr)(struct platform_device *host, int state);
        void (*set_clk_div)(struct platform_device *host, int state);
 };
        void (*set_pwr)(struct platform_device *host, int state);
        void (*set_clk_div)(struct platform_device *host, int state);
 };