da06a8d7be
A series of fixes (and in some cases, some cleanups): Via Tony Lindgren: - A collection of OMAP regression fixes, in particular because firmware no longer sets up all pin states before starting the kernel. - cpufreq fixes for OMAP (Rafael is on vacation and this was pre-agreed). - A longer series of misc regression fixes and cleanups, warning removals, etc for OMAP From Arnd Bergmann: - A series of warning fixes for various platforms (defconfig builds) Misc: - A couple of tegra fixes, one for i.MX, some vt8500 fixes, etc. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQdeoEAAoJEIwa5zzehBx3odkP/2Z7UwXYYja63dmUYErWSQJU CtPa5U7UlbM9hWVzuGplCBbNuDEmZ8PlUboiX0Q0ml0Jl4KtOYAbuq6st96Vmn9z z6VkApTzAmlo1p8C+Y/liEL3Kr9PKV4zWi4VMLDUgSiP65hVtbe/hEjRSty14iTC sF5Ao42YO0y8L1e7d2OSbK0DQyHCnk/cbOQJnzaX5fN31uE2GSM4nFY1ty5gb3aB +LyyGx6pd26LxsGYtLIzlpV+qkFeGcGAU16pJj10Xo4UNKUjwVfq2k1Nn0t4I06f 1gs+lGRqfj2ciVTIdJd+OUFb2gI0DfLhASzb6efQzggOTDHxNFyew8+Yve82muEA 0G2as/yW9GSGw1Zdkh4FCtr/1VgORTsXWEPCSx+oWn1hCOn5PtcGHYjYBpPh/drb EhYioL3s5ZzXT2+RhKf3JEfFNEupyPrTFsNpGtNSjB7b5XkSU39BcykXc/ghXmeB XOrcOO5cvsGVcEcKJjJaPtYznkULh/aU8mu+/D0AZFW24ke8ya1mR5t6W0+PBEnL sePinBHWKzLtswQrij0NKT781SqZAFwqvlAh+t5kwOo68m1E3Kt6afjZ0B4dsJlG XIcxUyHeE+LvJgy/IOIOJUflnmUgghvUtbsHL5SIjssmijHrzYpu/ikfYCt+Ti0f CAzGeHrS41sGAnN4vWit =vAh+ -----END PGP SIGNATURE----- Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "A series of fixes (and in some cases, some cleanups): Via Tony Lindgren: - A collection of OMAP regression fixes, in particular because firmware no longer sets up all pin states before starting the kernel. - cpufreq fixes for OMAP (Rafael is on vacation and this was pre-agreed). - A longer series of misc regression fixes and cleanups, warning removals, etc for OMAP From Arnd Bergmann: - A series of warning fixes for various platforms (defconfig builds) Misc: - A couple of tegra fixes, one for i.MX, some vt8500 fixes, etc." * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits) ARM: pxa: armcore: fix PCI PIO warnings ARM: integrator: use __iomem pointers for MMIO, part 2 ARM: assabet: fix bogus warning in get_assabet_scr (again) ARM: shmobile: mark shmobile_init_late as __init ARM: integrator_cp: fix build failure ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling ARM: OMAP3: fix workaround for EMU clockdomain arm/omap: Replace board_ref_clock with enum values ARM: OMAP2+: remove duplicated include from board-omap3stalker.c arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon arch/arm/mach-omap2: Remove unecessary semicolon arch/arm/mach-omap1/devices.c: Remove unecessary semicolon ARM/dts: omap5-evm: pinmux configuration for audio ARM/dts: Add pinctrl driver entries for omap5 ARM/dts: omap4-panda: pinmux configuration for audio ARM/dts: omap4-sdp: pinmux configuration for audio ARM/dts: omap5-evm: Disable unused McBSP3 ARM/dts: omap4-sdp: Disable unused McBSP3 ARM/dts: omap4-panda: Disable unused audio IPs ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs ...
306 lines
7.5 KiB
C
306 lines
7.5 KiB
C
/*
|
|
* Copyright (C) 2009 Texas Instruments Inc.
|
|
*
|
|
* Modified from mach-omap2/board-zoom2.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/input.h>
|
|
#include <linux/input/matrix_keypad.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/i2c/twl.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/regulator/fixed.h>
|
|
#include <linux/wl12xx.h>
|
|
#include <linux/mmc/host.h>
|
|
#include <linux/platform_data/gpio-omap.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include "common.h"
|
|
#include <plat/usb.h>
|
|
|
|
#include <mach/board-zoom.h>
|
|
|
|
#include "mux.h"
|
|
#include "hsmmc.h"
|
|
#include "common-board-devices.h"
|
|
|
|
#define OMAP_ZOOM_WLAN_PMENA_GPIO (101)
|
|
#define ZOOM2_HEADSET_EXTMUTE_GPIO (153)
|
|
#define OMAP_ZOOM_WLAN_IRQ_GPIO (162)
|
|
|
|
#define LCD_PANEL_ENABLE_GPIO (7 + OMAP_MAX_GPIO_LINES)
|
|
|
|
/* Zoom2 has Qwerty keyboard*/
|
|
static uint32_t board_keymap[] = {
|
|
KEY(0, 0, KEY_E),
|
|
KEY(0, 1, KEY_R),
|
|
KEY(0, 2, KEY_T),
|
|
KEY(0, 3, KEY_HOME),
|
|
KEY(0, 6, KEY_I),
|
|
KEY(0, 7, KEY_LEFTSHIFT),
|
|
KEY(1, 0, KEY_D),
|
|
KEY(1, 1, KEY_F),
|
|
KEY(1, 2, KEY_G),
|
|
KEY(1, 3, KEY_SEND),
|
|
KEY(1, 6, KEY_K),
|
|
KEY(1, 7, KEY_ENTER),
|
|
KEY(2, 0, KEY_X),
|
|
KEY(2, 1, KEY_C),
|
|
KEY(2, 2, KEY_V),
|
|
KEY(2, 3, KEY_END),
|
|
KEY(2, 6, KEY_DOT),
|
|
KEY(2, 7, KEY_CAPSLOCK),
|
|
KEY(3, 0, KEY_Z),
|
|
KEY(3, 1, KEY_KPPLUS),
|
|
KEY(3, 2, KEY_B),
|
|
KEY(3, 3, KEY_F1),
|
|
KEY(3, 6, KEY_O),
|
|
KEY(3, 7, KEY_SPACE),
|
|
KEY(4, 0, KEY_W),
|
|
KEY(4, 1, KEY_Y),
|
|
KEY(4, 2, KEY_U),
|
|
KEY(4, 3, KEY_F2),
|
|
KEY(4, 4, KEY_VOLUMEUP),
|
|
KEY(4, 6, KEY_L),
|
|
KEY(4, 7, KEY_LEFT),
|
|
KEY(5, 0, KEY_S),
|
|
KEY(5, 1, KEY_H),
|
|
KEY(5, 2, KEY_J),
|
|
KEY(5, 3, KEY_F3),
|
|
KEY(5, 4, KEY_UNKNOWN),
|
|
KEY(5, 5, KEY_VOLUMEDOWN),
|
|
KEY(5, 6, KEY_M),
|
|
KEY(5, 7, KEY_RIGHT),
|
|
KEY(6, 0, KEY_Q),
|
|
KEY(6, 1, KEY_A),
|
|
KEY(6, 2, KEY_N),
|
|
KEY(6, 3, KEY_BACKSPACE),
|
|
KEY(6, 6, KEY_P),
|
|
KEY(6, 7, KEY_UP),
|
|
KEY(7, 0, KEY_PROG1), /*MACRO 1 <User defined> */
|
|
KEY(7, 1, KEY_PROG2), /*MACRO 2 <User defined> */
|
|
KEY(7, 2, KEY_PROG3), /*MACRO 3 <User defined> */
|
|
KEY(7, 3, KEY_PROG4), /*MACRO 4 <User defined> */
|
|
KEY(7, 6, KEY_SELECT),
|
|
KEY(7, 7, KEY_DOWN)
|
|
};
|
|
|
|
static struct matrix_keymap_data board_map_data = {
|
|
.keymap = board_keymap,
|
|
.keymap_size = ARRAY_SIZE(board_keymap),
|
|
};
|
|
|
|
static struct twl4030_keypad_data zoom_kp_twl4030_data = {
|
|
.keymap_data = &board_map_data,
|
|
.rows = 8,
|
|
.cols = 8,
|
|
.rep = 1,
|
|
};
|
|
|
|
static struct regulator_consumer_supply zoom_vmmc1_supply[] = {
|
|
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
|
|
};
|
|
|
|
static struct regulator_consumer_supply zoom_vsim_supply[] = {
|
|
REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),
|
|
};
|
|
|
|
static struct regulator_consumer_supply zoom_vmmc2_supply[] = {
|
|
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
|
|
};
|
|
|
|
static struct regulator_consumer_supply zoom_vmmc3_supply[] = {
|
|
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.2"),
|
|
};
|
|
|
|
/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
|
|
static struct regulator_init_data zoom_vmmc1 = {
|
|
.constraints = {
|
|
.min_uV = 1850000,
|
|
.max_uV = 3150000,
|
|
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
|
| REGULATOR_MODE_STANDBY,
|
|
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
|
|
| REGULATOR_CHANGE_MODE
|
|
| REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.num_consumer_supplies = ARRAY_SIZE(zoom_vmmc1_supply),
|
|
.consumer_supplies = zoom_vmmc1_supply,
|
|
};
|
|
|
|
/* VMMC2 for MMC2 card */
|
|
static struct regulator_init_data zoom_vmmc2 = {
|
|
.constraints = {
|
|
.min_uV = 1850000,
|
|
.max_uV = 1850000,
|
|
.apply_uV = true,
|
|
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
|
| REGULATOR_MODE_STANDBY,
|
|
.valid_ops_mask = REGULATOR_CHANGE_MODE
|
|
| REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.num_consumer_supplies = ARRAY_SIZE(zoom_vmmc2_supply),
|
|
.consumer_supplies = zoom_vmmc2_supply,
|
|
};
|
|
|
|
/* VSIM for OMAP VDD_MMC1A (i/o for DAT4..DAT7) */
|
|
static struct regulator_init_data zoom_vsim = {
|
|
.constraints = {
|
|
.min_uV = 1800000,
|
|
.max_uV = 3000000,
|
|
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
|
| REGULATOR_MODE_STANDBY,
|
|
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
|
|
| REGULATOR_CHANGE_MODE
|
|
| REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.num_consumer_supplies = ARRAY_SIZE(zoom_vsim_supply),
|
|
.consumer_supplies = zoom_vsim_supply,
|
|
};
|
|
|
|
static struct regulator_init_data zoom_vmmc3 = {
|
|
.constraints = {
|
|
.valid_ops_mask = REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.num_consumer_supplies = ARRAY_SIZE(zoom_vmmc3_supply),
|
|
.consumer_supplies = zoom_vmmc3_supply,
|
|
};
|
|
|
|
static struct fixed_voltage_config zoom_vwlan = {
|
|
.supply_name = "vwl1271",
|
|
.microvolts = 1800000, /* 1.8V */
|
|
.gpio = OMAP_ZOOM_WLAN_PMENA_GPIO,
|
|
.startup_delay = 70000, /* 70msec */
|
|
.enable_high = 1,
|
|
.enabled_at_boot = 0,
|
|
.init_data = &zoom_vmmc3,
|
|
};
|
|
|
|
static struct platform_device omap_vwlan_device = {
|
|
.name = "reg-fixed-voltage",
|
|
.id = 1,
|
|
.dev = {
|
|
.platform_data = &zoom_vwlan,
|
|
},
|
|
};
|
|
|
|
static struct wl12xx_platform_data omap_zoom_wlan_data __initdata = {
|
|
.board_ref_clock = WL12XX_REFCLOCK_26, /* 26 MHz */
|
|
};
|
|
|
|
static struct omap2_hsmmc_info mmc[] = {
|
|
{
|
|
.name = "external",
|
|
.mmc = 1,
|
|
.caps = MMC_CAP_4_BIT_DATA,
|
|
.gpio_wp = -EINVAL,
|
|
.power_saving = true,
|
|
.deferred = true,
|
|
},
|
|
{
|
|
.name = "internal",
|
|
.mmc = 2,
|
|
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
|
|
.gpio_cd = -EINVAL,
|
|
.gpio_wp = -EINVAL,
|
|
.nonremovable = true,
|
|
.power_saving = true,
|
|
},
|
|
{
|
|
.name = "wl1271",
|
|
.mmc = 3,
|
|
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD,
|
|
.gpio_wp = -EINVAL,
|
|
.gpio_cd = -EINVAL,
|
|
.nonremovable = true,
|
|
},
|
|
{} /* Terminator */
|
|
};
|
|
|
|
static int zoom_twl_gpio_setup(struct device *dev,
|
|
unsigned gpio, unsigned ngpio)
|
|
{
|
|
int ret;
|
|
|
|
/* gpio + 0 is "mmc0_cd" (input/IRQ) */
|
|
mmc[0].gpio_cd = gpio + 0;
|
|
omap_hsmmc_late_init(mmc);
|
|
|
|
ret = gpio_request_one(LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,
|
|
"lcd enable");
|
|
if (ret)
|
|
pr_err("Failed to get LCD_PANEL_ENABLE_GPIO (gpio%d).\n",
|
|
LCD_PANEL_ENABLE_GPIO);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct twl4030_gpio_platform_data zoom_gpio_data = {
|
|
.setup = zoom_twl_gpio_setup,
|
|
};
|
|
|
|
static struct twl4030_platform_data zoom_twldata = {
|
|
/* platform_data for children goes here */
|
|
.gpio = &zoom_gpio_data,
|
|
.keypad = &zoom_kp_twl4030_data,
|
|
.vmmc1 = &zoom_vmmc1,
|
|
.vmmc2 = &zoom_vmmc2,
|
|
.vsim = &zoom_vsim,
|
|
};
|
|
|
|
static int __init omap_i2c_init(void)
|
|
{
|
|
omap3_pmic_get_config(&zoom_twldata,
|
|
TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_BCI |
|
|
TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO,
|
|
TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
|
|
|
|
if (machine_is_omap_zoom2()) {
|
|
struct twl4030_codec_data *codec_data;
|
|
codec_data = zoom_twldata.audio->codec;
|
|
|
|
codec_data->ramp_delay_value = 3; /* 161 ms */
|
|
codec_data->hs_extmute = 1;
|
|
codec_data->hs_extmute_gpio = ZOOM2_HEADSET_EXTMUTE_GPIO;
|
|
}
|
|
omap_pmic_init(1, 2400, "twl5030", 7 + OMAP_INTC_START, &zoom_twldata);
|
|
omap_register_i2c_bus(2, 400, NULL, 0);
|
|
omap_register_i2c_bus(3, 400, NULL, 0);
|
|
return 0;
|
|
}
|
|
|
|
static void enable_board_wakeup_source(void)
|
|
{
|
|
/* T2 interrupt line (keypad) */
|
|
omap_mux_init_signal("sys_nirq",
|
|
OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);
|
|
}
|
|
|
|
void __init zoom_peripherals_init(void)
|
|
{
|
|
int ret;
|
|
|
|
omap_zoom_wlan_data.irq = gpio_to_irq(OMAP_ZOOM_WLAN_IRQ_GPIO);
|
|
ret = wl12xx_set_platform_data(&omap_zoom_wlan_data);
|
|
|
|
if (ret)
|
|
pr_err("error setting wl12xx data: %d\n", ret);
|
|
|
|
omap_hsmmc_init(mmc);
|
|
omap_i2c_init();
|
|
platform_device_register(&omap_vwlan_device);
|
|
usb_musb_init(NULL);
|
|
enable_board_wakeup_source();
|
|
omap_serial_init();
|
|
}
|