omap-fixes for 2.6.34-rc1
Subsystems (6)
Tony Lindgren
maintainercover omap-fixes for 2.6.34-rc1
Hi all,
Here's some omap fixes for review.
I also threw in the n8x0 platform init for tusb6010 and updated the defconfig as those were needed to fix and test the tusb6010 for the DMA API changes as posted earlier.
Regards,
Tony
---
Aaro Koskinen (2):
omap: pass the reboot command to the boot loader
omap: mach-omap2/io.c: fix function declarations
Andrea Gelmini (1):
omap: Checkpatch cleanup for blizzard.h
Andrew Clayton (1):
ARM/OMAP: Remove the +x bit from a couple of source files
Enric Balletbo i Serra (1):
omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2board
Felipe Balbi (1):
omap2/3/4: ehci: avoid compiler error with touchbook
Francisco Alecrim (1):
omap2: add USB initialization for tusb6010
Grazvydas Ignotas (1):
omap3: pandora: add missing i2c3 board_info
Janusz Krzysztofik (1):
omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values
Kevin Hilman (2):
OMAP2: cpu_is_omap2*: fix compile-time removal of unused code
OMAP4: fix temporary hacks that break multi-omap PM
Santosh Shilimkar (1):
omap4: Fix build break by moving omap_smc1 into a separate .S
Suman Anna (1):
omap2/3/4: mailbox: remove compiler warning
Thomas Weber (1):
OMAP2: serial.c: Fix number of uarts in early_init
Tony Lindgren (4):
omap3: Fix compile for Touch Book early_param
omap2: Update n8x0 defconfig to test multi-omap and DMA api changes
omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors
omap: Fix gpio_resume_after_retention
Vaibhav Hiremath (1):
omap: Add DSI regulator supply to OMAP3EVM board file
arch/arm/configs/cm_t35_defconfig | 2 arch/arm/configs/n770_defconfig | 1 arch/arm/configs/n8x0_defconfig | 160 +++++++++++++++++++++++--- arch/arm/configs/omap3_beagle_defconfig | 1 arch/arm/configs/omap3_defconfig | 2 arch/arm/configs/omap3_evm_defconfig | 1 arch/arm/configs/omap3_touchbook_defconfig | 2 arch/arm/configs/omap_3430sdp_defconfig | 1 arch/arm/configs/omap_3630sdp_defconfig | 2 arch/arm/configs/omap_h2_1610_defconfig | 1 arch/arm/configs/omap_zoom2_defconfig | 1 arch/arm/configs/omap_zoom3_defconfig | 2 arch/arm/configs/rx51_defconfig | 1 arch/arm/mach-omap2/Makefile | 3 arch/arm/mach-omap2/board-3430sdp.c | 2 arch/arm/mach-omap2/board-3630sdp.c | 2 arch/arm/mach-omap2/board-4430sdp.c | 26 ---- arch/arm/mach-omap2/board-am3517evm.c | 2 arch/arm/mach-omap2/board-cm-t35.c | 2 arch/arm/mach-omap2/board-devkit8000.c | 2 arch/arm/mach-omap2/board-igep0020.c | 56 ++++++--- arch/arm/mach-omap2/board-n8x0.c | 98 ++++++++++++++++ arch/arm/mach-omap2/board-omap3beagle.c | 2 arch/arm/mach-omap2/board-omap3evm.c | 18 ++- arch/arm/mach-omap2/board-omap3pandora.c | 12 ++ arch/arm/mach-omap2/board-omap3touchbook.c | 12 +- arch/arm/mach-omap2/board-overo.c | 2 arch/arm/mach-omap2/board-zoom-peripherals.c | 0 arch/arm/mach-omap2/board-zoom3.c | 2 arch/arm/mach-omap2/clock2420_data.c | 1 arch/arm/mach-omap2/io.c | 21 ++- arch/arm/mach-omap2/mailbox.c | 12 +- arch/arm/mach-omap2/omap44xx-smc.S | 32 +++++ arch/arm/mach-omap2/prcm.c | 4 - arch/arm/mach-omap2/serial.c | 15 ++ arch/arm/mach-omap2/usb-ehci.c | 6 - arch/arm/plat-omap/gpio.c | 10 +- arch/arm/plat-omap/include/plat/blizzard.h | 2 arch/arm/plat-omap/include/plat/cpu.h | 8 + arch/arm/plat-omap/include/plat/prcm.h | 2 arch/arm/plat-omap/include/plat/system.h | 6 - arch/arm/plat-omap/include/plat/usb.h | 2 arch/arm/plat-omap/mcbsp.c | 12 +- 43 files changed, 414 insertions(+), 137 deletions(-) mode change 100755 => 100644 arch/arm/mach-omap2/board-3630sdp.c mode change 100755 => 100644 arch/arm/mach-omap2/board-zoom-peripherals.c create mode 100644 arch/arm/mach-omap2/omap44xx-smc.S
Signature · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/19 omap3: Fix compile for Touch Book early_param
Commit 2b0d8c251b8876d530a6bf671eb5425838fa698a changed ARM to use the common early_param code. Fix compile for Touch Book accordingly.
--- arch/arm/mach-omap2/board-omap3touchbook.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/board-omap3touchbook.c +5 -5
@@ -518,14 +518,14 @@ static void omap3_touchbook_poweroff(void)gpio_direction_output (TB_KILL_POWER_GPIO ,0 ); } -static void __init early_touchbook_revision (char **p) +static int __init early_touchbook_revision (char *p) { -if (!*p) -return ; +if (!p) +return 0 ; -strict_strtoul (*p,10 , &touchbook_revision); +return strict_strtoul (p,10 , &touchbook_revision); } -__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 ,
Tony Lindgren
maintainerPATCH 2/19 omap2/3/4: ehci: avoid compiler error with touchbook
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
the early_param() call in board-omap3touchbook.c expands to:
static const char __setup_str_early_touchbook_revision[]
__section(.init.rodata) _aligned(1) = tbr;
[...]
and we have a non-const variable being added to the same section:
static struct ehci_hcd_omap_platform_data ehci_pdata __section(.init.rodata);
because of that, gcc generates a section type conflict which can (and actually should) be avoided by marking const every variable marked with __initconst.
This patch fixes that for the ehci_hdc_omap_platform_data.
--- arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-3630sdp.c | 2 +- arch/arm/mach-omap2/board-am3517evm.c | 2 +- arch/arm/mach-omap2/board-cm-t35.c | 2 +- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-igep0020.c | 2 +- arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap3pandora.c | 2 +- arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- arch/arm/mach-omap2/board-overo.c | 2 +- arch/arm/mach-omap2/board-zoom3.c | 2 +- arch/arm/mach-omap2/usb-ehci.c | 6 +++--- arch/arm/plat-omap/include/plat/usb.h | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/mach-omap2/board-3430sdp.c +1 -1
@@ -648,7 +648,7 @@ static void enable_board_wakeup_source(void) OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP); } -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY ,
arch/arm/mach-omap2/board-3630sdp.c +1 -1
@@ -54,7 +54,7 @@ static void enable_board_wakeup_source(void) OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP); } -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY ,
arch/arm/mach-omap2/board-am3517evm.c +1 -1
@@ -273,7 +273,7 @@ static void __init am3517_evm_init_irq(void)omap_gpio_init (); } -static struct ehci_hcd_omap_platform_data ehci_pdata__initdata = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[2 ] =EHCI_HCD_OMAP_MODE_UNKNOWN ,
arch/arm/mach-omap2/board-cm-t35.c +1 -1
@@ -612,7 +612,7 @@ static struct omap2_hsmmc_info mmc[] = { {}/* Terminator */ }; -static struct ehci_hcd_omap_platform_data ehci_pdata = { +static struct ehci_hcd_omap_platform_data ehci_pdata__initdata = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[2 ] =EHCI_HCD_OMAP_MODE_UNKNOWN ,
arch/arm/mach-omap2/board-devkit8000.c +1 -1
@@ -636,7 +636,7 @@ static struct omap_musb_board_data musb_board_data = { .power = 100, }; -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY ,
arch/arm/mach-omap2/board-igep0020.c +1 -1
@@ -442,7 +442,7 @@ static struct omap_musb_board_data musb_board_data = { .power = 100, }; -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[2 ] =EHCI_HCD_OMAP_MODE_UNKNOWN ,
arch/arm/mach-omap2/board-omap3beagle.c +1 -1
@@ -410,7 +410,7 @@ static void __init omap3beagle_flash_init(void) } } -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY ,
arch/arm/mach-omap2/board-omap3evm.c +1 -1
@@ -635,7 +635,7 @@ static struct platform_device *omap3_evm_devices[] __initdata = { &omap3_evm_dss_device, }; -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static struct ehci_hcd_omap_platform_data ehci_pdata__initdata = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY ,
arch/arm/mach-omap2/board-omap3pandora.c +1 -1
@@ -537,7 +537,7 @@ static struct platform_device *omap3pandora_devices[] __initdata = { &pandora_dss_device, }; -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_UNKNOWN ,
arch/arm/mach-omap2/board-omap3touchbook.c +1 -1
@@ -493,7 +493,7 @@ static void __init omap3touchbook_flash_init(void) } } -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY ,
arch/arm/mach-omap2/board-overo.c +1 -1
@@ -394,7 +394,7 @@ static struct platform_device *overo_devices[] __initdata = { &overo_lcd_device, }; -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[2 ] =EHCI_HCD_OMAP_MODE_UNKNOWN ,
arch/arm/mach-omap2/board-zoom3.c +1 -1
@@ -52,7 +52,7 @@ static struct omap_board_mux board_mux[] __initdata = {#define board_mux NULL#endif -static struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = { .port_mode[0 ] =EHCI_HCD_OMAP_MODE_UNKNOWN , .port_mode[1 ] =EHCI_HCD_OMAP_MODE_PHY , .port_mode[2 ] =EHCI_HCD_OMAP_MODE_UNKNOWN ,
arch/arm/mach-omap2/usb-ehci.c +3 -3
@@ -70,7 +70,7 @@ static struct platform_device ehci_device = {/* * setup_ehci_io_mux - initialize IO pad mux for USBHOST */ -static void setup_ehci_io_mux (enum ehci_hcd_omap_mode *port_mode) +static void setup_ehci_io_mux (const enum ehci_hcd_omap_mode *port_mode) {switch (port_mode[0 ]) {case EHCI_HCD_OMAP_MODE_PHY :
@@ -213,7 +213,7 @@ static void setup_ehci_io_mux(enum ehci_hcd_omap_mode *port_mode)return ; } -void __init usb_ehci_init (struct ehci_hcd_omap_platform_data *pdata) +void __init usb_ehci_init (const struct ehci_hcd_omap_platform_data *pdata) {platform_device_add_data (&ehci_device, pdata,sizeof (*pdata));
@@ -229,7 +229,7 @@ void __init usb_ehci_init(struct ehci_hcd_omap_platform_data *pdata)#else -void __init usb_ehci_init (struct ehci_hcd_omap_platform_data *pdata) +void __init usb_ehci_init (const struct ehci_hcd_omap_platform_data *pdata) { }
arch/arm/plat-omap/include/plat/usb.h +1 -1
@@ -53,7 +53,7 @@ enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};extern void usb_musb_init (struct omap_musb_board_data *board_data); -extern void usb_ehci_init (struct ehci_hcd_omap_platform_data *pdata); +extern void usb_ehci_init (const struct ehci_hcd_omap_platform_data *pdata);#endif
Tony Lindgren
maintainerPATCH 3/19 omap4: Fix build break by moving omap_smc1 into a separate .S
In reply to Tony LindgrenFrom: Santosh Shilimkar <[email protected]>
This patch moves omap_smc1 function to a seperate omap44xx-smc.S file and sets compile flags as -Wa,-march=armv7-a.
This fix was suggested by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap2/Makefile | 3 +++ arch/arm/mach-omap2/board-4430sdp.c | 26 +------------------------- arch/arm/mach-omap2/omap44xx-smc.S | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 25 deletions(-) create mode 100644 arch/arm/mach-omap2/omap44xx-smc.S
arch/arm/mach-omap2/Makefile +3 -0
@@ -22,6 +22,9 @@ obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o # SMP support ONLY available for OMAP4 obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o obj-$(CONFIG_LOCAL_TIMERS) += timer-mpu.o +obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o + +AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a # Functions loaded to SRAM obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o
arch/arm/mach-omap2/board-4430sdp.c +1 -25
@@ -50,33 +50,9 @@ static struct omap_board_config_kernel sdp4430_config[] __initdata = { };#ifdef CONFIG_CACHE_L2X0 -noinline void omap_smc1(u32 fn, u32 arg) -{ - register u32 r12 asm("r12") = fn; - register u32 r0 asm("r0") = arg; - -/* This is common routine cache secure monitor API used to -* modify the PL310 secure registers. -* r0 contains the value to be modified and "r12" contains -* the monitor API number. It uses few CPU registers -* internally and hence they need be backed up including -* link register "lr". -* Explicitly save r11 and r12 the compiler generated code -* won't save it. -*/ - asmvolatile ( -"stmfd r13!, {r11,r12}\n" -"dsb\n" -"smc\n" -"ldmfd r13!, {r11,r12}\n" - :"+r" (r0),"+r" (r12) - : - :"r4" ,"r5" ,"r10" ,"lr" ,"cc" ); -} -EXPORT_SYMBOL (omap_smc1); -static int __init omap_l2_cache_init (void ) { +extern void omap_smc1 (u32 fn,u32 arg);void __iomem *l2cache_base;/* To avoid code running on other OMAPs in
arch/arm/mach-omap2/omap44xx-smc.S new file +32 -0
@@ -0,0 +1,32 @@ +/* + * OMAP44xx secure APIs file. + * + * Copyright (C) 2010 Texas Instruments, Inc. + * Written by Santosh Shilimkar <[email protected]> + * + * + * This program is free software,you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/linkage.h> + +/* + * This is common routine to manage secure monitor API + * used to modify the PL310 secure registers. + * 'r0' contains the value to be modified and 'r12' contains + * the monitor API number. It uses few CPU registers + * internally and hence they need be backed up including + * link register "lr". + * Function signature : void omap_smc1(u32 fn, u32 arg) + */ + +ENTRY(omap_smc1) + stmfd sp!, {r2-r12, lr} + mov r12, r0 + mov r0, r1 + dsb + smc + ldmfd sp!, {r2-r12, pc} +END(omap_smc1)
Tony Lindgren
maintainerPATCH 4/19 omap2: add USB initialization for tusb6010
In reply to Tony LindgrenFrom: Francisco Alecrim <[email protected]>
Based on Kalle's and Tony's patches. Some variables re-organized and unused code removed.
--- arch/arm/mach-omap2/board-n8x0.c | 98 ++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/clock2420_data.c | 1 2 files changed, 99 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-n8x0.c +98 -0
@@ -37,6 +37,103 @@ static int slot1_cover_open;static int slot2_cover_open;static struct device *mmc_device; +#define TUSB6010_ASYNC_CS 1 +#define TUSB6010_SYNC_CS 4 +#define TUSB6010_GPIO_INT 58 +#define TUSB6010_GPIO_ENABLE 0 +#define TUSB6010_DMACHAN 0x3f + +#if defined(CONFIG_USB_TUSB6010) || \ + defined(CONFIG_USB_TUSB6010_MODULE) +/* + * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and + * 1.5 V voltage regulators of PM companion chip. Companion chip will then + * provide then PGOOD signal to TUSB6010 which will release it from reset. + */ +static int tusb_set_power(int state) +{ + int i, retval = 0; + + if (state) { + gpio_set_value(TUSB6010_GPIO_ENABLE, 1); + msleep(1); + + /* Wait until TUSB6010 pulls INT pin down */ + i = 100; + while (i && gpio_get_value(TUSB6010_GPIO_INT)) { + msleep(1); + i--; + } + + if (!i) { + printk(KERN_ERR "tusb: powerup failed\n"); + retval = -ENODEV; + } + } else { + gpio_set_value(TUSB6010_GPIO_ENABLE, 0); + msleep(10); + } + + return retval; +} + +static struct musb_hdrc_config musb_config = { + .multipoint = 1, + .dyn_fifo = 1, + .num_eps = 16, + .ram_bits = 12, +}; + +static struct musb_hdrc_platform_data tusb_data = { +#if defined(CONFIG_USB_MUSB_OTG) + .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_PERIPHERAL) + .mode = MUSB_PERIPHERAL, +#else /* defined(CONFIG_USB_MUSB_HOST) */ + .mode = MUSB_HOST, +#endif + .set_power = tusb_set_power, + .min_power = 25, /* x2 = 50 mA drawn from VBUS as peripheral */ + .power = 100, /* Max 100 mA VBUS for host mode */ + .config = &musb_config, +}; + +static void __init n8x0_usb_init(void) +{ + int ret = 0; + static char announce[] __initdata = KERN_INFO "TUSB 6010\n"; + + /* PM companion chip power control pin */ + ret = gpio_request(TUSB6010_GPIO_ENABLE, "TUSB6010 enable"); + if (ret != 0) { + printk(KERN_ERR "Could not get TUSB power GPIO%i\n", + TUSB6010_GPIO_ENABLE); + return; + } + gpio_direction_output(TUSB6010_GPIO_ENABLE, 0); + + tusb_set_power(0); + + ret = tusb6010_setup_interface(&tusb_data, TUSB6010_REFCLK_19, 2, + TUSB6010_ASYNC_CS, TUSB6010_SYNC_CS, + TUSB6010_GPIO_INT, TUSB6010_DMACHAN); + if (ret != 0) + goto err; + + printk(announce); + + return; + +err: + gpio_free(TUSB6010_GPIO_ENABLE); +} +#else + +static void __init n8x0_usb_init(void) {} + +#endif /*CONFIG_USB_TUSB6010 */ + + static struct omap2_mcspi_device_config p54spi_mcspi_config = { .turbo_mode = 0, .single_channel = 1,
@@ -562,6 +659,7 @@ static void __init n8x0_init_machine(void)n8x0_menelaus_init ();n8x0_onenand_init ();n8x0_mmc_init (); +n8x0_usb_init (); }MACHINE_START (NOKIA_N800 ,"Nokia N800" )
arch/arm/mach-omap2/clock2420_data.c +1 -0
@@ -1841,6 +1841,7 @@ static struct omap_clk omap2420_clks[] = {CLK (NULL ,"aes_ick" , &aes_ick,CK_242X ),CLK (NULL ,"pka_ick" , &pka_ick,CK_242X ),CLK (NULL ,"usb_fck" , &usb_fck,CK_242X ), + CLK("musb_hdrc", "fck", &osc_ck, CK_242X), };/*
Tony Lindgren
maintainerPATCH 5/19 omap2: Update n8x0 defconfig to test multi-omap and DMA api changes
In reply to Tony LindgrenRecent DMA API changes broke compile for tusb6010. While testing the fixes for tusb6010, I had to update the n8x0 defconfig quite a bit. Might as well merge it while at it to make it more usable as we're using this to test the multi-omap booting between V6 and V7 ARMs.
Also, anybody using n8x0 with a current kernel will most likely want to mount root on the MMC instead of the onenand to keep the Maemo install intact.
Enable I2C, REGULATOR, MMC, MFD, PM, and USB. Also change the root to /dev/mmcblk0p2 instead of the onenand.
--- arch/arm/configs/n8x0_defconfig | 160 +++++++++++++++++++++++++++++++++++---- 1 files changed, 142 insertions(+), 18 deletions(-)
arch/arm/configs/n8x0_defconfig +142 -18
@@ -191,6 +191,7 @@ CONFIG_ARCH_OMAP=y # CONFIG_ARCH_OMAP_OTG=y # CONFIG_ARCH_OMAP1 is not set +CONFIG_ARCH_OMAP2PLUS=y CONFIG_ARCH_OMAP2=y # CONFIG_ARCH_OMAP3 is not set # CONFIG_ARCH_OMAP4 is not set
@@ -198,8 +199,6 @@ CONFIG_ARCH_OMAP2=y # # OMAP Feature Selections # -# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set -# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set CONFIG_OMAP_RESET_CLOCKS=y # CONFIG_OMAP_MUX is not set # CONFIG_OMAP_MCBSP is not set
@@ -208,15 +207,13 @@ CONFIG_OMAP_MBOX_FWK=y CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 CONFIG_OMAP_DM_TIMER=y -# CONFIG_OMAP_LL_DEBUG_UART1 is not set -# CONFIG_OMAP_LL_DEBUG_UART2 is not set -CONFIG_OMAP_LL_DEBUG_UART3=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y # CONFIG_MACH_OMAP_GENERIC is not set # # OMAP Core Type # -CONFIG_ARCH_OMAP24XX=y CONFIG_ARCH_OMAP2420=y # CONFIG_ARCH_OMAP2430 is not set
@@ -227,6 +224,9 @@ CONFIG_MACH_OMAP2_TUSB6010=y # CONFIG_MACH_OMAP_H4 is not set # CONFIG_MACH_OMAP_APOLLON is not set # CONFIG_MACH_OMAP_2430SDP is not set +CONFIG_MACH_NOKIA_N800=y +CONFIG_MACH_NOKIA_N810=y +CONFIG_MACH_NOKIA_N810_WIMAX=y CONFIG_MACH_NOKIA_N8X0=y #
@@ -303,7 +303,7 @@ CONFIG_ALIGNMENT_TRAP=y CONFIG_ZBOOT_ROM_TEXT=0x10C08000 CONFIG_ZBOOT_ROM_BSS=0x10200000 # CONFIG_ZBOOT_ROM is not set -CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 console=ttyS2,115200n8" +CONFIG_CMDLINE="root=/dev/mmcblk0p2 console=ttyS2,115200n8 debug earlyprintk rootwait" # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set
@@ -337,7 +337,14 @@ CONFIG_HAVE_AOUT=y # # Power management options # -# CONFIG_PM is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y +CONFIG_PM_OPS=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
@@ -617,7 +624,55 @@ CONFIG_UNIX98_PTYS=y # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -# CONFIG_I2C is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +# CONFIG_I2C_COMPAT is not set +# CONFIG_I2C_CHARDEV is not set +# CONFIG_I2C_HELPER_AUTO is not set +# CONFIG_I2C_SMBUS is not set + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set CONFIG_SPI=y # CONFIG_SPI_DEBUG is not set CONFIG_SPI_MASTER=y
@@ -673,15 +728,44 @@ CONFIG_SSB_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_CORE is not set +# CONFIG_MFD_88PM860X is not set # CONFIG_MFD_SM501 is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_EGPIO is not set # CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_TPS65010 is not set +CONFIG_MENELAUS=y +# CONFIG_TWL4030_CORE is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set # CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13783 is not set +# CONFIG_AB3100_CORE is not set # CONFIG_EZX_PCAP is not set +# CONFIG_AB4500_CORE is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_DUMMY is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set # CONFIG_MEDIA_SUPPORT is not set #
@@ -718,7 +802,10 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set +CONFIG_USB_SUSPEND=y +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set
@@ -737,9 +824,10 @@ CONFIG_USB_DEVICE_CLASS=y CONFIG_USB_MUSB_HDRC=y CONFIG_USB_TUSB6010=y # CONFIG_USB_MUSB_HOST is not set -CONFIG_USB_MUSB_PERIPHERAL=y -# CONFIG_USB_MUSB_OTG is not set +# CONFIG_USB_MUSB_PERIPHERAL is not set +CONFIG_USB_MUSB_OTG=y CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC_HCD=y # CONFIG_MUSB_PIO_ONLY is not set # CONFIG_USB_INVENTRA_DMA is not set # CONFIG_USB_TI_CPPI_DMA is not set
@@ -824,44 +912,77 @@ CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set # CONFIG_USB_AUDIO is not set CONFIG_USB_ETH=y -# CONFIG_USB_ETH_RNDIS is not set +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_MASS_STORAGE is not set # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_MULTI is not set # # OTG and related infrastructure # CONFIG_USB_OTG_UTILS=y # CONFIG_USB_GPIO_VBUS is not set +# CONFIG_ISP1301_OMAP is not set +# CONFIG_USB_ULPI is not set CONFIG_NOP_USB_XCEIV=y -# CONFIG_MMC is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_OMAP=y +# CONFIG_MMC_SPI is not set # CONFIG_MEMSTICK is not set -# CONFIG_ACCESSIBILITY is not set # CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set -# CONFIG_REGULATOR is not set # CONFIG_UIO is not set + +# +# TI VLYNQ +# # CONFIG_STAGING is not set # # File systems # # CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4_FS is not set +CONFIG_JBD=y +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y
@@ -886,8 +1007,11 @@ CONFIG_INOTIFY_USER=y # # DOS/FAT/NT Filesystems # +CONFIG_FAT_FS=y # CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set #
Tony Lindgren
maintainerPATCH 6/19 omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors
In reply to Tony LindgrenWhile waiting for the related USB patch, fix compile by enabling it in the defconfigs. As discussed at:
http://thread.gmane.org/gmane.linux.usb.general/27432/focus=4460
Otherwise we'll get errors like:
drivers/usb/core/hcd.c:1892: error: 'pm_wq' undeclared (first use in this function) drivers/usb/core/hcd.c:1892: error: (Each undeclared identifier is reported only once drivers/usb/core/hcd.c:1892: error: for each function it appears in.)
--- arch/arm/configs/cm_t35_defconfig | 2 +- arch/arm/configs/n770_defconfig | 1 + arch/arm/configs/omap3_beagle_defconfig | 1 + arch/arm/configs/omap3_defconfig | 2 +- arch/arm/configs/omap3_evm_defconfig | 1 + arch/arm/configs/omap3_touchbook_defconfig | 2 +- arch/arm/configs/omap_3430sdp_defconfig | 1 + arch/arm/configs/omap_3630sdp_defconfig | 2 +- arch/arm/configs/omap_h2_1610_defconfig | 1 + arch/arm/configs/omap_zoom2_defconfig | 1 + arch/arm/configs/omap_zoom3_defconfig | 2 +- arch/arm/configs/rx51_defconfig | 1 + 12 files changed, 12 insertions(+), 5 deletions(-)
arch/arm/configs/cm_t35_defconfig +1 -1
@@ -358,7 +358,7 @@ CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
arch/arm/configs/n770_defconfig +1 -0
@@ -308,6 +308,7 @@ CONFIG_PM_SLEEP=y CONFIG_SUSPEND_UP_POSSIBLE=y CONFIG_SUSPEND=y # CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y # # Networking
arch/arm/configs/omap3_beagle_defconfig +1 -0
@@ -324,6 +324,7 @@ CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
arch/arm/configs/omap3_defconfig +1 -1
@@ -450,7 +450,7 @@ CONFIG_SUSPEND=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
arch/arm/configs/omap3_evm_defconfig +1 -0
@@ -340,6 +340,7 @@ CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
arch/arm/configs/omap3_touchbook_defconfig +1 -1
@@ -368,7 +368,7 @@ CONFIG_SUSPEND=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
arch/arm/configs/omap_3430sdp_defconfig +1 -0
@@ -363,6 +363,7 @@ CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
arch/arm/configs/omap_3630sdp_defconfig +1 -1
@@ -361,7 +361,7 @@ CONFIG_SUSPEND=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
arch/arm/configs/omap_h2_1610_defconfig +1 -0
@@ -331,6 +331,7 @@ CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y #
arch/arm/configs/omap_zoom2_defconfig +1 -0
@@ -343,6 +343,7 @@ CONFIG_SUSPEND=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
arch/arm/configs/omap_zoom3_defconfig +1 -1
@@ -361,7 +361,7 @@ CONFIG_SUSPEND=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
arch/arm/configs/rx51_defconfig +1 -0
@@ -322,6 +322,7 @@ CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y
Tony Lindgren
maintainerPATCH 7/19 OMAP2: serial.c: Fix number of uarts in early_init
In reply to Tony LindgrenFrom: Thomas Weber <[email protected]>
The omap_serial_early_init prints the following errors:
Could not get uart4_ick
Could not get uart4_fck
because all the uarts available in omap_uart[] will be initialized. Only omap4430 and omap3630 have 4 uarts at the moment. This patch reduces the number of uarts when cpu is not omap4430 or omap3630.
--- arch/arm/mach-omap2/serial.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/serial.c +10 -5
@@ -644,16 +644,21 @@ static void serial_out_override(struct uart_port *up, int offset, int value) }void __init omap_serial_early_init (void ) { -int i; +int i, nr_ports;char name[16 ]; +if (!(cpu_is_omap3630 () ||cpu_is_omap4430 ())) + nr_ports =3 ; +else + nr_ports =ARRAY_SIZE (omap_uart); +/* * Make sure the serial ports are muxed on at this point. * You have to mux them off in device drivers later on * if not needed. */ -for (i =0 ; i <ARRAY_SIZE (omap_uart); i++) { +for (i =0 ; i < nr_ports; i++) {struct omap_uart_state *uart = &omap_uart[i];struct platform_device *pdev = &uart->pdev;struct device *dev = &pdev->dev;
@@ -669,17 +674,17 @@ void __init omap_serial_early_init(void)continue ; } -sprintf (name,"uart%d_ick" , i+1 ); +sprintf (name,"uart%d_ick" , i +1 ); uart->ick =clk_get (NULL , name);if (IS_ERR (uart->ick)) { -printk (KERN_ERR "Could not get uart%d_ick\n" , i+1 ); +printk (KERN_ERR "Could not get uart%d_ick\n" , i +1 ); uart->ick =NULL ; }sprintf (name,"uart%d_fck" , i+1 ); uart->fck =clk_get (NULL , name);if (IS_ERR (uart->fck)) { -printk (KERN_ERR "Could not get uart%d_fck\n" , i+1 ); +printk (KERN_ERR "Could not get uart%d_fck\n" , i +1 ); uart->fck =NULL ; }
Tony Lindgren
maintainerPATCH 8/19 omap2/3/4: mailbox: remove compiler warning
In reply to Tony LindgrenFrom: Suman Anna <[email protected]>
Remove a compiler warning in device-specific
mailbox module.
--- arch/arm/mach-omap2/mailbox.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/mailbox.c +6 -6
@@ -430,19 +430,19 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)if (unlikely (!res)) {dev_err (&pdev->dev,"invalid irq resource\n" ); ret = -ENODEV ; - goto err_iva1; +omap_mbox_unregister (&mbox_dsp_info); + goto err_dsp; } mbox_iva_info.irq = res->start; ret =omap_mbox_register (&pdev->dev, &mbox_iva_info); -if (ret) - goto err_iva1; +if (ret) { +omap_mbox_unregister (&mbox_dsp_info); + goto err_dsp; + } }#endif return 0 ; -err_iva1: -omap_mbox_unregister (&mbox_dsp_info); - err_dsp:iounmap (mbox_base);return ret;
Tony Lindgren
maintainerPATCH 9/19 omap: pass the reboot command to the boot loader
In reply to Tony LindgrenFrom: Aaro Koskinen <[email protected]>
This patch follows the commit be093beb608edf821b45fe00a8a080fb5c6ed4af by Russell King:
OMAP wishes to pass state to the boot loader upon reboot in order to instruct it whether to wait for USB-based reflashing or not. There is already a facility to do this via the reboot() syscall, except we ignore the string passed to machine_restart().
The patch adds the missing parameter to omap1_arch_reset() and omap_prcm_arch_reset(), and modifies the latter to pass the reboot command parameter to the boot loader instead of reboot mode (which is for kernel internal use only and cannot be modified by the userspace).
--- arch/arm/mach-omap2/prcm.c | 4 ++-- arch/arm/plat-omap/include/plat/prcm.h | 2 +- arch/arm/plat-omap/include/plat/system.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/prcm.c +2 -2
@@ -133,7 +133,7 @@ u32 omap_prcm_get_reset_sources(void)EXPORT_SYMBOL (omap_prcm_get_reset_sources);/* Resets clock rates and reboots the system. Only called from system.h */ -void omap_prcm_arch_reset (char mode) +void omap_prcm_arch_reset (char mode,const char *cmd) {s16 prcm_offs =0 ;
@@ -145,7 +145,7 @@ void omap_prcm_arch_reset(char mode)u32 l; prcm_offs =OMAP3430_GR_MOD ; - l = ('B' <<24 ) | ('M' <<16 ) | mode; + l = ('B' <<24 ) | ('M' <<16 ) | (cmd ? (u8)*cmd :0 );/* Reserve the first word in scratchpad for communicating * with the boot ROM. A pointer to a data structure * describing the boot process can be stored there,
arch/arm/plat-omap/include/plat/prcm.h +1 -1
@@ -24,7 +24,7 @@#define __ASM_ARM_ARCH_OMAP_PRCM_Hu32 omap_prcm_get_reset_sources (void ); -void omap_prcm_arch_reset (char mode); +void omap_prcm_arch_reset (char mode,const char *cmd);int omap2_cm_wait_idlest (void __iomem *reg,u32 mask,u8 idlest,const char *name);
arch/arm/plat-omap/include/plat/system.h +3 -3
@@ -22,7 +22,7 @@ static inline void arch_idle(void)cpu_do_idle (); } -static inline void omap1_arch_reset (char mode) +static inline void omap1_arch_reset (char mode,const char *cmd) {/* * Workaround for 5912/1611b bug mentioned in sprz209d.pdf p. 28
@@ -43,9 +43,9 @@ static inline void omap1_arch_reset(char mode)static inline void arch_reset (char mode,const char *cmd) {if (!cpu_class_is_omap2 ()) -omap1_arch_reset (mode); +omap1_arch_reset (mode, cmd);else -omap_prcm_arch_reset (mode); +omap_prcm_arch_reset (mode, cmd); }#endif
Tony Lindgren
maintainerPATCH 10/19 omap: Checkpatch cleanup for blizzard.h
In reply to Tony LindgrenFrom: Andrea Gelmini <[email protected]>
arch/arm/plat-omap/include/plat/blizzard.h:9:
ERROR: spaces prohibited around that ':' (ctx:WxW)
--- arch/arm/plat-omap/include/plat/blizzard.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-omap/include/plat/blizzard.h +1 -1
@@ -6,7 +6,7 @@ struct blizzard_platform_data {void (*power_down)(struct device *dev);unsigned long (*get_clock_rate)(struct device *dev); - unsigned te_connected : 1; + unsigned te_connected:1; };#endif
Tony Lindgren
maintainerPATCH 11/19 omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2board
In reply to Tony LindgrenFrom: Enric Balletbo i Serra <[email protected]>
Select CONFIG_LEDS_GPIO to enable IGEP v2 LED support and control of supported LEDs from userspace. Otherwise GPIO LEDs are exported as GPIO 26, 27 and 28 using the gpiolib framework.
--- arch/arm/mach-omap2/board-igep0020.c | 54 +++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 18 deletions(-)
arch/arm/mach-omap2/board-igep0020.c +36 -18
@@ -16,7 +16,6 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/gpio.h> -#include <linux/leds.h> #include <linux/interrupt.h> #include <linux/regulator/machine.h>
@@ -39,8 +38,8 @@#define IGEP2_SMSC911X_CS 5#define IGEP2_SMSC911X_GPIO 176#define IGEP2_GPIO_USBH_NRESET 24 -#define IGEP2_GPIO_LED0_RED 26 -#define IGEP2_GPIO_LED0_GREEN 27 +#define IGEP2_GPIO_LED0_GREEN 26 +#define IGEP2_GPIO_LED0_RED 27#define IGEP2_GPIO_LED1_RED 28#define IGEP2_GPIO_DVI_PUP 170#define IGEP2_GPIO_WIFI_NPD 94
@@ -355,34 +354,50 @@ static void __init igep2_display_init(void) gpio_direction_output(IGEP2_GPIO_DVI_PUP, 1))pr_err ("IGEP v2: Could not obtain gpio GPIO_DVI_PUP\n" ); } -#ifdef CONFIG_LEDS_TRIGGERS -static struct gpio_led gpio_leds[] = { + +#if defined(CONFIG_LEDS_GPIO ) || defined(CONFIG_LEDS_GPIO_MODULE ) +#include <linux/leds.h> + +static struct gpio_led igep2_gpio_leds[] = { { - .name ="GPIO_LED1_RED" , + .name ="led0:red" , + .gpio =IGEP2_GPIO_LED0_RED , + }, + { + .name ="led0:green" , .default_trigger ="heartbeat" , + .gpio =IGEP2_GPIO_LED0_GREEN , + }, + { + .name ="led1:red" , .gpio =IGEP2_GPIO_LED1_RED , }, }; -static struct gpio_led_platform_data gpio_leds_info = { - .leds = gpio_leds, - .num_leds =ARRAY_SIZE (gpio_leds), +static struct gpio_led_platform_data igep2_led_pdata = { + .leds = igep2_gpio_leds, + .num_leds =ARRAY_SIZE (igep2_gpio_leds), }; -static struct platform_device leds_gpio = { +static struct platform_device igep2_led_device = { .name ="leds-gpio" , .id =-1 , .dev = { - .platform_data = &gpio_leds_info, + .platform_data = &igep2_led_pdata, }, }; + +static void __init igep2_init_led (void ) +{ +platform_device_register (&igep2_led_device); +} + +#else +static inline void igep2_init_led (void ) {}#endif static struct platform_device *igep2_devices[]__initdata = { &igep2_dss_device, -#ifdef CONFIG_LEDS_TRIGGERS - &leds_gpio, -#endif };static void __init igep2_init_irq (void )
@@ -471,31 +486,34 @@ static void __init igep2_init(void)usb_ehci_init (&ehci_pdata);igep2_flash_init (); +igep2_init_led ();igep2_display_init ();igep2_init_smsc911x ();/* GPIO userspace leds */ -if ((gpio_request (IGEP2_GPIO_LED0_RED ,"GPIO_LED0_RED" ) ==0 ) && +#if !defined(CONFIG_LEDS_GPIO ) && !defined(CONFIG_LEDS_GPIO_MODULE ) +if ((gpio_request (IGEP2_GPIO_LED0_RED ,"led0:red" ) ==0 ) && (gpio_direction_output (IGEP2_GPIO_LED0_RED ,1 ) ==0 )) {gpio_export (IGEP2_GPIO_LED0_RED ,0 );gpio_set_value (IGEP2_GPIO_LED0_RED ,0 ); }else pr_warning ("IGEP v2: Could not obtain gpio GPIO_LED0_RED\n" ); -if ((gpio_request (IGEP2_GPIO_LED0_GREEN ,"GPIO_LED0_GREEN" ) ==0 ) && +if ((gpio_request (IGEP2_GPIO_LED0_GREEN ,"led0:green" ) ==0 ) && (gpio_direction_output (IGEP2_GPIO_LED0_GREEN ,1 ) ==0 )) {gpio_export (IGEP2_GPIO_LED0_GREEN ,0 );gpio_set_value (IGEP2_GPIO_LED0_GREEN ,0 ); }else pr_warning ("IGEP v2: Could not obtain gpio GPIO_LED0_GREEN\n" ); -#ifndef CONFIG_LEDS_TRIGGERS -if ((gpio_request (IGEP2_GPIO_LED1_RED ,"GPIO_LED1_RED" ) ==0 ) && + +if ((gpio_request (IGEP2_GPIO_LED1_RED ,"led1:red" ) ==0 ) && (gpio_direction_output (IGEP2_GPIO_LED1_RED ,1 ) ==0 )) {gpio_export (IGEP2_GPIO_LED1_RED ,0 );gpio_set_value (IGEP2_GPIO_LED1_RED ,0 ); }else pr_warning ("IGEP v2: Could not obtain gpio GPIO_LED1_RED\n" );#endif +/* GPIO W-LAN + Bluetooth combo module */ if ((gpio_request (IGEP2_GPIO_WIFI_NPD ,"GPIO_WIFI_NPD" ) ==0 ) && (gpio_direction_output (IGEP2_GPIO_WIFI_NPD ,1 ) ==0 )) {
Tony Lindgren
maintainerPATCH 12/19 omap: Fix gpio_resume_after_retention
In reply to Tony LindgrenFrom: Tony Lindgren <Aguirre>
For omap4 case, this was wrongly writing GPIO_LEVELDETECTx registers with OMAP24XX_ offset and OMAP4_ offset.
Bug introduced in commit:
commit 3f1686a9bfe74979c6ad538c78039730f665f77e
Author: Tony Lindgren <[email protected]>
Date: Mon Feb 15 09:27:25 2010 -0800
omap: Fix gpio.c for multi-omap for omap4
--- arch/arm/plat-omap/gpio.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/plat-omap/gpio.c +5 -5
@@ -2140,18 +2140,18 @@ void omap2_gpio_resume_after_retention(void)if (gen) {u32 old0, old1; -if (cpu_is_omap24xx () ||cpu_is_omap44xx ()) { +if (cpu_is_omap24xx () ||cpu_is_omap34xx ()) { old0 =__raw_readl (bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); old1 =__raw_readl (bank->base +OMAP24XX_GPIO_LEVELDETECT1 ); -__raw_writel (old0 | gen, bank->base + +__raw_writel (old0 | gen, bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); -__raw_writel (old1 | gen, bank->base + +__raw_writel (old1 | gen, bank->base +OMAP24XX_GPIO_LEVELDETECT1 ); -__raw_writel (old0, bank->base + +__raw_writel (old0, bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); -__raw_writel (old1, bank->base + +__raw_writel (old1, bank->base +OMAP24XX_GPIO_LEVELDETECT1 ); }
PATCH 12/19 omap: Fix gpio_resume_after_retention
Hi Tony,
Quoted 8 lines
-----Original Message-----
From: Tony Lindgren [mailto:tony at atomide.com]
Sent: Thursday, March 11, 2010 5:49 PM
To: linux-arm-kernel at lists.infradead.org
Cc: Aguirre, Sergio; linux-omap at vger.kernel.org
Subject: [PATCH 12/19] omap: Fixgpio_resume_after_retentionFrom: Tony Lindgren <Aguirre>
Something funky mix happened with the authorship here :)
Should be:
From: Sergio Aguirre <[email protected]>
Regards,
Sergio
Tony Lindgren
maintainerPATCH 12/19 omap: Fix gpio_resume_after_retention
Quoted 9 lines · Aguirre, Sergio
Hi Tony,
Quoted 7 lines
-----Original Message-----
From: Tony Lindgren [mailto:[email protected]]
Sent: Thursday, March 11, 2010 5:49 PM
To: [email protected]
Cc: Aguirre, Sergio; [email protected]
Subject: [PATCH 12/19] omap: Fixgpio_resume_after_retention
Quoted 7 lines
Quoted 1 line
From: Tony Lindgren <Aguirre>
Something funky mix happened with the authorship here :)
Should be:
From: Sergio Aguirre <[email protected]>
Thanks, updated patch below.
I think this issue is related to applying patches from patchwork.kernel.org with email addresses in Lastname, Firstname format..
Tony
Quoted 1 line
From
f00d649703fbedbdeb33d63c4c4731656e11297cMon Sep 17 00:00:00 2001
From: Sergio Aguirre <[email protected]>
Date: Wed, 3 Mar 2010 16:21:08 +0000
Subject: [PATCH] omap: Fix gpio_resume_after_retention
For omap4 case, this was wrongly writing GPIO_LEVELDETECTx registers with OMAP24XX_ offset and OMAP4_ offset.
Bug introduced in commit:
commit 3f1686a9bfe74979c6ad538c78039730f665f77e
Author: Tony Lindgren <[email protected]>
Date: Mon Feb 15 09:27:25 2010 -0800
omap: Fix gpio.c for multi-omap for omap4
arch/arm/plat-omap/gpio.c +5 -5
@@ -2140,18 +2140,18 @@ void omap2_gpio_resume_after_retention(void)if (gen) {u32 old0, old1; -if (cpu_is_omap24xx () ||cpu_is_omap44xx ()) { +if (cpu_is_omap24xx () ||cpu_is_omap34xx ()) { old0 =__raw_readl (bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); old1 =__raw_readl (bank->base +OMAP24XX_GPIO_LEVELDETECT1 ); -__raw_writel (old0 | gen, bank->base + +__raw_writel (old0 | gen, bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); -__raw_writel (old1 | gen, bank->base + +__raw_writel (old1 | gen, bank->base +OMAP24XX_GPIO_LEVELDETECT1 ); -__raw_writel (old0, bank->base + +__raw_writel (old0, bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); -__raw_writel (old1, bank->base + +__raw_writel (old1, bank->base +OMAP24XX_GPIO_LEVELDETECT1 ); }
PATCH 12/19 omap: Fix gpio_resume_after_retention
Quoted 25 lines
-----Original Message-----
From: Tony Lindgren [mailto:tony at atomide.com]
Sent: Thursday, March 11, 2010 5:57 PM
To: Aguirre, Sergio
Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: Re: [PATCH 12/19] omap: Fixgpio_resume_after_retentionQuoted 15 lines · Aguirre, Sergio
Hi Tony,
Quoted 8 lines
-----Original Message-----
From: Tony Lindgren [mailto:tony at atomide.com]
Sent: Thursday, March 11, 2010 5:49 PM
To: linux-arm-kernel at lists.infradead.org
Cc: Aguirre, Sergio; linux-omap at vger.kernel.org
Subject: [PATCH 12/19] omap: Fixgpio_resume_after_retentionFrom: Tony Lindgren <Aguirre>
Something funky mix happened with the authorship here :)
Should be:
Quoted 7 lines
Quoted 1 line
From: Sergio Aguirre <[email protected]>
Thanks, updated patch below.
I think this issue is related to applying patches from patchwork.kernel.org with email addresses in Lastname, Firstname format..
Hmm... I see.
I normally send my patches with this alias:
alias gsend='git send-email --smtp-server /usr/bin/msmtp --from "Sergio Aguirre <[email protected]>" --envelope-sender="Sergio Aguirre <[email protected]>"'
and then just do:
gsend --to='linux-omap at vger.kernel.org' patches/forLO_20100311/0001-mypatch.patch
But somehow the patch ends up (I'm guessing through TI LDAP server) changing that to "Aguirre, Sergio"...
and also Patchworks seems to continue display my old fullname: "Aguirre Rodriguez, Sergio Alberto"... I guess it's in a static data cache somewhere, maybe?
Does anyone know how to overcome this kind of scenario, and force what --from param says?
Regards,
Sergio
Quoted 2 lines
Tony
PATCH 12/19 omap: Fix gpio_resume_after_retention
Quoted 14 lines
I normally send my patches with this alias:
alias gsend='git send-email --smtp-server
/usr/bin/msmtp--from "Sergio Aguirre <[email protected]>" --envelope-sender="Sergio Aguirre <[email protected]>"'and then just do:
gsend --to='linux-omap at vger.kernel.org'
patches/forLO_20100311/0001-mypatch.patchBut somehow the patch ends up (I'm guessing through TI LDAP server) changing that to "Aguirre, Sergio"...
Quoted 6 lines
and also Patchworks seems to continue display my old
fullname: "Aguirre Rodriguez, Sergio Alberto"... I guess it's in a static data cache somewhere, maybe?Does anyone know how to overcome this kind of scenario, and force what --from param says?
I send patches with an explicit "From: Anand Gadiyar <[email protected]>" line in the content. This seems to work okay.
Can you check if this works for you?
- Anand
PATCH 12/19 omap: Fix gpio_resume_after_retention
Quoted 4 lines · Anand
I send patches with an explicit "From: Anand Gadiyar <[email protected]>" line in the content. This seems to work okay.
Can you check if this works for you?
$ git config --global sendemail.from "Sergio Aguirre <[email protected]>" $ git send-email --to linux-omap at vger.kernel.org --from saaguirre at ti.com 0001-mypatch.patch
This will forge git to add the From: Sergio Aguirre <[email protected]> when sending the patches
Signature · 1 line
balbi
PATCH 12/19 omap: Fix gpio_resume_after_retention
From: Felipe Balbi [mailto:felipe.balbi at nokia.com]
Sent: Friday, March 12, 2010 7:19 AM
Quoted 12 lines · Anand
Quoted 4 lines
I send patches with an explicit "From: Anand Gadiyar <[email protected]>" line in the content. This seems to work okay.
Can you check if this works for you?
$ git config --global sendemail.from "Sergio Aguirre <[email protected]>" $ git send-email --to linux-omap at vger.kernel.org --from saaguirre at ti.com 0001-mypatch.patchThis will forge git to add the From: Sergio Aguirre <[email protected]> when sending the patches
Great!
Thanks, Anand and Felipe. I'll definitely experiment with those 2.
Regards,
Sergio
Quoted 3 lines
--
balbi
Tony Lindgren
maintainerPATCH 13/19 omap: mach-omap2/io.c: fix function declarations
In reply to Tony LindgrenFrom: Aaro Koskinen <[email protected]>
Get rid of the following warnings:
warning: non-ANSI function declaration of function [...]
--- arch/arm/mach-omap2/io.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/io.c +4 -4
@@ -237,7 +237,7 @@ static void __init _omap2_map_common_io(void) }#ifdef CONFIG_ARCH_OMAP2420 -void __init omap242x_map_common_io () +void __init omap242x_map_common_io (void ) {iotable_init (omap24xx_io_desc,ARRAY_SIZE (omap24xx_io_desc));iotable_init (omap242x_io_desc,ARRAY_SIZE (omap242x_io_desc));
@@ -246,7 +246,7 @@ void __init omap242x_map_common_io()#endif #ifdef CONFIG_ARCH_OMAP2430 -void __init omap243x_map_common_io () +void __init omap243x_map_common_io (void ) {iotable_init (omap24xx_io_desc,ARRAY_SIZE (omap24xx_io_desc));iotable_init (omap243x_io_desc,ARRAY_SIZE (omap243x_io_desc));
@@ -255,7 +255,7 @@ void __init omap243x_map_common_io()#endif #ifdef CONFIG_ARCH_OMAP3 -void __init omap34xx_map_common_io () +void __init omap34xx_map_common_io (void ) {iotable_init (omap34xx_io_desc,ARRAY_SIZE (omap34xx_io_desc));_omap2_map_common_io ();
@@ -263,7 +263,7 @@ void __init omap34xx_map_common_io()#endif #ifdef CONFIG_ARCH_OMAP4 -void __init omap44xx_map_common_io () +void __init omap44xx_map_common_io (void ) {iotable_init (omap44xx_io_desc,ARRAY_SIZE (omap44xx_io_desc));_omap2_map_common_io ();
Tony Lindgren
maintainerPATCH 14/19 omap3: pandora: add missing i2c3 board_info
In reply to Tony LindgrenFrom: Grazvydas Ignotas <[email protected]>
This will allow BQ27500 fuel gauge to function.
--- arch/arm/mach-omap2/board-omap3pandora.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-omap3pandora.c +9 -1
@@ -459,12 +459,20 @@ static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = { }, }; +static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = { + { +I2C_BOARD_INFO ("bq27500" ,0x55 ), + .flags =I2C_CLIENT_WAKE , + }, +}; +static int __init omap3pandora_i2c_init (void ) {omap_register_i2c_bus (1 ,2600 , omap3pandora_i2c_boardinfo,ARRAY_SIZE (omap3pandora_i2c_boardinfo));/* i2c2 pins are not connected */ -omap_register_i2c_bus (3 ,100 ,NULL ,0 ); +omap_register_i2c_bus (3 ,100 , omap3pandora_i2c3_boardinfo, +ARRAY_SIZE (omap3pandora_i2c3_boardinfo));return 0 ; }
Tony Lindgren
maintainerPATCH 15/19 OMAP2: cpu_is_omap2*: fix compile-time removal of unused code
In reply to Tony LindgrenFrom: Kevin Hilman <[email protected]>
Currently if omap2420 is defined but not omap2430, cpu_is_omap2430() is still defined as a macro, instead of #define'd to zero. This results in conditional cpu_is_omap2430() code still being compiled, and leads to possible compile/link errors. In particular for hwmod init.
To fix, add extra #ifdefs to CPU check macros to ensure that the is_omap* macros are zero for each OMAP2 if they are not configured into the kernel.
--- arch/arm/plat-omap/include/plat/cpu.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/plat-omap/include/plat/cpu.h +6 -2
@@ -167,10 +167,14 @@ IS_OMAP_SUBCLASS(443x, 0x443)#if defined(MULTI_OMAP2 )# if defined(CONFIG_ARCH_OMAP2 )# undef cpu_is_omap24xx -# undef cpu_is_omap242x -# undef cpu_is_omap243x# define cpu_is_omap24xx () is_omap24xx() +# endif +# if defined (CONFIG_ARCH_OMAP2420 ) +# undef cpu_is_omap242x# define cpu_is_omap242x () is_omap242x() +# endif +# if defined (CONFIG_ARCH_OMAP2430 ) +# undef cpu_is_omap243x# define cpu_is_omap243x () is_omap243x()# endif # if defined(CONFIG_ARCH_OMAP3 )
Tony Lindgren
maintainerPATCH 16/19 OMAP4: fix temporary hacks that break multi-omap PM
In reply to Tony LindgrenFrom: Kevin Hilman <[email protected]>
When building for multi-omap, and OMAP4 is enabled, CONFIG_ARCH_OMAP4 will be true and prevent included code from building/running for OMAP2/3 as well.
This problem exists in io.c where some hwmod/PM/SDRC init code is prevented from running even on OMAP2/3 when OMAP4 is included in a multi-OMAP build.
A quick glance suggests that this #ifndef is no longer needed in most of the cases. In the remaining cases, the function is wrapped with "if (cpu_is_omap24xx() || cpu_is_omap34xx())" which will be optimized out for OMAP4-only builds.
Note that this is only a short-term fix. Longer-term, OMAP4 needs to create init functions for SDRC and hwmod late-init.
--- arch/arm/mach-omap2/io.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
arch/arm/mach-omap2/io.c +6 -7
@@ -309,7 +309,6 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, {pwrdm_init (powerdomains_omap);clkdm_init (clockdomains_omap, clkdm_autodeps); -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdev is ready */ if (cpu_is_omap242x ())omap2420_hwmod_init ();else if (cpu_is_omap243x ())
@@ -319,7 +318,6 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0,omap2_mux_init ();/* The OPP tables have to be registered before a clk init */ omap_pm_if_early_init (mpu_opps, dsp_opps, l3_opps); -#endif if (cpu_is_omap2420 ())omap2420_clk_init ();
@@ -333,11 +331,12 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0,pr_err ("Could not init clock framework - unknown CPU\n" );omap_serial_early_init (); -#ifndef CONFIG_ARCH_OMAP4 -omap_hwmod_late_init (); +if (cpu_is_omap24xx () ||cpu_is_omap34xx ())/* FIXME: OMAP4 */ +omap_hwmod_late_init ();omap_pm_if_init (); -omap2_sdrc_init (sdrc_cs0, sdrc_cs1); -_omap2_init_reprogram_sdrc (); -#endif +if (cpu_is_omap24xx () ||cpu_is_omap34xx ()) { +omap2_sdrc_init (sdrc_cs0, sdrc_cs1); +_omap2_init_reprogram_sdrc (); + }gpmc_init (); }
Tony Lindgren
maintainerPATCH 17/19 omap: Add DSI regulator supply to OMAP3EVM board file
In reply to Tony LindgrenFrom: Vaibhav Hiremath <[email protected]>
With recent changes happened in OMAP2/3 DSS library for regulator interface, it is required to define DSI regulator supply, without this DSS (in turn Fbdev) fails to get regulator.
--- arch/arm/mach-omap2/board-omap3evm.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/board-omap3evm.c +11 -5
@@ -514,9 +514,15 @@ static struct regulator_init_data omap3_evm_vdac = { };/* VPLL2 for digital video outputs */ -static struct regulator_consumer_supply omap3_evm_vpll2_supply = { - .supply ="vdvi" , - .dev = &omap3_evm_lcd_device.dev, +static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = { + { + .supply ="vdvi" , + .dev = &omap3_evm_lcd_device.dev, + }, + { + .supply ="vdds_dsi" , + .dev = &omap3_evm_dss_device.dev, + }, };static struct regulator_init_data omap3_evm_vpll2 = {
@@ -530,8 +536,8 @@ static struct regulator_init_data omap3_evm_vpll2 = { .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = 1, - .consumer_supplies = &omap3_evm_vpll2_supply, + .num_consumer_supplies = ARRAY_SIZE(omap3_evm_vpll2_supplies), + .consumer_supplies = omap3_evm_vpll2_supplies, }; static struct twl4030_platform_data omap3evm_twldata = {
PATCH 17/19 omap: Add DSI regulator supply to OMAP3EVM board file
Quoted 46 lines
-----Original Message-----
From: Tony Lindgren [mailto:tony at atomide.com]
Sent: Friday, March 12, 2010 5:19 AM
To: linux-arm-kernel at lists.infradead.org
Cc: Tomi Valkeinen; linux-omap at vger.kernel.org; Hiremath, Vaibhav
Subject: [PATCH 17/19] omap: Add DSI regulator supply to OMAP3EVM board fileFrom: Vaibhav Hiremath <[email protected]>
With recent changes happened in OMAP2/3 DSS library for regulator interface, it
is required to define DSI regulator supply, without this DSS (in turn Fbdev) fails to get regulator.Signed-off-by Vaibhav Hiremath <[email protected]>Acked-by Tomi Valkeinen <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap2/board-omap3evm.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-)arch/arm/mach- renamed from arch/arm/mach-omap2/board-omap3evm.c +0
-0
omap2/board-omap3evm.c
index 017bb2f..a05de10 100644arch/arm/mach-omap2/board-omap3evm.c +9
-3@@ -514,9 +514,15 @@ static struct regulator_init_data omap3_evm_vdac = { };/* VPLL2 for digital video outputs */ -static struct regulator_consumer_supply omap3_evm_vpll2_supply = { - .supply ="vdvi" , - .dev = &omap3_evm_lcd_device.dev, +static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = { + { + .supply ="vdvi" , + .dev = &omap3_evm_lcd_device.dev, + }, + { + .supply ="vdds_dsi" , + .dev = &omap3_evm_dss_device.dev, + }, };static struct regulator_init_data omap3_evm_vpll2 = {
arch/arm/mach-omap2/board-omap3evm.c static struct regulator_init_data omap3_evm_vpll2 = { · line 543
Quoted 10 lines
arch/arm/mach-omap2/board-omap3evm.c +2
-2@@ -530,8 +536,8 @@ static struct regulator_init_data omap3_evm_vpll2 = { .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = 1, - .consumer_supplies = &omap3_evm_vpll2_supply, + .num_consumer_supplies = ARRAY_SIZE(omap3_evm_vpll2_supplies), + .consumer_supplies = omap3_evm_vpll2_supplies, }; static struct twl4030_platform_data omap3evm_twldata = {
[Hiremath, Vaibhav] Tony,
Please use the patch below, I have fixed Mark's comments to use devname instead of dev.
arch/arm/mach-omap2/board-omap3evm.c +2 -4
@@ -514,10 +514,8 @@ static struct regulator_init_data omap3_evm_vdac = { };/* VPLL2 for digital video outputs */ -static struct regulator_consumer_supply omap3_evm_vpll2_supply = { - .supply ="vdds_dsi" , - .dev = &omap3_evm_dss_device.dev, -}; +static struct regulator_consumer_supply omap3_evm_vpll2_supply = +REGULATOR_SUPPLY ("vdds_dsi" ,"omapdss" );static struct regulator_init_data omap3_evm_vpll2 = { .constraints = {
[Hiremath, Vaibhav] Since you have already merged the patch , I have created patch on top of linux-omap/master below.
arch/arm/mach-omap2/board-omap3evm.c +4 -12
@@ -514,16 +514,8 @@ static struct regulator_init_data omap3_evm_vdac = { };/* VPLL2 for digital video outputs */ -static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = { - { - .supply ="vdvi" , - .dev = &omap3_evm_lcd_device.dev, - }, - { - .supply ="vdds_dsi" , - .dev = &omap3_evm_dss_device.dev, - }, -}; +static struct regulator_consumer_supply omap3_evm_vpll2_supply = +REGULATOR_SUPPLY ("vdds_dsi" ,"omapdss" );static struct regulator_init_data omap3_evm_vpll2 = { .constraints = {
@@ -536,8 +528,8 @@ static struct regulator_init_data omap3_evm_vpll2 = { .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = ARRAY_SIZE(omap3_evm_vpll2_supplies), - .consumer_supplies = omap3_evm_vpll2_supplies, + .num_consumer_supplies = 1, + .consumer_supplies = &omap3_evm_vpll2_supply, }; static struct twl4030_platform_data omap3evm_twldata = {
drivers/mtd/maps/omap_nor.c deleted +0 -0
Thanks,
Vaibhav
Tony Lindgren
maintainerPATCH 17/19 omap: Add DSI regulator supply to OMAP3EVM board file
Quoted 2 lines · Hiremath, Vaibhav
[Hiremath, Vaibhav] Tony,
Please use the patch below, I have fixed Mark's comments to use devname instead of dev.
Sorry, looks like I missed Mark's comments while reading the thread at:
http://patchwork.kernel.org/patch/84823/
I can't get either of your patches to apply. Please just repost your whole patch against the 2.6.34-rc1 with the Acked-by from Tomi.
Also, please read the mailing list instructions we have at:
http://www.elinux.org/Netiquette
Basically one patch per mail. In format that can be applied as it is. Patches inlined, not quoted-printable. I don't want to manually re-edit the patches, it's a complete waste of time.
drivers/mtd/maps/omap_nor.c
Quoted 3 lines
drivers/mtd/maps/omap_nor.c deleted +0
-0
And this part we don't want to apply, it's not related to this patch.
Regards,
Tony
Tony Lindgren
maintainerPATCH 17/19 omap: Add DSI regulator supply to OMAP3EVM board file
Quoted 20 lines · Tony Lindgren
Quoted 2 lines · Hiremath, Vaibhav
[Hiremath, Vaibhav] Tony,
Please use the patch below, I have fixed Mark's comments to use devname instead of dev.Sorry, looks like I missed Mark's comments while reading the thread at:
http://patchwork.kernel.org/patch/84823/
I can't get either of your patches to apply. Please just repost your whole patch against the 2.6.34-rc1 with the Acked-by from Tomi.
Also, please read the mailing list instructions we have at:
http://www.elinux.org/Netiquette
Basically one patch per mail. In format that can be applied as it is. Patches inlined, not quoted-printable. I don't want to manually re-edit the patches, it's a complete waste of time.
Quoted 5 lines
drivers/mtd/maps/omap_nor.c
Quoted 3 lines
drivers/mtd/maps/omap_nor.c deleted +0
-0And this part we don't want to apply, it's not related to this patch.
Also, since this is not urgent to get things compiling again, I'll drop this for now. We can merge it with the next set of fixes.
Regards,
Tony
Tony Lindgren
maintainerPATCH 18/19 omap: Add DSI regulator supply to OMAP3EVM board file
In reply to Tony LindgrenQuoted 1 line
From
9c7ceeb2621349f180be4779d954352bcc8df9cdMon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <[email protected]>
Date: Thu, 11 Mar 2010 08:55:17 +0000
Subject: [PATCH] omap: Add DSI regulator supply to OMAP3EVM board file
With recent changes happened in OMAP2/3 DSS library for regulator interface, it is required to define DSI regulator supply, without this DSS (in turn Fbdev) fails to get regulator.
arch/arm/mach-omap2/board-omap3evm.c +11 -5
@@ -514,9 +514,15 @@ static struct regulator_init_data omap3_evm_vdac = { };/* VPLL2 for digital video outputs */ -static struct regulator_consumer_supply omap3_evm_vpll2_supply = { - .supply ="vdvi" , - .dev = &omap3_evm_lcd_device.dev, +static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = { + { + .supply ="vdvi" , + .dev = &omap3_evm_lcd_device.dev, + }, + { + .supply ="vdds_dsi" , + .dev = &omap3_evm_dss_device.dev, + }, };static struct regulator_init_data omap3_evm_vpll2 = {
@@ -530,8 +536,8 @@ static struct regulator_init_data omap3_evm_vpll2 = { .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = 1, - .consumer_supplies = &omap3_evm_vpll2_supply, + .num_consumer_supplies = ARRAY_SIZE(omap3_evm_vpll2_supplies), + .consumer_supplies = omap3_evm_vpll2_supplies, }; static struct twl4030_platform_data omap3evm_twldata = {
Tony Lindgren
maintainerPATCH 18/19 omap: Add DSI regulator supply to OMAP3EVM board file
Quoted 8 lines · Tony Lindgren
From
9c7ceeb2621349f180be4779d954352bcc8df9cdMon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <[email protected]>
Date: Thu, 11 Mar 2010 08:55:17 +0000
Subject: [PATCH] omap: Add DSI regulator supply to OMAP3EVM board fileWith recent changes happened in OMAP2/3 DSS library for regulator interface, it is required to define DSI regulator supply, without this DSS (in turn Fbdev) fails to get regulator.
Oops, had to manually send the last two messages.. This is already at 17/18, so please ignore.
Regards,
Tony
Tony Lindgren
maintainerPATCH 19/19 omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values
In reply to Tony LindgrenQuoted 1 line
From
eee91441bf26c6ea88656eb9866e706b1e07d30bMon Sep 17 00:00:00 2001
From: Janusz Krzysztofik <[email protected]>
Date: Tue, 23 Feb 2010 15:50:38 +0000
Subject: [PATCH] omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values
The MsBSP register cache will never have any error/status flags set, since these flags are never written to the reg_cache. So it is kind of not necessary to clear these flags, which are actually always 0.
In other words, clearing the status/error flags are not necessary, since the reg_cache will never got these bits set. We can just write back the register content from the cache as it is when clearing an error condition.
Tested on Amstrad Delta.
arch/arm/plat-omap/mcbsp.c +4 -8
@@ -133,8 +133,7 @@ static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id)dev_err (mcbsp_tx->dev,"TX Frame Sync Error! : 0x%x\n" , irqst_spcr2);/* Writing zero to XSYNC_ERR clears the IRQ */ -MCBSP_WRITE (mcbsp_tx,SPCR2 , -MCBSP_READ_CACHE (mcbsp_tx,SPCR2 ) & ~(XSYNC_ERR )); +MCBSP_WRITE (mcbsp_tx,SPCR2 ,MCBSP_READ_CACHE (mcbsp_tx,SPCR2 )); }else {complete (&mcbsp_tx->tx_irq_completion); }
@@ -154,8 +153,7 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id)dev_err (mcbsp_rx->dev,"RX Frame Sync Error! : 0x%x\n" , irqst_spcr1);/* Writing zero to RSYNC_ERR clears the IRQ */ -MCBSP_WRITE (mcbsp_rx,SPCR1 , -MCBSP_READ_CACHE (mcbsp_rx,SPCR1 ) & ~(RSYNC_ERR )); +MCBSP_WRITE (mcbsp_rx,SPCR1 ,MCBSP_READ_CACHE (mcbsp_rx,SPCR1 )); }else {complete (&mcbsp_rx->tx_irq_completion); }
@@ -934,8 +932,7 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf)/* if frame sync error - clear the error */ if (MCBSP_READ (mcbsp,SPCR2 ) &XSYNC_ERR ) {/* clear error */ -MCBSP_WRITE (mcbsp,SPCR2 , -MCBSP_READ_CACHE (mcbsp,SPCR2 ) & (~XSYNC_ERR )); +MCBSP_WRITE (mcbsp,SPCR2 ,MCBSP_READ_CACHE (mcbsp,SPCR2 ));/* resend */ return -1 ; }else {
@@ -975,8 +972,7 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf)/* if frame sync error - clear the error */ if (MCBSP_READ (mcbsp,SPCR1 ) &RSYNC_ERR ) {/* clear error */ -MCBSP_WRITE (mcbsp,SPCR1 , -MCBSP_READ_CACHE (mcbsp,SPCR1 ) & (~RSYNC_ERR )); +MCBSP_WRITE (mcbsp,SPCR1 ,MCBSP_READ_CACHE (mcbsp,SPCR1 ));/* resend */ return -1 ; }else {
Tony Lindgren
maintainerPATCH 19/19 omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values
Quoted 9 lines · Tony Lindgren
From
eee91441bf26c6ea88656eb9866e706b1e07d30bMon Sep 17 00:00:00 2001
From: Janusz Krzysztofik <[email protected]>
Date: Tue, 23 Feb 2010 15:50:38 +0000
Subject: [PATCH] omap: McBSP: Drop unnecessary status/error bit clearing onreg_cacheretrievedregister valuesThe MsBSP register cache will never have any error/status flags set, since these flags are never written to the
reg_cache. So it is kind of not necessary to clear these flags, which are actually always 0.
Quoted 5 lines
In other words, clearing the status/error flags are not necessary, since the
reg_cachewill never got these bits set. We can just write back the register content from the cache as it is when clearing an error condition.Tested on Amstrad Delta.
And this one is really patch 18/19. Sorry again.
Tony
Tony Lindgren
maintainerPATCH 1/1 ARM/OMAP: Remove the +x bit from a couple of source files
In reply to Tony LindgrenQuoted 1 line
From
5aeb05c97c94f03627ad6983a0b5069ea539d084Mon Sep 17 00:00:00 2001
From: Andrew Clayton <[email protected]>
Date: Sat, 6 Mar 2010 00:14:46 +0000
Subject: [PATCH] ARM/OMAP: Remove the +x bit from a couple of source files
Remove the +x bit from a couple of source files