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

Commit 04496e37 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes-non-critical' of... 

Merge branch 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

* 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  OMAP4: dma: Correct CPU version check for dma_common_ch_end
  ARM: OMAP: Fix section mismatch warning for platform_cpu_die()
  ARM: OMAP: fix section mismatch warning for omap4_hotplug_cpu()
  ARM: OMAP: convert omap_device_build() and callers to __init
  ARM: OMAP2+: Mark omap_hsmmc_init and omap_mux related functions as __init
  ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP
  ARM: OMAP: Fix devexit for dma when CONFIG_HOTPLUG is not set
  ARM: OMAP2+: Fix devexit for smartreflex when CONFIG_HOTPLUG is not set
  ARM: OMAP2+: Fix zoom LCD backlight if TWL_CORE is not selected
  ARM: OMAP2+: Fix board_mux section type conflict when OMAP_MUX is not set
  ARM: OMAP2+: Fix OMAP_HDQ_BASE build error
  ARM: OMAP2+: Fix Kconfig dependencies for USB_ARCH_HAS_EHCI
  ARM: OMAP2+: I2C: always compile I2C reset code, even if I2C driver is not built
  ARM: OMAP2+: Split omap2_hsmmc_init() to properly support I2C GPIO pins
  ARM: OMAP: omap_device: Expose omap_device_{alloc, delete, register}
  ARM: OMAP: Fix build error when mmc_omap is built as module
  ARM: OMAP: Fix kernel panic with HSMMC when twl4030_gpio is a module
parents a0008bf7 824e2dbb

arch/arm/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -164,9 +164,7 @@ machine-$(CONFIG_ARCH_MXS) := mxs 
machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_OMAP1)		:= omap1

machine-$(CONFIG_ARCH_OMAP2)		:= omap2

machine-$(CONFIG_ARCH_OMAP3)		:= omap2

machine-$(CONFIG_ARCH_OMAP4)		:= omap2

machine-$(CONFIG_ARCH_OMAP2PLUS)	:= omap2

machine-$(CONFIG_ARCH_ORION5X)		:= orion5x

machine-$(CONFIG_ARCH_PICOXCELL)	:= picoxcell

machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008

arch/arm/mach-omap2/Kconfig

+36 −19
Original line number Diff line number Diff line
@@ -21,27 +21,21 @@ config ARCH_OMAP2PLUS_TYPICAL 
	  Compile a kernel suitable for booting most boards



config ARCH_OMAP2

	bool "TI OMAP2"

	depends on ARCH_OMAP2PLUS

	default y

	bool

	select CPU_V6

	select MULTI_IRQ_HANDLER



config ARCH_OMAP3

	bool "TI OMAP3"

	depends on ARCH_OMAP2PLUS

	default y

	bool

	select CPU_V7

	select USB_ARCH_HAS_EHCI

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select ARCH_HAS_OPP

	select PM_OPP if PM

	select ARM_CPU_SUSPEND if PM

	select MULTI_IRQ_HANDLER



config ARCH_OMAP4

	bool "TI OMAP4"

	default y

	depends on ARCH_OMAP2PLUS

	bool

	select CACHE_L2X0

	select CPU_V7

	select ARM_GIC
@@ -52,40 +46,62 @@ config ARCH_OMAP4 
	select ARM_ERRATA_720789

	select ARCH_HAS_OPP

	select PM_OPP if PM

	select USB_ARCH_HAS_EHCI

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select ARM_CPU_SUSPEND if PM



comment "OMAP Core Type"

	depends on ARCH_OMAP2



config SOC_OMAP

	bool



config SOC_OMAP2420

	bool "OMAP2420 support"

	depends on ARCH_OMAP2

	default y

	select SOC_OMAP

	select ARCH_OMAP2

	select OMAP_DM_TIMER

	select ARCH_OMAP_OTG



config SOC_OMAP2430

	bool "OMAP2430 support"

	depends on ARCH_OMAP2

	default y

	select SOC_OMAP

	select ARCH_OMAP2

	select ARCH_OMAP_OTG



