Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / board-rx51-peripherals.c

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 1a2c4db13e3268b79d740b104e4028e45c996bd2..3a077df6b8dfff24d7ccb09478f4ffce291e9b42 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -42,7 +42,7 @@
 #include <media/si4713.h>
 #include <linux/platform_data/leds-lp55xx.h>
 
-#include <../drivers/staging/iio/light/tsl2563.h>
+#include <linux/platform_data/tsl2563.h>
 #include <linux/lis3lv02d.h>
 
 #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)
@@ -162,30 +162,39 @@ static struct tsl2563_platform_data rx51_tsl2563_platform_data = {
 #if defined(CONFIG_LEDS_LP5523) || defined(CONFIG_LEDS_LP5523_MODULE)
 static struct lp55xx_led_config rx51_lp5523_led_config[] = {
        {
+               .name           = "lp5523:kb1",
                .chan_nr        = 0,
                .led_current    = 50,
        }, {
+               .name           = "lp5523:kb2",
                .chan_nr        = 1,
                .led_current    = 50,
        }, {
+               .name           = "lp5523:kb3",
                .chan_nr        = 2,
                .led_current    = 50,
        }, {
+               .name           = "lp5523:kb4",
                .chan_nr        = 3,
                .led_current    = 50,
        }, {
+               .name           = "lp5523:b",
                .chan_nr        = 4,
                .led_current    = 50,
        }, {
+               .name           = "lp5523:g",
                .chan_nr        = 5,
                .led_current    = 50,
        }, {
+               .name           = "lp5523:r",
                .chan_nr        = 6,
                .led_current    = 50,
        }, {
+               .name           = "lp5523:kb5",
                .chan_nr        = 7,
                .led_current    = 50,
        }, {
+               .name           = "lp5523:kb6",
                .chan_nr        = 8,
                .led_current    = 50,
        }
@@ -1253,6 +1262,16 @@ static void __init rx51_init_lirc(void)
 }
 #endif
 
+static struct platform_device madc_hwmon = {
+       .name   = "twl4030_madc_hwmon",
+       .id     = -1,
+};
+
+static void __init rx51_init_twl4030_hwmon(void)
+{
+       platform_device_register(&madc_hwmon);
+}
+
 void __init rx51_peripherals_init(void)
 {
        rx51_i2c_init();
@@ -1272,5 +1291,6 @@ void __init rx51_peripherals_init(void)
                omap_hsmmc_init(mmc);
 
        rx51_charger_init();
+       rx51_init_twl4030_hwmon();
 }