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

Commit 04cc7bc6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'sr' of... 

Merge branch 'sr' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

* 'sr' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP3+: SmartReflex: fix error handling
  ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
  ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
  ARM: OMAP3+: SmartReflex: misc cleanups
  ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
  ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
  ARM: OMAP3+: hwmod: add SmartReflex IRQs
  ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
  ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
  ARM: OMAP3+: SmartReflex: Add a shutdown hook
  ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
  ARM: OMAP3+: SmartReflex: fix err interrupt disable sequence
  ARM: OMAP3+: SmartReflex: use voltage domain name in device attributes
  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
parents 2c76744b bb887688

arch/arm/mach-omap2/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ config ARCH_OMAP3 
	depends on ARCH_OMAP2PLUS

	default y

	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
@@ -52,7 +52,7 @@ 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"

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-zoom-display.c

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static void zoom_panel_disable_lcd(struct omap_dss_device *dssdev) 


static int zoom_set_bl_intensity(struct omap_dss_device *dssdev, int level)

{

#ifdef CONFIG_TWL4030_CORE

	unsigned char c;

	u8 mux_pwm, enb_pwm;
@@ -90,6 +91,9 @@ static int zoom_set_bl_intensity(struct omap_dss_device *dssdev, int level) 
	c = ((50 * (100 - level)) / 100) + 1;

	twl_i2c_write_u8(TWL4030_MODULE_PWM1, 0x7F, TWL_LED_PWMOFF);

	twl_i2c_write_u8(TWL4030_MODULE_PWM1, c, TWL_LED_PWMON);

#else

	pr_warn("Backlight not enabled\n");

#endif



	return 0;

}

arch/arm/mach-omap2/devices.c

+4 −3
Original line number Diff line number Diff line
@@ -654,9 +654,7 @@ void __init omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) 
/*-------------------------------------------------------------------------*/



#if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE)

#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)

#define OMAP_HDQ_BASE	0x480B2000

#endif

static struct resource omap_hdq_resources[] = {

	{

		.start		= OMAP_HDQ_BASE,
@@ -679,7 +677,10 @@ static struct platform_device omap_hdq_dev = { 
};

static inline void omap_hdq_init(void)

{

	(void) platform_device_register(&omap_hdq_dev);

	if (cpu_is_omap2420())

		return;



	platform_device_register(&omap_hdq_dev);

}

#else

static inline void omap_hdq_init(void) {}

arch/arm/mach-omap2/mux.h

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static inline void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state) 
{

}



static struct omap_board_mux *board_mux __initdata __maybe_unused;

static struct omap_board_mux *board_mux __maybe_unused;



#endif