Skip to content

L
linux
Commit 829ae273 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'omap-for-linus' of... 

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (33 commits)
  OMAP3: PM: Boot message is not an error, and not helpful, remove it
  OMAP3: cpuidle: change the power domains modes determination logic
  OMAP3: cpuidle: code rework for improved readability
  OMAP3: cpuidle: re-organize the C-states data
  OMAP3: clean-up mach specific cpuidle data structures
  OMAP3 cpuidle: remove useless SDP specific timings
  usb: otg: OMAP4430: Powerdown the internal PHY when USB is disabled
  usb: otg: OMAP4430: Fixing the omap4430_phy_init function
  usb: musb: am35x: fix compile error when building am35x
  usb: musb: OMAP4430: Power down the PHY during board init
  omap: drop board-igep0030.c
  omap: igep0020: add support for IGEP3
  omap: igep0020: minor refactoring
  omap: igep0020: name refactoring for future merge with IGEP3
  omap: Remove support for omap2evm
  arm: omap2plus: GPIO cleanup
  omap: musb: introduce default board config
  omap: move detection of NAND CS to common-board-devices
  omap: use common initialization for PMIC i2c bus
  omap: consolidate touch screen initialization among different boards
  ...
parents 6ddb4518 9b28b11e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1110 additions and 3384 deletions
arch/arm/configs/omap2plus_defconfig
View file @ 829ae273
...@@ -21,58 +21,22 @@ CONFIG_MODVERSIONS=y ...@@ -21,58 +21,22 @@ CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_OMAP=y CONFIG_ARCH_OMAP=y
CONFIG_ARCH_OMAP2=y
CONFIG_ARCH_OMAP3=y
CONFIG_ARCH_OMAP4=y
CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_RESET_CLOCKS=y
CONFIG_OMAP_MUX_DEBUG=y CONFIG_OMAP_MUX_DEBUG=y
CONFIG_OMAP_32K_TIMER=y
CONFIG_MACH_OMAP_GENERIC=y
CONFIG_ARCH_OMAP2420=y
CONFIG_ARCH_OMAP2430=y
CONFIG_ARCH_OMAP3430=y
CONFIG_MACH_OMAP_H4=y
CONFIG_MACH_OMAP_APOLLON=y
CONFIG_MACH_OMAP_2430SDP=y
CONFIG_MACH_OMAP3_BEAGLE=y
CONFIG_MACH_DEVKIT8000=y
CONFIG_MACH_OMAP_LDP=y
CONFIG_MACH_OVERO=y
CONFIG_MACH_OMAP3EVM=y
CONFIG_MACH_OMAP3517EVM=y
CONFIG_MACH_OMAP3_PANDORA=y
CONFIG_MACH_OMAP3_TOUCHBOOK=y
CONFIG_MACH_OMAP_3430SDP=y
CONFIG_MACH_NOKIA_N8X0=y
CONFIG_MACH_NOKIA_RX51=y
CONFIG_MACH_OMAP_ZOOM2=y
CONFIG_MACH_OMAP_ZOOM3=y
CONFIG_MACH_CM_T35=y
CONFIG_MACH_IGEP0020=y
CONFIG_MACH_SBC3530=y
CONFIG_MACH_OMAP_3630SDP=y
CONFIG_MACH_OMAP_4430SDP=y
CONFIG_ARM_THUMBEE=y CONFIG_ARM_THUMBEE=y
CONFIG_ARM_L1_CACHE_SHIFT=5
CONFIG_ARM_ERRATA_411920=y CONFIG_ARM_ERRATA_411920=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_NR_CPUS=2 CONFIG_NR_CPUS=2
# CONFIG_LOCAL_TIMERS is not set
CONFIG_AEABI=y
CONFIG_LEDS=y CONFIG_LEDS=y
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_FPE_NWFPE=y CONFIG_FPE_NWFPE=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=y CONFIG_BINFMT_MISC=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y CONFIG_PM_DEBUG=y
CONFIG_PM_RUNTIME=y
CONFIG_NET=y CONFIG_NET=y
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_UNIX=y CONFIG_UNIX=y
...@@ -89,14 +53,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -89,14 +53,6 @@ CONFIG_IP_PNP_RARP=y
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_BT=m CONFIG_BT=m
CONFIG_BT_L2CAP=m
CONFIG_BT_SCO=m
CONFIG_BT_RFCOMM=y
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_BCSP=y
...@@ -107,11 +63,9 @@ CONFIG_CFG80211=m ...@@ -107,11 +63,9 @@ CONFIG_CFG80211=m
CONFIG_MAC80211=m CONFIG_MAC80211=m
CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_PID=y
CONFIG_MAC80211_RC_DEFAULT_PID=y CONFIG_MAC80211_RC_DEFAULT_PID=y
CONFIG_MAC80211_LEDS=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_CONNECTOR=y CONFIG_CONNECTOR=y
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_CONCAT=y
CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
...@@ -127,7 +81,6 @@ CONFIG_MTD_UBI=y ...@@ -127,7 +81,6 @@ CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_RAM_SIZE=16384
CONFIG_EEPROM_LEGACY=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_MULTI_LUN=y
...@@ -158,19 +111,15 @@ CONFIG_TOUCHSCREEN_ADS7846=y ...@@ -158,19 +111,15 @@ CONFIG_TOUCHSCREEN_ADS7846=y
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_TWL4030_PWRBUTTON=y CONFIG_INPUT_TWL4030_PWRBUTTON=y
CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_SERIAL_8250=y # CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_DETECT_IRQ=y
CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_RSA=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM=y
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y CONFIG_I2C_CHARDEV=y
CONFIG_I2C_OMAP=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_OMAP24XX=y CONFIG_SPI_OMAP24XX=y
CONFIG_DEBUG_GPIO=y CONFIG_DEBUG_GPIO=y
...@@ -181,10 +130,6 @@ CONFIG_POWER_SUPPLY=y ...@@ -181,10 +130,6 @@ CONFIG_POWER_SUPPLY=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_OMAP_WATCHDOG=y CONFIG_OMAP_WATCHDOG=y
CONFIG_TWL4030_WATCHDOG=y CONFIG_TWL4030_WATCHDOG=y
CONFIG_MENELAUS=y
CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_POWER=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_TPS65023=y CONFIG_REGULATOR_TPS65023=y
CONFIG_REGULATOR_TPS6507X=y CONFIG_REGULATOR_TPS6507X=y
...@@ -208,7 +153,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y ...@@ -208,7 +153,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_PLATFORM=y CONFIG_LCD_PLATFORM=y
CONFIG_DISPLAY_SUPPORT=y CONFIG_DISPLAY_SUPPORT=y
# CONFIG_VGA_CONSOLE is not set
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FONTS=y CONFIG_FONTS=y
...@@ -217,25 +161,20 @@ CONFIG_FONT_8x16=y ...@@ -217,25 +161,20 @@ CONFIG_FONT_8x16=y
CONFIG_LOGO=y CONFIG_LOGO=y
CONFIG_SOUND=m CONFIG_SOUND=m
CONFIG_SND=m CONFIG_SND=m
CONFIG_SND_MIXER_OSS=y CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS=m
CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_DEBUG=y CONFIG_SND_DEBUG=y
CONFIG_SND_USB_AUDIO=y CONFIG_SND_USB_AUDIO=m
CONFIG_SND_SOC=y CONFIG_SND_SOC=m
CONFIG_SND_OMAP_SOC=y CONFIG_SND_OMAP_SOC=m
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_DEBUG=y CONFIG_USB_DEBUG=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICEFS=y
CONFIG_USB_SUSPEND=y CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG_WHITELIST is not set
CONFIG_USB_MON=y CONFIG_USB_MON=y
# CONFIG_USB_MUSB_HDRC is not set
# CONFIG_USB_MUSB_OTG is not set
# CONFIG_USB_GADGET_MUSB_HDRC is not set
CONFIG_USB_MUSB_DEBUG=y
CONFIG_USB_WDM=y CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_LIBUSUAL=y CONFIG_USB_LIBUSUAL=y
...@@ -250,18 +189,12 @@ CONFIG_MMC_UNSAFE_RESUME=y ...@@ -250,18 +189,12 @@ CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_SDIO_UART=y CONFIG_SDIO_UART=y
CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP=y
CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP_HS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_TWL92330=y CONFIG_RTC_DRV_TWL92330=y
CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_DRV_TWL4030=y
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT3_FS_XATTR is not set
CONFIG_INOTIFY=y
CONFIG_QUOTA=y CONFIG_QUOTA=y
CONFIG_QFMT_V2=y CONFIG_QFMT_V2=y
CONFIG_MSDOS_FS=y CONFIG_MSDOS_FS=y
...@@ -285,12 +218,10 @@ CONFIG_NLS_CODEPAGE_437=y ...@@ -285,12 +218,10 @@ CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_1=y
CONFIG_PRINTK_TIME=y CONFIG_PRINTK_TIME=y
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
CONFIG_SCHEDSTATS=y CONFIG_SCHEDSTATS=y
CONFIG_TIMER_STATS=y CONFIG_TIMER_STATS=y
CONFIG_PROVE_LOCKING=y CONFIG_PROVE_LOCKING=y
# CONFIG_LOCK_STAT is not set
CONFIG_DEBUG_SPINLOCK_SLEEP=y CONFIG_DEBUG_SPINLOCK_SLEEP=y
# CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_BUGVERBOSE is not set
CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO=y
......
arch/arm/mach-omap2/Kconfig
View file @ 829ae273
...@@ -288,6 +288,7 @@ config MACH_IGEP0030 ...@@ -288,6 +288,7 @@ config MACH_IGEP0030
depends on ARCH_OMAP3 depends on ARCH_OMAP3
default y default y
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
select MACH_IGEP0020
config MACH_SBC3530 config MACH_SBC3530
bool "OMAP3 SBC STALKER board" bool "OMAP3 SBC STALKER board"
......
arch/arm/mach-omap2/Makefile
View file @ 829ae273
...@@ -229,8 +229,6 @@ obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ ...@@ -229,8 +229,6 @@ obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
obj-$(CONFIG_MACH_CM_T3517) += board-cm-t3517.o obj-$(CONFIG_MACH_CM_T3517) += board-cm-t3517.o
obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \ obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \
hsmmc.o hsmmc.o
obj-$(CONFIG_MACH_IGEP0030) += board-igep0030.o \
hsmmc.o
obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \ obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \
hsmmc.o hsmmc.o
obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \ obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \
...@@ -270,3 +268,5 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o ...@@ -270,3 +268,5 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o
disp-$(CONFIG_OMAP2_DSS) := display.o disp-$(CONFIG_OMAP2_DSS) := display.o
obj-y += $(disp-m) $(disp-y) obj-y += $(disp-m) $(disp-y)
obj-y += common-board-devices.o
arch/arm/mach-omap2/board-2430sdp.c
View file @ 829ae273
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "mux.h" #include "mux.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "common-board-devices.h"
#define SDP2430_CS0_BASE 0x04000000 #define SDP2430_CS0_BASE 0x04000000
#define SECONDARY_LCD_GPIO 147 #define SECONDARY_LCD_GPIO 147
...@@ -180,15 +181,6 @@ static struct twl4030_platform_data sdp2430_twldata = { ...@@ -180,15 +181,6 @@ static struct twl4030_platform_data sdp2430_twldata = {
.vmmc1 = &sdp2430_vmmc1, .vmmc1 = &sdp2430_vmmc1,
}; };
static struct i2c_board_info __initdata sdp2430_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl4030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_24XX_SYS_NIRQ,
.platform_data = &sdp2430_twldata,
},
};
static struct i2c_board_info __initdata sdp2430_i2c1_boardinfo[] = { static struct i2c_board_info __initdata sdp2430_i2c1_boardinfo[] = {
{ {
I2C_BOARD_INFO("isp1301_omap", 0x2D), I2C_BOARD_INFO("isp1301_omap", 0x2D),
...@@ -201,8 +193,7 @@ static int __init omap2430_i2c_init(void) ...@@ -201,8 +193,7 @@ static int __init omap2430_i2c_init(void)
{ {
omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo, omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,
ARRAY_SIZE(sdp2430_i2c1_boardinfo)); ARRAY_SIZE(sdp2430_i2c1_boardinfo));
omap_register_i2c_bus(2, 2600, sdp2430_i2c_boardinfo, omap2_pmic_init("twl4030", &sdp2430_twldata);
ARRAY_SIZE(sdp2430_i2c_boardinfo));
return 0; return 0;
} }
...@@ -217,11 +208,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { ...@@ -217,11 +208,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
{} /* Terminator */ {} /* Terminator */
}; };
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static struct omap_usb_config sdp2430_usb_config __initdata = { static struct omap_usb_config sdp2430_usb_config __initdata = {
.otg = 1, .otg = 1,
#ifdef CONFIG_USB_GADGET_OMAP #ifdef CONFIG_USB_GADGET_OMAP
...@@ -240,8 +226,6 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -240,8 +226,6 @@ static struct omap_board_mux board_mux[] __initdata = {
static void __init omap_2430sdp_init(void) static void __init omap_2430sdp_init(void)
{ {
int ret;
omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC); omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);
omap_board_config = sdp2430_config; omap_board_config = sdp2430_config;
...@@ -255,14 +239,13 @@ static void __init omap_2430sdp_init(void) ...@@ -255,14 +239,13 @@ static void __init omap_2430sdp_init(void)
omap2_usbfs_init(&sdp2430_usb_config); omap2_usbfs_init(&sdp2430_usb_config);
omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP); omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);
usb_musb_init(&musb_board_data); usb_musb_init(NULL);
board_smc91x_init(); board_smc91x_init();
/* Turn off secondary LCD backlight */ /* Turn off secondary LCD backlight */
ret = gpio_request(SECONDARY_LCD_GPIO, "Secondary LCD backlight"); gpio_request_one(SECONDARY_LCD_GPIO, GPIOF_OUT_INIT_LOW,
if (ret == 0) "Secondary LCD backlight");
gpio_direction_output(SECONDARY_LCD_GPIO, 0);
} }
static void __init omap_2430sdp_map_io(void) static void __init omap_2430sdp_map_io(void)
......
arch/arm/mach-omap2/board-3430sdp.c
View file @ 829ae273
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/matrix_keypad.h> #include <linux/input/matrix_keypad.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/i2c/twl.h> #include <linux/i2c/twl.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -48,6 +47,7 @@ ...@@ -48,6 +47,7 @@
#include "hsmmc.h" #include "hsmmc.h"
#include "pm.h" #include "pm.h"
#include "control.h" #include "control.h"
#include "common-board-devices.h"
#define CONFIG_DISABLE_HFCLK 1 #define CONFIG_DISABLE_HFCLK 1
...@@ -59,24 +59,6 @@ ...@@ -59,24 +59,6 @@
#define TWL4030_MSECURE_GPIO 22 #define TWL4030_MSECURE_GPIO 22
/* FIXME: These values need to be updated based on more profiling on 3430sdp*/
static struct cpuidle_params omap3_cpuidle_params_table[] = {
/* C1 */
{1, 2, 2, 5},
/* C2 */
{1, 10, 10, 30},
/* C3 */
{1, 50, 50, 300},
/* C4 */
{1, 1500, 1800, 4000},
/* C5 */
{1, 2500, 7500, 12000},
/* C6 */
{1, 3000, 8500, 15000},
/* C7 */
{1, 10000, 30000, 300000},
};
static uint32_t board_keymap[] = { static uint32_t board_keymap[] = {
KEY(0, 0, KEY_LEFT), KEY(0, 0, KEY_LEFT),
KEY(0, 1, KEY_RIGHT), KEY(0, 1, KEY_RIGHT),
...@@ -123,63 +105,14 @@ static struct twl4030_keypad_data sdp3430_kp_data = { ...@@ -123,63 +105,14 @@ static struct twl4030_keypad_data sdp3430_kp_data = {
.rep = 1, .rep = 1,
}; };
static int ts_gpio; /* Needed for ads7846_get_pendown_state */
/**
* @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq
*
* @return - void. If request gpio fails then Flag KERN_ERR.
*/
static void ads7846_dev_init(void)
{
if (gpio_request(ts_gpio, "ADS7846 pendown") < 0) {
printk(KERN_ERR "can't get ads746 pen down GPIO\n");
return;
}
gpio_direction_input(ts_gpio);
gpio_set_debounce(ts_gpio, 310);
}
static int ads7846_get_pendown_state(void)
{
return !gpio_get_value(ts_gpio);
}
static struct ads7846_platform_data tsc2046_config __initdata = {
.get_pendown_state = ads7846_get_pendown_state,
.keep_vref_on = 1,
.wakeup = true,
};
static struct omap2_mcspi_device_config tsc2046_mcspi_config = {
.turbo_mode = 0,
.single_channel = 1, /* 0: slave, 1: master */
};
static struct spi_board_info sdp3430_spi_board_info[] __initdata = {
[0] = {
/*
* TSC2046 operates at a max freqency of 2MHz, so
* operate slightly below at 1.5MHz
*/
.modalias = "ads7846",
.bus_num = 1,
.chip_select = 0,
.max_speed_hz = 1500000,
.controller_data = &tsc2046_mcspi_config,
.irq = 0,
.platform_data = &tsc2046_config,
},
};
#define SDP3430_LCD_PANEL_BACKLIGHT_GPIO 8 #define SDP3430_LCD_PANEL_BACKLIGHT_GPIO 8
#define SDP3430_LCD_PANEL_ENABLE_GPIO 5 #define SDP3430_LCD_PANEL_ENABLE_GPIO 5
static unsigned backlight_gpio; static struct gpio sdp3430_dss_gpios[] __initdata = {
static unsigned enable_gpio; {SDP3430_LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW, "LCD reset" },
{SDP3430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD Backlight"},
};
static int lcd_enabled; static int lcd_enabled;
static int dvi_enabled; static int dvi_enabled;
...@@ -187,29 +120,11 @@ static void __init sdp3430_display_init(void) ...@@ -187,29 +120,11 @@ static void __init sdp3430_display_init(void)
{ {
int r; int r;
enable_gpio = SDP3430_LCD_PANEL_ENABLE_GPIO; r = gpio_request_array(sdp3430_dss_gpios,
backlight_gpio = SDP3430_LCD_PANEL_BACKLIGHT_GPIO; ARRAY_SIZE(sdp3430_dss_gpios));
if (r)
printk(KERN_ERR "failed to get LCD control GPIOs\n");
r = gpio_request(enable_gpio, "LCD reset");
if (r) {
printk(KERN_ERR "failed to get LCD reset GPIO\n");
goto err0;
}
r = gpio_request(backlight_gpio, "LCD Backlight");
if (r) {
printk(KERN_ERR "failed to get LCD backlight GPIO\n");
goto err1;
}
gpio_direction_output(enable_gpio, 0);
gpio_direction_output(backlight_gpio, 0);
return;
err1:
gpio_free(enable_gpio);
err0:
return;
} }
static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev) static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev)
...@@ -219,8 +134,8 @@ static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev) ...@@ -219,8 +134,8 @@ static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev)
return -EINVAL; return -EINVAL;
} }
gpio_direction_output(enable_gpio, 1); gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 1);
gpio_direction_output(backlight_gpio, 1); gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 1);
lcd_enabled = 1; lcd_enabled = 1;
...@@ -231,8 +146,8 @@ static void sdp3430_panel_disable_lcd(struct omap_dss_device *dssdev) ...@@ -231,8 +146,8 @@ static void sdp3430_panel_disable_lcd(struct omap_dss_device *dssdev)
{ {
lcd_enabled = 0; lcd_enabled = 0;
gpio_direction_output(enable_gpio, 0); gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 0);
gpio_direction_output(backlight_gpio, 0); gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 0);
} }
static int sdp3430_panel_enable_dvi(struct omap_dss_device *dssdev) static int sdp3430_panel_enable_dvi(struct omap_dss_device *dssdev)
...@@ -360,12 +275,10 @@ static int sdp3430_twl_gpio_setup(struct device *dev, ...@@ -360,12 +275,10 @@ static int sdp3430_twl_gpio_setup(struct device *dev,
omap2_hsmmc_init(mmc); omap2_hsmmc_init(mmc);
/* gpio + 7 is "sub_lcd_en_bkl" (output/PWM1) */ /* gpio + 7 is "sub_lcd_en_bkl" (output/PWM1) */
gpio_request(gpio + 7, "sub_lcd_en_bkl"); gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "sub_lcd_en_bkl");
gpio_direction_output(gpio + 7, 0);
/* gpio + 15 is "sub_lcd_nRST" (output) */ /* gpio + 15 is "sub_lcd_nRST" (output) */
gpio_request(gpio + 15, "sub_lcd_nRST"); gpio_request_one(gpio + 15, GPIOF_OUT_INIT_LOW, "sub_lcd_nRST");
gpio_direction_output(gpio + 15, 0);
return 0; return 0;
} }
...@@ -580,20 +493,10 @@ static struct twl4030_platform_data sdp3430_twldata = { ...@@ -580,20 +493,10 @@ static struct twl4030_platform_data sdp3430_twldata = {
.vpll2 = &sdp3430_vpll2, .vpll2 = &sdp3430_vpll2,
}; };
static struct i2c_board_info __initdata sdp3430_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl4030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &sdp3430_twldata,
},
};
static int __init omap3430_i2c_init(void) static int __init omap3430_i2c_init(void)
{ {
/* i2c1 for PMIC only */ /* i2c1 for PMIC only */
omap_register_i2c_bus(1, 2600, sdp3430_i2c_boardinfo, omap3_pmic_init("twl4030", &sdp3430_twldata);
ARRAY_SIZE(sdp3430_i2c_boardinfo));
/* i2c2 on camera connector (for sensor control) and optional isp1301 */ /* i2c2 on camera connector (for sensor control) and optional isp1301 */
omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(2, 400, NULL, 0);
/* i2c3 on display connector (for DVI, tfp410) */ /* i2c3 on display connector (for DVI, tfp410) */
...@@ -872,30 +775,22 @@ static struct flash_partitions sdp_flash_partitions[] = { ...@@ -872,30 +775,22 @@ static struct flash_partitions sdp_flash_partitions[] = {
}, },
}; };
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static void __init omap_3430sdp_init(void) static void __init omap_3430sdp_init(void)
{ {
int gpio_pendown;
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap_board_config = sdp3430_config; omap_board_config = sdp3430_config;
omap_board_config_size = ARRAY_SIZE(sdp3430_config); omap_board_config_size = ARRAY_SIZE(sdp3430_config);
omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
omap3430_i2c_init(); omap3430_i2c_init();
omap_display_init(&sdp3430_dss_data); omap_display_init(&sdp3430_dss_data);
if (omap_rev() > OMAP3430_REV_ES1_0) if (omap_rev() > OMAP3430_REV_ES1_0)
ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2; gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV2;
else else
ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV1; gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;
sdp3430_spi_board_info[0].irq = gpio_to_irq(ts_gpio); omap_ads7846_init(1, gpio_pendown, 310, NULL);
spi_register_board_info(sdp3430_spi_board_info,
ARRAY_SIZE(sdp3430_spi_board_info));
ads7846_dev_init();
board_serial_init(); board_serial_init();
usb_musb_init(&musb_board_data); usb_musb_init(NULL);
board_smc91x_init(); board_smc91x_init();
board_flash_init(sdp_flash_partitions, chip_sel_3430, 0); board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);
sdp3430_display_init(); sdp3430_display_init();
......
arch/arm/mach-omap2/board-4430sdp.c
View file @ 829ae273
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "hsmmc.h" #include "hsmmc.h"
#include "timer-gp.h" #include "timer-gp.h"
#include "control.h" #include "control.h"
#include "common-board-devices.h"
#define ETH_KS8851_IRQ 34 #define ETH_KS8851_IRQ 34
#define ETH_KS8851_POWER_ON 48 #define ETH_KS8851_POWER_ON 48
...@@ -251,58 +252,22 @@ static struct spi_board_info sdp4430_spi_board_info[] __initdata = { ...@@ -251,58 +252,22 @@ static struct spi_board_info sdp4430_spi_board_info[] __initdata = {
}, },
}; };
static struct gpio sdp4430_eth_gpios[] __initdata = {
{ ETH_KS8851_POWER_ON, GPIOF_OUT_INIT_HIGH, "eth_power" },
{ ETH_KS8851_QUART, GPIOF_OUT_INIT_HIGH, "quart" },
{ ETH_KS8851_IRQ, GPIOF_IN, "eth_irq" },
};
static int omap_ethernet_init(void) static int omap_ethernet_init(void)
{ {
int status; int status;
/* Request of GPIO lines */ /* Request of GPIO lines */
status = gpio_request_array(sdp4430_eth_gpios,
ARRAY_SIZE(sdp4430_eth_gpios));
if (status)
pr_err("Cannot request ETH GPIOs\n");
status = gpio_request(ETH_KS8851_POWER_ON, "eth_power");
if (status) {
pr_err("Cannot request GPIO %d\n", ETH_KS8851_POWER_ON);
return status;
}
status = gpio_request(ETH_KS8851_QUART, "quart");
if (status) {
pr_err("Cannot request GPIO %d\n", ETH_KS8851_QUART);
goto error1;
}
status = gpio_request(ETH_KS8851_IRQ, "eth_irq");
if (status) {
pr_err("Cannot request GPIO %d\n", ETH_KS8851_IRQ);
goto error2;
}
/* Configuration of requested GPIO lines */
status = gpio_direction_output(ETH_KS8851_POWER_ON, 1);
if (status) {
pr_err("Cannot set output GPIO %d\n", ETH_KS8851_IRQ);
goto error3;
}
status = gpio_direction_output(ETH_KS8851_QUART, 1);
if (status) {
pr_err("Cannot set output GPIO %d\n", ETH_KS8851_QUART);
goto error3;
}
status = gpio_direction_input(ETH_KS8851_IRQ);
if (status) {
pr_err("Cannot set input GPIO %d\n", ETH_KS8851_IRQ);
goto error3;
}
return 0;
error3:
gpio_free(ETH_KS8851_IRQ);
error2:
gpio_free(ETH_KS8851_QUART);
error1:
gpio_free(ETH_KS8851_POWER_ON);
return status; return status;
} }
...@@ -575,14 +540,6 @@ static struct twl4030_platform_data sdp4430_twldata = { ...@@ -575,14 +540,6 @@ static struct twl4030_platform_data sdp4430_twldata = {
.usb = &omap4_usbphy_data .usb = &omap4_usbphy_data
}; };
static struct i2c_board_info __initdata sdp4430_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl6030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = OMAP44XX_IRQ_SYS_1N,
.platform_data = &sdp4430_twldata,
},
};
static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = { static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = {
{ {
I2C_BOARD_INFO("tmp105", 0x48), I2C_BOARD_INFO("tmp105", 0x48),
...@@ -598,12 +555,7 @@ static struct i2c_board_info __initdata sdp4430_i2c_4_boardinfo[] = { ...@@ -598,12 +555,7 @@ static struct i2c_board_info __initdata sdp4430_i2c_4_boardinfo[] = {
}; };
static int __init omap4_i2c_init(void) static int __init omap4_i2c_init(void)
{ {
/* omap4_pmic_init("twl6030", &sdp4430_twldata);
* Phoenix Audio IC needs I2C1 to
* start with 400 KHz or less
*/
omap_register_i2c_bus(1, 400, sdp4430_i2c_boardinfo,
ARRAY_SIZE(sdp4430_i2c_boardinfo));
omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(2, 400, NULL, 0);
omap_register_i2c_bus(3, 400, sdp4430_i2c_3_boardinfo, omap_register_i2c_bus(3, 400, sdp4430_i2c_3_boardinfo,
ARRAY_SIZE(sdp4430_i2c_3_boardinfo)); ARRAY_SIZE(sdp4430_i2c_3_boardinfo));
...@@ -616,19 +568,11 @@ static void __init omap_sfh7741prox_init(void) ...@@ -616,19 +568,11 @@ static void __init omap_sfh7741prox_init(void)
{ {
int error; int error;
error = gpio_request(OMAP4_SFH7741_ENABLE_GPIO, "sfh7741"); error = gpio_request_one(OMAP4_SFH7741_ENABLE_GPIO,
if (error < 0) { GPIOF_OUT_INIT_LOW, "sfh7741");
if (error < 0)
pr_err("%s:failed to request GPIO %d, error %d\n", pr_err("%s:failed to request GPIO %d, error %d\n",
__func__, OMAP4_SFH7741_ENABLE_GPIO, error); __func__, OMAP4_SFH7741_ENABLE_GPIO, error);
return;
}
error = gpio_direction_output(OMAP4_SFH7741_ENABLE_GPIO , 0);
if (error < 0) {
pr_err("%s: GPIO configuration failed: GPIO %d,error %d\n",
__func__, OMAP4_SFH7741_ENABLE_GPIO, error);
gpio_free(OMAP4_SFH7741_ENABLE_GPIO);
}
} }
static void sdp4430_hdmi_mux_init(void) static void sdp4430_hdmi_mux_init(void)
...@@ -645,27 +589,19 @@ static void sdp4430_hdmi_mux_init(void) ...@@ -645,27 +589,19 @@ static void sdp4430_hdmi_mux_init(void)
OMAP_PIN_INPUT_PULLUP); OMAP_PIN_INPUT_PULLUP);
} }
static struct gpio sdp4430_hdmi_gpios[] = {
{ HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd" },
{ HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
};
static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev) static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
{ {
int status; int status;
status = gpio_request_one(HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, status = gpio_request_array(sdp4430_hdmi_gpios,
"hdmi_gpio_hpd"); ARRAY_SIZE(sdp4430_hdmi_gpios));
if (status) { if (status)
pr_err("Cannot request GPIO %d\n", HDMI_GPIO_HPD); pr_err("%s: Cannot request HDMI GPIOs\n", __func__);
return status;
}
status = gpio_request_one(HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH,
"hdmi_gpio_ls_oe");
if (status) {
pr_err("Cannot request GPIO %d\n", HDMI_GPIO_LS_OE);
goto error1;
}
return 0;
error1:
gpio_free(HDMI_GPIO_HPD);
return status; return status;
} }
......
arch/arm/mach-omap2/board-am3517crane.c
View file @ 829ae273
...@@ -89,19 +89,13 @@ static void __init am3517_crane_init(void) ...@@ -89,19 +89,13 @@ static void __init am3517_crane_init(void)
return; return;
} }
ret = gpio_request(GPIO_USB_POWER, "usb_ehci_enable"); ret = gpio_request_one(GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
"usb_ehci_enable");
if (ret < 0) { if (ret < 0) {
pr_err("Can not request GPIO %d\n", GPIO_USB_POWER); pr_err("Can not request GPIO %d\n", GPIO_USB_POWER);
return; return;
} }
ret = gpio_direction_output(GPIO_USB_POWER, 1);
if (ret < 0) {
gpio_free(GPIO_USB_POWER);
pr_err("Unable to initialize EHCI power\n");
return;
}
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
} }
......
arch/arm/mach-omap2/board-am3517evm.c
View file @ 829ae273
...@@ -174,19 +174,14 @@ static void __init am3517_evm_rtc_init(void) ...@@ -174,19 +174,14 @@ static void __init am3517_evm_rtc_init(void)
int r; int r;
omap_mux_init_gpio(GPIO_RTCS35390A_IRQ, OMAP_PIN_INPUT_PULLUP); omap_mux_init_gpio(GPIO_RTCS35390A_IRQ, OMAP_PIN_INPUT_PULLUP);
r = gpio_request(GPIO_RTCS35390A_IRQ, "rtcs35390a-irq");
r = gpio_request_one(GPIO_RTCS35390A_IRQ, GPIOF_IN, "rtcs35390a-irq");
if (r < 0) { if (r < 0) {
printk(KERN_WARNING "failed to request GPIO#%d\n", printk(KERN_WARNING "failed to request GPIO#%d\n",
GPIO_RTCS35390A_IRQ); GPIO_RTCS35390A_IRQ);
return; return;
} }
r = gpio_direction_input(GPIO_RTCS35390A_IRQ);
if (r < 0) {
printk(KERN_WARNING "GPIO#%d cannot be configured as input\n",
GPIO_RTCS35390A_IRQ);
gpio_free(GPIO_RTCS35390A_IRQ);
return;
}
am3517evm_i2c1_boardinfo[0].irq = gpio_to_irq(GPIO_RTCS35390A_IRQ); am3517evm_i2c1_boardinfo[0].irq = gpio_to_irq(GPIO_RTCS35390A_IRQ);
} }
...@@ -242,6 +237,15 @@ static int dvi_enabled; ...@@ -242,6 +237,15 @@ static int dvi_enabled;
#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \ #if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
defined(CONFIG_PANEL_SHARP_LQ043T1DG01_MODULE) defined(CONFIG_PANEL_SHARP_LQ043T1DG01_MODULE)
static struct gpio am3517_evm_dss_gpios[] __initdata = {
/* GPIO 182 = LCD Backlight Power */
{ LCD_PANEL_BKLIGHT_PWR, GPIOF_OUT_INIT_HIGH, "lcd_backlight_pwr" },
/* GPIO 181 = LCD Panel PWM */
{ LCD_PANEL_PWM, GPIOF_OUT_INIT_HIGH, "lcd bl enable" },
/* GPIO 176 = LCD Panel Power enable pin */
{ LCD_PANEL_PWR, GPIOF_OUT_INIT_HIGH, "dvi enable" },
};
static void __init am3517_evm_display_init(void) static void __init am3517_evm_display_init(void)
{ {
int r; int r;
...@@ -249,41 +253,15 @@ static void __init am3517_evm_display_init(void) ...@@ -249,41 +253,15 @@ static void __init am3517_evm_display_init(void)
omap_mux_init_gpio(LCD_PANEL_PWR, OMAP_PIN_INPUT_PULLUP); omap_mux_init_gpio(LCD_PANEL_PWR, OMAP_PIN_INPUT_PULLUP);
omap_mux_init_gpio(LCD_PANEL_BKLIGHT_PWR, OMAP_PIN_INPUT_PULLDOWN); omap_mux_init_gpio(LCD_PANEL_BKLIGHT_PWR, OMAP_PIN_INPUT_PULLDOWN);
omap_mux_init_gpio(LCD_PANEL_PWM, OMAP_PIN_INPUT_PULLDOWN); omap_mux_init_gpio(LCD_PANEL_PWM, OMAP_PIN_INPUT_PULLDOWN);
/*
* Enable GPIO 182 = LCD Backlight Power r = gpio_request_array(am3517_evm_dss_gpios,
*/ ARRAY_SIZE(am3517_evm_dss_gpios));
r = gpio_request(LCD_PANEL_BKLIGHT_PWR, "lcd_backlight_pwr");
if (r) { if (r) {
printk(KERN_ERR "failed to get lcd_backlight_pwr\n"); printk(KERN_ERR "failed to get DSS panel control GPIOs\n");
return; return;
} }
gpio_direction_output(LCD_PANEL_BKLIGHT_PWR, 1);
/*
* Enable GPIO 181 = LCD Panel PWM
*/
r = gpio_request(LCD_PANEL_PWM, "lcd_pwm");
if (r) {
printk(KERN_ERR "failed to get lcd_pwm\n");
goto err_1;
}
gpio_direction_output(LCD_PANEL_PWM, 1);
/*
* Enable GPIO 176 = LCD Panel Power enable pin
*/
r = gpio_request(LCD_PANEL_PWR, "lcd_panel_pwr");
if (r) {
printk(KERN_ERR "failed to get lcd_panel_pwr\n");
goto err_2;
}
gpio_direction_output(LCD_PANEL_PWR, 1);
printk(KERN_INFO "Display initialized successfully\n"); printk(KERN_INFO "Display initialized successfully\n");
return;
err_2:
gpio_free(LCD_PANEL_PWM);
err_1:
gpio_free(LCD_PANEL_BKLIGHT_PWR);
} }
#else #else
static void __init am3517_evm_display_init(void) {} static void __init am3517_evm_display_init(void) {}
...@@ -396,7 +374,7 @@ static struct omap_musb_board_data musb_board_data = { ...@@ -396,7 +374,7 @@ static struct omap_musb_board_data musb_board_data = {
.power = 500, .power = 500,
.set_phy_power = am35x_musb_phy_power, .set_phy_power = am35x_musb_phy_power,
.clear_irq = am35x_musb_clear_irq, .clear_irq = am35x_musb_clear_irq,
.set_mode = am35x_musb_set_mode, .set_mode = am35x_set_mode,
.reset = am35x_musb_reset, .reset = am35x_musb_reset,
}; };
......
arch/arm/mach-omap2/board-apollon.c
View file @ 829ae273
...@@ -202,6 +202,7 @@ static inline void __init apollon_init_smc91x(void) ...@@ -202,6 +202,7 @@ static inline void __init apollon_init_smc91x(void)
unsigned int rate; unsigned int rate;
struct clk *gpmc_fck; struct clk *gpmc_fck;
int eth_cs; int eth_cs;
int err;
gpmc_fck = clk_get(NULL, "gpmc_fck"); /* Always on ENABLE_ON_INIT */ gpmc_fck = clk_get(NULL, "gpmc_fck"); /* Always on ENABLE_ON_INIT */
if (IS_ERR(gpmc_fck)) { if (IS_ERR(gpmc_fck)) {
...@@ -245,15 +246,13 @@ static inline void __init apollon_init_smc91x(void) ...@@ -245,15 +246,13 @@ static inline void __init apollon_init_smc91x(void)
apollon_smc91x_resources[0].end = base + 0x30f; apollon_smc91x_resources[0].end = base + 0x30f;
udelay(100); udelay(100);
omap_mux_init_gpio(74, 0); omap_mux_init_gpio(APOLLON_ETHR_GPIO_IRQ, 0);
if (gpio_request(APOLLON_ETHR_GPIO_IRQ, "SMC91x irq") < 0) { err = gpio_request_one(APOLLON_ETHR_GPIO_IRQ, GPIOF_IN, "SMC91x irq");
if (err) {
printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n", printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
APOLLON_ETHR_GPIO_IRQ); APOLLON_ETHR_GPIO_IRQ);
gpmc_cs_free(APOLLON_ETH_CS); gpmc_cs_free(APOLLON_ETH_CS);
goto out;
} }
gpio_direction_input(APOLLON_ETHR_GPIO_IRQ);
out: out:
clk_disable(gpmc_fck); clk_disable(gpmc_fck);
clk_put(gpmc_fck); clk_put(gpmc_fck);
...@@ -280,20 +279,19 @@ static void __init omap_apollon_init_early(void) ...@@ -280,20 +279,19 @@ static void __init omap_apollon_init_early(void)
omap2_init_common_devices(NULL, NULL); omap2_init_common_devices(NULL, NULL);
} }
static struct gpio apollon_gpio_leds[] __initdata = {
{ LED0_GPIO13, GPIOF_OUT_INIT_LOW, "LED0" }, /* LED0 - AA10 */
{ LED1_GPIO14, GPIOF_OUT_INIT_LOW, "LED1" }, /* LED1 - AA6 */
{ LED2_GPIO15, GPIOF_OUT_INIT_LOW, "LED2" }, /* LED2 - AA4 */
};
static void __init apollon_led_init(void) static void __init apollon_led_init(void)
{ {
/* LED0 - AA10 */
omap_mux_init_signal("vlynq_clk.gpio_13", 0); omap_mux_init_signal("vlynq_clk.gpio_13", 0);
gpio_request(LED0_GPIO13, "LED0");
gpio_direction_output(LED0_GPIO13, 0);
/* LED1 - AA6 */
omap_mux_init_signal("vlynq_rx1.gpio_14", 0); omap_mux_init_signal("vlynq_rx1.gpio_14", 0);
gpio_request(LED1_GPIO14, "LED1");
gpio_direction_output(LED1_GPIO14, 0);
/* LED2 - AA4 */
omap_mux_init_signal("vlynq_rx0.gpio_15", 0); omap_mux_init_signal("vlynq_rx0.gpio_15", 0);
gpio_request(LED2_GPIO15, "LED2");
gpio_direction_output(LED2_GPIO15, 0); gpio_request_array(apollon_gpio_leds, ARRAY_SIZE(apollon_gpio_leds));
} }
static void __init apollon_usb_init(void) static void __init apollon_usb_init(void)
...@@ -301,8 +299,7 @@ static void __init apollon_usb_init(void) ...@@ -301,8 +299,7 @@ static void __init apollon_usb_init(void)
/* USB device */ /* USB device */
/* DEVICE_SUSPEND */ /* DEVICE_SUSPEND */
omap_mux_init_signal("mcbsp2_clkx.gpio_12", 0); omap_mux_init_signal("mcbsp2_clkx.gpio_12", 0);
gpio_request(12, "USB suspend"); gpio_request_one(12, GPIOF_OUT_INIT_LOW, "USB suspend");
gpio_direction_output(12, 0);
omap2_usbfs_init(&apollon_usb_config); omap2_usbfs_init(&apollon_usb_config);
} }
......
arch/arm/mach-omap2/board-cm-t35.c
View file @ 829ae273
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include "mux.h" #include "mux.h"
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "common-board-devices.h"
#define CM_T35_GPIO_PENDOWN 57 #define CM_T35_GPIO_PENDOWN 57
...@@ -66,86 +67,28 @@ ...@@ -66,86 +67,28 @@
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
#include <plat/gpmc-smsc911x.h>
static struct smsc911x_platform_config cm_t35_smsc911x_config = { static struct omap_smsc911x_platform_data cm_t35_smsc911x_cfg = {
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
.irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
.flags = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
.phy_interface = PHY_INTERFACE_MODE_MII,
};
static struct resource cm_t35_smsc911x_resources[] = {
{
.flags = IORESOURCE_MEM,
},
{
.start = OMAP_GPIO_IRQ(CM_T35_SMSC911X_GPIO),
.end = OMAP_GPIO_IRQ(CM_T35_SMSC911X_GPIO),
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
},
};
static struct platform_device cm_t35_smsc911x_device = {
.name = "smsc911x",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(cm_t35_smsc911x_resources), .cs = CM_T35_SMSC911X_CS,
.resource = cm_t35_smsc911x_resources, .gpio_irq = CM_T35_SMSC911X_GPIO,
.dev = { .gpio_reset = -EINVAL,
.platform_data = &cm_t35_smsc911x_config, .flags = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
},
};
static struct resource sb_t35_smsc911x_resources[] = {
{
.flags = IORESOURCE_MEM,
},
{
.start = OMAP_GPIO_IRQ(SB_T35_SMSC911X_GPIO),
.end = OMAP_GPIO_IRQ(SB_T35_SMSC911X_GPIO),
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
},
}; };
static struct platform_device sb_t35_smsc911x_device = { static struct omap_smsc911x_platform_data sb_t35_smsc911x_cfg = {
.name = "smsc911x",
.id = 1, .id = 1,
.num_resources = ARRAY_SIZE(sb_t35_smsc911x_resources), .cs = SB_T35_SMSC911X_CS,
.resource = sb_t35_smsc911x_resources, .gpio_irq = SB_T35_SMSC911X_GPIO,
.dev = { .gpio_reset = -EINVAL,
.platform_data = &cm_t35_smsc911x_config, .flags = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
},
}; };
static void __init cm_t35_init_smsc911x(struct platform_device *dev,
int cs, int irq_gpio)
{
unsigned long cs_mem_base;
if (gpmc_cs_request(cs, SZ_16M, &cs_mem_base) < 0) {
pr_err("CM-T35: Failed request for GPMC mem for smsc911x\n");
return;
}
dev->resource[0].start = cs_mem_base + 0x0;
dev->resource[0].end = cs_mem_base + 0xff;
if ((gpio_request(irq_gpio, "ETH IRQ") == 0) &&
(gpio_direction_input(irq_gpio) == 0)) {
gpio_export(irq_gpio, 0);
} else {
pr_err("CM-T35: could not obtain gpio for SMSC911X IRQ\n");
return;
}
platform_device_register(dev);
}
static void __init cm_t35_init_ethernet(void) static void __init cm_t35_init_ethernet(void)
{ {
cm_t35_init_smsc911x(&cm_t35_smsc911x_device, gpmc_smsc911x_init(&cm_t35_smsc911x_cfg);
CM_T35_SMSC911X_CS, CM_T35_SMSC911X_GPIO); gpmc_smsc911x_init(&sb_t35_smsc911x_cfg);
cm_t35_init_smsc911x(&sb_t35_smsc911x_device,
SB_T35_SMSC911X_CS, SB_T35_SMSC911X_GPIO);
} }
#else #else
static inline void __init cm_t35_init_ethernet(void) { return; } static inline void __init cm_t35_init_ethernet(void) { return; }
...@@ -235,69 +178,10 @@ static void __init cm_t35_init_nand(void) ...@@ -235,69 +178,10 @@ static void __init cm_t35_init_nand(void)
static inline void cm_t35_init_nand(void) {} static inline void cm_t35_init_nand(void) {}
#endif #endif
#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
#include <linux/spi/ads7846.h>
static struct omap2_mcspi_device_config ads7846_mcspi_config = {
.turbo_mode = 0,
.single_channel = 1, /* 0: slave, 1: master */
};
static int ads7846_get_pendown_state(void)
{
return !gpio_get_value(CM_T35_GPIO_PENDOWN);
}
static struct ads7846_platform_data ads7846_config = {
.x_max = 0x0fff,
.y_max = 0x0fff,
.x_plate_ohms = 180,
.pressure_max = 255,
.debounce_max = 10,
.debounce_tol = 3,
.debounce_rep = 1,
.get_pendown_state = ads7846_get_pendown_state,
.keep_vref_on = 1,
};
static struct spi_board_info cm_t35_spi_board_info[] __initdata = {
{
.modalias = "ads7846",
.bus_num = 1,
.chip_select = 0,
.max_speed_hz = 1500000,
.controller_data = &ads7846_mcspi_config,
.irq = OMAP_GPIO_IRQ(CM_T35_GPIO_PENDOWN),
.platform_data = &ads7846_config,
},
};
static void __init cm_t35_init_ads7846(void)
{
if ((gpio_request(CM_T35_GPIO_PENDOWN, "ADS7846_PENDOWN") == 0) &&
(gpio_direction_input(CM_T35_GPIO_PENDOWN) == 0)) {
gpio_export(CM_T35_GPIO_PENDOWN, 0);
} else {
pr_err("CM-T35: could not obtain gpio for ADS7846_PENDOWN\n");
return;
}
spi_register_board_info(cm_t35_spi_board_info,
ARRAY_SIZE(cm_t35_spi_board_info));
}
#else
static inline void cm_t35_init_ads7846(void) {}
#endif
#define CM_T35_LCD_EN_GPIO 157 #define CM_T35_LCD_EN_GPIO 157
#define CM_T35_LCD_BL_GPIO 58 #define CM_T35_LCD_BL_GPIO 58
#define CM_T35_DVI_EN_GPIO 54 #define CM_T35_DVI_EN_GPIO 54
static int lcd_bl_gpio;
static int lcd_en_gpio;
static int dvi_en_gpio;
static int lcd_enabled; static int lcd_enabled;
static int dvi_enabled; static int dvi_enabled;
...@@ -308,8 +192,8 @@ static int cm_t35_panel_enable_lcd(struct omap_dss_device *dssdev) ...@@ -308,8 +192,8 @@ static int cm_t35_panel_enable_lcd(struct omap_dss_device *dssdev)
return -EINVAL; return -EINVAL;
} }
gpio_set_value(lcd_en_gpio, 1); gpio_set_value(CM_T35_LCD_EN_GPIO, 1);
gpio_set_value(lcd_bl_gpio, 1); gpio_set_value(CM_T35_LCD_BL_GPIO, 1);
lcd_enabled = 1; lcd_enabled = 1;
...@@ -320,8 +204,8 @@ static void cm_t35_panel_disable_lcd(struct omap_dss_device *dssdev) ...@@ -320,8 +204,8 @@ static void cm_t35_panel_disable_lcd(struct omap_dss_device *dssdev)
{ {
lcd_enabled = 0; lcd_enabled = 0;
gpio_set_value(lcd_bl_gpio, 0); gpio_set_value(CM_T35_LCD_BL_GPIO, 0);
gpio_set_value(lcd_en_gpio, 0); gpio_set_value(CM_T35_LCD_EN_GPIO, 0);
} }
static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev) static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev)
...@@ -331,7 +215,7 @@ static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev) ...@@ -331,7 +215,7 @@ static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev)
return -EINVAL; return -EINVAL;
} }
gpio_set_value(dvi_en_gpio, 0); gpio_set_value(CM_T35_DVI_EN_GPIO, 0);
dvi_enabled = 1; dvi_enabled = 1;
return 0; return 0;
...@@ -339,7 +223,7 @@ static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev) ...@@ -339,7 +223,7 @@ static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev)
static void cm_t35_panel_disable_dvi(struct omap_dss_device *dssdev) static void cm_t35_panel_disable_dvi(struct omap_dss_device *dssdev)
{ {
gpio_set_value(dvi_en_gpio, 1); gpio_set_value(CM_T35_DVI_EN_GPIO, 1);
dvi_enabled = 0; dvi_enabled = 0;
} }
...@@ -421,62 +305,38 @@ static struct spi_board_info cm_t35_lcd_spi_board_info[] __initdata = { ...@@ -421,62 +305,38 @@ static struct spi_board_info cm_t35_lcd_spi_board_info[] __initdata = {
}, },
}; };
static struct gpio cm_t35_dss_gpios[] __initdata = {
{ CM_T35_LCD_EN_GPIO, GPIOF_OUT_INIT_LOW, "lcd enable" },
{ CM_T35_LCD_BL_GPIO, GPIOF_OUT_INIT_LOW, "lcd bl enable" },
{ CM_T35_DVI_EN_GPIO, GPIOF_OUT_INIT_HIGH, "dvi enable" },
};
static void __init cm_t35_init_display(void) static void __init cm_t35_init_display(void)
{ {
int err; int err;
lcd_en_gpio = CM_T35_LCD_EN_GPIO;
lcd_bl_gpio = CM_T35_LCD_BL_GPIO;
dvi_en_gpio = CM_T35_DVI_EN_GPIO;
spi_register_board_info(cm_t35_lcd_spi_board_info, spi_register_board_info(cm_t35_lcd_spi_board_info,
ARRAY_SIZE(cm_t35_lcd_spi_board_info)); ARRAY_SIZE(cm_t35_lcd_spi_board_info));
err = gpio_request(lcd_en_gpio, "LCD RST"); err = gpio_request_array(cm_t35_dss_gpios,
if (err) { ARRAY_SIZE(cm_t35_dss_gpios));
pr_err("CM-T35: failed to get LCD reset GPIO\n");
goto out;
}
err = gpio_request(lcd_bl_gpio, "LCD BL");
if (err) {
pr_err("CM-T35: failed to get LCD backlight control GPIO\n");
goto err_lcd_bl;
}
err = gpio_request(dvi_en_gpio, "DVI EN");
if (err) { if (err) {
pr_err("CM-T35: failed to get DVI reset GPIO\n"); pr_err("CM-T35: failed to request DSS control GPIOs\n");
goto err_dvi_en; return;
} }
gpio_export(lcd_en_gpio, 0); gpio_export(CM_T35_LCD_EN_GPIO, 0);
gpio_export(lcd_bl_gpio, 0); gpio_export(CM_T35_LCD_BL_GPIO, 0);
gpio_export(dvi_en_gpio, 0); gpio_export(CM_T35_DVI_EN_GPIO, 0);
gpio_direction_output(lcd_en_gpio, 0);
gpio_direction_output(lcd_bl_gpio, 0);
gpio_direction_output(dvi_en_gpio, 1);
msleep(50); msleep(50);
gpio_set_value(lcd_en_gpio, 1); gpio_set_value(CM_T35_LCD_EN_GPIO, 1);
err = omap_display_init(&cm_t35_dss_data); err = omap_display_init(&cm_t35_dss_data);
if (err) { if (err) {
pr_err("CM-T35: failed to register DSS device\n"); pr_err("CM-T35: failed to register DSS device\n");
goto err_dev_reg; gpio_free_array(cm_t35_dss_gpios, ARRAY_SIZE(cm_t35_dss_gpios));
} }
return;
err_dev_reg:
gpio_free(dvi_en_gpio);
err_dvi_en:
gpio_free(lcd_bl_gpio);
err_lcd_bl:
gpio_free(lcd_en_gpio);
out:
return;
} }
static struct regulator_consumer_supply cm_t35_vmmc1_supply = { static struct regulator_consumer_supply cm_t35_vmmc1_supply = {
...@@ -609,10 +469,8 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio, ...@@ -609,10 +469,8 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
{ {
int wlan_rst = gpio + 2; int wlan_rst = gpio + 2;
if ((gpio_request(wlan_rst, "WLAN RST") == 0) && if (gpio_request_one(wlan_rst, GPIOF_OUT_INIT_HIGH, "WLAN RST") == 0) {
(gpio_direction_output(wlan_rst, 1) == 0)) {
gpio_export(wlan_rst, 0); gpio_export(wlan_rst, 0);
udelay(10); udelay(10);
gpio_set_value(wlan_rst, 0); gpio_set_value(wlan_rst, 0);
udelay(10); udelay(10);
...@@ -653,19 +511,9 @@ static struct twl4030_platform_data cm_t35_twldata = { ...@@ -653,19 +511,9 @@ static struct twl4030_platform_data cm_t35_twldata = {
.vpll2 = &cm_t35_vpll2, .vpll2 = &cm_t35_vpll2,
}; };
static struct i2c_board_info __initdata cm_t35_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("tps65930", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &cm_t35_twldata,
},
};
static void __init cm_t35_init_i2c(void) static void __init cm_t35_init_i2c(void)
{ {
omap_register_i2c_bus(1, 2600, cm_t35_i2c_boardinfo, omap3_pmic_init("tps65930", &cm_t35_twldata);
ARRAY_SIZE(cm_t35_i2c_boardinfo));
} }
static void __init cm_t35_init_early(void) static void __init cm_t35_init_early(void)
...@@ -775,12 +623,6 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -775,12 +623,6 @@ static struct omap_board_mux board_mux[] __initdata = {
}; };
#endif #endif
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static struct omap_board_config_kernel cm_t35_config[] __initdata = { static struct omap_board_config_kernel cm_t35_config[] __initdata = {
}; };
...@@ -792,12 +634,12 @@ static void __init cm_t35_init(void) ...@@ -792,12 +634,12 @@ static void __init cm_t35_init(void)
omap_serial_init(); omap_serial_init();
cm_t35_init_i2c(); cm_t35_init_i2c();
cm_t35_init_nand(); cm_t35_init_nand();
cm_t35_init_ads7846(); omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL);
cm_t35_init_ethernet(); cm_t35_init_ethernet();
cm_t35_init_led(); cm_t35_init_led();
cm_t35_init_display(); cm_t35_init_display();
usb_musb_init(&musb_board_data); usb_musb_init(NULL);
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
} }
......
arch/arm/mach-omap2/board-cm-t3517.c
View file @ 829ae273
...@@ -148,14 +148,13 @@ static void __init cm_t3517_init_rtc(void) ...@@ -148,14 +148,13 @@ static void __init cm_t3517_init_rtc(void)
{ {
int err; int err;
err = gpio_request(RTC_CS_EN_GPIO, "rtc cs en"); err = gpio_request_one(RTC_CS_EN_GPIO, GPIOF_OUT_INIT_HIGH,
"rtc cs en");
if (err) { if (err) {
pr_err("CM-T3517: rtc cs en gpio request failed: %d\n", err); pr_err("CM-T3517: rtc cs en gpio request failed: %d\n", err);
return; return;
} }
gpio_direction_output(RTC_CS_EN_GPIO, 1);
platform_device_register(&cm_t3517_rtc_device); platform_device_register(&cm_t3517_rtc_device);
} }
#else #else
...@@ -182,11 +181,11 @@ static int cm_t3517_init_usbh(void) ...@@ -182,11 +181,11 @@ static int cm_t3517_init_usbh(void)
{ {
int err; int err;
err = gpio_request(USB_HUB_RESET_GPIO, "usb hub rst"); err = gpio_request_one(USB_HUB_RESET_GPIO, GPIOF_OUT_INIT_LOW,
"usb hub rst");
if (err) { if (err) {
pr_err("CM-T3517: usb hub rst gpio request failed: %d\n", err); pr_err("CM-T3517: usb hub rst gpio request failed: %d\n", err);
} else { } else {
gpio_direction_output(USB_HUB_RESET_GPIO, 0);
udelay(10); udelay(10);
gpio_set_value(USB_HUB_RESET_GPIO, 1); gpio_set_value(USB_HUB_RESET_GPIO, 1);
msleep(1); msleep(1);
......
arch/arm/mach-omap2/board-devkit8000.c
View file @ 829ae273
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <plat/mcspi.h> #include <plat/mcspi.h>
#include <linux/input/matrix_keypad.h> #include <linux/input/matrix_keypad.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/dm9000.h> #include <linux/dm9000.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
...@@ -60,6 +59,7 @@ ...@@ -60,6 +59,7 @@
#include "mux.h" #include "mux.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "timer-gp.h" #include "timer-gp.h"
#include "common-board-devices.h"
#define NAND_BLOCK_SIZE SZ_128K #define NAND_BLOCK_SIZE SZ_128K
...@@ -97,13 +97,6 @@ static struct mtd_partition devkit8000_nand_partitions[] = { ...@@ -97,13 +97,6 @@ static struct mtd_partition devkit8000_nand_partitions[] = {
}, },
}; };
static struct omap_nand_platform_data devkit8000_nand_data = {
.options = NAND_BUSWIDTH_16,
.parts = devkit8000_nand_partitions,
.nr_parts = ARRAY_SIZE(devkit8000_nand_partitions),
.dma_channel = -1, /* disable DMA in OMAP NAND driver */
};
static struct omap2_hsmmc_info mmc[] = { static struct omap2_hsmmc_info mmc[] = {
{ {
.mmc = 1, .mmc = 1,
...@@ -249,7 +242,7 @@ static int devkit8000_twl_gpio_setup(struct device *dev, ...@@ -249,7 +242,7 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
/* TWL4030_GPIO_MAX + 0 is "LCD_PWREN" (out, active high) */ /* TWL4030_GPIO_MAX + 0 is "LCD_PWREN" (out, active high) */
devkit8000_lcd_device.reset_gpio = gpio + TWL4030_GPIO_MAX + 0; devkit8000_lcd_device.reset_gpio = gpio + TWL4030_GPIO_MAX + 0;
ret = gpio_request_one(devkit8000_lcd_device.reset_gpio, ret = gpio_request_one(devkit8000_lcd_device.reset_gpio,
GPIOF_DIR_OUT | GPIOF_INIT_LOW, "LCD_PWREN"); GPIOF_OUT_INIT_LOW, "LCD_PWREN");
if (ret < 0) { if (ret < 0) {
devkit8000_lcd_device.reset_gpio = -EINVAL; devkit8000_lcd_device.reset_gpio = -EINVAL;
printk(KERN_ERR "Failed to request GPIO for LCD_PWRN\n"); printk(KERN_ERR "Failed to request GPIO for LCD_PWRN\n");
...@@ -258,7 +251,7 @@ static int devkit8000_twl_gpio_setup(struct device *dev, ...@@ -258,7 +251,7 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
/* gpio + 7 is "DVI_PD" (out, active low) */ /* gpio + 7 is "DVI_PD" (out, active low) */
devkit8000_dvi_device.reset_gpio = gpio + 7; devkit8000_dvi_device.reset_gpio = gpio + 7;
ret = gpio_request_one(devkit8000_dvi_device.reset_gpio, ret = gpio_request_one(devkit8000_dvi_device.reset_gpio,
GPIOF_DIR_OUT | GPIOF_INIT_LOW, "DVI PowerDown"); GPIOF_OUT_INIT_LOW, "DVI PowerDown");
if (ret < 0) { if (ret < 0) {
devkit8000_dvi_device.reset_gpio = -EINVAL; devkit8000_dvi_device.reset_gpio = -EINVAL;
printk(KERN_ERR "Failed to request GPIO for DVI PowerDown\n"); printk(KERN_ERR "Failed to request GPIO for DVI PowerDown\n");
...@@ -366,19 +359,9 @@ static struct twl4030_platform_data devkit8000_twldata = { ...@@ -366,19 +359,9 @@ static struct twl4030_platform_data devkit8000_twldata = {
.keypad = &devkit8000_kp_data, .keypad = &devkit8000_kp_data,
}; };
static struct i2c_board_info __initdata devkit8000_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("tps65930", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &devkit8000_twldata,
},
};
static int __init devkit8000_i2c_init(void) static int __init devkit8000_i2c_init(void)
{ {
omap_register_i2c_bus(1, 2600, devkit8000_i2c_boardinfo, omap3_pmic_init("tps65930", &devkit8000_twldata);
ARRAY_SIZE(devkit8000_i2c_boardinfo));
/* Bus 3 is attached to the DVI port where devices like the pico DLP /* Bus 3 is attached to the DVI port where devices like the pico DLP
* projector don't work reliably with 400kHz */ * projector don't work reliably with 400kHz */
omap_register_i2c_bus(3, 400, NULL, 0); omap_register_i2c_bus(3, 400, NULL, 0);
...@@ -463,56 +446,6 @@ static void __init devkit8000_init_irq(void) ...@@ -463,56 +446,6 @@ static void __init devkit8000_init_irq(void)
#endif #endif
} }
static void __init devkit8000_ads7846_init(void)
{
int gpio = OMAP3_DEVKIT_TS_GPIO;
int ret;
ret = gpio_request(gpio, "ads7846_pen_down");
if (ret < 0) {
printk(KERN_ERR "Failed to request GPIO %d for "
"ads7846 pen down IRQ\n", gpio);
return;
}
gpio_direction_input(gpio);
}
static int ads7846_get_pendown_state(void)
{
return !gpio_get_value(OMAP3_DEVKIT_TS_GPIO);
}
static struct ads7846_platform_data ads7846_config = {
.x_max = 0x0fff,
.y_max = 0x0fff,
.x_plate_ohms = 180,
.pressure_max = 255,
.debounce_max = 10,
.debounce_tol = 5,
.debounce_rep = 1,
.get_pendown_state = ads7846_get_pendown_state,
.keep_vref_on = 1,
.settle_delay_usecs = 150,
};
static struct omap2_mcspi_device_config ads7846_mcspi_config = {
.turbo_mode = 0,
.single_channel = 1, /* 0: slave, 1: master */
};
static struct spi_board_info devkit8000_spi_board_info[] __initdata = {
{
.modalias = "ads7846",
.bus_num = 2,
.chip_select = 0,
.max_speed_hz = 1500000,
.controller_data = &ads7846_mcspi_config,
.irq = OMAP_GPIO_IRQ(OMAP3_DEVKIT_TS_GPIO),
.platform_data = &ads7846_config,
}
};
#define OMAP_DM9000_BASE 0x2c000000 #define OMAP_DM9000_BASE 0x2c000000
static struct resource omap_dm9000_resources[] = { static struct resource omap_dm9000_resources[] = {
...@@ -550,15 +483,15 @@ static void __init omap_dm9000_init(void) ...@@ -550,15 +483,15 @@ static void __init omap_dm9000_init(void)
{ {
unsigned char *eth_addr = omap_dm9000_platdata.dev_addr; unsigned char *eth_addr = omap_dm9000_platdata.dev_addr;
struct omap_die_id odi; struct omap_die_id odi;
int ret;
if (gpio_request(OMAP_DM9000_GPIO_IRQ, "dm9000 irq") < 0) { ret = gpio_request_one(OMAP_DM9000_GPIO_IRQ, GPIOF_IN, "dm9000 irq");
if (ret < 0) {
printk(KERN_ERR "Failed to request GPIO%d for dm9000 IRQ\n", printk(KERN_ERR "Failed to request GPIO%d for dm9000 IRQ\n",
OMAP_DM9000_GPIO_IRQ); OMAP_DM9000_GPIO_IRQ);
return; return;
} }
gpio_direction_input(OMAP_DM9000_GPIO_IRQ);
/* init the mac address using DIE id */ /* init the mac address using DIE id */
omap_get_die_id(&odi); omap_get_die_id(&odi);
...@@ -576,45 +509,6 @@ static struct platform_device *devkit8000_devices[] __initdata = { ...@@ -576,45 +509,6 @@ static struct platform_device *devkit8000_devices[] __initdata = {
&omap_dm9000_dev, &omap_dm9000_dev,
}; };
static void __init devkit8000_flash_init(void)
{
u8 cs = 0;
u8 nandcs = GPMC_CS_NUM + 1;
/* find out the chip-select on which NAND exists */
while (cs < GPMC_CS_NUM) {
u32 ret = 0;
ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
if ((ret & 0xC00) == 0x800) {
printk(KERN_INFO "Found NAND on CS%d\n", cs);
if (nandcs > GPMC_CS_NUM)
nandcs = cs;
}
cs++;
}
if (nandcs > GPMC_CS_NUM) {
printk(KERN_INFO "NAND: Unable to find configuration "
"in GPMC\n ");
return;
}
if (nandcs < GPMC_CS_NUM) {
devkit8000_nand_data.cs = nandcs;
printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
if (gpmc_nand_init(&devkit8000_nand_data) < 0)
printk(KERN_ERR "Unable to register NAND device\n");
}
}
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static const struct usbhs_omap_board_data usbhs_bdata __initconst = { static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
...@@ -795,14 +689,13 @@ static void __init devkit8000_init(void) ...@@ -795,14 +689,13 @@ static void __init devkit8000_init(void)
ARRAY_SIZE(devkit8000_devices)); ARRAY_SIZE(devkit8000_devices));
omap_display_init(&devkit8000_dss_data); omap_display_init(&devkit8000_dss_data);
spi_register_board_info(devkit8000_spi_board_info,
ARRAY_SIZE(devkit8000_spi_board_info));
devkit8000_ads7846_init(); omap_ads7846_init(2, OMAP3_DEVKIT_TS_GPIO, 0, NULL);
usb_musb_init(&musb_board_data); usb_musb_init(NULL);
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
devkit8000_flash_init(); omap_nand_flash_init(NAND_BUSWIDTH_16, devkit8000_nand_partitions,
ARRAY_SIZE(devkit8000_nand_partitions));
/* Ensure SDRC pins are mux'd for self-refresh */ /* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
......
arch/arm/mach-omap2/board-igep0020.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/board-igep0030.c deleted 100644 → 0
View file @ 6ddb4518
This diff is collapsed.
arch/arm/mach-omap2/board-ldp.c
View file @ 829ae273
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
#include <linux/i2c/twl.h> #include <linux/i2c/twl.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -43,47 +42,19 @@ ...@@ -43,47 +42,19 @@
#include <asm/delay.h> #include <asm/delay.h>
#include <plat/usb.h> #include <plat/usb.h>
#include <plat/gpmc-smsc911x.h>
#include "board-flash.h" #include "board-flash.h"
#include "mux.h" #include "mux.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "control.h" #include "control.h"
#include "common-board-devices.h"
#define LDP_SMSC911X_CS 1 #define LDP_SMSC911X_CS 1
#define LDP_SMSC911X_GPIO 152 #define LDP_SMSC911X_GPIO 152
#define DEBUG_BASE 0x08000000 #define DEBUG_BASE 0x08000000
#define LDP_ETHR_START DEBUG_BASE #define LDP_ETHR_START DEBUG_BASE
static struct resource ldp_smsc911x_resources[] = {
[0] = {
.start = LDP_ETHR_START,
.end = LDP_ETHR_START + SZ_4K,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = 0,
.end = 0,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
},
};
static struct smsc911x_platform_config ldp_smsc911x_config = {
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
.irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
.flags = SMSC911X_USE_32BIT,
.phy_interface = PHY_INTERFACE_MODE_MII,
};
static struct platform_device ldp_smsc911x_device = {
.name = "smsc911x",
.id = -1,
.num_resources = ARRAY_SIZE(ldp_smsc911x_resources),
.resource = ldp_smsc911x_resources,
.dev = {
.platform_data = &ldp_smsc911x_config,
},
};
static uint32_t board_keymap[] = { static uint32_t board_keymap[] = {
KEY(0, 0, KEY_1), KEY(0, 0, KEY_1),
KEY(1, 0, KEY_2), KEY(1, 0, KEY_2),
...@@ -197,82 +168,16 @@ static struct platform_device ldp_gpio_keys_device = { ...@@ -197,82 +168,16 @@ static struct platform_device ldp_gpio_keys_device = {
}, },
}; };
static int ts_gpio; static struct omap_smsc911x_platform_data smsc911x_cfg = {
.cs = LDP_SMSC911X_CS,
/** .gpio_irq = LDP_SMSC911X_GPIO,
* @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq .gpio_reset = -EINVAL,
* .flags = SMSC911X_USE_32BIT,
* @return - void. If request gpio fails then Flag KERN_ERR.
*/
static void ads7846_dev_init(void)
{
if (gpio_request(ts_gpio, "ads7846 irq") < 0) {
printk(KERN_ERR "can't get ads746 pen down GPIO\n");
return;
}
gpio_direction_input(ts_gpio);
gpio_set_debounce(ts_gpio, 310);
}
static int ads7846_get_pendown_state(void)
{
return !gpio_get_value(ts_gpio);
}
static struct ads7846_platform_data tsc2046_config __initdata = {
.get_pendown_state = ads7846_get_pendown_state,
.keep_vref_on = 1,
};
static struct omap2_mcspi_device_config tsc2046_mcspi_config = {
.turbo_mode = 0,
.single_channel = 1, /* 0: slave, 1: master */
};
static struct spi_board_info ldp_spi_board_info[] __initdata = {
[0] = {
/*
* TSC2046 operates at a max freqency of 2MHz, so
* operate slightly below at 1.5MHz
*/
.modalias = "ads7846",
.bus_num = 1,
.chip_select = 0,
.max_speed_hz = 1500000,
.controller_data = &tsc2046_mcspi_config,
.irq = 0,
.platform_data = &tsc2046_config,
},
}; };
static inline void __init ldp_init_smsc911x(void) static inline void __init ldp_init_smsc911x(void)
{ {
int eth_cs; gpmc_smsc911x_init(&smsc911x_cfg);
unsigned long cs_mem_base;
int eth_gpio = 0;
eth_cs = LDP_SMSC911X_CS;
if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n");
return;
}
ldp_smsc911x_resources[0].start = cs_mem_base + 0x0;
ldp_smsc911x_resources[0].end = cs_mem_base + 0xff;
udelay(100);
eth_gpio = LDP_SMSC911X_GPIO;
ldp_smsc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
if (gpio_request(eth_gpio, "smsc911x irq") < 0) {
printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
eth_gpio);
return;
}
gpio_direction_input(eth_gpio);
} }
static struct platform_device ldp_lcd_device = { static struct platform_device ldp_lcd_device = {
...@@ -360,19 +265,9 @@ static struct twl4030_platform_data ldp_twldata = { ...@@ -360,19 +265,9 @@ static struct twl4030_platform_data ldp_twldata = {
.keypad = &ldp_kp_twl4030_data, .keypad = &ldp_kp_twl4030_data,
}; };
static struct i2c_board_info __initdata ldp_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl4030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &ldp_twldata,
},
};
static int __init omap_i2c_init(void) static int __init omap_i2c_init(void)
{ {
omap_register_i2c_bus(1, 2600, ldp_i2c_boardinfo, omap3_pmic_init("twl4030", &ldp_twldata);
ARRAY_SIZE(ldp_i2c_boardinfo));
omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(2, 400, NULL, 0);
omap_register_i2c_bus(3, 400, NULL, 0); omap_register_i2c_bus(3, 400, NULL, 0);
return 0; return 0;
...@@ -389,7 +284,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { ...@@ -389,7 +284,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
}; };
static struct platform_device *ldp_devices[] __initdata = { static struct platform_device *ldp_devices[] __initdata = {
&ldp_smsc911x_device,
&ldp_lcd_device, &ldp_lcd_device,
&ldp_gpio_keys_device, &ldp_gpio_keys_device,
}; };
...@@ -400,12 +294,6 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -400,12 +294,6 @@ static struct omap_board_mux board_mux[] __initdata = {
}; };
#endif #endif
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static struct mtd_partition ldp_nand_partitions[] = { static struct mtd_partition ldp_nand_partitions[] = {
/* All the partition sizes are listed in terms of NAND block size */ /* All the partition sizes are listed in terms of NAND block size */
{ {
...@@ -446,13 +334,9 @@ static void __init omap_ldp_init(void) ...@@ -446,13 +334,9 @@ static void __init omap_ldp_init(void)
ldp_init_smsc911x(); ldp_init_smsc911x();
omap_i2c_init(); omap_i2c_init();
platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices));
ts_gpio = 54; omap_ads7846_init(1, 54, 310, NULL);
ldp_spi_board_info[0].irq = gpio_to_irq(ts_gpio);
spi_register_board_info(ldp_spi_board_info,
ARRAY_SIZE(ldp_spi_board_info));
ads7846_dev_init();
omap_serial_init(); omap_serial_init();
usb_musb_init(&musb_board_data); usb_musb_init(NULL);
board_nand_init(ldp_nand_partitions, board_nand_init(ldp_nand_partitions,
ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0); ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0);
......
arch/arm/mach-omap2/board-n8x0.c
View file @ 829ae273
...@@ -106,14 +106,13 @@ static void __init n8x0_usb_init(void) ...@@ -106,14 +106,13 @@ static void __init n8x0_usb_init(void)
static char announce[] __initdata = KERN_INFO "TUSB 6010\n"; static char announce[] __initdata = KERN_INFO "TUSB 6010\n";
/* PM companion chip power control pin */ /* PM companion chip power control pin */
ret = gpio_request(TUSB6010_GPIO_ENABLE, "TUSB6010 enable"); ret = gpio_request_one(TUSB6010_GPIO_ENABLE, GPIOF_OUT_INIT_LOW,
"TUSB6010 enable");
if (ret != 0) { if (ret != 0) {
printk(KERN_ERR "Could not get TUSB power GPIO%i\n", printk(KERN_ERR "Could not get TUSB power GPIO%i\n",
TUSB6010_GPIO_ENABLE); TUSB6010_GPIO_ENABLE);
return; return;
} }
gpio_direction_output(TUSB6010_GPIO_ENABLE, 0);
tusb_set_power(0); tusb_set_power(0);
ret = tusb6010_setup_interface(&tusb_data, TUSB6010_REFCLK_19, 2, ret = tusb6010_setup_interface(&tusb_data, TUSB6010_REFCLK_19, 2,
...@@ -494,8 +493,12 @@ static struct omap_mmc_platform_data mmc1_data = { ...@@ -494,8 +493,12 @@ static struct omap_mmc_platform_data mmc1_data = {
static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC]; static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC];
static void __init n8x0_mmc_init(void) static struct gpio n810_emmc_gpios[] __initdata = {
{ N810_EMMC_VSD_GPIO, GPIOF_OUT_INIT_LOW, "MMC slot 2 Vddf" },
{ N810_EMMC_VIO_GPIO, GPIOF_OUT_INIT_LOW, "MMC slot 2 Vdd" },
};
static void __init n8x0_mmc_init(void)
{ {
int err; int err;
...@@ -512,27 +515,18 @@ static void __init n8x0_mmc_init(void) ...@@ -512,27 +515,18 @@ static void __init n8x0_mmc_init(void)
mmc1_data.slots[1].ban_openended = 1; mmc1_data.slots[1].ban_openended = 1;
} }
err = gpio_request(N8X0_SLOT_SWITCH_GPIO, "MMC slot switch"); err = gpio_request_one(N8X0_SLOT_SWITCH_GPIO, GPIOF_OUT_INIT_LOW,
"MMC slot switch");
if (err) if (err)
return; return;
gpio_direction_output(N8X0_SLOT_SWITCH_GPIO, 0);
if (machine_is_nokia_n810()) { if (machine_is_nokia_n810()) {
err = gpio_request(N810_EMMC_VSD_GPIO, "MMC slot 2 Vddf"); err = gpio_request_array(n810_emmc_gpios,
ARRAY_SIZE(n810_emmc_gpios));
if (err) { if (err) {
gpio_free(N8X0_SLOT_SWITCH_GPIO); gpio_free(N8X0_SLOT_SWITCH_GPIO);
return; return;
} }
gpio_direction_output(N810_EMMC_VSD_GPIO, 0);
err = gpio_request(N810_EMMC_VIO_GPIO, "MMC slot 2 Vdd");
if (err) {
gpio_free(N8X0_SLOT_SWITCH_GPIO);
gpio_free(N810_EMMC_VSD_GPIO);
return;
}
gpio_direction_output(N810_EMMC_VIO_GPIO, 0);
} }
mmc_data[0] = &mmc1_data; mmc_data[0] = &mmc1_data;
......
arch/arm/mach-omap2/board-omap3beagle.c
View file @ 829ae273
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include "hsmmc.h" #include "hsmmc.h"
#include "timer-gp.h" #include "timer-gp.h"
#include "pm.h" #include "pm.h"
#include "common-board-devices.h"
#define NAND_BLOCK_SIZE SZ_128K #define NAND_BLOCK_SIZE SZ_128K
...@@ -79,6 +80,12 @@ static u8 omap3_beagle_get_rev(void) ...@@ -79,6 +80,12 @@ static u8 omap3_beagle_get_rev(void)
return omap3_beagle_version; return omap3_beagle_version;
} }
static struct gpio omap3_beagle_rev_gpios[] __initdata = {
{ 171, GPIOF_IN, "rev_id_0" },
{ 172, GPIOF_IN, "rev_id_1" },
{ 173, GPIOF_IN, "rev_id_2" },
};
static void __init omap3_beagle_init_rev(void) static void __init omap3_beagle_init_rev(void)
{ {
int ret; int ret;
...@@ -88,21 +95,13 @@ static void __init omap3_beagle_init_rev(void) ...@@ -88,21 +95,13 @@ static void __init omap3_beagle_init_rev(void)
omap_mux_init_gpio(172, OMAP_PIN_INPUT_PULLUP); omap_mux_init_gpio(172, OMAP_PIN_INPUT_PULLUP);
omap_mux_init_gpio(173, OMAP_PIN_INPUT_PULLUP); omap_mux_init_gpio(173, OMAP_PIN_INPUT_PULLUP);
ret = gpio_request(171, "rev_id_0"); ret = gpio_request_array(omap3_beagle_rev_gpios,
if (ret < 0) ARRAY_SIZE(omap3_beagle_rev_gpios));
goto fail0; if (ret < 0) {
printk(KERN_ERR "Unable to get revision detection GPIO pins\n");
ret = gpio_request(172, "rev_id_1"); omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN;
if (ret < 0) return;
goto fail1; }
ret = gpio_request(173, "rev_id_2");
if (ret < 0)
goto fail2;
gpio_direction_input(171);
gpio_direction_input(172);
gpio_direction_input(173);
beagle_rev = gpio_get_value(171) | (gpio_get_value(172) << 1) beagle_rev = gpio_get_value(171) | (gpio_get_value(172) << 1)
| (gpio_get_value(173) << 2); | (gpio_get_value(173) << 2);
...@@ -128,18 +127,6 @@ static void __init omap3_beagle_init_rev(void) ...@@ -128,18 +127,6 @@ static void __init omap3_beagle_init_rev(void)
printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev); printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev);
omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN; omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN;
} }
return;
fail2:
gpio_free(172);
fail1:
gpio_free(171);
fail0:
printk(KERN_ERR "Unable to get revision detection GPIO pins\n");
omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN;
return;
} }
static struct mtd_partition omap3beagle_nand_partitions[] = { static struct mtd_partition omap3beagle_nand_partitions[] = {
...@@ -173,15 +160,6 @@ static struct mtd_partition omap3beagle_nand_partitions[] = { ...@@ -173,15 +160,6 @@ static struct mtd_partition omap3beagle_nand_partitions[] = {
}, },
}; };
static struct omap_nand_platform_data omap3beagle_nand_data = {
.options = NAND_BUSWIDTH_16,
.parts = omap3beagle_nand_partitions,
.nr_parts = ARRAY_SIZE(omap3beagle_nand_partitions),
.dma_channel = -1, /* disable DMA in OMAP NAND driver */
.nand_setup = NULL,
.dev_ready = NULL,
};
/* DSS */ /* DSS */
static int beagle_enable_dvi(struct omap_dss_device *dssdev) static int beagle_enable_dvi(struct omap_dss_device *dssdev)
...@@ -243,13 +221,10 @@ static void __init beagle_display_init(void) ...@@ -243,13 +221,10 @@ static void __init beagle_display_init(void)
{ {
int r; int r;
r = gpio_request(beagle_dvi_device.reset_gpio, "DVI reset"); r = gpio_request_one(beagle_dvi_device.reset_gpio, GPIOF_OUT_INIT_LOW,
if (r < 0) { "DVI reset");
if (r < 0)
printk(KERN_ERR "Unable to get DVI reset GPIO\n"); printk(KERN_ERR "Unable to get DVI reset GPIO\n");
return;
}
gpio_direction_output(beagle_dvi_device.reset_gpio, 0);
} }
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
...@@ -276,7 +251,7 @@ static struct gpio_led gpio_leds[]; ...@@ -276,7 +251,7 @@ static struct gpio_led gpio_leds[];
static int beagle_twl_gpio_setup(struct device *dev, static int beagle_twl_gpio_setup(struct device *dev,
unsigned gpio, unsigned ngpio) unsigned gpio, unsigned ngpio)
{ {
int r; int r, usb_pwr_level;
if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
mmc[0].gpio_wp = -EINVAL; mmc[0].gpio_wp = -EINVAL;
...@@ -295,66 +270,46 @@ static int beagle_twl_gpio_setup(struct device *dev, ...@@ -295,66 +270,46 @@ static int beagle_twl_gpio_setup(struct device *dev,
beagle_vmmc1_supply.dev = mmc[0].dev; beagle_vmmc1_supply.dev = mmc[0].dev;
beagle_vsim_supply.dev = mmc[0].dev; beagle_vsim_supply.dev = mmc[0].dev;
/* REVISIT: need ehci-omap hooks for external VBUS
* power switch and overcurrent detect
*/
if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) {
r = gpio_request(gpio + 1, "EHCI_nOC");
if (!r) {
r = gpio_direction_input(gpio + 1);
if (r)
gpio_free(gpio + 1);
}
if (r)
pr_err("%s: unable to configure EHCI_nOC\n", __func__);
}
/* /*
* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active
* high / others active low) * high / others active low)
* DVI reset GPIO is different between beagle revisions
*/ */
gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) usb_pwr_level = GPIOF_OUT_INIT_HIGH;
gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
else
gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
/* DVI reset GPIO is different between beagle revisions */
if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
beagle_dvi_device.reset_gpio = 129; beagle_dvi_device.reset_gpio = 129;
else
beagle_dvi_device.reset_gpio = 170;
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
/* /*
* gpio + 1 on Xm controls the TFP410's enable line (active low) * gpio + 1 on Xm controls the TFP410's enable line (active low)
* gpio + 2 control varies depending on the board rev as follows: * gpio + 2 control varies depending on the board rev as below:
* P7/P8 revisions(prototype): Camera EN * P7/P8 revisions(prototype): Camera EN
* A2+ revisions (production): LDO (supplies DVI, serial, led blocks) * A2+ revisions (production): LDO (DVI, serial, led blocks)
*/ */
if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { r = gpio_request_one(gpio + 1, GPIOF_OUT_INIT_LOW,
r = gpio_request(gpio + 1, "nDVI_PWR_EN"); "nDVI_PWR_EN");
if (!r) {
r = gpio_direction_output(gpio + 1, 0);
if (r)
gpio_free(gpio + 1);
}
if (r) if (r)
pr_err("%s: unable to configure nDVI_PWR_EN\n", pr_err("%s: unable to configure nDVI_PWR_EN\n",
__func__); __func__);
r = gpio_request(gpio + 2, "DVI_LDO_EN"); r = gpio_request_one(gpio + 2, GPIOF_OUT_INIT_HIGH,
if (!r) { "DVI_LDO_EN");
r = gpio_direction_output(gpio + 2, 1);
if (r)
gpio_free(gpio + 2);
}
if (r) if (r)
pr_err("%s: unable to configure DVI_LDO_EN\n", pr_err("%s: unable to configure DVI_LDO_EN\n",
__func__); __func__);
} else {
usb_pwr_level = GPIOF_OUT_INIT_LOW;
beagle_dvi_device.reset_gpio = 170;
/*
* REVISIT: need ehci-omap hooks for external VBUS
* power switch and overcurrent detect
*/
if (gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC"))
pr_err("%s: unable to configure EHCI_nOC\n", __func__);
} }
gpio_request_one(gpio + TWL4030_GPIO_MAX, usb_pwr_level, "nEN_USB_PWR");
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
return 0; return 0;
} }
...@@ -453,15 +408,6 @@ static struct twl4030_platform_data beagle_twldata = { ...@@ -453,15 +408,6 @@ static struct twl4030_platform_data beagle_twldata = {
.vpll2 = &beagle_vpll2, .vpll2 = &beagle_vpll2,
}; };
static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl4030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &beagle_twldata,
},
};
static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
{ {
I2C_BOARD_INFO("eeprom", 0x50), I2C_BOARD_INFO("eeprom", 0x50),
...@@ -470,8 +416,7 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { ...@@ -470,8 +416,7 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
static int __init omap3_beagle_i2c_init(void) static int __init omap3_beagle_i2c_init(void)
{ {
omap_register_i2c_bus(1, 2600, beagle_i2c_boardinfo, omap3_pmic_init("twl4030", &beagle_twldata);
ARRAY_SIZE(beagle_i2c_boardinfo));
/* Bus 3 is attached to the DVI port where devices like the pico DLP /* Bus 3 is attached to the DVI port where devices like the pico DLP
* projector don't work reliably with 400kHz */ * projector don't work reliably with 400kHz */
omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom)); omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom));
...@@ -551,39 +496,6 @@ static struct platform_device *omap3_beagle_devices[] __initdata = { ...@@ -551,39 +496,6 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
&keys_gpio, &keys_gpio,
}; };
static void __init omap3beagle_flash_init(void)
{
u8 cs = 0;
u8 nandcs = GPMC_CS_NUM + 1;
/* find out the chip-select on which NAND exists */
while (cs < GPMC_CS_NUM) {
u32 ret = 0;
ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
if ((ret & 0xC00) == 0x800) {
printk(KERN_INFO "Found NAND on CS%d\n", cs);
if (nandcs > GPMC_CS_NUM)
nandcs = cs;
}
cs++;
}
if (nandcs > GPMC_CS_NUM) {
printk(KERN_INFO "NAND: Unable to find configuration "
"in GPMC\n ");
return;
}
if (nandcs < GPMC_CS_NUM) {
omap3beagle_nand_data.cs = nandcs;
printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
if (gpmc_nand_init(&omap3beagle_nand_data) < 0)
printk(KERN_ERR "Unable to register NAND device\n");
}
}
static const struct usbhs_omap_board_data usbhs_bdata __initconst = { static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
...@@ -602,12 +514,6 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -602,12 +514,6 @@ static struct omap_board_mux board_mux[] __initdata = {
}; };
#endif #endif
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static void __init beagle_opp_init(void) static void __init beagle_opp_init(void)
{ {
int r = 0; int r = 0;
...@@ -665,13 +571,13 @@ static void __init omap3_beagle_init(void) ...@@ -665,13 +571,13 @@ static void __init omap3_beagle_init(void)
omap_serial_init(); omap_serial_init();
omap_mux_init_gpio(170, OMAP_PIN_INPUT); omap_mux_init_gpio(170, OMAP_PIN_INPUT);
gpio_request(170, "DVI_nPD");
/* REVISIT leave DVI powered down until it's needed ... */ /* REVISIT leave DVI powered down until it's needed ... */
gpio_direction_output(170, true); gpio_request_one(170, GPIOF_OUT_INIT_HIGH, "DVI_nPD");
usb_musb_init(&musb_board_data); usb_musb_init(NULL);
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
omap3beagle_flash_init(); omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
ARRAY_SIZE(omap3beagle_nand_partitions));
/* Ensure SDRC pins are mux'd for self-refresh */ /* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
......
arch/arm/mach-omap2/board-omap3evm.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/board-omap3logic.c
View file @ 829ae273
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "hsmmc.h" #include "hsmmc.h"
#include "timer-gp.h" #include "timer-gp.h"
#include "control.h" #include "control.h"
#include "common-board-devices.h"
#include <plat/mux.h> #include <plat/mux.h>
#include <plat/board.h> #include <plat/board.h>
...@@ -93,19 +94,9 @@ static struct twl4030_platform_data omap3logic_twldata = { ...@@ -93,19 +94,9 @@ static struct twl4030_platform_data omap3logic_twldata = {
.vmmc1 = &omap3logic_vmmc1, .vmmc1 = &omap3logic_vmmc1,
}; };
static struct i2c_board_info __initdata omap3logic_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl4030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &omap3logic_twldata,
},
};
static int __init omap3logic_i2c_init(void) static int __init omap3logic_i2c_init(void)
{ {
omap_register_i2c_bus(1, 2600, omap3logic_i2c_boardinfo, omap3_pmic_init("twl4030", &omap3logic_twldata);
ARRAY_SIZE(omap3logic_i2c_boardinfo));
return 0; return 0;
} }
...@@ -147,7 +138,6 @@ static struct omap_smsc911x_platform_data __initdata board_smsc911x_data = { ...@@ -147,7 +138,6 @@ static struct omap_smsc911x_platform_data __initdata board_smsc911x_data = {
.cs = OMAP3LOGIC_SMSC911X_CS, .cs = OMAP3LOGIC_SMSC911X_CS,
.gpio_irq = -EINVAL, .gpio_irq = -EINVAL,
.gpio_reset = -EINVAL, .gpio_reset = -EINVAL,
.flags = IORESOURCE_IRQ_LOWLEVEL,
}; };
/* TODO/FIXME (comment by Peter Barada, LogicPD): /* TODO/FIXME (comment by Peter Barada, LogicPD):
......
arch/arm/mach-omap2/board-omap3pandora.c
View file @ 829ae273
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
#include <linux/i2c/twl.h> #include <linux/i2c/twl.h>
#include <linux/wl12xx.h> #include <linux/wl12xx.h>
...@@ -52,6 +51,7 @@ ...@@ -52,6 +51,7 @@
#include "mux.h" #include "mux.h"
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "common-board-devices.h"
#define PANDORA_WIFI_IRQ_GPIO 21 #define PANDORA_WIFI_IRQ_GPIO 21
#define PANDORA_WIFI_NRESET_GPIO 23 #define PANDORA_WIFI_NRESET_GPIO 23
...@@ -305,24 +305,13 @@ static int omap3pandora_twl_gpio_setup(struct device *dev, ...@@ -305,24 +305,13 @@ static int omap3pandora_twl_gpio_setup(struct device *dev,
/* gpio + 13 drives 32kHz buffer for wifi module */ /* gpio + 13 drives 32kHz buffer for wifi module */
gpio_32khz = gpio + 13; gpio_32khz = gpio + 13;
ret = gpio_request(gpio_32khz, "wifi 32kHz"); ret = gpio_request_one(gpio_32khz, GPIOF_OUT_INIT_HIGH, "wifi 32kHz");
if (ret < 0) { if (ret < 0) {
pr_err("Cannot get GPIO line %d, ret=%d\n", gpio_32khz, ret); pr_err("Cannot get GPIO line %d, ret=%d\n", gpio_32khz, ret);
goto fail; return -ENODEV;
}
ret = gpio_direction_output(gpio_32khz, 1);
if (ret < 0) {
pr_err("Cannot set GPIO line %d, ret=%d\n", gpio_32khz, ret);
goto fail_direction;
} }
return 0; return 0;
fail_direction:
gpio_free(gpio_32khz);
fail:
return -ENODEV;
} }
static struct twl4030_gpio_platform_data omap3pandora_gpio_data = { static struct twl4030_gpio_platform_data omap3pandora_gpio_data = {
...@@ -544,15 +533,6 @@ static struct twl4030_platform_data omap3pandora_twldata = { ...@@ -544,15 +533,6 @@ static struct twl4030_platform_data omap3pandora_twldata = {
.bci = &pandora_bci_data, .bci = &pandora_bci_data,
}; };
static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("tps65950", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &omap3pandora_twldata,
},
};
static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = { static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = {
{ {
I2C_BOARD_INFO("bq27500", 0x55), I2C_BOARD_INFO("bq27500", 0x55),
...@@ -562,61 +542,15 @@ static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = { ...@@ -562,61 +542,15 @@ static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = {
static int __init omap3pandora_i2c_init(void) static int __init omap3pandora_i2c_init(void)
{ {
omap_register_i2c_bus(1, 2600, omap3pandora_i2c_boardinfo, omap3_pmic_init("tps65950", &omap3pandora_twldata);
ARRAY_SIZE(omap3pandora_i2c_boardinfo));
/* i2c2 pins are not connected */ /* i2c2 pins are not connected */
omap_register_i2c_bus(3, 100, omap3pandora_i2c3_boardinfo, omap_register_i2c_bus(3, 100, omap3pandora_i2c3_boardinfo,
ARRAY_SIZE(omap3pandora_i2c3_boardinfo)); ARRAY_SIZE(omap3pandora_i2c3_boardinfo));
return 0; return 0;
} }
static void __init omap3pandora_ads7846_init(void)
{
int gpio = OMAP3_PANDORA_TS_GPIO;
int ret;
ret = gpio_request(gpio, "ads7846_pen_down");
if (ret < 0) {
printk(KERN_ERR "Failed to request GPIO %d for "
"ads7846 pen down IRQ\n", gpio);
return;
}
gpio_direction_input(gpio);
}
static int ads7846_get_pendown_state(void)
{
return !gpio_get_value(OMAP3_PANDORA_TS_GPIO);
}
static struct ads7846_platform_data ads7846_config = {
.x_max = 0x0fff,
.y_max = 0x0fff,
.x_plate_ohms = 180,
.pressure_max = 255,
.debounce_max = 10,
.debounce_tol = 3,
.debounce_rep = 1,
.get_pendown_state = ads7846_get_pendown_state,
.keep_vref_on = 1,
};
static struct omap2_mcspi_device_config ads7846_mcspi_config = {
.turbo_mode = 0,
.single_channel = 1, /* 0: slave, 1: master */
};
static struct spi_board_info omap3pandora_spi_board_info[] __initdata = { static struct spi_board_info omap3pandora_spi_board_info[] __initdata = {
{ {
.modalias = "ads7846",
.bus_num = 1,
.chip_select = 0,
.max_speed_hz = 1500000,
.controller_data = &ads7846_mcspi_config,
.irq = OMAP_GPIO_IRQ(OMAP3_PANDORA_TS_GPIO),
.platform_data = &ads7846_config,
}, {
.modalias = "tpo_td043mtea1_panel_spi", .modalias = "tpo_td043mtea1_panel_spi",
.bus_num = 1, .bus_num = 1,
.chip_select = 1, .chip_select = 1,
...@@ -639,14 +573,10 @@ static void __init pandora_wl1251_init(void) ...@@ -639,14 +573,10 @@ static void __init pandora_wl1251_init(void)
memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata)); memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata));
ret = gpio_request(PANDORA_WIFI_IRQ_GPIO, "wl1251 irq"); ret = gpio_request_one(PANDORA_WIFI_IRQ_GPIO, GPIOF_IN, "wl1251 irq");
if (ret < 0) if (ret < 0)
goto fail; goto fail;
ret = gpio_direction_input(PANDORA_WIFI_IRQ_GPIO);
if (ret < 0)
goto fail_irq;
pandora_wl1251_pdata.irq = gpio_to_irq(PANDORA_WIFI_IRQ_GPIO); pandora_wl1251_pdata.irq = gpio_to_irq(PANDORA_WIFI_IRQ_GPIO);
if (pandora_wl1251_pdata.irq < 0) if (pandora_wl1251_pdata.irq < 0)
goto fail_irq; goto fail_irq;
...@@ -688,12 +618,6 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -688,12 +618,6 @@ static struct omap_board_mux board_mux[] __initdata = {
}; };
#endif #endif
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static void __init omap3pandora_init(void) static void __init omap3pandora_init(void)
{ {
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
...@@ -705,9 +629,9 @@ static void __init omap3pandora_init(void) ...@@ -705,9 +629,9 @@ static void __init omap3pandora_init(void)
omap_serial_init(); omap_serial_init();
spi_register_board_info(omap3pandora_spi_board_info, spi_register_board_info(omap3pandora_spi_board_info,
ARRAY_SIZE(omap3pandora_spi_board_info)); ARRAY_SIZE(omap3pandora_spi_board_info));
omap3pandora_ads7846_init(); omap_ads7846_init(1, OMAP3_PANDORA_TS_GPIO, 0, NULL);
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
usb_musb_init(&musb_board_data); usb_musb_init(NULL);
gpmc_nand_init(&pandora_nand_data); gpmc_nand_init(&pandora_nand_data);
/* Ensure SDRC pins are mux'd for self-refresh */ /* Ensure SDRC pins are mux'd for self-refresh */
......
arch/arm/mach-omap2/board-omap3stalker.c
View file @ 829ae273
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include <plat/mcspi.h> #include <plat/mcspi.h>
#include <linux/input/matrix_keypad.h> #include <linux/input/matrix_keypad.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
#include <linux/i2c/at24.h> #include <linux/i2c/at24.h>
...@@ -54,52 +53,28 @@ ...@@ -54,52 +53,28 @@
#include "mux.h" #include "mux.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "timer-gp.h" #include "timer-gp.h"
#include "common-board-devices.h"
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <plat/gpmc-smsc911x.h>
#define OMAP3STALKER_ETHR_START 0x2c000000 #define OMAP3STALKER_ETHR_START 0x2c000000
#define OMAP3STALKER_ETHR_SIZE 1024 #define OMAP3STALKER_ETHR_SIZE 1024
#define OMAP3STALKER_ETHR_GPIO_IRQ 19 #define OMAP3STALKER_ETHR_GPIO_IRQ 19
#define OMAP3STALKER_SMC911X_CS 5 #define OMAP3STALKER_SMC911X_CS 5
static struct resource omap3stalker_smsc911x_resources[] = { static struct omap_smsc911x_platform_data smsc911x_cfg = {
[0] = { .cs = OMAP3STALKER_SMC911X_CS,
.start = OMAP3STALKER_ETHR_START, .gpio_irq = OMAP3STALKER_ETHR_GPIO_IRQ,
.end = .gpio_reset = -EINVAL,
(OMAP3STALKER_ETHR_START + OMAP3STALKER_ETHR_SIZE - 1),
.flags = IORESOURCE_MEM,
},
[1] = {
.start = OMAP_GPIO_IRQ(OMAP3STALKER_ETHR_GPIO_IRQ),
.end = OMAP_GPIO_IRQ(OMAP3STALKER_ETHR_GPIO_IRQ),
.flags = (IORESOURCE_IRQ | IRQF_TRIGGER_LOW),
},
};
static struct smsc911x_platform_config smsc911x_config = {
.phy_interface = PHY_INTERFACE_MODE_MII,
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
.irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
.flags = (SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS), .flags = (SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS),
}; };
static struct platform_device omap3stalker_smsc911x_device = {
.name = "smsc911x",
.id = -1,
.num_resources = ARRAY_SIZE(omap3stalker_smsc911x_resources),
.resource = &omap3stalker_smsc911x_resources[0],
.dev = {
.platform_data = &smsc911x_config,
},
};
static inline void __init omap3stalker_init_eth(void) static inline void __init omap3stalker_init_eth(void)
{ {
int eth_cs;
struct clk *l3ck; struct clk *l3ck;
unsigned int rate; unsigned int rate;
eth_cs = OMAP3STALKER_SMC911X_CS;
l3ck = clk_get(NULL, "l3_ck"); l3ck = clk_get(NULL, "l3_ck");
if (IS_ERR(l3ck)) if (IS_ERR(l3ck))
rate = 100000000; rate = 100000000;
...@@ -107,16 +82,7 @@ static inline void __init omap3stalker_init_eth(void) ...@@ -107,16 +82,7 @@ static inline void __init omap3stalker_init_eth(void)
rate = clk_get_rate(l3ck); rate = clk_get_rate(l3ck);
omap_mux_init_gpio(19, OMAP_PIN_INPUT_PULLUP); omap_mux_init_gpio(19, OMAP_PIN_INPUT_PULLUP);
if (gpio_request(OMAP3STALKER_ETHR_GPIO_IRQ, "SMC911x irq") < 0) { gpmc_smsc911x_init(&smsc911x_cfg);
printk(KERN_ERR
"Failed to request GPIO%d for smc911x IRQ\n",
OMAP3STALKER_ETHR_GPIO_IRQ);
return;
}
gpio_direction_input(OMAP3STALKER_ETHR_GPIO_IRQ);
platform_device_register(&omap3stalker_smsc911x_device);
} }
#else #else
...@@ -365,12 +331,11 @@ omap3stalker_twl_gpio_setup(struct device *dev, ...@@ -365,12 +331,11 @@ omap3stalker_twl_gpio_setup(struct device *dev,
*/ */
/* TWL4030_GPIO_MAX + 0 == ledA, LCD Backlight control */ /* TWL4030_GPIO_MAX + 0 == ledA, LCD Backlight control */
gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL"); gpio_request_one(gpio + TWL4030_GPIO_MAX, GPIOF_OUT_INIT_LOW,
gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); "EN_LCD_BKL");
/* gpio + 7 == DVI Enable */ /* gpio + 7 == DVI Enable */
gpio_request(gpio + 7, "EN_DVI"); gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI");
gpio_direction_output(gpio + 7, 0);
/* TWL4030_GPIO_MAX + 1 == ledB (out, mmc0) */ /* TWL4030_GPIO_MAX + 1 == ledB (out, mmc0) */
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
...@@ -489,15 +454,8 @@ static struct twl4030_platform_data omap3stalker_twldata = { ...@@ -489,15 +454,8 @@ static struct twl4030_platform_data omap3stalker_twldata = {
.codec = &omap3stalker_codec_data, .codec = &omap3stalker_codec_data,
.vdac = &omap3_stalker_vdac, .vdac = &omap3_stalker_vdac,
.vpll2 = &omap3_stalker_vpll2, .vpll2 = &omap3_stalker_vpll2,
}; .vmmc1 = &omap3stalker_vmmc1,
.vsim = &omap3stalker_vsim,
static struct i2c_board_info __initdata omap3stalker_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl4030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &omap3stalker_twldata,
},
}; };
static struct at24_platform_data fram_info = { static struct at24_platform_data fram_info = {
...@@ -516,15 +474,7 @@ static struct i2c_board_info __initdata omap3stalker_i2c_boardinfo3[] = { ...@@ -516,15 +474,7 @@ static struct i2c_board_info __initdata omap3stalker_i2c_boardinfo3[] = {
static int __init omap3_stalker_i2c_init(void) static int __init omap3_stalker_i2c_init(void)
{ {
/* omap3_pmic_init("twl4030", &omap3stalker_twldata);
* REVISIT: These entries can be set in omap3evm_twl_data
* after a merge with MFD tree
*/
omap3stalker_twldata.vmmc1 = &omap3stalker_vmmc1;
omap3stalker_twldata.vsim = &omap3stalker_vsim;
omap_register_i2c_bus(1, 2600, omap3stalker_i2c_boardinfo,
ARRAY_SIZE(omap3stalker_i2c_boardinfo));
omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(2, 400, NULL, 0);
omap_register_i2c_bus(3, 400, omap3stalker_i2c_boardinfo3, omap_register_i2c_bus(3, 400, omap3stalker_i2c_boardinfo3,
ARRAY_SIZE(omap3stalker_i2c_boardinfo3)); ARRAY_SIZE(omap3stalker_i2c_boardinfo3));
...@@ -532,49 +482,6 @@ static int __init omap3_stalker_i2c_init(void) ...@@ -532,49 +482,6 @@ static int __init omap3_stalker_i2c_init(void)
} }
#define OMAP3_STALKER_TS_GPIO 175 #define OMAP3_STALKER_TS_GPIO 175
static void ads7846_dev_init(void)
{
if (gpio_request(OMAP3_STALKER_TS_GPIO, "ADS7846 pendown") < 0)
printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
gpio_direction_input(OMAP3_STALKER_TS_GPIO);
gpio_set_debounce(OMAP3_STALKER_TS_GPIO, 310);
}
static int ads7846_get_pendown_state(void)
{
return !gpio_get_value(OMAP3_STALKER_TS_GPIO);
}
static struct ads7846_platform_data ads7846_config = {
.x_max = 0x0fff,
.y_max = 0x0fff,
.x_plate_ohms = 180,
.pressure_max = 255,
.debounce_max = 10,
.debounce_tol = 3,
.debounce_rep = 1,
.get_pendown_state = ads7846_get_pendown_state,
.keep_vref_on = 1,
.settle_delay_usecs = 150,
};
static struct omap2_mcspi_device_config ads7846_mcspi_config = {
.turbo_mode = 0,
.single_channel = 1, /* 0: slave, 1: master */
};
static struct spi_board_info omap3stalker_spi_board_info[] = {
[0] = {
.modalias = "ads7846",
.bus_num = 1,
.chip_select = 0,
.max_speed_hz = 1500000,
.controller_data = &ads7846_mcspi_config,
.irq = OMAP_GPIO_IRQ(OMAP3_STALKER_TS_GPIO),
.platform_data = &ads7846_config,
},
};
static struct omap_board_config_kernel omap3_stalker_config[] __initdata = { static struct omap_board_config_kernel omap3_stalker_config[] __initdata = {
}; };
...@@ -618,12 +525,6 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -618,12 +525,6 @@ static struct omap_board_mux board_mux[] __initdata = {
}; };
#endif #endif
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static void __init omap3_stalker_init(void) static void __init omap3_stalker_init(void)
{ {
omap3_mux_init(board_mux, OMAP_PACKAGE_CUS); omap3_mux_init(board_mux, OMAP_PACKAGE_CUS);
...@@ -636,13 +537,11 @@ static void __init omap3_stalker_init(void) ...@@ -636,13 +537,11 @@ static void __init omap3_stalker_init(void)
ARRAY_SIZE(omap3_stalker_devices)); ARRAY_SIZE(omap3_stalker_devices));
omap_display_init(&omap3_stalker_dss_data); omap_display_init(&omap3_stalker_dss_data);
spi_register_board_info(omap3stalker_spi_board_info,
ARRAY_SIZE(omap3stalker_spi_board_info));
omap_serial_init(); omap_serial_init();
usb_musb_init(&musb_board_data); usb_musb_init(NULL);
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
ads7846_dev_init(); omap_ads7846_init(1, OMAP3_STALKER_TS_GPIO, 310, NULL);
omap_mux_init_gpio(21, OMAP_PIN_OUTPUT); omap_mux_init_gpio(21, OMAP_PIN_OUTPUT);
omap_mux_init_gpio(18, OMAP_PIN_INPUT_PULLUP); omap_mux_init_gpio(18, OMAP_PIN_INPUT_PULLUP);
......
arch/arm/mach-omap2/board-omap3touchbook.c
View file @ 829ae273
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include "mux.h" #include "mux.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "timer-gp.h" #include "timer-gp.h"
#include "common-board-devices.h"
#include <asm/setup.h> #include <asm/setup.h>
...@@ -95,15 +96,6 @@ static struct mtd_partition omap3touchbook_nand_partitions[] = { ...@@ -95,15 +96,6 @@ static struct mtd_partition omap3touchbook_nand_partitions[] = {
}, },
}; };
static struct omap_nand_platform_data omap3touchbook_nand_data = {
.options = NAND_BUSWIDTH_16,
.parts = omap3touchbook_nand_partitions,
.nr_parts = ARRAY_SIZE(omap3touchbook_nand_partitions),
.dma_channel = -1, /* disable DMA in OMAP NAND driver */
.nand_setup = NULL,
.dev_ready = NULL,
};
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
static struct omap2_hsmmc_info mmc[] = { static struct omap2_hsmmc_info mmc[] = {
...@@ -154,13 +146,11 @@ static int touchbook_twl_gpio_setup(struct device *dev, ...@@ -154,13 +146,11 @@ static int touchbook_twl_gpio_setup(struct device *dev,
/* REVISIT: need ehci-omap hooks for external VBUS /* REVISIT: need ehci-omap hooks for external VBUS
* power switch and overcurrent detect * power switch and overcurrent detect
*/ */
gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC");
gpio_request(gpio + 1, "EHCI_nOC");
gpio_direction_input(gpio + 1);
/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); gpio_request_one(gpio + TWL4030_GPIO_MAX, GPIOF_OUT_INIT_LOW,
gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); "nEN_USB_PWR");
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
...@@ -273,15 +263,6 @@ static struct twl4030_platform_data touchbook_twldata = { ...@@ -273,15 +263,6 @@ static struct twl4030_platform_data touchbook_twldata = {
.vpll2 = &touchbook_vpll2, .vpll2 = &touchbook_vpll2,
}; };
static struct i2c_board_info __initdata touchbook_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl4030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &touchbook_twldata,
},
};
static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = { static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = {
{ {
I2C_BOARD_INFO("bq27200", 0x55), I2C_BOARD_INFO("bq27200", 0x55),
...@@ -291,8 +272,7 @@ static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = { ...@@ -291,8 +272,7 @@ static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = {
static int __init omap3_touchbook_i2c_init(void) static int __init omap3_touchbook_i2c_init(void)
{ {
/* Standard TouchBook bus */ /* Standard TouchBook bus */
omap_register_i2c_bus(1, 2600, touchbook_i2c_boardinfo, omap3_pmic_init("twl4030", &touchbook_twldata);
ARRAY_SIZE(touchbook_i2c_boardinfo));
/* Additional TouchBook bus */ /* Additional TouchBook bus */
omap_register_i2c_bus(3, 100, touchBook_i2c_boardinfo, omap_register_i2c_bus(3, 100, touchBook_i2c_boardinfo,
...@@ -301,19 +281,7 @@ static int __init omap3_touchbook_i2c_init(void) ...@@ -301,19 +281,7 @@ static int __init omap3_touchbook_i2c_init(void)
return 0; return 0;
} }
static void __init omap3_ads7846_init(void) static struct ads7846_platform_data ads7846_pdata = {
{
if (gpio_request(OMAP3_TS_GPIO, "ads7846_pen_down")) {
printk(KERN_ERR "Failed to request GPIO %d for "
"ads7846 pen down IRQ\n", OMAP3_TS_GPIO);
return;
}
gpio_direction_input(OMAP3_TS_GPIO);
gpio_set_debounce(OMAP3_TS_GPIO, 310);
}
static struct ads7846_platform_data ads7846_config = {
.x_min = 100, .x_min = 100,
.y_min = 265, .y_min = 265,
.x_max = 3950, .x_max = 3950,
...@@ -327,23 +295,6 @@ static struct ads7846_platform_data ads7846_config = { ...@@ -327,23 +295,6 @@ static struct ads7846_platform_data ads7846_config = {
.keep_vref_on = 1, .keep_vref_on = 1,
}; };
static struct omap2_mcspi_device_config ads7846_mcspi_config = {
.turbo_mode = 0,
.single_channel = 1, /* 0: slave, 1: master */
};
static struct spi_board_info omap3_ads7846_spi_board_info[] __initdata = {
{
.modalias = "ads7846",
.bus_num = 4,
.chip_select = 0,
.max_speed_hz = 1500000,
.controller_data = &ads7846_mcspi_config,
.irq = OMAP_GPIO_IRQ(OMAP3_TS_GPIO),
.platform_data = &ads7846_config,
}
};
static struct gpio_led gpio_leds[] = { static struct gpio_led gpio_leds[] = {
{ {
.name = "touchbook::usr0", .name = "touchbook::usr0",
...@@ -434,39 +385,6 @@ static struct platform_device *omap3_touchbook_devices[] __initdata = { ...@@ -434,39 +385,6 @@ static struct platform_device *omap3_touchbook_devices[] __initdata = {
&keys_gpio, &keys_gpio,
}; };
static void __init omap3touchbook_flash_init(void)
{
u8 cs = 0;
u8 nandcs = GPMC_CS_NUM + 1;
/* find out the chip-select on which NAND exists */
while (cs < GPMC_CS_NUM) {
u32 ret = 0;
ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
if ((ret & 0xC00) == 0x800) {
printk(KERN_INFO "Found NAND on CS%d\n", cs);
if (nandcs > GPMC_CS_NUM)
nandcs = cs;
}
cs++;
}
if (nandcs > GPMC_CS_NUM) {
printk(KERN_INFO "NAND: Unable to find configuration "
"in GPMC\n ");
return;
}
if (nandcs < GPMC_CS_NUM) {
omap3touchbook_nand_data.cs = nandcs;
printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
if (gpmc_nand_init(&omap3touchbook_nand_data) < 0)
printk(KERN_ERR "Unable to register NAND device\n");
}
}
static const struct usbhs_omap_board_data usbhs_bdata __initconst = { static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
...@@ -481,15 +399,10 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = { ...@@ -481,15 +399,10 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
static void omap3_touchbook_poweroff(void) static void omap3_touchbook_poweroff(void)
{ {
int r; int pwr_off = TB_KILL_POWER_GPIO;
r = gpio_request(TB_KILL_POWER_GPIO, "DVI reset"); if (gpio_request_one(pwr_off, GPIOF_OUT_INIT_LOW, "DVI reset") < 0)
if (r < 0) {
printk(KERN_ERR "Unable to get kill power GPIO\n"); printk(KERN_ERR "Unable to get kill power GPIO\n");
return;
}
gpio_direction_output(TB_KILL_POWER_GPIO, 0);
} }
static int __init early_touchbook_revision(char *p) static int __init early_touchbook_revision(char *p)
...@@ -501,12 +414,6 @@ static int __init early_touchbook_revision(char *p) ...@@ -501,12 +414,6 @@ static int __init early_touchbook_revision(char *p)
} }
early_param("tbr", early_touchbook_revision); early_param("tbr", early_touchbook_revision);
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static void __init omap3_touchbook_init(void) static void __init omap3_touchbook_init(void)
{ {
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
...@@ -521,17 +428,15 @@ static void __init omap3_touchbook_init(void) ...@@ -521,17 +428,15 @@ static void __init omap3_touchbook_init(void)
omap_serial_init(); omap_serial_init();
omap_mux_init_gpio(170, OMAP_PIN_INPUT); omap_mux_init_gpio(170, OMAP_PIN_INPUT);
gpio_request(176, "DVI_nPD");
/* REVISIT leave DVI powered down until it's needed ... */ /* REVISIT leave DVI powered down until it's needed ... */
gpio_direction_output(176, true); gpio_request_one(176, GPIOF_OUT_INIT_HIGH, "DVI_nPD");
/* Touchscreen and accelerometer */ /* Touchscreen and accelerometer */
spi_register_board_info(omap3_ads7846_spi_board_info, omap_ads7846_init(4, OMAP3_TS_GPIO, 310, &ads7846_pdata);
ARRAY_SIZE(omap3_ads7846_spi_board_info)); usb_musb_init(NULL);
omap3_ads7846_init();
usb_musb_init(&musb_board_data);
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
omap3touchbook_flash_init(); omap_nand_flash_init(NAND_BUSWIDTH_16, omap3touchbook_nand_partitions,
ARRAY_SIZE(omap3touchbook_nand_partitions));
/* Ensure SDRC pins are mux'd for self-refresh */ /* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
......
arch/arm/mach-omap2/board-omap4panda.c
View file @ 829ae273
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "hsmmc.h" #include "hsmmc.h"
#include "control.h" #include "control.h"
#include "mux.h" #include "mux.h"
#include "common-board-devices.h"
#define GPIO_HUB_POWER 1 #define GPIO_HUB_POWER 1
#define GPIO_HUB_NRESET 62 #define GPIO_HUB_NRESET 62
...@@ -111,6 +112,11 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = { ...@@ -111,6 +112,11 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
.reset_gpio_port[2] = -EINVAL .reset_gpio_port[2] = -EINVAL
}; };
static struct gpio panda_ehci_gpios[] __initdata = {
{ GPIO_HUB_POWER, GPIOF_OUT_INIT_LOW, "hub_power" },
{ GPIO_HUB_NRESET, GPIOF_OUT_INIT_LOW, "hub_nreset" },
};
static void __init omap4_ehci_init(void) static void __init omap4_ehci_init(void)
{ {
int ret; int ret;
...@@ -120,44 +126,27 @@ static void __init omap4_ehci_init(void) ...@@ -120,44 +126,27 @@ static void __init omap4_ehci_init(void)
phy_ref_clk = clk_get(NULL, "auxclk3_ck"); phy_ref_clk = clk_get(NULL, "auxclk3_ck");
if (IS_ERR(phy_ref_clk)) { if (IS_ERR(phy_ref_clk)) {
pr_err("Cannot request auxclk3\n"); pr_err("Cannot request auxclk3\n");
goto error1; return;
} }
clk_set_rate(phy_ref_clk, 19200000); clk_set_rate(phy_ref_clk, 19200000);
clk_enable(phy_ref_clk); clk_enable(phy_ref_clk);
/* disable the power to the usb hub prior to init */ /* disable the power to the usb hub prior to init and reset phy+hub */
ret = gpio_request(GPIO_HUB_POWER, "hub_power"); ret = gpio_request_array(panda_ehci_gpios,
ARRAY_SIZE(panda_ehci_gpios));
if (ret) { if (ret) {
pr_err("Cannot request GPIO %d\n", GPIO_HUB_POWER); pr_err("Unable to initialize EHCI power/reset\n");
goto error1; return;
} }
gpio_export(GPIO_HUB_POWER, 0);
gpio_direction_output(GPIO_HUB_POWER, 0);
gpio_set_value(GPIO_HUB_POWER, 0);
/* reset phy+hub */ gpio_export(GPIO_HUB_POWER, 0);
ret = gpio_request(GPIO_HUB_NRESET, "hub_nreset");
if (ret) {
pr_err("Cannot request GPIO %d\n", GPIO_HUB_NRESET);
goto error2;
}
gpio_export(GPIO_HUB_NRESET, 0); gpio_export(GPIO_HUB_NRESET, 0);
gpio_direction_output(GPIO_HUB_NRESET, 0);
gpio_set_value(GPIO_HUB_NRESET, 0);
gpio_set_value(GPIO_HUB_NRESET, 1); gpio_set_value(GPIO_HUB_NRESET, 1);
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
/* enable power to hub */ /* enable power to hub */
gpio_set_value(GPIO_HUB_POWER, 1); gpio_set_value(GPIO_HUB_POWER, 1);
return;
error2:
gpio_free(GPIO_HUB_POWER);
error1:
pr_err("Unable to initialize EHCI power/reset\n");
return;
} }
static struct omap_musb_board_data musb_board_data = { static struct omap_musb_board_data musb_board_data = {
...@@ -408,15 +397,6 @@ static struct twl4030_platform_data omap4_panda_twldata = { ...@@ -408,15 +397,6 @@ static struct twl4030_platform_data omap4_panda_twldata = {
.usb = &omap4_usbphy_data, .usb = &omap4_usbphy_data,
}; };
static struct i2c_board_info __initdata omap4_panda_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl6030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = OMAP44XX_IRQ_SYS_1N,
.platform_data = &omap4_panda_twldata,
},
};
/* /*
* Display monitor features are burnt in their EEPROM as EDID data. The EEPROM * Display monitor features are burnt in their EEPROM as EDID data. The EEPROM
* is connected as I2C slave device, and can be accessed at address 0x50 * is connected as I2C slave device, and can be accessed at address 0x50
...@@ -429,12 +409,7 @@ static struct i2c_board_info __initdata panda_i2c_eeprom[] = { ...@@ -429,12 +409,7 @@ static struct i2c_board_info __initdata panda_i2c_eeprom[] = {
static int __init omap4_panda_i2c_init(void) static int __init omap4_panda_i2c_init(void)
{ {
/* omap4_pmic_init("twl6030", &omap4_panda_twldata);
* Phoenix Audio IC needs I2C1 to
* start with 400 KHz or less
*/
omap_register_i2c_bus(1, 400, omap4_panda_i2c_boardinfo,
ARRAY_SIZE(omap4_panda_i2c_boardinfo));
omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(2, 400, NULL, 0);
/* /*
* Bus 3 is attached to the DVI port where devices like the pico DLP * Bus 3 is attached to the DVI port where devices like the pico DLP
...@@ -651,27 +626,19 @@ static void omap4_panda_hdmi_mux_init(void) ...@@ -651,27 +626,19 @@ static void omap4_panda_hdmi_mux_init(void)
OMAP_PIN_INPUT_PULLUP); OMAP_PIN_INPUT_PULLUP);
} }
static struct gpio panda_hdmi_gpios[] = {
{ HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd" },
{ HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
};
static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev) static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
{ {
int status; int status;
status = gpio_request_one(HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, status = gpio_request_array(panda_hdmi_gpios,
"hdmi_gpio_hpd"); ARRAY_SIZE(panda_hdmi_gpios));
if (status) { if (status)
pr_err("Cannot request GPIO %d\n", HDMI_GPIO_HPD); pr_err("Cannot request HDMI GPIOs\n");
return status;
}
status = gpio_request_one(HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH,
"hdmi_gpio_ls_oe");
if (status) {
pr_err("Cannot request GPIO %d\n", HDMI_GPIO_LS_OE);
goto error1;
}
return 0;
error1:
gpio_free(HDMI_GPIO_HPD);
return status; return status;
} }
......
arch/arm/mach-omap2/board-overo.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/board-rm680.c
View file @ 829ae273
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "mux.h" #include "mux.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "sdram-nokia.h" #include "sdram-nokia.h"
#include "common-board-devices.h"
static struct regulator_consumer_supply rm680_vemmc_consumers[] = { static struct regulator_consumer_supply rm680_vemmc_consumers[] = {
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"), REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
...@@ -90,19 +91,9 @@ static struct twl4030_platform_data rm680_twl_data = { ...@@ -90,19 +91,9 @@ static struct twl4030_platform_data rm680_twl_data = {
/* add rest of the children here */ /* add rest of the children here */
}; };
static struct i2c_board_info __initdata rm680_twl_i2c_board_info[] = {
{
I2C_BOARD_INFO("twl5031", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &rm680_twl_data,
},
};
static void __init rm680_i2c_init(void) static void __init rm680_i2c_init(void)
{ {
omap_register_i2c_bus(1, 2900, rm680_twl_i2c_board_info, omap_pmic_init(1, 2900, "twl5031", INT_34XX_SYS_NIRQ, &rm680_twl_data);
ARRAY_SIZE(rm680_twl_i2c_board_info));
omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(2, 400, NULL, 0);
omap_register_i2c_bus(3, 400, NULL, 0); omap_register_i2c_bus(3, 400, NULL, 0);
} }
...@@ -153,17 +144,11 @@ static struct omap_board_mux board_mux[] __initdata = { ...@@ -153,17 +144,11 @@ static struct omap_board_mux board_mux[] __initdata = {
}; };
#endif #endif
static struct omap_musb_board_data rm680_musb_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_PERIPHERAL,
.power = 100,
};
static void __init rm680_init(void) static void __init rm680_init(void)
{ {
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap_serial_init(); omap_serial_init();
usb_musb_init(&rm680_musb_data); usb_musb_init(NULL);
rm680_peripherals_init(); rm680_peripherals_init();
} }
......
arch/arm/mach-omap2/board-rx51-peripherals.c
View file @ 829ae273
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "mux.h" #include "mux.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "common-board-devices.h"
#define SYSTEM_REV_B_USES_VAUX3 0x1699 #define SYSTEM_REV_B_USES_VAUX3 0x1699
#define SYSTEM_REV_S_USES_VAUX3 0x8 #define SYSTEM_REV_S_USES_VAUX3 0x8
...@@ -557,10 +558,8 @@ static __init void rx51_init_si4713(void) ...@@ -557,10 +558,8 @@ static __init void rx51_init_si4713(void)
static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n) static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n)
{ {
/* FIXME this gpio setup is just a placeholder for now */ /* FIXME this gpio setup is just a placeholder for now */
gpio_request(gpio + 6, "backlight_pwm"); gpio_request_one(gpio + 6, GPIOF_OUT_INIT_LOW, "backlight_pwm");
gpio_direction_output(gpio + 6, 0); gpio_request_one(gpio + 7, GPIOF_OUT_INIT_HIGH, "speaker_en");
gpio_request(gpio + 7, "speaker_en");
gpio_direction_output(gpio + 7, 1);
return 0; return 0;
} }
...@@ -777,15 +776,6 @@ static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module = ...@@ -777,15 +776,6 @@ static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module =
.power_gpio = 98, .power_gpio = 98,
}; };
static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = {
{
I2C_BOARD_INFO("twl5030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &rx51_twldata,
},
};
/* Audio setup data */ /* Audio setup data */
static struct aic3x_setup_data rx51_aic34_setup = { static struct aic3x_setup_data rx51_aic34_setup = {
.gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED, .gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
...@@ -833,8 +823,7 @@ static int __init rx51_i2c_init(void) ...@@ -833,8 +823,7 @@ static int __init rx51_i2c_init(void)
rx51_twldata.vaux3 = &rx51_vaux3_cam; rx51_twldata.vaux3 = &rx51_vaux3_cam;
} }
rx51_twldata.vmmc2 = &rx51_vmmc2; rx51_twldata.vmmc2 = &rx51_vmmc2;
omap_register_i2c_bus(1, 2200, rx51_peripherals_i2c_board_info_1, omap_pmic_init(1, 2200, "twl5030", INT_34XX_SYS_NIRQ, &rx51_twldata);
ARRAY_SIZE(rx51_peripherals_i2c_board_info_1));
omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2, omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2,
ARRAY_SIZE(rx51_peripherals_i2c_board_info_2)); ARRAY_SIZE(rx51_peripherals_i2c_board_info_2));
omap_register_i2c_bus(3, 400, NULL, 0); omap_register_i2c_bus(3, 400, NULL, 0);
...@@ -921,26 +910,20 @@ static void rx51_wl1251_set_power(bool enable) ...@@ -921,26 +910,20 @@ static void rx51_wl1251_set_power(bool enable)
gpio_set_value(RX51_WL1251_POWER_GPIO, enable); gpio_set_value(RX51_WL1251_POWER_GPIO, enable);
} }
static struct gpio rx51_wl1251_gpios[] __initdata = {
{ RX51_WL1251_POWER_GPIO, GPIOF_OUT_INIT_LOW, "wl1251 power" },
{ RX51_WL1251_IRQ_GPIO, GPIOF_IN, "wl1251 irq" },
};
static void __init rx51_init_wl1251(void) static void __init rx51_init_wl1251(void)
{ {
int irq, ret; int irq, ret;
ret = gpio_request(RX51_WL1251_POWER_GPIO, "wl1251 power"); ret = gpio_request_array(rx51_wl1251_gpios,
ARRAY_SIZE(rx51_wl1251_gpios));
if (ret < 0) if (ret < 0)
goto error; goto error;
ret = gpio_direction_output(RX51_WL1251_POWER_GPIO, 0);
if (ret < 0)
goto err_power;
ret = gpio_request(RX51_WL1251_IRQ_GPIO, "wl1251 irq");
if (ret < 0)
goto err_power;
ret = gpio_direction_input(RX51_WL1251_IRQ_GPIO);
if (ret < 0)
goto err_irq;
irq = gpio_to_irq(RX51_WL1251_IRQ_GPIO); irq = gpio_to_irq(RX51_WL1251_IRQ_GPIO);
if (irq < 0) if (irq < 0)
goto err_irq; goto err_irq;
...@@ -952,10 +935,7 @@ static void __init rx51_init_wl1251(void) ...@@ -952,10 +935,7 @@ static void __init rx51_init_wl1251(void)
err_irq: err_irq:
gpio_free(RX51_WL1251_IRQ_GPIO); gpio_free(RX51_WL1251_IRQ_GPIO);
err_power:
gpio_free(RX51_WL1251_POWER_GPIO); gpio_free(RX51_WL1251_POWER_GPIO);
error: error:
printk(KERN_ERR "wl1251 board initialisation failed\n"); printk(KERN_ERR "wl1251 board initialisation failed\n");
wl1251_pdata.set_power = NULL; wl1251_pdata.set_power = NULL;
......
arch/arm/mach-omap2/board-rx51-video.c
View file @ 829ae273
...@@ -76,13 +76,12 @@ static int __init rx51_video_init(void) ...@@ -76,13 +76,12 @@ static int __init rx51_video_init(void)
return 0; return 0;
} }
if (gpio_request(RX51_LCD_RESET_GPIO, "LCD ACX565AKM reset")) { if (gpio_request_one(RX51_LCD_RESET_GPIO, GPIOF_OUT_INIT_HIGH,
"LCD ACX565AKM reset")) {
pr_err("%s failed to get LCD Reset GPIO\n", __func__); pr_err("%s failed to get LCD Reset GPIO\n", __func__);
return 0; return 0;
} }
gpio_direction_output(RX51_LCD_RESET_GPIO, 1);
omap_display_init(&rx51_dss_board_info); omap_display_init(&rx51_dss_board_info);
return 0; return 0;
} }
......
arch/arm/mach-omap2/board-rx51.c
View file @ 829ae273
...@@ -58,21 +58,25 @@ static struct platform_device leds_gpio = { ...@@ -58,21 +58,25 @@ static struct platform_device leds_gpio = {
}, },
}; };
/*
* cpuidle C-states definition override from the default values.
* The 'exit_latency' field is the sum of sleep and wake-up latencies.
*/
static struct cpuidle_params rx51_cpuidle_params[] = { static struct cpuidle_params rx51_cpuidle_params[] = {
/* C1 */ /* C1 */
{1, 110, 162, 5}, {110 + 162, 5 , 1},
/* C2 */ /* C2 */
{1, 106, 180, 309}, {106 + 180, 309, 1},
/* C3 */ /* C3 */
{0, 107, 410, 46057}, {107 + 410, 46057, 0},
/* C4 */ /* C4 */
{0, 121, 3374, 46057}, {121 + 3374, 46057, 0},
/* C5 */ /* C5 */
{1, 855, 1146, 46057}, {855 + 1146, 46057, 1},
/* C6 */ /* C6 */
{0, 7580, 4134, 484329}, {7580 + 4134, 484329, 0},
/* C7 */ /* C7 */
{1, 7505, 15274, 484329}, {7505 + 15274, 484329, 1},
}; };
static struct omap_lcd_config rx51_lcd_config = { static struct omap_lcd_config rx51_lcd_config = {
......
arch/arm/mach-omap2/board-zoom-debugboard.c
View file @ 829ae273
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <plat/gpmc.h> #include <plat/gpmc.h>
#include <plat/gpmc-smsc911x.h>
#include <mach/board-zoom.h> #include <mach/board-zoom.h>
...@@ -26,60 +27,16 @@ ...@@ -26,60 +27,16 @@
#define DEBUG_BASE 0x08000000 #define DEBUG_BASE 0x08000000
#define ZOOM_ETHR_START DEBUG_BASE #define ZOOM_ETHR_START DEBUG_BASE
static struct resource zoom_smsc911x_resources[] = { static struct omap_smsc911x_platform_data zoom_smsc911x_cfg = {
[0] = { .cs = ZOOM_SMSC911X_CS,
.start = ZOOM_ETHR_START, .gpio_irq = ZOOM_SMSC911X_GPIO,
.end = ZOOM_ETHR_START + SZ_4K, .gpio_reset = -EINVAL,
.flags = IORESOURCE_MEM,
},
[1] = {
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
},
};
static struct smsc911x_platform_config zoom_smsc911x_config = {
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
.irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
.flags = SMSC911X_USE_32BIT, .flags = SMSC911X_USE_32BIT,
.phy_interface = PHY_INTERFACE_MODE_MII,
};
static struct platform_device zoom_smsc911x_device = {
.name = "smsc911x",
.id = -1,
.num_resources = ARRAY_SIZE(zoom_smsc911x_resources),
.resource = zoom_smsc911x_resources,
.dev = {
.platform_data = &zoom_smsc911x_config,
},
}; };
static inline void __init zoom_init_smsc911x(void) static inline void __init zoom_init_smsc911x(void)
{ {
int eth_cs; gpmc_smsc911x_init(&zoom_smsc911x_cfg);
unsigned long cs_mem_base;
int eth_gpio = 0;
eth_cs = ZOOM_SMSC911X_CS;
if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n");
return;
}
zoom_smsc911x_resources[0].start = cs_mem_base + 0x0;
zoom_smsc911x_resources[0].end = cs_mem_base + 0xff;
eth_gpio = ZOOM_SMSC911X_GPIO;
zoom_smsc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
if (gpio_request(eth_gpio, "smsc911x irq") < 0) {
printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
eth_gpio);
return;
}
gpio_direction_input(eth_gpio);
} }
static struct plat_serial8250_port serial_platform_data[] = { static struct plat_serial8250_port serial_platform_data[] = {
...@@ -120,12 +77,9 @@ static inline void __init zoom_init_quaduart(void) ...@@ -120,12 +77,9 @@ static inline void __init zoom_init_quaduart(void)
quart_gpio = ZOOM_QUADUART_GPIO; quart_gpio = ZOOM_QUADUART_GPIO;
if (gpio_request(quart_gpio, "TL16CP754C GPIO") < 0) { if (gpio_request_one(quart_gpio, GPIOF_IN, "TL16CP754C GPIO") < 0)
printk(KERN_ERR "Failed to request GPIO%d for TL16CP754C\n", printk(KERN_ERR "Failed to request GPIO%d for TL16CP754C\n",
quart_gpio); quart_gpio);
return;
}
gpio_direction_input(quart_gpio);
} }
static inline int omap_zoom_debugboard_detect(void) static inline int omap_zoom_debugboard_detect(void)
...@@ -135,12 +89,12 @@ static inline int omap_zoom_debugboard_detect(void) ...@@ -135,12 +89,12 @@ static inline int omap_zoom_debugboard_detect(void)
debug_board_detect = ZOOM_SMSC911X_GPIO; debug_board_detect = ZOOM_SMSC911X_GPIO;
if (gpio_request(debug_board_detect, "Zoom debug board detect") < 0) { if (gpio_request_one(debug_board_detect, GPIOF_IN,
"Zoom debug board detect") < 0) {
printk(KERN_ERR "Failed to request GPIO%d for Zoom debug" printk(KERN_ERR "Failed to request GPIO%d for Zoom debug"
"board detect\n", debug_board_detect); "board detect\n", debug_board_detect);
return 0; return 0;
} }
gpio_direction_input(debug_board_detect);
if (!gpio_get_value(debug_board_detect)) { if (!gpio_get_value(debug_board_detect)) {
ret = 0; ret = 0;
...@@ -150,7 +104,6 @@ static inline int omap_zoom_debugboard_detect(void) ...@@ -150,7 +104,6 @@ static inline int omap_zoom_debugboard_detect(void)
} }
static struct platform_device *zoom_devices[] __initdata = { static struct platform_device *zoom_devices[] __initdata = {
&zoom_smsc911x_device,
&zoom_debugboard_serial_device, &zoom_debugboard_serial_device,
}; };
......
arch/arm/mach-omap2/board-zoom-display.c
View file @ 829ae273
...@@ -21,34 +21,19 @@ ...@@ -21,34 +21,19 @@
#define LCD_PANEL_RESET_GPIO_PILOT 55 #define LCD_PANEL_RESET_GPIO_PILOT 55
#define LCD_PANEL_QVGA_GPIO 56 #define LCD_PANEL_QVGA_GPIO 56
static struct gpio zoom_lcd_gpios[] __initdata = {
{ -EINVAL, GPIOF_OUT_INIT_HIGH, "lcd reset" },
{ LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "lcd qvga" },
};
static void zoom_lcd_panel_init(void) static void zoom_lcd_panel_init(void)
{ {
int ret; zoom_lcd_gpios[0].gpio = (omap_rev() > OMAP3430_REV_ES3_0) ?
unsigned char lcd_panel_reset_gpio;
lcd_panel_reset_gpio = (omap_rev() > OMAP3430_REV_ES3_0) ?
LCD_PANEL_RESET_GPIO_PROD : LCD_PANEL_RESET_GPIO_PROD :
LCD_PANEL_RESET_GPIO_PILOT; LCD_PANEL_RESET_GPIO_PILOT;
ret = gpio_request(lcd_panel_reset_gpio, "lcd reset"); if (gpio_request_array(zoom_lcd_gpios, ARRAY_SIZE(zoom_lcd_gpios)))
if (ret) { pr_err("%s: Failed to get LCD GPIOs.\n", __func__);
pr_err("Failed to get LCD reset GPIO (gpio%d).\n",
lcd_panel_reset_gpio);
return;
}
gpio_direction_output(lcd_panel_reset_gpio, 1);
ret = gpio_request(LCD_PANEL_QVGA_GPIO, "lcd qvga");
if (ret) {
pr_err("Failed to get LCD_PANEL_QVGA_GPIO (gpio%d).\n",
LCD_PANEL_QVGA_GPIO);
goto err0;
}
gpio_direction_output(LCD_PANEL_QVGA_GPIO, 1);
return;
err0:
gpio_free(lcd_panel_reset_gpio);
} }
static int zoom_panel_enable_lcd(struct omap_dss_device *dssdev) static int zoom_panel_enable_lcd(struct omap_dss_device *dssdev)
......
arch/arm/mach-omap2/board-zoom-peripherals.c
View file @ 829ae273
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "mux.h" #include "mux.h"
#include "hsmmc.h" #include "hsmmc.h"
#include "common-board-devices.h"
#define OMAP_ZOOM_WLAN_PMENA_GPIO (101) #define OMAP_ZOOM_WLAN_PMENA_GPIO (101)
#define OMAP_ZOOM_WLAN_IRQ_GPIO (162) #define OMAP_ZOOM_WLAN_IRQ_GPIO (162)
...@@ -276,13 +277,11 @@ static int zoom_twl_gpio_setup(struct device *dev, ...@@ -276,13 +277,11 @@ static int zoom_twl_gpio_setup(struct device *dev,
zoom_vsim_supply.dev = mmc[0].dev; zoom_vsim_supply.dev = mmc[0].dev;
zoom_vmmc2_supply.dev = mmc[1].dev; zoom_vmmc2_supply.dev = mmc[1].dev;
ret = gpio_request(LCD_PANEL_ENABLE_GPIO, "lcd enable"); ret = gpio_request_one(LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,
if (ret) { "lcd enable");
if (ret)
pr_err("Failed to get LCD_PANEL_ENABLE_GPIO (gpio%d).\n", pr_err("Failed to get LCD_PANEL_ENABLE_GPIO (gpio%d).\n",
LCD_PANEL_ENABLE_GPIO); LCD_PANEL_ENABLE_GPIO);
return ret;
}
gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0);
return ret; return ret;
} }
...@@ -349,15 +348,6 @@ static struct twl4030_platform_data zoom_twldata = { ...@@ -349,15 +348,6 @@ static struct twl4030_platform_data zoom_twldata = {
.vdac = &zoom_vdac, .vdac = &zoom_vdac,
}; };
static struct i2c_board_info __initdata zoom_i2c_boardinfo[] = {
{
I2C_BOARD_INFO("twl5030", 0x48),
.flags = I2C_CLIENT_WAKE,
.irq = INT_34XX_SYS_NIRQ,
.platform_data = &zoom_twldata,
},
};
static int __init omap_i2c_init(void) static int __init omap_i2c_init(void)
{ {
if (machine_is_omap_zoom2()) { if (machine_is_omap_zoom2()) {
...@@ -365,19 +355,12 @@ static int __init omap_i2c_init(void) ...@@ -365,19 +355,12 @@ static int __init omap_i2c_init(void)
zoom_audio_data.hs_extmute = 1; zoom_audio_data.hs_extmute = 1;
zoom_audio_data.set_hs_extmute = zoom2_set_hs_extmute; zoom_audio_data.set_hs_extmute = zoom2_set_hs_extmute;
} }
omap_register_i2c_bus(1, 2400, zoom_i2c_boardinfo, omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata);
ARRAY_SIZE(zoom_i2c_boardinfo));
omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(2, 400, NULL, 0);
omap_register_i2c_bus(3, 400, NULL, 0); omap_register_i2c_bus(3, 400, NULL, 0);
return 0; return 0;
} }
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
.mode = MUSB_OTG,
.power = 100,
};
static void enable_board_wakeup_source(void) static void enable_board_wakeup_source(void)
{ {
/* T2 interrupt line (keypad) */ /* T2 interrupt line (keypad) */
...@@ -392,7 +375,7 @@ void __init zoom_peripherals_init(void) ...@@ -392,7 +375,7 @@ void __init zoom_peripherals_init(void)
omap_i2c_init(); omap_i2c_init();
platform_device_register(&omap_vwlan_device); platform_device_register(&omap_vwlan_device);
usb_musb_init(&musb_board_data); usb_musb_init(NULL);
enable_board_wakeup_source(); enable_board_wakeup_source();
omap_serial_init(); omap_serial_init();
} }
arch/arm/mach-omap2/common-board-devices.c 0 → 100644
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/common-board-devices.h 0 → 100644
View file @ 829ae273
#ifndef __OMAP_COMMON_BOARD_DEVICES__
#define __OMAP_COMMON_BOARD_DEVICES__
struct twl4030_platform_data;
struct mtd_partition;
void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,
struct twl4030_platform_data *pmic_data);
static inline void omap2_pmic_init(const char *pmic_type,
struct twl4030_platform_data *pmic_data)
{
omap_pmic_init(2, 2600, pmic_type, INT_24XX_SYS_NIRQ, pmic_data);
}
static inline void omap3_pmic_init(const char *pmic_type,
struct twl4030_platform_data *pmic_data)
{
omap_pmic_init(1, 2600, pmic_type, INT_34XX_SYS_NIRQ, pmic_data);
}
static inline void omap4_pmic_init(const char *pmic_type,
struct twl4030_platform_data *pmic_data)
{
/* Phoenix Audio IC needs I2C1 to start with 400 KHz or less */
omap_pmic_init(1, 400, pmic_type, OMAP44XX_IRQ_SYS_1N, pmic_data);
}
struct ads7846_platform_data;
void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
struct ads7846_platform_data *board_pdata);
void omap_nand_flash_init(int opts, struct mtd_partition *parts, int n_parts);
#endif /* __OMAP_COMMON_BOARD_DEVICES__ */
arch/arm/mach-omap2/cpuidle34xx.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/gpmc-smc91x.c
View file @ 829ae273
...@@ -147,25 +147,24 @@ void __init gpmc_smc91x_init(struct omap_smc91x_platform_data *board_data) ...@@ -147,25 +147,24 @@ void __init gpmc_smc91x_init(struct omap_smc91x_platform_data *board_data)
goto free1; goto free1;
} }
if (gpio_request(gpmc_cfg->gpio_irq, "SMC91X irq") < 0) if (gpio_request_one(gpmc_cfg->gpio_irq, GPIOF_IN, "SMC91X irq") < 0)
goto free1; goto free1;
gpio_direction_input(gpmc_cfg->gpio_irq);
gpmc_smc91x_resources[1].start = gpio_to_irq(gpmc_cfg->gpio_irq); gpmc_smc91x_resources[1].start = gpio_to_irq(gpmc_cfg->gpio_irq);
if (gpmc_cfg->gpio_pwrdwn) { if (gpmc_cfg->gpio_pwrdwn) {
ret = gpio_request(gpmc_cfg->gpio_pwrdwn, "SMC91X powerdown"); ret = gpio_request_one(gpmc_cfg->gpio_pwrdwn,
GPIOF_OUT_INIT_LOW, "SMC91X powerdown");
if (ret) if (ret)
goto free2; goto free2;
gpio_direction_output(gpmc_cfg->gpio_pwrdwn, 0);
} }
if (gpmc_cfg->gpio_reset) { if (gpmc_cfg->gpio_reset) {
ret = gpio_request(gpmc_cfg->gpio_reset, "SMC91X reset"); ret = gpio_request_one(gpmc_cfg->gpio_reset,
GPIOF_OUT_INIT_LOW, "SMC91X reset");
if (ret) if (ret)
goto free3; goto free3;
gpio_direction_output(gpmc_cfg->gpio_reset, 0);
gpio_set_value(gpmc_cfg->gpio_reset, 1); gpio_set_value(gpmc_cfg->gpio_reset, 1);
msleep(100); msleep(100);
gpio_set_value(gpmc_cfg->gpio_reset, 0); gpio_set_value(gpmc_cfg->gpio_reset, 0);
......
arch/arm/mach-omap2/gpmc-smsc911x.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/omap_l3_noc.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/omap_l3_smx.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/omap_phy_internal.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/pm.h
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/pm34xx.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/pm44xx.c
View file @ 829ae273
...@@ -105,13 +105,11 @@ static int __init omap4_pm_init(void) ...@@ -105,13 +105,11 @@ static int __init omap4_pm_init(void)
pr_err("Power Management for TI OMAP4.\n"); pr_err("Power Management for TI OMAP4.\n");
#ifdef CONFIG_PM
ret = pwrdm_for_each(pwrdms_setup, NULL); ret = pwrdm_for_each(pwrdms_setup, NULL);
if (ret) { if (ret) {
pr_err("Failed to setup powerdomains\n"); pr_err("Failed to setup powerdomains\n");
goto err2; goto err2;
} }
#endif
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND
suspend_set_ops(&omap_pm_ops); suspend_set_ops(&omap_pm_ops);
......
arch/arm/mach-omap2/smartreflex.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/usb-musb.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/usb-tusb6010.c
View file @ 829ae273
This diff is collapsed.
arch/arm/mach-omap2/voltage.c
View file @ 829ae273
This diff is collapsed.
arch/arm/plat-omap/include/plat/usb.h
View file @ 829ae273
This diff is collapsed.
drivers/video/omap/Makefile
View file @ 829ae273
This diff is collapsed.
drivers/video/omap/lcd_omap2evm.c deleted 100644 → 0
View file @ 6ddb4518
This diff is collapsed.
sound/soc/omap/Kconfig
View file @ 829ae273
This diff is collapsed.
sound/soc/omap/Makefile
View file @ 829ae273
This diff is collapsed.
sound/soc/omap/omap2evm.c deleted 100644 → 0
View file @ 6ddb4518
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7