omap updates for 2.6.34 merge window, part 2
Subsystems (5)
Tony Lindgren
maintainercover omap updates for 2.6.34 merge window, part 2
Hi all,
Here is part 2 of the omap updates for 2.6.34. The MMC low-level init patches have been already posted to linux-omap and linux-mmc.
Regards,
Tony
---
Adrian Hunter (10):
omap_hsmmc: Move gpio and regulator control from board file
omap: Rename mmc-twl4030 files to hsmmc
omap: Rename hsmmc symbols to reflect independence from twl4030
omap: Reconnect hsmmc context loss count
omap: RX51: Remux to pull eMMC lines down when powering off
omap_hsmmc: Allow for power saving without going off
omap_hsmmc: Fix disable timeouts
omap_hsmmc: Ensure regulator enable / disable are paired
omap_hsmmc: Allow for a shared VccQ
omap_hsmmc: allow compile without regulator framework
Felipe Balbi (1):
arm: omap: kill compile warning on board-4430-sdp.c
Jorge Eduardo Candelaria (3):
OMAP4: IRQ: Add McPDM IRQ definition
ARM: OMAP4: Add McPDM base address
OMAP4: MCPDM: Register McPDM platform device
Lesly A M (1):
omap3: pm: Add T2 Keypad as a wakeup source
Tony Lindgren (1):
omap3: Clean-up for omap_mux_init
Vaibhav Hiremath (3):
AM35xx: Introduce am35xx.h file
AM35xx: Add AM35xx intr_clr & sw_rst cntrl reg bit definition
AM35xx: Update irq.h for AM35xx IPSS module interrupts
arch/arm/configs/rx51_defconfig | 4
arch/arm/mach-omap2/Makefile | 28 +
arch/arm/mach-omap2/board-2430sdp.c | 6
arch/arm/mach-omap2/board-3430sdp.c | 6
arch/arm/mach-omap2/board-4430sdp.c | 4
arch/arm/mach-omap2/board-am3517evm.c | 1
arch/arm/mach-omap2/board-cm-t35.c | 6
arch/arm/mach-omap2/board-igep0020.c | 6
arch/arm/mach-omap2/board-ldp.c | 6
arch/arm/mach-omap2/board-omap3beagle.c | 6
arch/arm/mach-omap2/board-omap3evm.c | 6
arch/arm/mach-omap2/board-omap3pandora.c | 6
arch/arm/mach-omap2/board-omap3touchbook.c | 6
arch/arm/mach-omap2/board-overo.c | 6
arch/arm/mach-omap2/board-rx51-peripherals.c | 63 ++-
arch/arm/mach-omap2/board-zoom-peripherals.c | 15 +
arch/arm/mach-omap2/hsmmc.c | 266 +++++++++++++
arch/arm/mach-omap2/hsmmc.h | 14 -
arch/arm/mach-omap2/include/mach/am35xx.h | 26 +
arch/arm/mach-omap2/mmc-twl4030.c | 542 --------------------------
arch/arm/mach-omap2/mux.c | 46 ++
arch/arm/plat-omap/devices.c | 37 ++
arch/arm/plat-omap/include/plat/control.h | 17 +
arch/arm/plat-omap/include/plat/irqs.h | 12 +
arch/arm/plat-omap/include/plat/mmc.h | 35 +-
arch/arm/plat-omap/include/plat/omap44xx.h | 2
drivers/mmc/host/omap_hsmmc.c | 400 ++++++++++++++++++-
27 files changed, 920 insertions(+), 652 deletions(-)
create mode 100644 arch/arm/mach-omap2/hsmmc.c
rename arch/arm/mach-omap2/{mmc-twl4030.h => hsmmc.h} (63%)
create mode 100644 arch/arm/mach-omap2/include/mach/am35xx.h
delete mode 100644 arch/arm/mach-omap2/mmc-twl4030.cSignature · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/19 omap_hsmmc: Move gpio and regulator control from board file
From: Adrian Hunter <[email protected]>
This patch moves the setup code for GPIO's and Voltage Regulators from the board file mmc-twl4030.c to the driver omap_hsmmc.c. PBIAS and other system control configuration remains in the board file.
Moving GPIO code to the driver makes the board initialisation code independent of when GPIO's are defined. That makes the board initialisation now entirely independent of its original twl4030 roots.
Moving Voltage Regulator code to the driver allows for further development of regulator support in the core MMC code. It also permits the MMC core to be compiled as a module, because the board code no longer calls MMC core functions.
--- arch/arm/configs/rx51_defconfig | 4 arch/arm/mach-omap2/mmc-twl4030.c | 352 +++------------------------------ arch/arm/mach-omap2/mmc-twl4030.h | 4 arch/arm/plat-omap/include/plat/mmc.h | 28 ++- drivers/mmc/host/omap_hsmmc.c | 352 ++++++++++++++++++++++++++++++++- 5 files changed, 391 insertions(+), 349 deletions(-)
arch/arm/configs/rx51_defconfig +2 -2
@@ -1354,7 +1354,7 @@ CONFIG_USB_OTG_UTILS=y # CONFIG_USB_GPIO_VBUS is not set # CONFIG_ISP1301_OMAP is not set CONFIG_TWL4030_USB=y -CONFIG_MMC=y +CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set
@@ -1362,7 +1362,7 @@ CONFIG_MMC=y # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_MMC_BLOCK_BOUNCE is not set # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set
arch/arm/mach-omap2/mmc-twl4030.c +31 -321
442 lines not on this page · raw message
arch/arm/mach-omap2/mmc-twl4030.h +1 -3
@@ -21,9 +21,7 @@ struct twl4030_hsmmc_info {int ocr_mask;/* temporary HACK */ }; -#if defined(CONFIG_REGULATOR ) && \ - (defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE ) || \ - defined(CONFIG_MMC_OMAP_HS ) || defined(CONFIG_MMC_OMAP_HS_MODULE )) +#if defined(CONFIG_MMC_OMAP_HS ) || defined(CONFIG_MMC_OMAP_HS_MODULE )void twl4030_mmc_init (struct twl4030_hsmmc_info *);
arch/arm/plat-omap/include/plat/mmc.h +18 -10
@@ -55,12 +55,12 @@ struct omap_mmc_platform_data {unsigned int max_freq;/* switch the bus to a new slot */ -int (* switch_slot)(struct device *dev,int slot); +int (*switch_slot)(struct device *dev,int slot);/* initialize board-specific MMC functionality, can be NULL if * not supported */ -int (* init)(struct device *dev); -void (* cleanup)(struct device *dev); -void (* shutdown)(struct device *dev); +int (*init)(struct device *dev); +void (*cleanup)(struct device *dev); +void (*shutdown)(struct device *dev);/* To handle board related suspend/resume functionality for MMC */ int (*suspend)(struct device *dev,int slot);
@@ -99,11 +99,18 @@ struct omap_mmc_platform_data {int switch_pin;/* gpio (card detect) */ int gpio_wp;/* gpio (write protect) */ -int (* set_bus_mode)(struct device *dev,int slot,int bus_mode); -int (* set_power)(struct device *dev,int slot,int power_on,int vdd); -int (* get_ro)(struct device *dev,int slot); +int (*set_bus_mode)(struct device *dev,int slot,int bus_mode); +int (*set_power)(struct device *dev,int slot, +int power_on,int vdd); +int (*get_ro)(struct device *dev,int slot);int (*set_sleep)(struct device *dev,int slot,int sleep,int vdd,int cardsleep); +/* Call back before enabling / disabling regulators */ +void (*before_set_reg)(struct device *dev,int slot, +int power_on,int vdd); +/* Call back after enabling / disabling regulators */ +void (*after_set_reg)(struct device *dev,int slot, +int power_on,int vdd);/* return MMC cover switch state, can be NULL if not supported. *
@@ -111,14 +118,14 @@ struct omap_mmc_platform_data {* 0 - closed * 1 - open */ -int (* get_cover_state)(struct device *dev,int slot); +int (*get_cover_state)(struct device *dev,int slot);const char *name;u32 ocr_mask;/* Card detection IRQs */ int card_detect_irq; -int (* card_detect)(int irq); +int (*card_detect)(struct device *dev,int slot); unsigned int ban_openended:1;
@@ -126,7 +133,8 @@ struct omap_mmc_platform_data { };/* called from board-specific card detection service routine */ -extern void omap_mmc_notify_cover_event (struct device *dev,int slot,int is_closed); +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 ) || \ defined(CONFIG_MMC_OMAP_HS ) || defined(CONFIG_MMC_OMAP_HS_MODULE )
drivers/mmc/host/omap_hsmmc.c +339 -13
450 lines not on this page · raw message
Tony Lindgren
maintainerPATCH 2/19 omap: Rename mmc-twl4030 files to hsmmc
In reply to Tony LindgrenFrom: Adrian Hunter <[email protected]>
mmc-twl4030.[ch] no longer has any dependency on twl4030 and should be renamed to reflect that.
---
arch/arm/mach-omap2/Makefile | 28 +++++++++++++-------------
arch/arm/mach-omap2/board-2430sdp.c | 2 +-
arch/arm/mach-omap2/board-3430sdp.c | 2 +-
arch/arm/mach-omap2/board-cm-t35.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 2 +-
arch/arm/mach-omap2/board-ldp.c | 2 +-
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
arch/arm/mach-omap2/board-overo.c | 2 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
arch/arm/mach-omap2/hsmmc.c | 4 ++--
arch/arm/mach-omap2/hsmmc.h | 0
15 files changed, 28 insertions(+), 28 deletions(-)
rename arch/arm/mach-omap2/{mmc-twl4030.c => hsmmc.c} (98%)
rename arch/arm/mach-omap2/{mmc-twl4030.h => hsmmc.h} (100%)arch/arm/mach-omap2/Makefile +14 -14
@@ -87,43 +87,43 @@ obj-y += $(i2c-omap-m) $(i2c-omap-y) obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_OVERO) += board-overo.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ - mmc-twl4030.o \ + hsmmc.o \ board-sdp-flash.o obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ board-rx51-sdram.o \ board-rx51-peripherals.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ board-zoom-peripherals.o \ - mmc-twl4030.o \ + hsmmc.o \ board-zoom-debugboard.o obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \ board-zoom-peripherals.o \ - mmc-twl4030.o \ + hsmmc.o \ board-zoom-debugboard.o obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \ board-zoom-peripherals.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \ - mmc-twl4030.o + hsmmc.o obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o
arch/arm/mach-omap2/board-2430sdp.c +1 -1
@@ -38,7 +38,7 @@#include <plat/usb.h> #include <plat/gpmc-smc91x.h> -#include "mmc-twl4030.h" +#include "hsmmc.h" #define SDP2430_CS0_BASE 0x04000000#define SECONDARY_LCD_GPIO 147
arch/arm/mach-omap2/board-3430sdp.c +1 -1
@@ -45,7 +45,7 @@#include "mux.h" #include "sdram-qimonda-hyb18m512160af-6.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #define CONFIG_DISABLE_HFCLK 1
arch/arm/mach-omap2/board-cm-t35.c +1 -1
@@ -46,7 +46,7 @@#include "mux.h" #include "sdram-micron-mt46h32m32lf-6.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #define CM_T35_GPIO_PENDOWN 57
arch/arm/mach-omap2/board-igep0020.c +1 -1
@@ -30,7 +30,7 @@#include <plat/usb.h> #include "mux.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #define IGEP2_SMSC911X_CS 5#define IGEP2_SMSC911X_GPIO 176
arch/arm/mach-omap2/board-ldp.c +1 -1
@@ -44,7 +44,7 @@#include <plat/usb.h> #include "mux.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #define LDP_SMSC911X_CS 1#define LDP_SMSC911X_GPIO 152
arch/arm/mach-omap2/board-omap3beagle.c +1 -1
@@ -45,7 +45,7 @@#include <plat/timer-gp.h> #include "mux.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #define GPMC_CS0_BASE 0x60#define GPMC_CS_SIZE 0x30
arch/arm/mach-omap2/board-omap3evm.c +1 -1
@@ -44,7 +44,7 @@#include "mux.h" #include "sdram-micron-mt46h32m32lf-6.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #define OMAP3_EVM_TS_GPIO 175#define OMAP3_EVM_EHCI_VBUS 22
arch/arm/mach-omap2/board-omap3pandora.c +1 -1
@@ -43,7 +43,7 @@#include "mux.h" #include "sdram-micron-mt46h32m32lf-6.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #define OMAP3_PANDORA_TS_GPIO 94
arch/arm/mach-omap2/board-omap3touchbook.c +1 -1
@@ -50,7 +50,7 @@#include <plat/timer-gp.h> #include "mux.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #include <asm/setup.h>
arch/arm/mach-omap2/board-overo.c +1 -1
@@ -48,7 +48,7 @@#include "mux.h" #include "sdram-micron-mt46h32m32lf-6.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #define OVERO_GPIO_BT_XGATE 15#define OVERO_GPIO_W2W_NRESET 16
arch/arm/mach-omap2/board-rx51-peripherals.c +1 -1
@@ -34,7 +34,7 @@#include <plat/gpmc-smc91x.h> #include "mux.h" -#include "mmc-twl4030.h" +#include "hsmmc.h" #define SYSTEM_REV_B_USES_VAUX3 0x1699#define SYSTEM_REV_S_USES_VAUX3 0x8
arch/arm/mach-omap2/board-zoom-peripherals.c +1 -1
@@ -24,7 +24,7 @@#include <plat/common.h> #include <plat/usb.h> -#include "mmc-twl4030.h" +#include "hsmmc.h" /* Zoom2 has Qwerty keyboard*/ static int board_keymap[] = {
arch/arm/mach-omap2/hsmmc.c renamed from arch/arm/mach-omap2/mmc-twl4030.c +2 -2
@@ -1,5 +1,5 @@/* -* linux/arch/arm/mach-omap2/mmc-twl4030.c +* linux/arch/arm/mach-omap2/hsmmc.c * * Copyright (C) 2007-2008 Texas Instruments * Copyright (C) 2008 Nokia Corporation
@@ -17,7 +17,7 @@#include <plat/control.h> #include <plat/mmc.h> -#include "mmc-twl4030.h" +#include "hsmmc.h" #if defined(CONFIG_MMC_OMAP_HS ) || defined(CONFIG_MMC_OMAP_HS_MODULE )
arch/arm/mach-omap2/hsmmc.h renamed from arch/arm/mach-omap2/mmc-twl4030.h +0 -0
Tony Lindgren
maintainerPATCH 3/19 omap: Rename hsmmc symbols to reflect independence from twl4030
In reply to Tony LindgrenFrom: Adrian Hunter <[email protected]>
hsmmc.[ch] no longer has any dependency on twl4030 and variable names should be renamed to reflect that.
--- arch/arm/mach-omap2/board-2430sdp.c | 4 ++-- arch/arm/mach-omap2/board-3430sdp.c | 4 ++-- arch/arm/mach-omap2/board-cm-t35.c | 4 ++-- arch/arm/mach-omap2/board-igep0020.c | 4 ++-- arch/arm/mach-omap2/board-ldp.c | 4 ++-- arch/arm/mach-omap2/board-omap3beagle.c | 4 ++-- arch/arm/mach-omap2/board-omap3evm.c | 4 ++-- arch/arm/mach-omap2/board-omap3pandora.c | 4 ++-- arch/arm/mach-omap2/board-omap3touchbook.c | 4 ++-- arch/arm/mach-omap2/board-overo.c | 4 ++-- arch/arm/mach-omap2/board-rx51-peripherals.c | 18 ++++++++---------- arch/arm/mach-omap2/board-zoom-peripherals.c | 4 ++-- arch/arm/mach-omap2/hsmmc.c | 24 ++++++++++++------------ arch/arm/mach-omap2/hsmmc.h | 6 +++--- 14 files changed, 45 insertions(+), 47 deletions(-)
arch/arm/mach-omap2/board-2430sdp.c +2 -2
@@ -182,7 +182,7 @@ static int __init omap2430_i2c_init(void)return 0 ; } -static struct twl4030_hsmmc_info mmc[]__initdata = { +static struct omap2_hsmmc_info mmc[]__initdata = { { .mmc =1 , .wires =4 ,
@@ -201,7 +201,7 @@ static void __init omap_2430sdp_init(void)platform_add_devices (sdp2430_devices,ARRAY_SIZE (sdp2430_devices));omap_serial_init (); -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc);usb_musb_init ();board_smc91x_init ();
arch/arm/mach-omap2/board-3430sdp.c +2 -2
@@ -328,7 +328,7 @@ static struct twl4030_bci_platform_data sdp3430_bci_data = { .tblsize = ARRAY_SIZE(sdp3430_batt_table), }; -static struct twl4030_hsmmc_info mmc[] = { +static struct omap2_hsmmc_info mmc[] = { { .mmc =1 ,/* 8 bits (default) requires S6.3 == ON,
@@ -365,7 +365,7 @@ static int sdp3430_twl_gpio_setup(struct device *dev,*/ mmc[0 ].gpio_cd = gpio +0 ; mmc[1 ].gpio_cd = gpio +1 ; -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc);/* link regulators to MMC adapters ... we "know" the * regulators will be set up only *after* we return.
arch/arm/mach-omap2/board-cm-t35.c +2 -2
@@ -364,7 +364,7 @@ static struct twl4030_keypad_data cm_t35_kp_data = { .rep = 1, }; -static struct twl4030_hsmmc_info mmc[] = { +static struct omap2_hsmmc_info mmc[] = { { .mmc =1 , .wires =4 ,
@@ -413,7 +413,7 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,/* gpio + 0 is "mmc0_cd" (input/IRQ) */ mmc[0 ].gpio_cd = gpio +0 ; -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc);/* link regulators to MMC adapters */ cm_t35_vmmc1_supply.dev = mmc[0 ].dev;
arch/arm/mach-omap2/board-igep0020.c +2 -2
@@ -121,7 +121,7 @@ static struct regulator_init_data igep2_vmmc1 = { .consumer_supplies = &igep2_vmmc1_supply, }; -static struct twl4030_hsmmc_info mmc[] = { +static struct omap2_hsmmc_info mmc[] = { { .mmc =1 , .wires =4 ,
@@ -142,7 +142,7 @@ static int igep2_twl_gpio_setup(struct device *dev, {/* gpio + 0 is "mmc0_cd" (input/IRQ) */ mmc[0 ].gpio_cd = gpio +0 ; -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc);/* link regulators to MMC adapters ... we "know" the * regulators will be set up only *after* we return.
arch/arm/mach-omap2/board-ldp.c +2 -2
@@ -359,7 +359,7 @@ static int __init omap_i2c_init(void)return 0 ; } -static struct twl4030_hsmmc_info mmc[]__initdata = { +static struct omap2_hsmmc_info mmc[]__initdata = { { .mmc =1 , .wires =4 ,
@@ -396,7 +396,7 @@ static void __init omap_ldp_init(void)omap_serial_init ();usb_musb_init (); -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc);/* link regulators to MMC adapters */ ldp_vmmc1_supply.dev = mmc[0 ].dev; }
arch/arm/mach-omap2/board-omap3beagle.c +2 -2
@@ -108,7 +108,7 @@ static struct platform_device omap3beagle_nand_device = {#include "sdram-micron-mt46h32m32lf-6.h" -static struct twl4030_hsmmc_info mmc[] = { +static struct omap2_hsmmc_info mmc[] = { { .mmc =1 , .wires =8 ,
@@ -147,7 +147,7 @@ static int beagle_twl_gpio_setup(struct device *dev, }/* gpio + 0 is "mmc0_cd" (input/IRQ) */ mmc[0 ].gpio_cd = gpio +0 ; -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc);/* link regulators to MMC adapters */ beagle_vmmc1_supply.dev = mmc[0 ].dev;
arch/arm/mach-omap2/board-omap3evm.c +2 -2
@@ -185,7 +185,7 @@ static struct regulator_init_data omap3evm_vsim = { .consumer_supplies = &omap3evm_vsim_supply, }; -static struct twl4030_hsmmc_info mmc[] = { +static struct omap2_hsmmc_info mmc[] = { { .mmc =1 , .wires =4 ,
@@ -225,7 +225,7 @@ static int omap3evm_twl_gpio_setup(struct device *dev,/* gpio + 0 is "mmc0_cd" (input/IRQ) */ omap_mux_init_gpio (63 ,OMAP_PIN_INPUT ); mmc[0 ].gpio_cd = gpio +0 ; -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc);/* link regulators to MMC adapters */ omap3evm_vmmc1_supply.dev = mmc[0 ].dev;
arch/arm/mach-omap2/board-omap3pandora.c +2 -2
@@ -192,7 +192,7 @@ static struct twl4030_keypad_data pandora_kp_data = { .rep = 1, }; -static struct twl4030_hsmmc_info omap3pandora_mmc[] = { +static struct omap2_hsmmc_info omap3pandora_mmc[] = { { .mmc =1 , .wires =4 ,
@@ -231,7 +231,7 @@ static int omap3pandora_twl_gpio_setup(struct device *dev,/* gpio + {0,1} is "mmc{0,1}_cd" (input/IRQ) */ omap3pandora_mmc[0 ].gpio_cd = gpio +0 ; omap3pandora_mmc[1 ].gpio_cd = gpio +1 ; -twl4030_mmc_init (omap3pandora_mmc); +omap2_hsmmc_init (omap3pandora_mmc);/* link regulators to MMC adapters */ pandora_vmmc1_supply.dev = omap3pandora_mmc[0 ].dev;
arch/arm/mach-omap2/board-omap3touchbook.c +2 -2
@@ -122,7 +122,7 @@ static struct platform_device omap3touchbook_nand_device = {#include "sdram-micron-mt46h32m32lf-6.h" -static struct twl4030_hsmmc_info mmc[] = { +static struct omap2_hsmmc_info mmc[] = { { .mmc =1 , .wires =8 ,
@@ -161,7 +161,7 @@ static int touchbook_twl_gpio_setup(struct device *dev, }/* gpio + 0 is "mmc0_cd" (input/IRQ) */ mmc[0 ].gpio_cd = gpio +0 ; -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc);/* link regulators to MMC adapters */ touchbook_vmmc1_supply.dev = mmc[0 ].dev;
arch/arm/mach-omap2/board-overo.c +2 -2
@@ -272,7 +272,7 @@ static void __init overo_flash_init(void) } } -static struct twl4030_hsmmc_info mmc[] = { +static struct omap2_hsmmc_info mmc[] = { { .mmc =1 , .wires =4 ,
@@ -297,7 +297,7 @@ static struct regulator_consumer_supply overo_vmmc1_supply = {static int overo_twl_gpio_setup (struct device *dev,unsigned gpio,unsigned ngpio) { -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc); overo_vmmc1_supply.dev = mmc[0 ].dev;
arch/arm/mach-omap2/board-rx51-peripherals.c +8 -10
@@ -209,7 +209,7 @@ static struct twl4030_madc_platform_data rx51_madc_data = { .irq_line = 1, }; -static struct twl4030_hsmmc_info mmc[] = { +static struct omap2_hsmmc_info mmc[]__initdata = { { .name ="external" , .mmc =1 ,
@@ -232,15 +232,18 @@ static struct twl4030_hsmmc_info mmc[] = { };static struct regulator_consumer_supply rx51_vmmc1_supply = { - .supply ="vmmc" , + .supply ="vmmc" , + .dev_name ="mmci-omap-hs.0" , };static struct regulator_consumer_supply rx51_vmmc2_supply = { - .supply ="vmmc" , + .supply ="vmmc" , + .dev_name ="mmci-omap-hs.1" , };static struct regulator_consumer_supply rx51_vsim_supply = { - .supply ="vmmc_aux" , + .supply ="vmmc_aux" , + .dev_name ="mmci-omap-hs.1" , };static struct regulator_init_data rx51_vaux1 = {
@@ -375,12 +378,6 @@ static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n)gpio_request (gpio +7 ,"speaker_en" );gpio_direction_output (gpio +7 ,1 ); -/* set up MMC adapters, linking their regulators to them */ -twl4030_mmc_init (mmc); - rx51_vmmc1_supply.dev = mmc[0 ].dev; - rx51_vmmc2_supply.dev = mmc[1 ].dev; - rx51_vsim_supply.dev = mmc[1 ].dev; -return 0 ; }
@@ -751,5 +748,6 @@ void __init rx51_peripherals_init(void)rx51_init_wl1251 ();spi_register_board_info (rx51_peripherals_spi_board_info,ARRAY_SIZE (rx51_peripherals_spi_board_info)); +omap2_hsmmc_init (mmc); }
arch/arm/mach-omap2/board-zoom-peripherals.c +2 -2
@@ -150,7 +150,7 @@ static struct regulator_init_data zoom_vsim = { .consumer_supplies = &zoom_vsim_supply, }; -static struct twl4030_hsmmc_info mmc[]__initdata = { +static struct omap2_hsmmc_info mmc[]__initdata = { { .name ="external" , .mmc =1 ,
@@ -175,7 +175,7 @@ static int zoom_twl_gpio_setup(struct device *dev, {/* gpio + 0 is "mmc0_cd" (input/IRQ) */ mmc[0 ].gpio_cd = gpio +0 ; -twl4030_mmc_init (mmc); +omap2_hsmmc_init (mmc);/* link regulators to MMC adapters ... we "know" the * regulators will be set up only *after* we return.
arch/arm/mach-omap2/hsmmc.c +12 -12
@@ -26,20 +26,20 @@ static u16 control_devconf1_offset;#define HSMMC_NAME_LEN 9 -static struct twl_mmc_controller { +static struct hsmmc_controller {char name[HSMMC_NAME_LEN +1 ]; } hsmmc[OMAP34XX_NR_MMC ];#if defined(CONFIG_ARCH_OMAP3 ) && defined(CONFIG_PM ) -static int twl4030_mmc_get_context_loss (struct device *dev) +static int hsmmc_get_context_loss (struct device *dev) {/* FIXME: PM DPS not implemented yet */ return 0 ; }#else -#define twl4030_mmc_get_context_loss NULL +#define hsmmc_get_context_loss NULL#endif static void hsmmc1_before_set_reg(struct device *dev, int slot,
@@ -135,9 +135,9 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot,static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC ]__initdata ; -void __init twl4030_mmc_init (struct twl4030_hsmmc_info *controllers) +void __init omap2_hsmmc_init (struct omap2_hsmmc_info *controllers) { -struct twl4030_hsmmc_info *c; +struct omap2_hsmmc_info *c;int nr_hsmmc =ARRAY_SIZE (hsmmc_data);int i;
@@ -150,7 +150,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) }for (c = controllers; c->mmc; c++) { -struct twl_mmc_controller *twl = hsmmc + c->mmc -1 ; +struct hsmmc_controller *hc = hsmmc + c->mmc -1 ;struct omap_mmc_platform_data *mmc = hsmmc_data[c->mmc -1 ];if (!c->mmc || c->mmc > nr_hsmmc) {
@@ -162,25 +162,25 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)continue ; } - mmc =kzalloc (sizeof (struct omap_mmc_platform_data ),GFP_KERNEL ); + mmc =kzalloc (sizeof (struct omap_mmc_platform_data ), +GFP_KERNEL );if (!mmc) {pr_err ("Cannot allocate memory for mmc device!\n" ); goto done; }if (c->name) -strncpy (twl->name, c->name,HSMMC_NAME_LEN ); +strncpy (hc->name, c->name,HSMMC_NAME_LEN );else -snprintf (twl->name,ARRAY_SIZE (twl->name), +snprintf (hc->name,ARRAY_SIZE (hc->name),"mmc%islot%i" , c->mmc,1 ); - mmc->slots[0 ].name = twl->name; + mmc->slots[0 ].name = hc->name; mmc->nr_slots =1 ; mmc->slots[0 ].wires = c->wires; mmc->slots[0 ].internal_clock = !c->ext_clock; mmc->dma_mask =0xffffffff ; - mmc->get_context_loss_count = - twl4030_mmc_get_context_loss; + mmc->get_context_loss_count = hsmmc_get_context_loss; mmc->slots[0 ].switch_pin = c->gpio_cd; mmc->slots[0 ].gpio_wp = c->gpio_wp;
arch/arm/mach-omap2/hsmmc.h +3 -3
@@ -6,7 +6,7 @@* published by the Free Software Foundation. */ -struct twl4030_hsmmc_info { +struct omap2_hsmmc_info {u8 mmc;/* controller 1/2/3 */ u8 wires;/* 1/4/8 wires */ bool transceiver;/* MMC-2 option */
@@ -23,11 +23,11 @@ struct twl4030_hsmmc_info {#if defined(CONFIG_MMC_OMAP_HS ) || defined(CONFIG_MMC_OMAP_HS_MODULE ) -void twl4030_mmc_init (struct twl4030_hsmmc_info *); +void omap2_hsmmc_init (struct omap2_hsmmc_info *);#else -static inline void twl4030_mmc_init (struct twl4030_hsmmc_info *info) +static inline void omap2_hsmmc_init (struct omap2_hsmmc_info *info) { }
Tony Lindgren
maintainerPATCH 4/19 omap: Reconnect hsmmc context loss count
In reply to Tony LindgrenFrom: Adrian Hunter <[email protected]>
Call the PM context-loss count function, now that there is a prototype for it.
--- arch/arm/mach-omap2/hsmmc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/hsmmc.c +2 -2
@@ -16,6 +16,7 @@#include <mach/hardware.h> #include <plat/control.h> #include <plat/mmc.h> +#include <plat/omap-pm.h> #include "hsmmc.h"
@@ -34,8 +35,7 @@ static struct hsmmc_controller {static int hsmmc_get_context_loss (struct device *dev) { -/* FIXME: PM DPS not implemented yet */ -return 0 ; +return omap_pm_get_dev_context_loss_count (dev); }#else
Tony Lindgren
maintainerPATCH 5/19 omap: RX51: Remux to pull eMMC lines down when powering off
In reply to Tony LindgrenFrom: Adrian Hunter <[email protected]>
It has been discovered that, when eMMC is powered off, current will flow from OMAP eMMC data pull-ups to the eMMC voltage supply. Configuring pads for OMAP off-mode does not help because eMMC is powered off independently of OMAP off-mode. Hence the pads are now re-configured when eMMC is powered on or off.
--- arch/arm/mach-omap2/board-rx51-peripherals.c | 43 +++++++++++++++++++++++++- arch/arm/mach-omap2/hsmmc.c | 8 +++++ arch/arm/mach-omap2/hsmmc.h | 2 + arch/arm/plat-omap/include/plat/mmc.h | 1 + 4 files changed, 53 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-rx51-peripherals.c +42 -1
@@ -209,6 +209,46 @@ static struct twl4030_madc_platform_data rx51_madc_data = { .irq_line = 1, }; +/* Enable input logic and pull all lines up when eMMC is on. */ +static struct omap_board_mux rx51_mmc2_on_mux[] = { +OMAP3_MUX (SDMMC2_CMD ,OMAP_PIN_INPUT_PULLUP |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT0 ,OMAP_PIN_INPUT_PULLUP |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT1 ,OMAP_PIN_INPUT_PULLUP |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT2 ,OMAP_PIN_INPUT_PULLUP |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT3 ,OMAP_PIN_INPUT_PULLUP |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT4 ,OMAP_PIN_INPUT_PULLUP |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT5 ,OMAP_PIN_INPUT_PULLUP |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT6 ,OMAP_PIN_INPUT_PULLUP |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT7 ,OMAP_PIN_INPUT_PULLUP |OMAP_MUX_MODE0 ), + { .reg_offset =OMAP_MUX_TERMINATOR }, +}; + +/* Disable input logic and pull all lines down when eMMC is off. */ +static struct omap_board_mux rx51_mmc2_off_mux[] = { +OMAP3_MUX (SDMMC2_CMD ,OMAP_PULL_ENA |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT0 ,OMAP_PULL_ENA |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT1 ,OMAP_PULL_ENA |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT2 ,OMAP_PULL_ENA |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT3 ,OMAP_PULL_ENA |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT4 ,OMAP_PULL_ENA |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT5 ,OMAP_PULL_ENA |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT6 ,OMAP_PULL_ENA |OMAP_MUX_MODE0 ), +OMAP3_MUX (SDMMC2_DAT7 ,OMAP_PULL_ENA |OMAP_MUX_MODE0 ), + { .reg_offset =OMAP_MUX_TERMINATOR }, +}; + +/* +* Current flows to eMMC when eMMC is off and the data lines are pulled up, +* so pull them down. N.B. we pull 8 lines because we are using 8 lines. +*/ +static void rx51_mmc2_remux (struct device *dev,int slot,int power_on) +{ +if (power_on) +omap_mux_write_array (rx51_mmc2_on_mux); +else +omap_mux_write_array (rx51_mmc2_off_mux); +} +static struct omap2_hsmmc_info mmc[]__initdata = { { .name ="external" ,
@@ -222,11 +262,12 @@ static struct omap2_hsmmc_info mmc[] __initdata = { { .name = "internal", .mmc = 2, - .wires = 8, + .wires = 8, /* See also rx51_mmc2_remux */ .gpio_cd = -EINVAL, .gpio_wp = -EINVAL, .nonremovable = true, .power_saving = true, + .remux = rx51_mmc2_remux, }, {}/* Terminator */ };
arch/arm/mach-omap2/hsmmc.c +8 -0
@@ -48,6 +48,9 @@ static void hsmmc1_before_set_reg(struct device *dev, int slot,u32 reg, prog_io;struct omap_mmc_platform_data *mmc = dev->platform_data; +if (mmc->slots[0 ].remux) + mmc->slots[0 ].remux (dev, slot, power_on); +/* * Assume we power both OMAP VMMC1 (for CMD, CLK, DAT0..3) and the * card with Vcc regulator (from twl4030 or whatever). OMAP has both
@@ -121,6 +124,9 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot, {struct omap_mmc_platform_data *mmc = dev->platform_data; +if (mmc->slots[0 ].remux) + mmc->slots[0 ].remux (dev, slot, power_on); +if (power_on) {/* Only MMC2 supports a CLKIN */ if (mmc->slots[0 ].internal_clock) {
@@ -185,6 +191,8 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) mmc->slots[0 ].switch_pin = c->gpio_cd; mmc->slots[0 ].gpio_wp = c->gpio_wp; + mmc->slots[0 ].remux = c->remux; +if (c->cover_only) mmc->slots[0 ].cover =1 ;
arch/arm/mach-omap2/hsmmc.h +2 -0
@@ -19,6 +19,8 @@ struct omap2_hsmmc_info {char *name;/* or NULL for default */ struct device *dev;/* returned: pointer to mmc adapter */ int ocr_mask;/* temporary HACK */ +/* Remux (pad configuation) when powering on/off */ +void (*remux)(struct device *dev,int slot,int power_on); };#if defined(CONFIG_MMC_OMAP_HS ) || defined(CONFIG_MMC_OMAP_HS_MODULE )
arch/arm/plat-omap/include/plat/mmc.h +1 -0
@@ -105,6 +105,7 @@ struct omap_mmc_platform_data {int (*get_ro)(struct device *dev,int slot);int (*set_sleep)(struct device *dev,int slot,int sleep,int vdd,int cardsleep); +void (*remux)(struct device *dev,int slot,int power_on);/* Call back before enabling / disabling regulators */ void (*before_set_reg)(struct device *dev,int slot,int power_on,int vdd);
Tony Lindgren
maintainerPATCH 6/19 omap_hsmmc: Allow for power saving without going off
In reply to Tony LindgrenFrom: Adrian Hunter <[email protected]>
An eMMC may be always powered on, so that the lowest power saving state possible is sleeping. Add a field to the platform data to indicate that.
--- arch/arm/mach-omap2/hsmmc.c | 3 +++ arch/arm/mach-omap2/hsmmc.h | 1 + arch/arm/plat-omap/include/plat/mmc.h | 3 +++ drivers/mmc/host/omap_hsmmc.c | 6 ++++++ 4 files changed, 13 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/hsmmc.c +3 -0
@@ -202,6 +202,9 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)if (c->power_saving) mmc->slots[0 ].power_saving =1 ; +if (c->no_off) + mmc->slots[0 ].no_off =1 ; +/* NOTE: MMC slots should have a Vcc regulator set up. * This may be from a TWL4030-family chip, another * controllable regulator, or a fixed supply.
arch/arm/mach-omap2/hsmmc.h +1 -0
@@ -14,6 +14,7 @@ struct omap2_hsmmc_info {bool cover_only;/* No card detect - just cover switch */ bool nonremovable;/* Nonremovable e.g. eMMC */ bool power_saving;/* Try to sleep or power off when possible */ +bool no_off;/* power_saving and power is not to go off */ int gpio_cd;/* or -EINVAL */ int gpio_wp;/* or -EINVAL */ char *name;/* or NULL for default */
arch/arm/plat-omap/include/plat/mmc.h +3 -0
@@ -96,6 +96,9 @@ struct omap_mmc_platform_data {/* Try to sleep or power off when possible */ unsigned power_saving:1; +/* If using power_saving and the MMC power is not to go off */ + unsigned no_off:1; +int switch_pin;/* gpio (card detect) */ int gpio_wp;/* gpio (write protect) */
drivers/mmc/host/omap_hsmmc.c +6 -0
@@ -1656,6 +1656,9 @@ static int omap_hsmmc_disabled_to_sleep(struct omap_hsmmc_host *host)dev_dbg (mmc_dev (host->mmc),"DISABLED -> %s\n" , host->dpm_state ==CARDSLEEP ?"CARDSLEEP" :"REGSLEEP" ); +if (mmc_slot (host).no_off) +return 0 ; + if ((host->mmc->caps & MMC_CAP_NONREMOVABLE) || mmc_slot(host).card_detect || (mmc_slot(host).get_cover_state &&
@@ -1671,6 +1674,9 @@ static int omap_hsmmc_sleep_to_off(struct omap_hsmmc_host *host)if (!mmc_try_claim_host (host->mmc))return 0 ; +if (mmc_slot (host).no_off) +return 0 ; + if (!((host->mmc->caps & MMC_CAP_NONREMOVABLE) || mmc_slot(host).card_detect || (mmc_slot(host).get_cover_state &&
Tony Lindgren
maintainerPATCH 7/19 omap_hsmmc: Fix disable timeouts
In reply to Tony LindgrenFrom: Adrian Hunter <[email protected]>
Disable timeouts are in msecs not jiffies.
--- drivers/mmc/host/omap_hsmmc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/omap_hsmmc.c +2 -2
@@ -1620,7 +1620,7 @@ static int omap_hsmmc_enabled_to_disabled(struct omap_hsmmc_host *host)if (host->power_mode ==MMC_POWER_OFF )return 0 ; -return msecs_to_jiffies (OMAP_MMC_SLEEP_TIMEOUT ); +return OMAP_MMC_SLEEP_TIMEOUT ; }/* Handler for [DISABLED -> REGSLEEP / CARDSLEEP] transition */
@@ -1663,7 +1663,7 @@ static int omap_hsmmc_disabled_to_sleep(struct omap_hsmmc_host *host)mmc_slot (host).card_detect || (mmc_slot (host).get_cover_state && mmc_slot(host).get_cover_state(host->dev, host->slot_id))) -return msecs_to_jiffies (OMAP_MMC_OFF_TIMEOUT ); + return OMAP_MMC_OFF_TIMEOUT;return 0 ; }
Tony Lindgren
maintainerPATCH 8/19 omap_hsmmc: Ensure regulator enable / disable are paired
In reply to Tony LindgrenFrom: Adrian Hunter <[email protected]>
Stop using 'regulator_is_enabled()' and just pair enables with disables so that the regulator reference counts can work correctly.
--- drivers/mmc/host/omap_hsmmc.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
drivers/mmc/host/omap_hsmmc.c +3 -6
@@ -296,11 +296,8 @@ static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on, ret =mmc_regulator_set_ocr (host->vcc,0 ); } }else { -if (host->vcc_aux) { - ret =regulator_is_enabled (host->vcc_aux); -if (ret >0 ) - ret =regulator_disable (host->vcc_aux); - } +if (host->vcc_aux) + ret =regulator_disable (host->vcc_aux);if (ret ==0 ) ret =mmc_regulator_set_ocr (host->vcc,0 ); }
@@ -1975,7 +1972,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) host->slot_id =0 ; host->mapbase = res->start; host->base =ioremap (host->mapbase,SZ_4K ); - host->power_mode =-1 ; + host->power_mode =MMC_POWER_OFF ;platform_set_drvdata (pdev, host);INIT_WORK (&host->mmc_carddetect_work, omap_hsmmc_detect);
Tony Lindgren
maintainerPATCH 9/19 omap_hsmmc: Allow for a shared VccQ
In reply to Tony LindgrenFrom: Adrian Hunter <[email protected]>
EMMC can have two voltage supplies, Vcc and VccQ which are implemented in the code as consumer supplies vmmc and vmmc_aux.
If the regulator that supplies vmmc_aux is shared with other consumers, then sending it to sleep will disrupt those consumers. However, the TWL4030-family regulators may have OFF remapped to SLEEP, in which case 'regulator_disable()' will put the regulator to sleep only when all consumers are disabled - which is the desired behaviour.
This patch adds a platform data field to allow that option.
--- arch/arm/mach-omap2/hsmmc.c | 3 +++ arch/arm/mach-omap2/hsmmc.h | 1 + arch/arm/plat-omap/include/plat/mmc.h | 3 +++ drivers/mmc/host/omap_hsmmc.c | 16 +++++++++++++++- 4 files changed, 22 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/hsmmc.c +3 -0
@@ -205,6 +205,9 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)if (c->no_off) mmc->slots[0 ].no_off =1 ; +if (c->vcc_aux_disable_is_sleep) + mmc->slots[0 ].vcc_aux_disable_is_sleep =1 ; +/* NOTE: MMC slots should have a Vcc regulator set up. * This may be from a TWL4030-family chip, another * controllable regulator, or a fixed supply.
arch/arm/mach-omap2/hsmmc.h +1 -0
@@ -15,6 +15,7 @@ struct omap2_hsmmc_info {bool nonremovable;/* Nonremovable e.g. eMMC */ bool power_saving;/* Try to sleep or power off when possible */ bool no_off;/* power_saving and power is not to go off */ +bool vcc_aux_disable_is_sleep;/* Regulator off remapped to sleep */ int gpio_cd;/* or -EINVAL */ int gpio_wp;/* or -EINVAL */ char *name;/* or NULL for default */
arch/arm/plat-omap/include/plat/mmc.h +3 -0
@@ -99,6 +99,9 @@ struct omap_mmc_platform_data {/* If using power_saving and the MMC power is not to go off */ unsigned no_off:1; +/* Regulator off remapped to sleep */ + unsigned vcc_aux_disable_is_sleep:1; +int switch_pin;/* gpio (card detect) */ int gpio_wp;/* gpio (write protect) */
drivers/mmc/host/omap_hsmmc.c +15 -1
@@ -347,7 +347,14 @@ static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep, err =regulator_set_mode (host->vcc, mode);if (err)return err; -return regulator_set_mode (host->vcc_aux, mode); + +if (!mmc_slot (host).vcc_aux_disable_is_sleep) +return regulator_set_mode (host->vcc_aux, mode); + +if (sleep) +return regulator_disable (host->vcc_aux); +else +return regulator_enable (host->vcc_aux); }static int omap_hsmmc_gpio_init (struct omap_mmc_platform_data *pdata)
@@ -1982,6 +1989,13 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)else mmc->ops = &omap_hsmmc_ops; +/* +* If regulator_disable can only put vcc_aux to sleep then there is +* no off state. +*/ +if (mmc_slot (host).vcc_aux_disable_is_sleep) +mmc_slot (host).no_off =1 ; + mmc->f_min =400000 ; mmc->f_max =52000000 ;
Tony Lindgren
maintainerPATCH 10/19 omap_hsmmc: allow compile without regulator framework
In reply to Tony LindgrenFrom: Adrian Hunter <[email protected]>
It is still possible to use the omap_hsmmc module without the regulator framework. Accordingly, ifdef out regulator-specific functions.
--- drivers/mmc/host/omap_hsmmc.c | 133 ++++++++++++++++++++++++----------------- 1 files changed, 79 insertions(+), 54 deletions(-)
drivers/mmc/host/omap_hsmmc.c +79 -54
@@ -236,6 +236,8 @@ static int omap_hsmmc_resume_cdirq(struct device *dev, int slot)#endif +#ifdef CONFIG_REGULATOR +static int omap_hsmmc_1_set_power (struct device *dev,int slot,int power_on,int vdd) {
@@ -357,59 +359,6 @@ static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep,return regulator_enable (host->vcc_aux); } -static int omap_hsmmc_gpio_init (struct omap_mmc_platform_data *pdata) -{ -int ret; - -if (gpio_is_valid (pdata->slots[0 ].switch_pin)) { - pdata->suspend = omap_hsmmc_suspend_cdirq; - pdata->resume = omap_hsmmc_resume_cdirq; -if (pdata->slots[0 ].cover) - pdata->slots[0 ].get_cover_state = - omap_hsmmc_get_cover_state; -else - pdata->slots[0 ].card_detect = omap_hsmmc_card_detect; - pdata->slots[0 ].card_detect_irq = -gpio_to_irq (pdata->slots[0 ].switch_pin); - ret =gpio_request (pdata->slots[0 ].switch_pin,"mmc_cd" ); -if (ret) -return ret; - ret =gpio_direction_input (pdata->slots[0 ].switch_pin); -if (ret) - goto err_free_sp; - }else - pdata->slots[0 ].switch_pin = -EINVAL ; - -if (gpio_is_valid (pdata->slots[0 ].gpio_wp)) { - pdata->slots[0 ].get_ro = omap_hsmmc_get_wp; - ret =gpio_request (pdata->slots[0 ].gpio_wp,"mmc_wp" ); -if (ret) - goto err_free_cd; - ret =gpio_direction_input (pdata->slots[0 ].gpio_wp); -if (ret) - goto err_free_wp; - }else - pdata->slots[0 ].gpio_wp = -EINVAL ; - -return 0 ; - -err_free_wp: -gpio_free (pdata->slots[0 ].gpio_wp); -err_free_cd: -if (gpio_is_valid (pdata->slots[0 ].switch_pin)) -err_free_sp: -gpio_free (pdata->slots[0 ].switch_pin); -return ret; -} - -static void omap_hsmmc_gpio_free (struct omap_mmc_platform_data *pdata) -{ -if (gpio_is_valid (pdata->slots[0 ].gpio_wp)) -gpio_free (pdata->slots[0 ].gpio_wp); -if (gpio_is_valid (pdata->slots[0 ].switch_pin)) -gpio_free (pdata->slots[0 ].switch_pin); -} -static int omap_hsmmc_reg_get (struct omap_hsmmc_host *host) {struct regulator *reg;
@@ -488,6 +437,82 @@ static void omap_hsmmc_reg_put(struct omap_hsmmc_host *host)mmc_slot (host).set_sleep =NULL ; } +static inline int omap_hsmmc_have_reg (void ) +{ +return 1 ; +} + +#else + +static inline int omap_hsmmc_reg_get (struct omap_hsmmc_host *host) +{ +return -EINVAL ; +} + +static inline void omap_hsmmc_reg_put (struct omap_hsmmc_host *host) +{ +} + +static inline int omap_hsmmc_have_reg (void ) +{ +return 0 ; +} + +#endif + +static int omap_hsmmc_gpio_init (struct omap_mmc_platform_data *pdata) +{ +int ret; + +if (gpio_is_valid (pdata->slots[0 ].switch_pin)) { + pdata->suspend = omap_hsmmc_suspend_cdirq; + pdata->resume = omap_hsmmc_resume_cdirq; +if (pdata->slots[0 ].cover) + pdata->slots[0 ].get_cover_state = + omap_hsmmc_get_cover_state; +else + pdata->slots[0 ].card_detect = omap_hsmmc_card_detect; + pdata->slots[0 ].card_detect_irq = +gpio_to_irq (pdata->slots[0 ].switch_pin); + ret =gpio_request (pdata->slots[0 ].switch_pin,"mmc_cd" ); +if (ret) +return ret; + ret =gpio_direction_input (pdata->slots[0 ].switch_pin); +if (ret) + goto err_free_sp; + }else + pdata->slots[0 ].switch_pin = -EINVAL ; + +if (gpio_is_valid (pdata->slots[0 ].gpio_wp)) { + pdata->slots[0 ].get_ro = omap_hsmmc_get_wp; + ret =gpio_request (pdata->slots[0 ].gpio_wp,"mmc_wp" ); +if (ret) + goto err_free_cd; + ret =gpio_direction_input (pdata->slots[0 ].gpio_wp); +if (ret) + goto err_free_wp; + }else + pdata->slots[0 ].gpio_wp = -EINVAL ; + +return 0 ; + +err_free_wp: +gpio_free (pdata->slots[0 ].gpio_wp); +err_free_cd: +if (gpio_is_valid (pdata->slots[0 ].switch_pin)) +err_free_sp: +gpio_free (pdata->slots[0 ].switch_pin); +return ret; +} + +static void omap_hsmmc_gpio_free (struct omap_mmc_platform_data *pdata) +{ +if (gpio_is_valid (pdata->slots[0 ].gpio_wp)) +gpio_free (pdata->slots[0 ].gpio_wp); +if (gpio_is_valid (pdata->slots[0 ].switch_pin)) +gpio_free (pdata->slots[0 ].switch_pin); +} +/* * Stop clock to the card */
@@ -2119,7 +2144,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) } } -if (!mmc_slot (host).set_power) { +if (omap_hsmmc_have_reg () && !mmc_slot (host).set_power) { ret =omap_hsmmc_reg_get (host);if (ret) goto err_reg;
Tony Lindgren
maintainerPATCH 11/19 omap3: Clean-up for omap_mux_init
In reply to Tony LindgrenGet rid of the ifdeffery in omap_mux_init by creating omap_mux_init_package and omap_mux_init_signals functions.
--- arch/arm/mach-omap2/mux.c | 46 +++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 12 deletions(-)
arch/arm/mach-omap2/mux.c +34 -12
@@ -985,6 +985,38 @@ static void __init omap_mux_init_list(struct omap_mux *superset) } } +#ifdef CONFIG_OMAP_MUX + +static void omap_mux_init_package (struct omap_mux *superset, +struct omap_mux *package_subset, +struct omap_ball *package_balls) +{ +if (package_subset) +omap_mux_package_fixup (package_subset, superset); +if (package_balls) +omap_mux_package_init_balls (package_balls, superset); +} + +static void omap_mux_init_signals (struct omap_board_mux *board_mux) +{ +omap_mux_set_cmdline_signals (); +omap_mux_write_array (board_mux); +} + +#else + +static void omap_mux_init_package (struct omap_mux *superset, +struct omap_mux *package_subset, +struct omap_ball *package_balls) +{ +} + +static void omap_mux_init_signals (struct omap_board_mux *board_mux) +{ +} + +#endif + int __init omap_mux_init(u32 mux_pbase, u32 mux_size, struct omap_mux *superset, struct omap_mux *package_subset,
@@ -1001,19 +1033,9 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size,return -ENODEV ; } -#ifdef CONFIG_OMAP_MUX -if (package_subset) -omap_mux_package_fixup (package_subset, superset); -if (package_balls) -omap_mux_package_init_balls (package_balls, superset); -#endif - +omap_mux_init_package (superset, package_subset, package_balls);omap_mux_init_list (superset); - -#ifdef CONFIG_OMAP_MUX -omap_mux_set_cmdline_signals (); -omap_mux_write_array (board_mux); -#endif +omap_mux_init_signals (board_mux);return 0 ; }
Tony Lindgren
maintainerPATCH 12/19 omap3: pm: Add T2 Keypad as a wakeup source
In reply to Tony LindgrenFrom: Lesly A M <[email protected]>
Changes for setting the padconf value for sys_nirq line which is connected to T2 INTR1. This will fix the T2 keypad wakeup.
--- arch/arm/mach-omap2/board-zoom-peripherals.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-zoom-peripherals.c +9 -0
@@ -24,6 +24,7 @@#include <plat/common.h> #include <plat/usb.h> +#include "mux.h" #include "hsmmc.h" /* Zoom2 has Qwerty keyboard*/
@@ -263,9 +264,17 @@ static int __init omap_i2c_init(void)return 0 ; } +static void enable_board_wakeup_source (void ) +{ +/* T2 interrupt line (keypad) */ +omap_mux_init_signal ("sys_nirq" , +OMAP_WAKEUP_EN |OMAP_PIN_INPUT_PULLUP ); +} +void __init zoom_peripherals_init (void ) {omap_i2c_init ();omap_serial_init ();usb_musb_init (); +enable_board_wakeup_source (); }
Tony Lindgren
maintainerPATCH 13/19 AM35xx: Introduce am35xx.h file
In reply to Tony LindgrenFrom: Vaibhav Hiremath <[email protected]>
Add base address definations for new AM35xx IPSS modules, like VPFE, USBOTG, CPGMAC.
Please note that the OMAP34xx IVA2 memory space is being used for AM35xx IPSS modules.
--- arch/arm/mach-omap2/board-am3517evm.c | 1 + arch/arm/mach-omap2/include/mach/am35xx.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap2/include/mach/am35xx.h
arch/arm/mach-omap2/board-am3517evm.c +1 -0
@@ -22,6 +22,7 @@#include <linux/gpio.h> #include <mach/hardware.h> +#include <mach/am35xx.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
arch/arm/mach-omap2/include/mach/am35xx.h new file +26 -0
@@ -0,0 +1,26 @@ +/*: +* Address mappings and base address for AM35XX specific interconnects +* and peripherals. +* +* Copyright (C) 2009 Texas Instruments +* +* Author: Sriramakrishnan <[email protected]> +* Vaibhav Hiremath <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ +#ifndef __ASM_ARCH_AM35XX_H +#define __ASM_ARCH_AM35XX_H + +/* +* Base addresses +* Note: OMAP3430 IVA2 memory space is being used for AM35xx IPSS modules +*/ +#define AM35XX_IPSS_EMAC_BASE 0x5C000000 +#define AM35XX_IPSS_USBOTGSS_BASE 0x5C040000 +#define AM35XX_IPSS_HECC_BASE 0x5C050000 +#define AM35XX_IPSS_VPFE_BASE 0x5C060000 + +#endif /* __ASM_ARCH_AM35XX_H */
Tony Lindgren
maintainerPATCH 14/19 AM35xx: Add AM35xx intr_clr & sw_rst cntrl reg bit definition
In reply to Tony LindgrenFrom: Vaibhav Hiremath <[email protected]>
AM3517/05 has few additional control module registers to control the new IP's, like VPFE, USBOTG, CPGMAC.
This patch adds the bit defination for INTR_CLR and SW_RST control register.
--- arch/arm/plat-omap/include/plat/control.h | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
arch/arm/plat-omap/include/plat/control.h +17 -0
@@ -274,6 +274,23 @@#define AM35XX_CPGMAC_FCLK_SHIFT 9#define AM35XX_VPFE_FCLK_SHIFT 10 +/*AM35XX CONTROL_LVL_INTR_CLEAR bits*/ +#define AM35XX_CPGMAC_C0_MISC_PULSE_CLR BIT(0) +#define AM35XX_CPGMAC_C0_RX_PULSE_CLR BIT(1) +#define AM35XX_CPGMAC_C0_RX_THRESH_CLR BIT(2) +#define AM35XX_CPGMAC_C0_TX_PULSE_CLR BIT(3) +#define AM35XX_USBOTGSS_INT_CLR BIT(4) +#define AM35XX_VPFE_CCDC_VD0_INT_CLR BIT(5) +#define AM35XX_VPFE_CCDC_VD1_INT_CLR BIT(6) +#define AM35XX_VPFE_CCDC_VD2_INT_CLR BIT(7) + +/*AM35XX CONTROL_IP_SW_RESET bits*/ +#define AM35XX_USBOTGSS_SW_RST BIT(0) +#define AM35XX_CPGMACSS_SW_RST BIT(1) +#define AM35XX_VPFE_VBUSP_SW_RST BIT(2) +#define AM35XX_HECC_SW_RST BIT(3) +#define AM35XX_VPFE_PCLK_SW_RST BIT(4) +/* * CONTROL OMAP STATUS register to identify OMAP3 features */
Tony Lindgren
maintainerPATCH 15/19 AM35xx: Update irq.h for AM35xx IPSS module interrupts
In reply to Tony LindgrenFrom: Vaibhav Hiremath <[email protected]>
--- arch/arm/plat-omap/include/plat/irqs.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/plat-omap/include/plat/irqs.h +10 -0
@@ -344,6 +344,16 @@#define INT_34XX_BENCH_MPU_EMUL 3 +#define INT_35XX_HECC0_IRQ 24 +#define INT_35XX_HECC1_IRQ 28 +#define INT_35XX_EMAC_C0_RXTHRESH_IRQ 67 +#define INT_35XX_EMAC_C0_RX_PULSE_IRQ 68 +#define INT_35XX_EMAC_C0_TX_PULSE_IRQ 69 +#define INT_35XX_EMAC_C0_MISC_PULSE_IRQ 70 +#define INT_35XX_USBOTG_IRQ 71 +#define INT_35XX_CCDC_VD0_IRQ 88 +#define INT_35XX_CCDC_VD1_IRQ 92 +#define INT_35XX_CCDC_VD2_IRQ 93#define IRQ_GIC_START 32#define INT_44XX_LOCALTIMER_IRQ 29
Tony Lindgren
maintainerPATCH 16/19 arm: omap: kill compile warning on board-4430-sdp.c
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
sdp4430_uart_config isn't used anywhere, so remove it.
--- arch/arm/mach-omap2/board-4430sdp.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/board-4430sdp.c +0 -4
@@ -38,10 +38,6 @@ static struct platform_device *sdp4430_devices[] __initdata = { &sdp4430_lcd_device, }; -static struct omap_uart_config sdp4430_uart_config__initdata = { - .enabled_uarts = (1 <<0 ) | (1 <<1 ) | (1 <<2 ) | (1 <<3 ), -}; -static struct omap_lcd_config sdp4430_lcd_config__initdata = { .ctrl_name ="internal" , };
Tony Lindgren
maintainerPATCH 17/19 OMAP4: IRQ: Add McPDM IRQ definition
In reply to Tony LindgrenFrom: Jorge Eduardo Candelaria <[email protected]>
Support for McPDM IRQs in OMAP4
--- arch/arm/plat-omap/include/plat/irqs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-omap/include/plat/irqs.h +1 -1
@@ -442,7 +442,7 @@#define INT_44XX_PARTHASH_IRQ (79 + IRQ_GIC_START)#define INT_44XX_MMC3_IRQ (94 + IRQ_GIC_START)#define INT_44XX_MMC4_IRQ (96 + IRQ_GIC_START) - +#define INT_44XX_MCPDM_IRQ (112 + IRQ_GIC_START)/* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730/850) and * 16 MPUIO lines */
Tony Lindgren
maintainerPATCH 18/19 ARM: OMAP4: Add McPDM base address
In reply to Tony LindgrenFrom: Jorge Eduardo Candelaria <[email protected]>
Define McPDM physical and L3 base address for OMAP4
--- arch/arm/plat-omap/include/plat/omap44xx.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/plat-omap/include/plat/omap44xx.h +2 -0
@@ -41,6 +41,8 @@#define OMAP44XX_SCU_BASE 0x48240000#define OMAP44XX_LOCAL_TWD_BASE 0x48240600#define OMAP44XX_WKUPGEN_BASE 0x48281000 +#define OMAP44XX_MCPDM_BASE 0x40132000 +#define OMAP44XX_MCPDM_L3_BASE 0x49032000#define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000)
Tony Lindgren
maintainerPATCH 19/19 OMAP4: MCPDM: Register McPDM platform device
In reply to Tony LindgrenFrom: Jorge Eduardo Candelaria <[email protected]>
Add platform device for McPDM interface in OMAP4 and register its memory and irq resources.
--- arch/arm/plat-omap/devices.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-)
arch/arm/plat-omap/devices.c +37 -0
@@ -28,6 +28,7 @@#include <plat/menelaus.h> #include <plat/mcbsp.h> #include <plat/dsp_common.h> +#include <plat/omap44xx.h> #if defined(CONFIG_OMAP_DSP ) || defined(CONFIG_OMAP_DSP_MODULE )
@@ -192,6 +193,41 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,/*-------------------------------------------------------------------------*/ +#if defined(CONFIG_SND_OMAP_SOC_MCPDM ) || \ + defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE ) + +static struct resource mcpdm_resources[] = { + { + .name ="mcpdm_mem" , + .start =OMAP44XX_MCPDM_BASE , + .end =OMAP44XX_MCPDM_BASE +SZ_4K , + .flags =IORESOURCE_MEM , + }, + { + .name ="mcpdm_irq" , + .start =INT_44XX_MCPDM_IRQ , + .end =INT_44XX_MCPDM_IRQ , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct platform_device omap_mcpdm_device = { + .name ="omap-mcpdm" , + .id =-1 , + .num_resources =ARRAY_SIZE (mcpdm_resources), + .resource = mcpdm_resources, +}; + +static void omap_init_mcpdm (void ) +{ + (void )platform_device_register (&omap_mcpdm_device); +} +#else +static inline void omap_init_mcpdm (void ) {} +#endif + +/*-------------------------------------------------------------------------*/ +#if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE ) || \ defined(CONFIG_MMC_OMAP_HS ) || defined(CONFIG_MMC_OMAP_HS_MODULE )
@@ -385,6 +421,7 @@ static int __init omap_init_devices(void)omap_init_dsp ();omap_init_kp ();omap_init_rng (); +omap_init_mcpdm ();omap_init_uwire ();omap_init_wdt ();return 0 ;