Skip to content

L
linux-davinci
Commit b5c96f89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

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

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP3: serial - fix bug introduced in
  mfd: twl: fix twl4030 rename for remaining driver, board files
  USB ehci: replace mach header with plat
  omap3: Allow EHCI to be built on OMAP3
parents e82b1dae f2eeeae0
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 27 deletions
arch/arm/mach-omap2/Kconfig
View file @ b5c96f89
...@@ -18,6 +18,7 @@ config ARCH_OMAP2430 ...@@ -18,6 +18,7 @@ config ARCH_OMAP2430
config ARCH_OMAP34XX config ARCH_OMAP34XX
bool "OMAP34xx Based System" bool "OMAP34xx Based System"
depends on ARCH_OMAP3 depends on ARCH_OMAP3
select USB_ARCH_HAS_EHCI
config ARCH_OMAP3430 config ARCH_OMAP3430
bool "OMAP3430 support" bool "OMAP3430 support"
......
arch/arm/mach-omap2/board-cm-t35.c
View file @ b5c96f89
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/i2c/at24.h> #include <linux/i2c/at24.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
......
arch/arm/mach-omap2/board-igep0020.c
View file @ b5c96f89
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
......
arch/arm/mach-omap2/board-omap3evm.c
View file @ b5c96f89
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h> #include <linux/spi/ads7846.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <linux/usb/otg.h> #include <linux/usb/otg.h>
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
......
arch/arm/mach-omap2/board-omap3touchbook.c
View file @ b5c96f89
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <linux/spi/ads7846.h> #include <linux/spi/ads7846.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
......
arch/arm/mach-omap2/board-rx51-peripherals.c
View file @ b5c96f89
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/wl12xx.h> #include <linux/spi/wl12xx.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
......
arch/arm/mach-omap2/board-zoom-peripherals.c
View file @ b5c96f89
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/matrix_keypad.h> #include <linux/input/matrix_keypad.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
......
arch/arm/mach-omap2/serial.c
View file @ b5c96f89
...@@ -640,12 +640,9 @@ void __init omap_serial_early_init(void) ...@@ -640,12 +640,9 @@ void __init omap_serial_early_init(void)
uart->num = i; uart->num = i;
p->private_data = uart; p->private_data = uart;
uart->p = p; uart->p = p;
list_add_tail(&uart->node, &uart_list);
if (cpu_is_omap44xx()) if (cpu_is_omap44xx())
p->irq += 32; p->irq += 32;
omap_uart_enable_clocks(uart);
} }
} }
...@@ -673,9 +670,13 @@ void __init omap_serial_init_port(int port) ...@@ -673,9 +670,13 @@ void __init omap_serial_init_port(int port)
pdev = &uart->pdev; pdev = &uart->pdev;
dev = &pdev->dev; dev = &pdev->dev;
omap_uart_enable_clocks(uart);
omap_uart_reset(uart); omap_uart_reset(uart);
omap_uart_idle_init(uart); omap_uart_idle_init(uart);
list_add_tail(&uart->node, &uart_list);
if (WARN_ON(platform_device_register(pdev))) if (WARN_ON(platform_device_register(pdev)))
return; return;
......
drivers/usb/host/ehci-omap.c
View file @ b5c96f89
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <mach/usb.h> #include <plat/usb.h>
/* /*
* OMAP USBHOST Register addresses: VIRTUAL ADDRESSES * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES
......
drivers/video/omap/lcd_ldp.c
View file @ b5c96f89
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <plat/mux.h> #include <plat/mux.h>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
#define TWL4030_VPLL2_DEV_GRP 0x33 #define TWL4030_VPLL2_DEV_GRP 0x33
#define TWL4030_VPLL2_DEDICATED 0x36 #define TWL4030_VPLL2_DEDICATED 0x36
#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v) #define t2_out(c, r, v) twl_i2c_write_u8(c, r, v)
static int ldp_panel_init(struct lcd_panel *panel, static int ldp_panel_init(struct lcd_panel *panel,
......
drivers/video/omap/lcd_omap2evm.c
View file @ b5c96f89
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <plat/mux.h> #include <plat/mux.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -61,9 +61,9 @@ static int omap2evm_panel_init(struct lcd_panel *panel, ...@@ -61,9 +61,9 @@ static int omap2evm_panel_init(struct lcd_panel *panel,
gpio_direction_output(LCD_PANEL_LR, 1); gpio_direction_output(LCD_PANEL_LR, 1);
gpio_direction_output(LCD_PANEL_UD, 1); gpio_direction_output(LCD_PANEL_UD, 1);
twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN); twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON); twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF); twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
bklight_level = 100; bklight_level = 100;
return 0; return 0;
...@@ -101,7 +101,7 @@ static int omap2evm_bklight_setlevel(struct lcd_panel *panel, ...@@ -101,7 +101,7 @@ static int omap2evm_bklight_setlevel(struct lcd_panel *panel,
u8 c; u8 c;
if ((level >= 0) && (level <= 100)) { if ((level >= 0) && (level <= 100)) {
c = (125 * (100 - level)) / 100 + 2; c = (125 * (100 - level)) / 100 + 2;
twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF); twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
bklight_level = level; bklight_level = level;
} }
return 0; return 0;
......
drivers/video/omap/lcd_omap3beagle.c
View file @ b5c96f89
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <plat/mux.h> #include <plat/mux.h>
#include <plat/mux.h> #include <plat/mux.h>
......
drivers/video/omap/lcd_omap3evm.c
View file @ b5c96f89
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <plat/mux.h> #include <plat/mux.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -63,9 +63,9 @@ static int omap3evm_panel_init(struct lcd_panel *panel, ...@@ -63,9 +63,9 @@ static int omap3evm_panel_init(struct lcd_panel *panel,
gpio_direction_output(LCD_PANEL_LR, 1); gpio_direction_output(LCD_PANEL_LR, 1);
gpio_direction_output(LCD_PANEL_UD, 1); gpio_direction_output(LCD_PANEL_UD, 1);
twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN); twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON); twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF); twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
bklight_level = 100; bklight_level = 100;
return 0; return 0;
...@@ -102,7 +102,7 @@ static int omap3evm_bklight_setlevel(struct lcd_panel *panel, ...@@ -102,7 +102,7 @@ static int omap3evm_bklight_setlevel(struct lcd_panel *panel,
u8 c; u8 c;
if ((level >= 0) && (level <= 100)) { if ((level >= 0) && (level <= 100)) {
c = (125 * (100 - level)) / 100 + 2; c = (125 * (100 - level)) / 100 + 2;
twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF); twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
bklight_level = level; bklight_level = level;
} }
return 0; return 0;
......
drivers/video/omap/lcd_overo.c
View file @ b5c96f89
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <plat/mux.h> #include <plat/mux.h>
......
sound/soc/omap/sdp3430.c
View file @ b5c96f89
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/soc.h> #include <sound/soc.h>
...@@ -321,11 +321,11 @@ static int __init sdp3430_soc_init(void) ...@@ -321,11 +321,11 @@ static int __init sdp3430_soc_init(void)
*(unsigned int *)sdp3430_dai[1].cpu_dai->private_data = 2; /* McBSP3 */ *(unsigned int *)sdp3430_dai[1].cpu_dai->private_data = 2; /* McBSP3 */
/* Set TWL4030 GPIO6 as EXTMUTE signal */ /* Set TWL4030 GPIO6 as EXTMUTE signal */
twl4030_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux, twl_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux,
TWL4030_INTBR_PMBR1); TWL4030_INTBR_PMBR1);
pin_mux &= ~TWL4030_GPIO6_PWM0_MUTE(0x03); pin_mux &= ~TWL4030_GPIO6_PWM0_MUTE(0x03);
pin_mux |= TWL4030_GPIO6_PWM0_MUTE(0x02); pin_mux |= TWL4030_GPIO6_PWM0_MUTE(0x02);
twl4030_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux, twl_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux,
TWL4030_INTBR_PMBR1); TWL4030_INTBR_PMBR1);
ret = platform_device_add(sdp3430_snd_device); ret = platform_device_add(sdp3430_snd_device);
......
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