config SOC_OMAP3430

	bool "OMAP3430 support"

	depends on ARCH_OMAP3

	default y

	select SOC_OMAP

	select ARCH_OMAP3

	select ARCH_OMAP_OTG



config SOC_OMAPTI81XX

	bool "TI81XX support"

	depends on ARCH_OMAP3

	default y

	select SOC_OMAP

	select ARCH_OMAP3



config SOC_OMAPAM33XX

	bool "AM33XX support"

	depends on ARCH_OMAP3

	default y

	select SOC_OMAP

	select ARCH_OMAP3



config SOC_OMAP44XX

	bool "OMAP44XX support"

	default y

	select SOC_OMAP

	select ARCH_OMAP4



config SOC_OMAP_NOOP

	bool

	depends on !SOC_OMAP

	default y

	select ARCH_OMAP2

	select ARCH_OMAP3

	select ARCH_OMAP4

	select MACH_OMAP_GENERIC



config OMAP_PACKAGE_ZAF

       bool
@@ -112,17 +128,17 @@ config OMAP_PACKAGE_CBS 
       bool



comment "OMAP Board Type"

	depends on ARCH_OMAP2PLUS



config MACH_OMAP_GENERIC

	bool "Generic OMAP2+ board"

	depends on ARCH_OMAP2PLUS

	select USE_OF

	default y

	help

	  Support for generic TI OMAP2+ boards using Flattened Device Tree.

	  More information at Documentation/devicetree



if SOC_OMAP



config MACH_OMAP2_TUSB6010

	bool

	depends on ARCH_OMAP2 && SOC_OMAP2420
@@ -343,6 +359,7 @@ config MACH_OMAP4_PANDA 
	select OMAP_PACKAGE_CBS

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



endif

config OMAP3_EMU

	bool "OMAP3 debugging peripherals"

	depends on ARCH_OMAP3

arch/arm/mach-omap2/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


# Common support

obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \

	 common.o gpio.o dma.o wd_timer.o display.o

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o



omap-2-3-common				= irq.o sdrc.o

hwmod-common				= omap_hwmod.o \
@@ -182,9 +182,6 @@ obj-$(CONFIG_OMAP_IOMMU) += iommu2.o 
iommu-$(CONFIG_OMAP_IOMMU)		:= omap-iommu.o

obj-y					+= $(iommu-m) $(iommu-y)



i2c-omap-$(CONFIG_I2C_OMAP)		:= i2c.o

obj-y					+= $(i2c-omap-m) $(i2c-omap-y)



ifneq ($(CONFIG_TIDSPBRIDGE),)

obj-y					+= dsp.o

endif

arch/arm/mach-omap2/board-2430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void __init omap_2430sdp_init(void) 
	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap2_hsmmc_init(mmc);

	omap_hsmmc_init(mmc);

	omap2_usbfs_init(&sdp2430_usb_config);



	omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);

arch/arm/mach-omap2/board-3430sdp.c

+4 −1
Original line number Diff line number Diff line
@@ -232,11 +232,13 @@ static struct omap2_hsmmc_info mmc[] = { 
		 */

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= 4,

		.deferred	= true,

	},

	{

		.mmc		= 2,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= 7,

		.deferred	= true,

	},

	{}	/* Terminator */

};
@@ -249,7 +251,7 @@ static int sdp3430_twl_gpio_setup(struct device *dev, 
	 */

	mmc[0].gpio_cd = gpio + 0;

	mmc[1].gpio_cd = gpio + 1;

	omap2_hsmmc_init(mmc);

	omap_hsmmc_late_init(mmc);



	/* gpio + 7 is "sub_lcd_en_bkl" (output/PWM1) */

	gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "sub_lcd_en_bkl");
@@ -606,6 +608,7 @@ static void __init omap_3430sdp_init(void) 
	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap_hsmmc_init(mmc);

	omap3430_i2c_init();

	omap_display_init(&sdp3430_dss_data);

	if (omap_rev() > OMAP3430_REV_ES1_0)