omap i2c init fix and trivial board changes for 2.6.34
Subsystems (4)
Tony Lindgren
maintainercover omap i2c init fix and trivial board changes for 2.6.34
Hi all,
Getting into fixes mode here. Still found few more trivial board related patches that should go into this merge window.
Regards,
Tony
---
Ajay Kumar Gupta (2):
AM35x: Add missing GPIO mux config for EHCI port
AM35x: Enable OMAP_MUX in defconfig
Jarkko Nikula (1):
omap: i2c: Fix muxing for command line enabled bus
Sriram (2):
AM3517 EVM: Enable I2C support
AM3517EVM : correct typo - tca6416 mispelt as tca6516
manjugk manjugk (1):
Zoom3: Defconfig update
arch/arm/configs/am3517_evm_defconfig | 43 +++++++++++++++++++++++++++++++-- arch/arm/configs/omap_zoom3_defconfig | 6 ++--- arch/arm/mach-omap1/i2c.c | 6 +---- arch/arm/mach-omap2/board-am3517evm.c | 15 +++++++----- arch/arm/mach-omap2/i2c.c | 6 +---- arch/arm/plat-omap/i2c.c | 10 ++++++-- arch/arm/plat-omap/include/plat/i2c.h | 5 ++-- 7 files changed, 65 insertions(+), 26 deletions(-)
Signature · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/6 omap: i2c: Fix muxing for command line enabled bus
From: Jarkko Nikula <[email protected]>
The commit b63128e81214cc2db2995d690438055c26d213a5 broke the pin muxing for I2C busses that are enabled from the kernel command line.
Fix this by defining the board registration function omap_register_i2c_bus in common platform code as it was before but keep the muxing in architecture dependent files.
--- arch/arm/mach-omap1/i2c.c | 6 +----- arch/arm/mach-omap2/i2c.c | 6 +----- arch/arm/plat-omap/i2c.c | 10 ++++++++-- arch/arm/plat-omap/include/plat/i2c.h | 5 ++--- 4 files changed, 12 insertions(+), 15 deletions(-)
arch/arm/mach-omap1/i2c.c +1 -5
@@ -23,9 +23,7 @@#include <plat/mux.h> #include <plat/cpu.h> -int __init omap_register_i2c_bus (int bus_id,u32 clkrate, -struct i2c_board_info const *info, -unsigned len) +void __init omap1_i2c_mux_pins (int bus_id) {if (cpu_is_omap7xx ()) {omap_cfg_reg (I2C_7XX_SDA );
@@ -34,6 +32,4 @@ int __init omap_register_i2c_bus(int bus_id, u32 clkrate,omap_cfg_reg (I2C_SDA );omap_cfg_reg (I2C_SCL ); } - -return omap_plat_register_i2c_bus (bus_id, clkrate, info, len); }
arch/arm/mach-omap2/i2c.c +1 -5
@@ -25,9 +25,7 @@#include "mux.h" -int __init omap_register_i2c_bus (int bus_id,u32 clkrate, -struct i2c_board_info const *info, -unsigned len) +void __init omap2_i2c_mux_pins (int bus_id) {if (cpu_is_omap24xx ()) { const int omap24xx_pins[][2] = {
@@ -51,6 +49,4 @@ int __init omap_register_i2c_bus(int bus_id, u32 clkrate,sprintf (mux_name,"i2c%i_sda.i2c%i_sda" , bus_id, bus_id);omap_mux_init_signal (mux_name,OMAP_PIN_INPUT ); } - -return omap_plat_register_i2c_bus (bus_id, clkrate, info, len); }
arch/arm/plat-omap/i2c.c +8 -2
@@ -28,6 +28,7 @@#include <linux/i2c.h> #include <mach/irqs.h> #include <plat/mux.h> +#include <plat/i2c.h> #define OMAP_I2C_SIZE 0x3f#define OMAP1_I2C_BASE 0xfffb3800
@@ -117,6 +118,11 @@ static int __init omap_i2c_add_bus(int bus_id) res[1 ].start = irq; } +if (cpu_class_is_omap1 ()) +omap1_i2c_mux_pins (bus_id); +if (cpu_class_is_omap2 ()) +omap2_i2c_mux_pins (bus_id); +return platform_device_register (pdev); }
@@ -169,7 +175,7 @@ out:subsys_initcall (omap_register_i2c_bus_cmdline);/** -* omap_plat_register_i2c_bus - register I2C bus with device descriptors +* omap_register_i2c_bus - register I2C bus with device descriptors * @bus_id: bus id counting from number 1 * @clkrate: clock rate of the bus in kHz * @info: pointer into I2C device descriptor table or NULL
@@ -177,7 +183,7 @@ subsys_initcall(omap_register_i2c_bus_cmdline);* * Returns 0 on success or an error code. */ -int __init omap_plat_register_i2c_bus (int bus_id,u32 clkrate, +int __init omap_register_i2c_bus (int bus_id,u32 clkrate,struct i2c_board_info const *info,unsigned len) {
arch/arm/plat-omap/include/plat/i2c.h +2 -3
@@ -34,6 +34,5 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate, }#endif -int omap_plat_register_i2c_bus (int bus_id,u32 clkrate, -struct i2c_board_info const *info, -unsigned len); +void __init omap1_i2c_mux_pins (int bus_id); +void __init omap2_i2c_mux_pins (int bus_id);
Tony Lindgren
maintainerPATCH 2/6 Zoom3: Defconfig update
In reply to Tony LindgrenFrom: manjugk manjugk <[email protected]>
Some of the features are not enabled by default in zoom3 defconfig.
This patch enables:
- MMC Resume
- TWL4030 RTC driver
- Debug File system
Build and boot tested on Zoom3 board.
--- arch/arm/configs/omap_zoom3_defconfig | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/configs/omap_zoom3_defconfig +3 -3
@@ -1136,7 +1136,7 @@ CONFIG_TWL4030_USB=y # CONFIG_NOP_USB_XCEIV is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_UNSAFE_RESUME=y # # MMC/SD/SDIO Card Drivers
@@ -1186,7 +1186,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_TWL4030 is not set +CONFIG_RTC_DRV_TWL4030=y # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8581 is not set
@@ -1416,7 +1416,7 @@ CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set
Tony Lindgren
maintainerPATCH 3/6 AM35x: Add missing GPIO mux config for EHCI port
In reply to Tony LindgrenFrom: Ajay Kumar Gupta <[email protected]>
Adding GPIO mux config used for PHY reset of EHCI port on base board. We get below failure message without this patch,
"hub 1-0:1.0: unable to enumerate USB device on port 1"
--- arch/arm/mach-omap2/board-am3517evm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-am3517evm.c +3 -0
@@ -301,6 +301,9 @@ static void __init am3517_evm_init(void) ARRAY_SIZE(am3517_evm_devices));omap_serial_init (); + +/* Configure GPIO for EHCI port */ +omap_mux_init_gpio (57 ,OMAP_PIN_OUTPUT );usb_ehci_init (&ehci_pdata);/* DSS */ am3517_evm_display_init ();
Tony Lindgren
maintainerPATCH 4/6 AM35x: Enable OMAP_MUX in defconfig
In reply to Tony LindgrenFrom: Ajay Kumar Gupta <[email protected]>
Enabling OMAP_MUX in defconfig as it is required for EHCI to work.
--- arch/arm/configs/am3517_evm_defconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/configs/am3517_evm_defconfig +1 -1
@@ -201,7 +201,7 @@ CONFIG_ARCH_OMAP3=y # CONFIG_OMAP_DEBUG_POWERDOMAIN is not set # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set CONFIG_OMAP_RESET_CLOCKS=y -# CONFIG_OMAP_MUX is not set +CONFIG_OMAP_MUX=y # CONFIG_OMAP_MCBSP is not set # CONFIG_OMAP_MBOX_FWK is not set # CONFIG_OMAP_MPU_TIMER is not set
Tony Lindgren
maintainerPATCH 5/6 AM3517 EVM: Enable I2C support
In reply to Tony LindgrenFrom: Sriram <[email protected]>
There are multiple devices connected to I2C bus on AM3517EVM (for instance audio codec, IO expander etc). Enable I2C support in the default kernel configuration for AM3517 EVM.
--- arch/arm/configs/am3517_evm_defconfig | 41 ++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-)
arch/arm/configs/am3517_evm_defconfig +40 -1
@@ -590,7 +590,46 @@ CONFIG_HW_RANDOM=y # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -# CONFIG_I2C is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set # CONFIG_SPI is not set #
Tony Lindgren
maintainerPATCH 6/6 AM3517EVM : correct typo - tca6416 mispelt as tca6516
In reply to Tony LindgrenFrom: Sriram <[email protected]>
Correct instances where tca6416 is misspelt as tca6516 in the board-am3517evm file.
--- arch/arm/mach-omap2/board-am3517evm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/board-am3517evm.c +6 -6
@@ -80,7 +80,7 @@ static void __init am3517_evm_rtc_init(void)static struct pca953x_platform_data am3517evm_gpio_expander_info_0 = { .gpio_base =OMAP_MAX_GPIO_LINES , }; -static struct i2c_board_info __initdata am3517evm_tca6516_info_0[] = { +static struct i2c_board_info __initdata am3517evm_tca6416_info_0[] = { {I2C_BOARD_INFO ("tca6416" ,0x21 ), .platform_data = &am3517evm_gpio_expander_info_0,
@@ -94,7 +94,7 @@ static struct pca953x_platform_data am3517evm_ui_gpio_expander_info_1 = {static struct pca953x_platform_data am3517evm_ui_gpio_expander_info_2 = { .gpio_base =OMAP_MAX_GPIO_LINES +32 , }; -static struct i2c_board_info __initdata am3517evm_ui_tca6516_info[] = { +static struct i2c_board_info __initdata am3517evm_ui_tca6416_info[] = { {I2C_BOARD_INFO ("tca6416" ,0x20 ), .platform_data = &am3517evm_ui_gpio_expander_info_1,
@@ -108,10 +108,10 @@ static struct i2c_board_info __initdata am3517evm_ui_tca6516_info[] = {static int __init am3517_evm_i2c_init (void ) {omap_register_i2c_bus (1 ,400 ,NULL ,0 ); -omap_register_i2c_bus (2 ,400 , am3517evm_tca6516_info_0, -ARRAY_SIZE (am3517evm_tca6516_info_0)); -omap_register_i2c_bus (3 ,400 , am3517evm_ui_tca6516_info, -ARRAY_SIZE (am3517evm_ui_tca6516_info)); +omap_register_i2c_bus (2 ,400 , am3517evm_tca6416_info_0, +ARRAY_SIZE (am3517evm_tca6416_info_0)); +omap_register_i2c_bus (3 ,400 , am3517evm_ui_tca6416_info, +ARRAY_SIZE (am3517evm_ui_tca6416_info));return 0 ; }
Tony Lindgren
maintainer[PATCH 7/6] omap2: Initialize Menelaus and MMC for N8X0
In reply to Tony LindgrenHere's one more to initialize the MMC on N8X0. That's handy for boot testing the multi-omap kernels on 24xx.
For some reason only one of the MMC slots seems to work on both N800 and N810 for some reason. No idea why, the Menelaus slot switching seems to be all there.
Regards,
Tony
From: Tony Lindgren <[email protected]>
Date: Fri, 26 Feb 2010 15:31:12 -0800
Subject: [PATCH] omap2: Initialize Menelaus and MMC for N8X0
Initialize MMC for N8X0
Based on an earlier patches from Nokia released kernel sources at:
http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/
arch/arm/mach-omap2/board-n8x0.c +445 -0
@@ -17,6 +17,7 @@#include <linux/init.h> #include <linux/io.h> #include <linux/stddef.h> +#include <linux/i2c.h> #include <linux/spi/spi.h> #include <linux/usb/musb.h>
@@ -25,11 +26,17 @@#include <plat/board.h> #include <plat/common.h> +#include <plat/menelaus.h> #include <mach/irqs.h> #include <plat/mcspi.h> #include <plat/onenand.h> +#include <plat/mmc.h> #include <plat/serial.h> +static int slot1_cover_open; +static int slot2_cover_open; +static struct device *mmc_device; +static struct omap2_mcspi_device_config p54spi_mcspi_config = { .turbo_mode =0 , .single_channel =1 ,
@@ -96,6 +103,442 @@ static void __init n8x0_onenand_init(void) {}#endif +#if defined(CONFIG_MENELAUS ) && \ + (defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE )) + +/* +* On both N800 and N810, only the first of the two MMC controllers is in use. +* The two MMC slots are multiplexed via Menelaus companion chip over I2C. +* On N800, both slots are powered via Menelaus. On N810, only one of the +* slots is powered via Menelaus. The N810 EMMC is powered via GPIO. +* +* VMMC slot 1 on both N800 and N810 +* VDCDC3_APE and VMCS2_APE slot 2 on N800 +* GPIO23 and GPIO9 slot 2 EMMC on N810 +* +*/ +#define N8X0_SLOT_SWITCH_GPIO 96 +#define N810_EMMC_VSD_GPIO 23 +#define NN810_EMMC_VIO_GPIO 9 + +static int n8x0_mmc_switch_slot (struct device *dev,int slot) +{ +#ifdef CONFIG_MMC_DEBUG +dev_dbg (dev,"Choose slot %d\n" , slot +1 ); +#endif +gpio_set_value (N8X0_SLOT_SWITCH_GPIO , slot); +return 0 ; +} + +static int n8x0_mmc_set_power_menelaus (struct device *dev,int slot, +int power_on,int vdd) +{ +int mV; + +#ifdef CONFIG_MMC_DEBUG +dev_dbg (dev,"Set slot %d power: %s (vdd %d)\n" , slot +1 , + power_on ?"on" :"off" , vdd); +#endif +if (slot ==0 ) { +if (!power_on) +return menelaus_set_vmmc (0 ); +switch (1 << vdd) { +case MMC_VDD_33_34 : +case MMC_VDD_32_33 : +case MMC_VDD_31_32 : + mV =3100 ; +break ; +case MMC_VDD_30_31 : + mV =3000 ; +break ; +case MMC_VDD_28_29 : + mV =2800 ; +break ; +case MMC_VDD_165_195 : + mV =1850 ; +break ; +default : +BUG (); + } +return menelaus_set_vmmc (mV); + }else { +if (!power_on) +return menelaus_set_vdcdc (3 ,0 ); +switch (1 << vdd) { +case MMC_VDD_33_34 : +case MMC_VDD_32_33 : + mV =3300 ; +break ; +case MMC_VDD_30_31 : +case MMC_VDD_29_30 : + mV =3000 ; +break ; +case MMC_VDD_28_29 : +case MMC_VDD_27_28 : + mV =2800 ; +break ; +case MMC_VDD_24_25 : +case MMC_VDD_23_24 : + mV =2400 ; +break ; +case MMC_VDD_22_23 : +case MMC_VDD_21_22 : + mV =2200 ; +break ; +case MMC_VDD_20_21 : + mV =2000 ; +break ; +case MMC_VDD_165_195 : + mV =1800 ; +break ; +default : +BUG (); + } +return menelaus_set_vdcdc (3 , mV); + } +return 0 ; +} + +static void n810_set_power_emmc (struct device *dev, +int power_on) +{ +dev_dbg (dev,"Set EMMC power %s\n" , power_on ?"on" :"off" ); + +if (power_on) { +gpio_set_value (N810_EMMC_VSD_GPIO ,1 ); +msleep (1 ); +gpio_set_value (NN810_EMMC_VIO_GPIO ,1 ); +msleep (1 ); + }else { +gpio_set_value (NN810_EMMC_VIO_GPIO ,0 ); +msleep (50 ); +gpio_set_value (N810_EMMC_VSD_GPIO ,0 ); +msleep (50 ); + } +} + +static int n8x0_mmc_set_power (struct device *dev,int slot,int power_on, +int vdd) +{ +if (machine_is_nokia_n800 () || slot ==0 ) +return n8x0_mmc_set_power_menelaus (dev, slot, power_on, vdd); + +n810_set_power_emmc (dev, power_on); + +return 0 ; +} + +static int n8x0_mmc_set_bus_mode (struct device *dev,int slot,int bus_mode) +{ +int r; + +dev_dbg (dev,"Set slot %d bus mode %s\n" , slot +1 , + bus_mode ==MMC_BUSMODE_OPENDRAIN ?"open-drain" :"push-pull" ); +BUG_ON (slot !=0 && slot !=1 ); + slot++; +switch (bus_mode) { +case MMC_BUSMODE_OPENDRAIN : + r =menelaus_set_mmc_opendrain (slot,1 ); +break ; +case MMC_BUSMODE_PUSHPULL : + r =menelaus_set_mmc_opendrain (slot,0 ); +break ; +default : +BUG (); + } +if (r !=0 &&printk_ratelimit ()) +dev_err (dev,"MMC: unable to set bus mode for slot %d\n" , + slot); +return r; +} + +static int n8x0_mmc_get_cover_state (struct device *dev,int slot) +{ + slot++; +BUG_ON (slot !=1 && slot !=2 ); +if (slot ==1 ) +return slot1_cover_open; +else +return slot2_cover_open; +} + +static void n8x0_mmc_callback (void *data,u8 card_mask) +{ +int bit, *openp, index; + +if (machine_is_nokia_n800 ()) { + bit =1 <<1 ; + openp = &slot2_cover_open; + index =1 ; + }else { + bit =1 ; + openp = &slot1_cover_open; + index =0 ; + } + +if (card_mask & bit) + *openp =1 ; +else + *openp =0 ; + +omap_mmc_notify_cover_event (mmc_device, index, *openp); +} + +void n8x0_mmc_slot1_cover_handler (void *arg,int closed_state) +{ +if (mmc_device ==NULL ) +return ; + + slot1_cover_open = !closed_state; +omap_mmc_notify_cover_event (mmc_device,0 , closed_state); +} + +static int n8x0_mmc_late_init (struct device *dev) +{ +int r, bit, *openp; +int vs2sel; + + mmc_device = dev; + + r =menelaus_set_slot_sel (1 ); +if (r <0 ) +return r; + +if (machine_is_nokia_n800 ()) + vs2sel =0 ; +else + vs2sel =2 ; + + r =menelaus_set_mmc_slot (2 ,0 , vs2sel,1 ); +if (r <0 ) +return r; + +n8x0_mmc_set_power (dev,0 ,MMC_POWER_ON ,16 );/* MMC_VDD_28_29 */ +n8x0_mmc_set_power (dev,1 ,MMC_POWER_ON ,16 ); + + r =menelaus_set_mmc_slot (1 ,1 ,0 ,1 ); +if (r <0 ) +return r; + r =menelaus_set_mmc_slot (2 ,1 , vs2sel,1 ); +if (r <0 ) +return r; + + r =menelaus_get_slot_pin_states (); +if (r <0 ) +return r; + +if (machine_is_nokia_n800 ()) { + bit =1 <<1 ; + openp = &slot2_cover_open; + }else { + bit =1 ; + openp = &slot1_cover_open; + slot2_cover_open =0 ; + } + +/* All slot pin bits seem to be inversed until first switch change */ +if (r ==0xf || r == (0xf & ~bit)) + r = ~r; + +if (r & bit) + *openp =1 ; +else + *openp =0 ; + + r =menelaus_register_mmc_callback (n8x0_mmc_callback,NULL ); + +return r; +} + +static void n8x0_mmc_shutdown (struct device *dev) +{ +int vs2sel; + +if (machine_is_nokia_n800 ()) + vs2sel =0 ; +else + vs2sel =2 ; + +menelaus_set_mmc_slot (1 ,0 ,0 ,0 ); +menelaus_set_mmc_slot (2 ,0 , vs2sel,0 ); +} + +static void n8x0_mmc_cleanup (struct device *dev) +{ +menelaus_unregister_mmc_callback (); + +gpio_free (N8X0_SLOT_SWITCH_GPIO ); + +if (machine_is_nokia_n810 ()) { +gpio_free (N810_EMMC_VSD_GPIO ); +gpio_free (NN810_EMMC_VIO_GPIO ); + } +} + +/* +* MMC controller1 has two slots that are multiplexed via I2C. +* MMC controller2 is not in use. +*/ +static struct omap_mmc_platform_data mmc1_data = { + .nr_slots =2 , + .switch_slot = n8x0_mmc_switch_slot, + .init = n8x0_mmc_late_init, + .cleanup = n8x0_mmc_cleanup, + .shutdown = n8x0_mmc_shutdown, + .max_freq =24000000 , + .dma_mask =0xffffffff , + .slots[0 ] = { + .wires =4 , + .set_power = n8x0_mmc_set_power, + .set_bus_mode = n8x0_mmc_set_bus_mode, + .get_cover_state = n8x0_mmc_get_cover_state, + .ocr_mask =MMC_VDD_165_195 |MMC_VDD_30_31 | +MMC_VDD_32_33 |MMC_VDD_33_34 , + .name ="internal" , + }, + .slots[1 ] = { + .set_power = n8x0_mmc_set_power, + .set_bus_mode = n8x0_mmc_set_bus_mode, + .get_cover_state = n8x0_mmc_get_cover_state, + .ocr_mask =MMC_VDD_165_195 |MMC_VDD_20_21 | +MMC_VDD_21_22 |MMC_VDD_22_23 | +MMC_VDD_23_24 |MMC_VDD_24_25 | +MMC_VDD_27_28 |MMC_VDD_28_29 | +MMC_VDD_29_30 |MMC_VDD_30_31 | +MMC_VDD_32_33 |MMC_VDD_33_34 , + .name ="external" , + }, +}; + +static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC ]; + +void __init n8x0_mmc_init (void ) + +{ +int err; + +if (machine_is_nokia_n810 ()) { + mmc1_data.slots[0 ].name ="external" ; + +/* +* Some Samsung Movinand chips do not like open-ended +* multi-block reads and fall to braind-dead state +* while doing so. Reducing the number of blocks in +* the transfer or delays in clock disable do not help +*/ + mmc1_data.slots[1 ].name ="internal" ; + mmc1_data.slots[1 ].ban_openended =1 ; + } + + err =gpio_request (N8X0_SLOT_SWITCH_GPIO ,"MMC slot switch" ); +if (err) +return err; + +gpio_direction_output (N8X0_SLOT_SWITCH_GPIO ,0 ); + +if (machine_is_nokia_n810 ()) { + err =gpio_request (N810_EMMC_VSD_GPIO ,"MMC slot 2 Vddf" ); +if (err) { +gpio_free (N8X0_SLOT_SWITCH_GPIO ); +return err; + } +gpio_direction_output (N810_EMMC_VSD_GPIO ,0 ); + + err =gpio_request (NN810_EMMC_VIO_GPIO ,"MMC slot 2 Vdd" ); +if (err) { +gpio_free (N8X0_SLOT_SWITCH_GPIO ); +gpio_free (N810_EMMC_VSD_GPIO ); +return err; + } +gpio_direction_output (NN810_EMMC_VIO_GPIO ,0 ); + } + + mmc_data[0 ] = &mmc1_data; +omap2_init_mmc (mmc_data,OMAP24XX_NR_MMC ); +} +#else + +void __init n8x0_mmc_init (void ) +{ +} + +void n8x0_mmc_slot1_cover_handler (void *arg,int state) +{ +} + +#endif /* CONFIG_MMC_OMAP */ + +#ifdef CONFIG_MENELAUS + +static int n8x0_auto_sleep_regulators (void ) +{ +u32 val; +int ret; + + val =EN_VPLL_SLEEP |EN_VMMC_SLEEP \ + |EN_VAUX_SLEEP |EN_VIO_SLEEP \ + |EN_VMEM_SLEEP |EN_DC3_SLEEP \ + |EN_VC_SLEEP |EN_DC2_SLEEP ; + + ret =menelaus_set_regulator_sleep (1 , val); +if (ret <0 ) { +printk (KERN_ERR "Could not set regulators to sleep on " +"menelaus: %u\n" , ret); +return ret; + } +return 0 ; +} + +static int n8x0_auto_voltage_scale (void ) +{ +int ret; + + ret =menelaus_set_vcore_hw (1400 ,1050 ); +if (ret <0 ) { +printk (KERN_ERR "Could not set VCORE voltage on " +"menelaus: %u\n" , ret); +return ret; + } +return 0 ; +} + +static int n8x0_menelaus_late_init (struct device *dev) +{ +int ret; + + ret =n8x0_auto_voltage_scale (); +if (ret <0 ) +return ret; + ret =n8x0_auto_sleep_regulators (); +if (ret <0 ) +return ret; +return 0 ; +} + +static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] = { + { +I2C_BOARD_INFO ("menelaus" ,0x72 ), + .irq =INT_24XX_SYS_NIRQ , + }, +}; + +static struct menelaus_platform_data n8x0_menelaus_platform_data = { + .late_init = n8x0_menelaus_late_init, +}; + +static void __init n8x0_menelaus_init (void ) +{ + n8x0_i2c_board_info_1[0 ].platform_data = &n8x0_menelaus_platform_data; +omap_register_i2c_bus (1 ,400 , n8x0_i2c_board_info_1, +ARRAY_SIZE (n8x0_i2c_board_info_1)); +} + +#else +static inline void __init n8x0_menelaus_init (void ) +{ +} +#endif +static void __init n8x0_map_io (void ) {omap2_set_globals_242x ();
@@ -116,7 +559,9 @@ static void __init n8x0_init_machine(void) ARRAY_SIZE(n800_spi_board_info));omap_serial_init (); +n8x0_menelaus_init ();n8x0_onenand_init (); +n8x0_mmc_init (); }MACHINE_START (NOKIA_N800 ,"Nokia N800" )