Allows TWL's 32KHz oscillator to go in low-power mode when
main battery voltage is running low.

Signed-off-by: Ilkka Koskinen <[email protected]>
---
 drivers/mfd/twl4030-core.c  |    9 +++++++--
 include/linux/i2c/twl4030.h |    5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index 8cf0a02..5596bb4 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -177,6 +177,7 @@
 #define HFCLK_FREQ_26_MHZ              (2 << 0)
 #define HFCLK_FREQ_38p4_MHZ            (3 << 0)
 #define HIGH_PERF_SQ                   (1 << 3)
+#define CK32K_LOWPWR_EN                        (1 << 7)
 
 
 /* chip-specific feature flags, for i2c_device_id.driver_data */
@@ -678,7 +679,8 @@ static inline int __init unprotect_pm_master(void)
        return e;
 }
 
-static void clocks_init(struct device *dev)
+static void clocks_init(struct device *dev,
+                       struct twl4030_clock_init_data *clock)
 {
        int e = 0;
        struct clk *osc;
@@ -725,6 +727,9 @@ static void clocks_init(struct device *dev)
        }
 
        ctrl |= HIGH_PERF_SQ;
+       if (clock && clock->ck32k_lowpwr_enable)
+               ctrl |= CK32K_LOWPWR_EN;
+
        e |= unprotect_pm_master();
        /* effect->MADC+USB ck en */
        e |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, ctrl, R_CFG_BOOT);
@@ -805,7 +810,7 @@ twl4030_probe(struct i2c_client *client, const struct 
i2c_device_id *id)
        inuse = true;
 
        /* setup clock framework */
-       clocks_init(&client->dev);
+       clocks_init(&client->dev, pdata->clock);
 
        /* load power event scripts */
        if (twl_has_power() && pdata->power)
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index 2d02dfd..612d0b7 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -312,6 +312,10 @@ int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, 
unsigned num_bytes);
 
 /*----------------------------------------------------------------------*/
 
+struct twl4030_clock_init_data {
+       int ck32k_lowpwr_enable;
+};
+
 struct twl4030_bci_platform_data {
        int *battery_tmp_tbl;
        unsigned int tblsize;
@@ -403,6 +407,7 @@ extern void twl4030_power_init(struct twl4030_power_data 
*triton2_scripts);
 
 struct twl4030_platform_data {
        unsigned                                irq_base, irq_end;
+       struct twl4030_clock_init_data          *clock;
        struct twl4030_bci_platform_data        *bci;
        struct twl4030_gpio_platform_data       *gpio;
        struct twl4030_madc_platform_data       *madc;
-- 
1.6.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to