Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f01c2879 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.9-rc1/fixes-signed' of... 

Merge tag 'omap-for-v3.9-rc1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fix few regressions, omap3 pm init with device tree, and some
issues with the legacy mux code.

* tag 'omap-for-v3.9-rc1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: RX-51: add missing USB phy binding
  ARM: OMAP2+: Remove duplicate omap4430_init_late() declaration
  ARM: OMAP2+: mux: correct wrong error messages
  ARM: OMAP2+: mux: fix debugfs file permission
  ARM: OMAP2+: Fix unmet direct dependencies for zoom for 8250 serial
  ARM: OMAP3: board-generic: Add missing omap3_init_late
  ARM: OMAP2+: Fix broken gpmc support
  ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
parents 4246a9c9 b0ad0995

arch/arm/configs/omap2plus_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ CONFIG_INPUT_MISC=y 
CONFIG_INPUT_TWL4030_PWRBUTTON=y

CONFIG_VT_HW_CONSOLE_BINDING=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=32

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

arch/arm/mach-omap1/common.h

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 


#include <plat/i2c.h>



#include <mach/irqs.h>



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

void omap7xx_map_io(void);

#else

arch/arm/mach-omap2/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -311,9 +311,6 @@ config MACH_OMAP_ZOOM2 
	default y

	select OMAP_PACKAGE_CBB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SERIAL_8250

	select SERIAL_8250_CONSOLE

	select SERIAL_CORE_CONSOLE



config MACH_OMAP_ZOOM3

	bool "OMAP3630 Zoom3 board"
@@ -321,9 +318,6 @@ config MACH_OMAP_ZOOM3 
	default y

	select OMAP_PACKAGE_CBP

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SERIAL_8250

	select SERIAL_8250_CONSOLE

	select SERIAL_CORE_CONSOLE



config MACH_CM_T35

	bool "CompuLab CM-T35/CM-T3730 modules"

arch/arm/mach-omap2/board-generic.c

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.dt_compat	= omap3_boards_compat,

	.restart	= omap3xxx_restart,
@@ -119,6 +120,7 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)") 
	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_secure_sync32k_timer_init,

	.dt_compat	= omap3_gp_boards_compat,

	.restart	= omap3xxx_restart,

arch/arm/mach-omap2/board-rx51.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/leds.h>

#include <linux/usb/phy.h>

#include <linux/usb/musb.h>

#include <linux/platform_data/spi-omap2-mcspi.h>
@@ -98,6 +99,7 @@ static void __init rx51_init(void) 
	sdrc_params = nokia_get_sdram_timings();

	omap_sdrc_init(sdrc_params, sdrc_params);



	usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb");

	usb_musb_init(&musb_board_data);

	rx51_peripherals_init();