Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes

[pandora-kernel.git] / arch / arm / mach-omap2 / board-omap4panda.c

diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 209cffb..c936c6d 100644 (file)
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -411,6 +411,12 @@ static struct regulator_init_data omap4_panda_vusb = {
        },
 };
 
+static struct regulator_init_data omap4_panda_clk32kg = {
+       .constraints = {
+               .valid_ops_mask         = REGULATOR_CHANGE_STATUS,
+       },
+};
+
 static struct twl4030_platform_data omap4_panda_twldata = {
        .irq_base       = TWL6030_IRQ_BASE,
        .irq_end        = TWL6030_IRQ_END,
@@ -426,6 +432,7 @@ static struct twl4030_platform_data omap4_panda_twldata = {
        .vaux1          = &omap4_panda_vaux1,
        .vaux2          = &omap4_panda_vaux2,
        .vaux3          = &omap4_panda_vaux3,
+       .clk32kg        = &omap4_panda_clk32kg,
        .usb            = &omap4_usbphy_data,
 };