* [PATCH 09/16] ARM: OMAP: Split plat/mmc.h into local headers and platform_data [not found] <20121004213950.26676.21898.stgit@muffinssi.local> @ 2012-10-04 22:04 ` Tony Lindgren 2012-10-05 6:38 ` Venkatraman S 2012-10-05 18:08 ` [PATCH 09.5/16] mmc: omap: Remove cpu_is_omap usage from the driver Tony Lindgren 0 siblings, 2 replies; 7+ messages in thread From: Tony Lindgren @ 2012-10-04 22:04 UTC (permalink / raw) To: linux-arm-kernel; +Cc: linux-omap, linux-mmc, Chris Ball, Venkatraman S We need to remove this from plat for ARM common zImage support. Cc: Chris Ball <cjb@laptop.org> Cc: Venkatraman S <svenkatr@ti.com> Cc: linux-mmc@vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap1/board-h2-mmc.c | 5 +-- arch/arm/mach-omap1/board-h3-mmc.c | 3 +- arch/arm/mach-omap1/board-htcherald.c | 2 + arch/arm/mach-omap1/board-innovator.c | 2 + arch/arm/mach-omap1/board-nokia770.c | 2 + arch/arm/mach-omap1/board-sx1-mmc.c | 3 +- arch/arm/mach-omap1/devices.c | 2 + arch/arm/mach-omap1/mmc.h | 18 +++++++++++ arch/arm/mach-omap2/board-4430sdp.c | 2 + arch/arm/mach-omap2/board-n8x0.c | 2 + arch/arm/mach-omap2/board-omap4panda.c | 2 + arch/arm/mach-omap2/board-rm680.c | 2 + arch/arm/mach-omap2/hsmmc.c | 2 + arch/arm/mach-omap2/mmc.h | 23 ++++++++++++++ arch/arm/mach-omap2/msdi.c | 2 + arch/arm/mach-omap2/omap4-common.c | 2 + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 + drivers/mmc/host/omap.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 2 + include/linux/platform_data/mmc-omap.h | 45 +--------------------------- 24 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 arch/arm/mach-omap1/mmc.h create mode 100644 arch/arm/mach-omap2/mmc.h rename arch/arm/plat-omap/include/plat/mmc.h => include/linux/platform_data/mmc-omap.h (80%) diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c index e1362ce..7119ef2 100644 --- a/arch/arm/mach-omap1/board-h2-mmc.c +++ b/arch/arm/mach-omap1/board-h2-mmc.c @@ -13,12 +13,11 @@ */ #include <linux/gpio.h> #include <linux/platform_device.h> - +#include <linux/platform_data/gpio-omap.h> #include <linux/i2c/tps65010.h> -#include <plat/mmc.h> - #include "board-h2.h" +#include "mmc.h" #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c index c74daac..17d7791 100644 --- a/arch/arm/mach-omap1/board-h3-mmc.c +++ b/arch/arm/mach-omap1/board-h3-mmc.c @@ -16,9 +16,8 @@ #include <linux/i2c/tps65010.h> -#include <plat/mmc.h> - #include "board-h3.h" +#include "mmc.h" #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 87ab208..f23200c 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c @@ -43,7 +43,7 @@ #include <asm/mach/arch.h> #include <mach/omap7xx.h> -#include <plat/mmc.h> +#include "mmc.h" #include <mach/irqs.h> #include <mach/usb.h> diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 06eb4e6..2b8977f 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c @@ -36,13 +36,13 @@ #include <../plat-omap/fpga.h> #include <mach/tc.h> #include <linux/platform_data/keypad-omap.h> -#include <plat/mmc.h> #include <mach/hardware.h> #include <mach/usb.h> #include "iomap.h" #include "common.h" +#include "mmc.h" /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ #define INNOVATOR1610_ETHR_START 0x04000300 diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 7d5c06d..cb72f24 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -29,13 +29,13 @@ #include <asm/mach/map.h> #include <mach/mux.h> -#include <plat/mmc.h> #include <plat/clock.h> #include <mach/hardware.h> #include <mach/usb.h> #include "common.h" +#include "mmc.h" #define ADS7846_PENDOWN_GPIO 15 diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c index 5932d56..4fcf19c 100644 --- a/arch/arm/mach-omap1/board-sx1-mmc.c +++ b/arch/arm/mach-omap1/board-sx1-mmc.c @@ -16,9 +16,10 @@ #include <linux/platform_device.h> #include <mach/hardware.h> -#include <plat/mmc.h> #include <mach/board-sx1.h> +#include "mmc.h" + #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) static int mmc_set_power(struct device *dev, int slot, int power_on, diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 552bda0..1cc4e18 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -22,7 +22,6 @@ #include <mach/tc.h> #include <mach/mux.h> #include <plat/dma.h> -#include <plat/mmc.h> #include <mach/omap7xx.h> #include <mach/camera.h> @@ -32,6 +31,7 @@ #include "common.h" #include "clock.h" +#include "mmc.h" #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) diff --git a/arch/arm/mach-omap1/mmc.h b/arch/arm/mach-omap1/mmc.h new file mode 100644 index 0000000..39c2b13 --- /dev/null +++ b/arch/arm/mach-omap1/mmc.h @@ -0,0 +1,18 @@ +#include <linux/mmc/host.h> +#include <linux/platform_data/mmc-omap.h> + +#define OMAP15XX_NR_MMC 1 +#define OMAP16XX_NR_MMC 2 +#define OMAP1_MMC_SIZE 0x080 +#define OMAP1_MMC1_BASE 0xfffb7800 +#define OMAP1_MMC2_BASE 0xfffb7c00 /* omap16xx only */ + +#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) +void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, + int nr_controllers); +#else +static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, + int nr_controllers) +{ +} +#endif diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 50188b6..1de82f8 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -35,7 +35,7 @@ #include "common.h" #include <plat/usb.h> -#include <plat/mmc.h> +#include "mmc.h" #include "omap4-keypad.h" #include <video/omapdss.h> #include <video/omap-panel-nokia-dsi.h> diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index e3e8325..b36b158 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -29,7 +29,7 @@ #include <asm/mach-types.h> #include "common.h" -#include <plat/mmc.h> +#include "mmc.h" #include "mux.h" diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 9d83780..9c49030 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -40,7 +40,7 @@ #include "common.h" #include <plat/usb.h> -#include <plat/mmc.h> +#include "mmc.h" #include <video/omap-panel-tfp410.h> #include "soc.h" diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c index a57ed21..4250229 100644 --- a/arch/arm/mach-omap2/board-rm680.c +++ b/arch/arm/mach-omap2/board-rm680.c @@ -22,7 +22,7 @@ #include <asm/mach/arch.h> #include <asm/mach-types.h> -#include <plat/mmc.h> +#include "mmc.h" #include <plat/usb.h> #include <plat/gpmc.h> #include "common.h" diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 03ebf47..dd8e694 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -17,7 +17,7 @@ #include <mach/hardware.h> #include <linux/platform_data/gpio-omap.h> -#include <plat/mmc.h> +#include "mmc.h" #include <plat/omap-pm.h> #include <plat/omap_device.h> diff --git a/arch/arm/mach-omap2/mmc.h b/arch/arm/mach-omap2/mmc.h new file mode 100644 index 0000000..0cd4b08 --- /dev/null +++ b/arch/arm/mach-omap2/mmc.h @@ -0,0 +1,23 @@ +#include <linux/mmc/host.h> +#include <linux/platform_data/mmc-omap.h> + +#define OMAP24XX_NR_MMC 2 +#define OMAP2420_MMC_SIZE OMAP1_MMC_SIZE +#define OMAP2_MMC1_BASE 0x4809c000 + +#define OMAP4_MMC_REG_OFFSET 0x100 + +#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) +void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data); +#else +static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) +{ +} +#endif + +struct omap_hwmod; +int omap_msdi_reset(struct omap_hwmod *oh); + +/* called from board-specific card detection service routine */ +extern void omap_mmc_notify_cover_event(struct device *dev, int slot, + int is_closed); diff --git a/arch/arm/mach-omap2/msdi.c b/arch/arm/mach-omap2/msdi.c index 9e57b4a..4c80334 100644 --- a/arch/arm/mach-omap2/msdi.c +++ b/arch/arm/mach-omap2/msdi.c @@ -27,7 +27,7 @@ #include <plat/omap_hwmod.h> #include <plat/omap_device.h> -#include <plat/mmc.h> +#include "mmc.h" #include "common.h" #include "control.h" diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 21992d8..9895574 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -26,7 +26,7 @@ #include <asm/memblock.h> #include <plat/omap-secure.h> -#include <plat/mmc.h> +#include "mmc.h" #include "../plat-omap/sram.h" diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index 1821109..b913ddf 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c @@ -22,7 +22,7 @@ #include <plat/dmtimer.h> #include "l3_2xxx.h" #include "l4_2xxx.h" -#include <plat/mmc.h> +#include "mmc.h" #include "omap_hwmod_common_data.h" diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index f902a18..bcda2fa5 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c @@ -21,7 +21,7 @@ #include <plat/dma.h> #include <plat/serial.h> #include <plat/dmtimer.h> -#include <plat/mmc.h> +#include "mmc.h" #include "l3_2xxx.h" #include "soc.h" diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c index 67f1ac4..76449f9 100644 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c @@ -21,7 +21,7 @@ #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/dma.h> -#include <plat/mmc.h> +#include "mmc.h" #include "omap_hwmod_common_data.h" diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index e72ccdc..d8aa3c1 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -24,7 +24,7 @@ #include <plat/serial.h> #include "l3_3xxx.h" #include "l4_3xxx.h" -#include <plat/mmc.h> +#include "mmc.h" #include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/dmtimer.h> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index d59c5ea..8364cc9 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -27,7 +27,7 @@ #include <plat/dma.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h> -#include <plat/mmc.h> +#include "mmc.h" #include <plat/dmtimer.h> #include <plat/iommu.h> #include "../plat-omap/common.h" diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 48ad361..e7c61b9 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -28,8 +28,9 @@ #include <linux/clk.h> #include <linux/scatterlist.h> #include <linux/slab.h> +#include <linux/platform_data/mmc-omap.h> -#include <plat/mmc.h> +#include <plat/cpu.h> #include <plat/dma.h> #define OMAP_MMC_REG_CMD 0x00 diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 54bfd0c..85b164e 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -38,8 +38,8 @@ #include <linux/gpio.h> #include <linux/regulator/consumer.h> #include <linux/pm_runtime.h> +#include <linux/platform_data/mmc-omap.h> #include <mach/hardware.h> -#include <plat/mmc.h> #include <plat/cpu.h> /* OMAP HSMMC Host Controller Registers */ diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/include/linux/platform_data/mmc-omap.h similarity index 80% rename from arch/arm/plat-omap/include/plat/mmc.h rename to include/linux/platform_data/mmc-omap.h index 8b4e4f2..39a7abc 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/include/linux/platform_data/mmc-omap.h @@ -8,27 +8,6 @@ * published by the Free Software Foundation. */ -#ifndef __OMAP2_MMC_H -#define __OMAP2_MMC_H - -#include <linux/types.h> -#include <linux/device.h> -#include <linux/mmc/host.h> - -#include <plat/omap_hwmod.h> - -#define OMAP15XX_NR_MMC 1 -#define OMAP16XX_NR_MMC 2 -#define OMAP1_MMC_SIZE 0x080 -#define OMAP1_MMC1_BASE 0xfffb7800 -#define OMAP1_MMC2_BASE 0xfffb7c00 /* omap16xx only */ - -#define OMAP24XX_NR_MMC 2 -#define OMAP2420_MMC_SIZE OMAP1_MMC_SIZE -#define OMAP2_MMC1_BASE 0x4809c000 - -#define OMAP4_MMC_REG_OFFSET 0x100 - #define OMAP_MMC_MAX_SLOTS 2 /* @@ -50,6 +29,8 @@ #define OMAP_HSMMC_SUPPORTS_DUAL_VOLT BIT(0) #define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ BIT(1) +struct mmc_card; + struct omap_mmc_dev_attr { u8 flags; }; @@ -164,25 +145,3 @@ struct omap_mmc_platform_data { } slots[OMAP_MMC_MAX_SLOTS]; }; - -/* called from board-specific card detection service routine */ -extern void omap_mmc_notify_cover_event(struct device *dev, int slot, - int is_closed); - -#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) -void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, - int nr_controllers); -void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data); -#else -static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, - int nr_controllers) -{ -} -static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) -{ -} -#endif - -extern int omap_msdi_reset(struct omap_hwmod *oh); - -#endif ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 09/16] ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-04 22:04 ` [PATCH 09/16] ARM: OMAP: Split plat/mmc.h into local headers and platform_data Tony Lindgren @ 2012-10-05 6:38 ` Venkatraman S 2012-10-05 18:09 ` Tony Lindgren 2012-10-05 18:08 ` [PATCH 09.5/16] mmc: omap: Remove cpu_is_omap usage from the driver Tony Lindgren 1 sibling, 1 reply; 7+ messages in thread From: Venkatraman S @ 2012-10-05 6:38 UTC (permalink / raw) To: Tony Lindgren; +Cc: linux-arm-kernel, linux-omap, linux-mmc, Chris Ball On Fri, Oct 5, 2012 at 3:34 AM, Tony Lindgren <tony@atomide.com> wrote: > We need to remove this from plat for ARM common zImage > support. > > Cc: Chris Ball <cjb@laptop.org> > Cc: Venkatraman S <svenkatr@ti.com> > Cc: linux-mmc@vger.kernel.org > Signed-off-by: Tony Lindgren <tony@atomide.com> Thanks Tony. I suppose this should go into your tree.. Acked-by: Venkatraman S <svenkatr@ti.com> > --- > arch/arm/mach-omap1/board-h2-mmc.c | 5 +-- > arch/arm/mach-omap1/board-h3-mmc.c | 3 +- > arch/arm/mach-omap1/board-htcherald.c | 2 + > arch/arm/mach-omap1/board-innovator.c | 2 + > arch/arm/mach-omap1/board-nokia770.c | 2 + > arch/arm/mach-omap1/board-sx1-mmc.c | 3 +- > arch/arm/mach-omap1/devices.c | 2 + > arch/arm/mach-omap1/mmc.h | 18 +++++++++++ > arch/arm/mach-omap2/board-4430sdp.c | 2 + > arch/arm/mach-omap2/board-n8x0.c | 2 + > arch/arm/mach-omap2/board-omap4panda.c | 2 + > arch/arm/mach-omap2/board-rm680.c | 2 + > arch/arm/mach-omap2/hsmmc.c | 2 + > arch/arm/mach-omap2/mmc.h | 23 ++++++++++++++ > arch/arm/mach-omap2/msdi.c | 2 + > arch/arm/mach-omap2/omap4-common.c | 2 + > arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 + > arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 + > arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 + > arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 + > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 + > drivers/mmc/host/omap.c | 3 +- > drivers/mmc/host/omap_hsmmc.c | 2 + > include/linux/platform_data/mmc-omap.h | 45 +--------------------------- > 24 files changed, 67 insertions(+), 67 deletions(-) > create mode 100644 arch/arm/mach-omap1/mmc.h > create mode 100644 arch/arm/mach-omap2/mmc.h ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 09/16] ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-05 6:38 ` Venkatraman S @ 2012-10-05 18:09 ` Tony Lindgren 0 siblings, 0 replies; 7+ messages in thread From: Tony Lindgren @ 2012-10-05 18:09 UTC (permalink / raw) To: Venkatraman S; +Cc: linux-arm-kernel, linux-omap, linux-mmc, Chris Ball * Venkatraman S <svenkatr@ti.com> [121004 23:40]: > On Fri, Oct 5, 2012 at 3:34 AM, Tony Lindgren <tony@atomide.com> wrote: > > We need to remove this from plat for ARM common zImage > > support. > > > > Cc: Chris Ball <cjb@laptop.org> > > Cc: Venkatraman S <svenkatr@ti.com> > > Cc: linux-mmc@vger.kernel.org > > Signed-off-by: Tony Lindgren <tony@atomide.com> > > Thanks Tony. I suppose this should go into your tree.. > Acked-by: Venkatraman S <svenkatr@ti.com> Thanks yeah it's probably best that I set up some minimal immutable branch that Chris can also pull in assuming these two MMC patches look OK. Regards, Tony ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 09.5/16] mmc: omap: Remove cpu_is_omap usage from the driver 2012-10-04 22:04 ` [PATCH 09/16] ARM: OMAP: Split plat/mmc.h into local headers and platform_data Tony Lindgren 2012-10-05 6:38 ` Venkatraman S @ 2012-10-05 18:08 ` Tony Lindgren 2012-10-05 18:23 ` Chris Ball 1 sibling, 1 reply; 7+ messages in thread From: Tony Lindgren @ 2012-10-05 18:08 UTC (permalink / raw) To: linux-arm-kernel; +Cc: linux-omap, linux-mmc, Chris Ball, Venkatraman S This is needed for the ARM common zImage support. We can use the existing slot features to pass omap1 specific options to the driver. For omap2 we don't want to pass anything new as that will be eventually moved to use device tree based init. Note that this patch depends on earlier patch that moves plat/mmc.h into include/linux/platform_data. Cc: Chris Ball <cjb@laptop.org> Cc: Venkatraman S <svenkatr@ti.com> Cc: linux-mmc@vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- Chris, I can set up a minimal immutable branch with omap header changes that you can also pull into MMC tree if these two MMC patches look ackable to you. --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -177,6 +177,13 @@ static int __init omap_mmc_add(const char *name, int id, unsigned long base, res[3].name = "tx"; res[3].flags = IORESOURCE_DMA; + if (cpu_is_omap7xx()) + data->slots[0].features = MMC_OMAP7XX; + if (cpu_is_omap15xx()) + data->slots[0].features = MMC_OMAP15XX; + if (cpu_is_omap16xx()) + data->slots[0].features = MMC_OMAP16XX; + ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); if (ret == 0) ret = platform_device_add_data(pdev, data, sizeof(*data)); --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -30,7 +30,6 @@ #include <linux/slab.h> #include <linux/platform_data/mmc-omap.h> -#include <plat/cpu.h> #include <plat/dma.h> #define OMAP_MMC_REG_CMD 0x00 @@ -73,6 +72,13 @@ #define OMAP_MMC_STAT_CARD_BUSY (1 << 2) #define OMAP_MMC_STAT_END_OF_CMD (1 << 0) +#define mmc_omap7xx() (host->features & MMC_OMAP7XX) +#define mmc_omap15xx() (host->features & MMC_OMAP15XX) +#define mmc_omap16xx() (host->features & MMC_OMAP16XX) +#define MMC_OMAP1_MASK (MMC_OMAP7XXX | MMC_OMAP15XX | MMC_OMAP16XX) +#define mmc_omap1() (host->features & MMC_OMAP1_MASK) +#define mmc_omap2() (!mmc_omap1) + #define OMAP_MMC_REG(host, reg) (OMAP_MMC_REG_##reg << (host)->reg_shift) #define OMAP_MMC_READ(host, reg) __raw_readw((host)->virt_base + OMAP_MMC_REG(host, reg)) #define OMAP_MMC_WRITE(host, reg, val) __raw_writew((val), (host)->virt_base + OMAP_MMC_REG(host, reg)) @@ -148,6 +154,7 @@ struct mmc_omap_host { u32 buffer_bytes_left; u32 total_bytes_left; + unsigned features; unsigned use_dma:1; unsigned brs_received:1, dma_done:1; unsigned dma_in_use:1; @@ -989,7 +996,7 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req) * blocksize is at least that large. Blocksize is * usually 512 bytes; but not for some SD reads. */ - burst = cpu_is_omap15xx() ? 32 : 64; + burst = mmc_omap15xx() ? 32 : 64; if (burst > data->blksz) burst = data->blksz; @@ -1105,8 +1112,7 @@ static void mmc_omap_set_power(struct mmc_omap_slot *slot, int power_on, if (slot->pdata->set_power != NULL) slot->pdata->set_power(mmc_dev(slot->mmc), slot->id, power_on, vdd); - - if (cpu_is_omap24xx()) { + if (mmc_omap2()) { u16 w; if (power_on) { @@ -1240,7 +1246,7 @@ static int __devinit mmc_omap_new_slot(struct mmc_omap_host *host, int id) mmc->ops = &mmc_omap_ops; mmc->f_min = 400000; - if (cpu_class_is_omap2()) + if (mmc_omap2()) mmc->f_max = 48000000; else mmc->f_max = 24000000; @@ -1360,6 +1366,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) init_waitqueue_head(&host->slot_wq); host->pdata = pdata; + host->features = host->pdata->slots[0].features; host->dev = &pdev->dev; platform_set_drvdata(pdev, host); @@ -1392,7 +1399,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) host->dma_tx_burst = -1; host->dma_rx_burst = -1; - if (cpu_is_omap24xx()) + if (mmc_omap2()) sig = host->id == 0 ? OMAP24XX_DMA_MMC1_TX : OMAP24XX_DMA_MMC2_TX; else sig = host->id == 0 ? OMAP_DMA_MMC_TX : OMAP_DMA_MMC2_TX; @@ -1408,7 +1415,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) dev_warn(host->dev, "unable to obtain TX DMA engine channel %u\n", sig); #endif - if (cpu_is_omap24xx()) + if (mmc_omap2()) sig = host->id == 0 ? OMAP24XX_DMA_MMC1_RX : OMAP24XX_DMA_MMC2_RX; else sig = host->id == 0 ? OMAP_DMA_MMC_RX : OMAP_DMA_MMC2_RX; @@ -1436,7 +1443,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) } host->nr_slots = pdata->nr_slots; - host->reg_shift = (cpu_is_omap7xx() ? 1 : 2); + host->reg_shift = (mmc_omap7xx() ? 1 : 2); host->mmc_omap_wq = alloc_workqueue("mmc_omap", 0, 0); if (!host->mmc_omap_wq) --- a/include/linux/platform_data/mmc-omap.h +++ b/include/linux/platform_data/mmc-omap.h @@ -107,6 +107,9 @@ struct omap_mmc_platform_data { /* we can put the features above into this variable */ #define HSMMC_HAS_PBIAS (1 << 0) #define HSMMC_HAS_UPDATED_RESET (1 << 1) +#define MMC_OMAP7XX (1 << 2) +#define MMC_OMAP15XX (1 << 3) +#define MMC_OMAP16XX (1 << 4) unsigned features; int switch_pin; /* gpio (card detect) */ ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 09.5/16] mmc: omap: Remove cpu_is_omap usage from the driver 2012-10-05 18:08 ` [PATCH 09.5/16] mmc: omap: Remove cpu_is_omap usage from the driver Tony Lindgren @ 2012-10-05 18:23 ` Chris Ball 2012-10-05 19:47 ` Tony Lindgren 2012-10-16 21:02 ` Tony Lindgren 0 siblings, 2 replies; 7+ messages in thread From: Chris Ball @ 2012-10-05 18:23 UTC (permalink / raw) To: Tony Lindgren; +Cc: linux-arm-kernel, linux-omap, linux-mmc, Venkatraman S Hi Tony, On Fri, Oct 05 2012, Tony Lindgren wrote: > This is needed for the ARM common zImage support. > > We can use the existing slot features to pass omap1 > specific options to the driver. For omap2 we don't > want to pass anything new as that will be eventually > moved to use device tree based init. > > Note that this patch depends on earlier patch that > moves plat/mmc.h into include/linux/platform_data. > > Cc: Chris Ball <cjb@laptop.org> > Cc: Venkatraman S <svenkatr@ti.com> > Cc: linux-mmc@vger.kernel.org > Signed-off-by: Tony Lindgren <tony@atomide.com> > > --- > > Chris, I can set up a minimal immutable branch with omap > header changes that you can also pull into MMC tree if these > two MMC patches look ackable to you. Thanks, sounds good. Acked-by: Chris Ball <cjb@laptop.org> - Chris. -- Chris Ball <cjb@laptop.org> <http://printf.net/> One Laptop Per Child ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 09.5/16] mmc: omap: Remove cpu_is_omap usage from the driver 2012-10-05 18:23 ` Chris Ball @ 2012-10-05 19:47 ` Tony Lindgren 2012-10-16 21:02 ` Tony Lindgren 1 sibling, 0 replies; 7+ messages in thread From: Tony Lindgren @ 2012-10-05 19:47 UTC (permalink / raw) To: Chris Ball; +Cc: linux-arm-kernel, linux-omap, linux-mmc, Venkatraman S * Chris Ball <cjb@laptop.org> [121005 11:24]: > Hi Tony, > > On Fri, Oct 05 2012, Tony Lindgren wrote: > > This is needed for the ARM common zImage support. > > > > We can use the existing slot features to pass omap1 > > specific options to the driver. For omap2 we don't > > want to pass anything new as that will be eventually > > moved to use device tree based init. > > > > Note that this patch depends on earlier patch that > > moves plat/mmc.h into include/linux/platform_data. > > > > Cc: Chris Ball <cjb@laptop.org> > > Cc: Venkatraman S <svenkatr@ti.com> > > Cc: linux-mmc@vger.kernel.org > > Signed-off-by: Tony Lindgren <tony@atomide.com> > > > > --- > > > > Chris, I can set up a minimal immutable branch with omap > > header changes that you can also pull into MMC tree if these > > two MMC patches look ackable to you. > > Thanks, sounds good. > > Acked-by: Chris Ball <cjb@laptop.org> Thanks will do when -rc1 is available. Looks like I posted a version before running stg refresh that was missing two compile fixes: MMC_OMAP7XXX should be MMC_OMAP7XX and !mmc_omap1 should be !mmc_omap1(). Updated patch below. Regards, Tony From: Tony Lindgren <tony@atomide.com> Date: Thu, 4 Oct 2012 19:01:53 -0700 Subject: [PATCH] mmc: omap: Remove cpu_is_omap usage from the driver This is needed for the ARM common zImage support. We can use the existing slot features to pass omap1 specific options to the driver. For omap2 we don't want to pass anything new as that will be eventually moved to use device tree based init. Note that this patch depends on earlier patch that moves plat/mmc.h into include/linux/platform_data. Cc: linux-mmc@vger.kernel.org Cc: Venkatraman S <svenkatr@ti.com> Acked-by: Chris Ball <cjb@laptop.org> Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 1cc4e18..f9c4fb9 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -177,6 +177,13 @@ static int __init omap_mmc_add(const char *name, int id, unsigned long base, res[3].name = "tx"; res[3].flags = IORESOURCE_DMA; + if (cpu_is_omap7xx()) + data->slots[0].features = MMC_OMAP7XX; + if (cpu_is_omap15xx()) + data->slots[0].features = MMC_OMAP15XX; + if (cpu_is_omap16xx()) + data->slots[0].features = MMC_OMAP16XX; + ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); if (ret == 0) ret = platform_device_add_data(pdev, data, sizeof(*data)); diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index e7c61b9..9f0e26f 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -30,7 +30,6 @@ #include <linux/slab.h> #include <linux/platform_data/mmc-omap.h> -#include <plat/cpu.h> #include <plat/dma.h> #define OMAP_MMC_REG_CMD 0x00 @@ -73,6 +72,13 @@ #define OMAP_MMC_STAT_CARD_BUSY (1 << 2) #define OMAP_MMC_STAT_END_OF_CMD (1 << 0) +#define mmc_omap7xx() (host->features & MMC_OMAP7XX) +#define mmc_omap15xx() (host->features & MMC_OMAP15XX) +#define mmc_omap16xx() (host->features & MMC_OMAP16XX) +#define MMC_OMAP1_MASK (MMC_OMAP7XX | MMC_OMAP15XX | MMC_OMAP16XX) +#define mmc_omap1() (host->features & MMC_OMAP1_MASK) +#define mmc_omap2() (!mmc_omap1()) + #define OMAP_MMC_REG(host, reg) (OMAP_MMC_REG_##reg << (host)->reg_shift) #define OMAP_MMC_READ(host, reg) __raw_readw((host)->virt_base + OMAP_MMC_REG(host, reg)) #define OMAP_MMC_WRITE(host, reg, val) __raw_writew((val), (host)->virt_base + OMAP_MMC_REG(host, reg)) @@ -148,6 +154,7 @@ struct mmc_omap_host { u32 buffer_bytes_left; u32 total_bytes_left; + unsigned features; unsigned use_dma:1; unsigned brs_received:1, dma_done:1; unsigned dma_in_use:1; @@ -989,7 +996,7 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req) * blocksize is at least that large. Blocksize is * usually 512 bytes; but not for some SD reads. */ - burst = cpu_is_omap15xx() ? 32 : 64; + burst = mmc_omap15xx() ? 32 : 64; if (burst > data->blksz) burst = data->blksz; @@ -1105,8 +1112,7 @@ static void mmc_omap_set_power(struct mmc_omap_slot *slot, int power_on, if (slot->pdata->set_power != NULL) slot->pdata->set_power(mmc_dev(slot->mmc), slot->id, power_on, vdd); - - if (cpu_is_omap24xx()) { + if (mmc_omap2()) { u16 w; if (power_on) { @@ -1240,7 +1246,7 @@ static int __devinit mmc_omap_new_slot(struct mmc_omap_host *host, int id) mmc->ops = &mmc_omap_ops; mmc->f_min = 400000; - if (cpu_class_is_omap2()) + if (mmc_omap2()) mmc->f_max = 48000000; else mmc->f_max = 24000000; @@ -1360,6 +1366,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) init_waitqueue_head(&host->slot_wq); host->pdata = pdata; + host->features = host->pdata->slots[0].features; host->dev = &pdev->dev; platform_set_drvdata(pdev, host); @@ -1392,7 +1399,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) host->dma_tx_burst = -1; host->dma_rx_burst = -1; - if (cpu_is_omap24xx()) + if (mmc_omap2()) sig = host->id == 0 ? OMAP24XX_DMA_MMC1_TX : OMAP24XX_DMA_MMC2_TX; else sig = host->id == 0 ? OMAP_DMA_MMC_TX : OMAP_DMA_MMC2_TX; @@ -1408,7 +1415,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) dev_warn(host->dev, "unable to obtain TX DMA engine channel %u\n", sig); #endif - if (cpu_is_omap24xx()) + if (mmc_omap2()) sig = host->id == 0 ? OMAP24XX_DMA_MMC1_RX : OMAP24XX_DMA_MMC2_RX; else sig = host->id == 0 ? OMAP_DMA_MMC_RX : OMAP_DMA_MMC2_RX; @@ -1436,7 +1443,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) } host->nr_slots = pdata->nr_slots; - host->reg_shift = (cpu_is_omap7xx() ? 1 : 2); + host->reg_shift = (mmc_omap7xx() ? 1 : 2); host->mmc_omap_wq = alloc_workqueue("mmc_omap", 0, 0); if (!host->mmc_omap_wq) diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h index 39a7abc..2bf6ea82 100644 --- a/include/linux/platform_data/mmc-omap.h +++ b/include/linux/platform_data/mmc-omap.h @@ -107,6 +107,9 @@ struct omap_mmc_platform_data { /* we can put the features above into this variable */ #define HSMMC_HAS_PBIAS (1 << 0) #define HSMMC_HAS_UPDATED_RESET (1 << 1) +#define MMC_OMAP7XX (1 << 2) +#define MMC_OMAP15XX (1 << 3) +#define MMC_OMAP16XX (1 << 4) unsigned features; int switch_pin; /* gpio (card detect) */ ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 09.5/16] mmc: omap: Remove cpu_is_omap usage from the driver 2012-10-05 18:23 ` Chris Ball 2012-10-05 19:47 ` Tony Lindgren @ 2012-10-16 21:02 ` Tony Lindgren 1 sibling, 0 replies; 7+ messages in thread From: Tony Lindgren @ 2012-10-16 21:02 UTC (permalink / raw) To: Chris Ball; +Cc: linux-arm-kernel, linux-omap, linux-mmc, Venkatraman S * Chris Ball <cjb@laptop.org> [121005 11:24]: > On Fri, Oct 05 2012, Tony Lindgren wrote: > > > > Chris, I can set up a minimal immutable branch with omap > > header changes that you can also pull into MMC tree if these > > two MMC patches look ackable to you. > > Thanks, sounds good. Chris, I've now pushed out branch omap-for-v3.8/cleanup-headers-mmc based on -rc1. The branch is located at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git It contains two omap MMC related patches that you can also merge into the MMC tree if needed as now include plat/mmc.h is gone for omaps. Regards, Tony ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-10-16 21:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20121004213950.26676.21898.stgit@muffinssi.local>
2012-10-04 22:04 ` [PATCH 09/16] ARM: OMAP: Split plat/mmc.h into local headers and platform_data Tony Lindgren
2012-10-05 6:38 ` Venkatraman S
2012-10-05 18:09 ` Tony Lindgren
2012-10-05 18:08 ` [PATCH 09.5/16] mmc: omap: Remove cpu_is_omap usage from the driver Tony Lindgren
2012-10-05 18:23 ` Chris Ball
2012-10-05 19:47 ` Tony Lindgren
2012-10-16 21:02 ` Tony Lindgren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).