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

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

Merge tag 'versatile-leds' of... 

Merge tag 'versatile-leds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup

Merge "Versatile LEDs conversion" from Linus Walleij:

This contains a christmas-decoration fix from Russell
King, converts the Versatile LEDs to a platform device
and moves the driver to the LEDs subsystem.

* tag 'versatile-leds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: plat-versatile: update defconfigs for Versatile LEDs
  ARM/leds: move ARM Versatile LED driver to leds subsystem
  ARM: plat-versatile: convert LEDs to platform device
  ARM: plat-versatile: LEDs initialise to off state

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents cfbf8d48 9b58d187

arch/arm/configs/realview-smp_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -76,8 +76,10 @@ CONFIG_MMC=y 
CONFIG_MMC_ARMMMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_VERSATILE=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_PL031=y

arch/arm/configs/realview_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -75,8 +75,10 @@ CONFIG_MMC=y 
CONFIG_MMC_ARMMMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_VERSATILE=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_PL031=y

arch/arm/configs/versatile_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ CONFIG_SND_ARMAACI=m 
CONFIG_MMC=y

CONFIG_MMC_ARMMMCI=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_VERSATILE=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_EXT2_FS=y

arch/arm/mach-realview/core.c

+15 −0
Original line number Diff line number Diff line
@@ -148,6 +148,21 @@ struct platform_device realview_cf_device = { 
	},

};



static struct resource realview_leds_resources[] = {

	{

		.start	= REALVIEW_SYS_BASE + REALVIEW_SYS_LED_OFFSET,

		.end	= REALVIEW_SYS_BASE + REALVIEW_SYS_LED_OFFSET + 4,

		.flags	= IORESOURCE_MEM,

	},

};



struct platform_device realview_leds_device = {

	.name		= "versatile-leds",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(realview_leds_resources),

	.resource	= realview_leds_resources,

};



static struct resource realview_i2c_resource = {

	.start		= REALVIEW_I2C_BASE,

	.end		= REALVIEW_I2C_BASE + SZ_4K - 1,

arch/arm/mach-realview/core.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct machine_desc; 


extern struct platform_device realview_flash_device;

extern struct platform_device realview_cf_device;

extern struct platform_device realview_leds_device;

extern struct platform_device realview_i2c_device;

extern struct mmci_platform_data realview_mmc0_plat_data;

extern struct mmci_platform_data realview_mmc1_plat_data;