summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Moń <desowin@gmail.com>2011-12-04 09:48:10 +0000
committerTomasz Moń <desowin@gmail.com>2011-12-04 09:48:10 +0000
commit2ee9facc11745db8d2b5d8795e24e683c9deee5e (patch)
tree9a965c58ec04550ccf197c86e9272d3580c832ac
parentde712eebbdbfc1a514ede554ba7d5d7db8ed4478 (diff)
downloadrockbox-2ee9facc11745db8d2b5d8795e24e683c9deee5e.tar.gz
rockbox-2ee9facc11745db8d2b5d8795e24e683c9deee5e.zip
Power management is to be kept in target tree due to being target specific.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31136 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/SOURCES1
-rw-r--r--firmware/drivers/tps65021.c64
-rw-r--r--firmware/export/tps65021.h27
-rw-r--r--firmware/target/arm/tms320dm320/sansa-connect/power-sansaconnect.c28
4 files changed, 26 insertions, 94 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 5610b5ab5a..f5ee7873a2 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1118,7 +1118,6 @@ target/arm/tms320dm320/creative-zvm/usb-creativezvm.c
#ifdef SANSA_CONNECT
#ifndef SIMULATOR
-drivers/tps65021.c
target/arm/mmu-arm.S
target/arm/lcd-as-memframe.S
target/arm/tms320dm320/sdmmc-dm320.c
diff --git a/firmware/drivers/tps65021.c b/firmware/drivers/tps65021.c
deleted file mode 100644
index d645b0d6f0..0000000000
--- a/firmware/drivers/tps65021.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id: $
- *
- * Driver for TPS 65021 Power Management IC
- *
- * Copyright (c) 2011 Tomasz Moń
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#include "system.h"
-#include "config.h"
-#if CONFIG_I2C == I2C_DM320
-#include "i2c-dm320.h"
-#endif
-#include "logf.h"
-#include "tps65021.h"
-
-/* (7-bit) address is 0x48, the LSB is read/write flag */
-#define TPS65021_ADDR (0x48 << 1)
-
-static void tps65021_write_reg(unsigned reg, unsigned value)
-{
- unsigned char data[2];
-
- data[0] = reg;
- data[1] = value;
-
-#if CONFIG_I2C == I2C_DM320
- if (i2c_write(TPS65021_ADDR, data, 2) != 0)
-#else
- #warning Implement tps65021_write_reg()
-#endif
- {
- logf("TPS65021 error reg=0x%x", reg);
- return;
- }
-}
-
-void tps65021_init(void)
-{
-#ifdef SANSA_CONNECT
- /* PWM mode */
- tps65021_write_reg(0x04, 0xB2);
-
- /* Set core voltage to 1.5V */
- tps65021_write_reg(0x06, 0x1C);
-
- /* Set LCM (LDO1) to 2.85V, Set CODEC and USB (LDO2) to 1.8V */
- tps65021_write_reg(0x08, 0x36);
-#endif
-}
diff --git a/firmware/export/tps65021.h b/firmware/export/tps65021.h
deleted file mode 100644
index 2b28ccb37e..0000000000
--- a/firmware/export/tps65021.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id: $
- *
- * Copyright (C) 2011 by Tomasz Moń
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef TPS65021_H
-#define TPS65021_H
-
-void tps65021_init(void);
-
-#endif
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/power-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/power-sansaconnect.c
index bb03e4c0dd..07c80a07c3 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/power-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/power-sansaconnect.c
@@ -28,11 +28,35 @@
#include "backlight.h"
#include "backlight-target.h"
#include "avr-sansaconnect.h"
-#include "tps65021.h"
+#include "i2c-dm320.h"
+#include "logf.h"
+
+/* (7-bit) address is 0x48, the LSB is read/write flag */
+#define TPS65021_ADDR (0x48 << 1)
+
+static void tps65021_write_reg(unsigned reg, unsigned value)
+{
+ unsigned char data[2];
+
+ data[0] = reg;
+ data[1] = value;
+
+ if (i2c_write(TPS65021_ADDR, data, 2) != 0)
+ {
+ logf("TPS65021 error reg=0x%x", reg);
+ }
+}
void power_init(void)
{
- tps65021_init();
+ /* PWM mode */
+ tps65021_write_reg(0x04, 0xB2);
+
+ /* Set core voltage to 1.5V */
+ tps65021_write_reg(0x06, 0x1C);
+
+ /* Set LCM (LDO1) to 2.85V, Set CODEC and USB (LDO2) to 1.8V */
+ tps65021_write_reg(0x08, 0x36);
}
void power_off(void)