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

Commit e9d69010 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'randconfig' into fixes-non-critical

parents d82ba995 c295fb63

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-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) {}