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

Commit ff57270d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'omap/boards' into late/cleanup 

* omap/boards:
  ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight
  ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
  ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor
  omap2+: Remove useless Makefile line
  omap2+: Remove useless Makefile line
  ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d
  ARM: OMAP1: fix omap_udc registration
parents 17ada81e 06993d6a

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 
CONFIG_SENSORS_LIS3LV02D=m

CONFIG_SENSORS_LIS3LV02D=m

CONFIG_SENSORS_TSL2550=m

CONFIG_SENSORS_TSL2550=m

CONFIG_SENSORS_LIS3_I2C=m

CONFIG_SENSORS_LIS3_I2C=m

CONFIG_BMP085_I2C=m

CONFIG_SCSI=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_MULTI_LUN=y

arch/arm/mach-omap1/include/mach/usb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * FIXME correct answer depends on hmc_mode,

 * FIXME correct answer depends on hmc_mode,

 * as does (on omap1) any nonzero value for config->otg port number

 * as does (on omap1) any nonzero value for config->otg port number

 */

 */

#ifdef	CONFIG_USB_GADGET_OMAP

#if IS_ENABLED(CONFIG_USB_OMAP)

#define	is_usb0_device(config)	1

#define	is_usb0_device(config)	1

#else

#else

#define	is_usb0_device(config)	0

#define	is_usb0_device(config)	0

arch/arm/mach-omap1/usb.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ omap_otg_init(struct omap_usb_config *config) 
	syscon = omap_readl(OTG_SYSCON_1);

	syscon = omap_readl(OTG_SYSCON_1);

	syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN;

	syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN;





#ifdef	CONFIG_USB_GADGET_OMAP

#if IS_ENABLED(CONFIG_USB_OMAP)

	if (config->otg || config->register_dev) {

	if (config->otg || config->register_dev) {

		struct platform_device *udc_device = config->udc_device;

		struct platform_device *udc_device = config->udc_device;

		int status;

		int status;
@@ -169,7 +169,7 @@ omap_otg_init(struct omap_usb_config *config) 
void omap_otg_init(struct omap_usb_config *config) {}

void omap_otg_init(struct omap_usb_config *config) {}

#endif

#endif





#ifdef	CONFIG_USB_GADGET_OMAP

#if IS_ENABLED(CONFIG_USB_OMAP)





static struct resource udc_resources[] = {

static struct resource udc_resources[] = {

	/* order is significant! */

	/* order is significant! */
@@ -600,7 +600,7 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config) 
	while (!(omap_readw(ULPD_DPLL_CTRL) & DPLL_LOCK))

	while (!(omap_readw(ULPD_DPLL_CTRL) & DPLL_LOCK))

		cpu_relax();

		cpu_relax();





#ifdef	CONFIG_USB_GADGET_OMAP

#if IS_ENABLED(CONFIG_USB_OMAP)

	if (config->register_dev) {

	if (config->register_dev) {

		int status;

		int status;

arch/arm/mach-omap2/Makefile

+0 −3
Original line number Original line Diff line number Diff line
@@ -229,7 +229,6 @@ obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o 
obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o

obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o

obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o

obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o

obj-$(CONFIG_MACH_OMAP3_TORPEDO)        += board-omap3logic.o

obj-$(CONFIG_MACH_OMAP3_TORPEDO)        += board-omap3logic.o

obj-$(CONFIG_MACH_ENCORE)		+= board-omap3encore.o

obj-$(CONFIG_MACH_OVERO)		+= board-overo.o

obj-$(CONFIG_MACH_OVERO)		+= board-overo.o

obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o

obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o

obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o

obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o
@@ -255,8 +254,6 @@ obj-$(CONFIG_MACH_TOUCHBOOK) += board-omap3touchbook.o 
obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o

obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o

obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o

obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o





obj-$(CONFIG_MACH_PCM049)		+= board-omap4pcm049.o



obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o

obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o





obj-$(CONFIG_MACH_CRANEBOARD)		+= board-am3517crane.o

obj-$(CONFIG_MACH_CRANEBOARD)		+= board-am3517crane.o

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -291,6 +291,10 @@ static struct platform_device sdp4430_leds_pwm = { 
	},

	},

};

};





/* Dummy regulator for pwm-backlight driver */

static struct regulator_consumer_supply backlight_supply =

	REGULATOR_SUPPLY("enable", "pwm-backlight");



static struct platform_pwm_backlight_data sdp4430_backlight_data = {

static struct platform_pwm_backlight_data sdp4430_backlight_data = {

	.max_brightness = 127,

	.max_brightness = 127,

	.dft_brightness = 127,

	.dft_brightness = 127,
@@ -718,6 +722,8 @@ static void __init omap_4430sdp_init(void) 




	omap4_i2c_init();

	omap4_i2c_init();

	omap_sfh7741prox_init();

	omap_sfh7741prox_init();

	regulator_register_always_on(0, "backlight-enable",

				     &backlight_supply, 1, 0);

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));

	omap_serial_init();

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap_sdrc_init(NULL, NULL);