summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ryabinin <ryabinin.a.a@gmail.com>2012-01-15 17:25:31 +0400
committerAndrew Ryabinin <ryabinin.a.a@gmail.com>2012-02-24 13:49:34 +0400
commit7b993187103c05aa87bca5393a17c3d737d2f160 (patch)
tree3b7b2f4fb91fe7585d373c60b25659a6c039ddbd
parentcac98a5ebf89a2ab75acab10e8d81dbe5f87f65d (diff)
downloadrockbox-7b993187103c05aa87bca5393a17c3d737d2f160.zip
rockbox-7b993187103c05aa87bca5393a17c3d737d2f160.tar.gz
rockbox-7b993187103c05aa87bca5393a17c3d737d2f160.tar.bz2
rockbox-7b993187103c05aa87bca5393a17c3d737d2f160.tar.xz
HiFiMAN: Implement lcd powersave mode.
Change-Id: I0a22b436549047ac0c2f9e2c203cbe8b31cfc1cd
-rw-r--r--firmware/export/config/hifimanhm60x.h2
-rw-r--r--firmware/export/config/hifimanhm801.h2
-rw-r--r--firmware/target/arm/rk27xx/backlight-rk27xx.c7
-rw-r--r--firmware/target/arm/rk27xx/lcd-hifiman.c47
4 files changed, 49 insertions, 9 deletions
diff --git a/firmware/export/config/hifimanhm60x.h b/firmware/export/config/hifimanhm60x.h
index 2fdea5e..860cc96 100644
--- a/firmware/export/config/hifimanhm60x.h
+++ b/firmware/export/config/hifimanhm60x.h
@@ -75,7 +75,7 @@
/* #define HAVE_LCD_SHUTDOWN */
/* Define this if your LCD can be enabled/disabled */
-/* #define HAVE_LCD_ENABLE */
+#define HAVE_LCD_ENABLE
/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE
should be defined as well. */
diff --git a/firmware/export/config/hifimanhm801.h b/firmware/export/config/hifimanhm801.h
index 1c504b2..06154ee 100644
--- a/firmware/export/config/hifimanhm801.h
+++ b/firmware/export/config/hifimanhm801.h
@@ -72,7 +72,7 @@
/* #define HAVE_LCD_SHUTDOWN */
/* Define this if your LCD can be enabled/disabled */
-/* #define HAVE_LCD_ENABLE */
+#define HAVE_LCD_ENABLE
/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE
should be defined as well. */
diff --git a/firmware/target/arm/rk27xx/backlight-rk27xx.c b/firmware/target/arm/rk27xx/backlight-rk27xx.c
index cb669ae..06c9cc3 100644
--- a/firmware/target/arm/rk27xx/backlight-rk27xx.c
+++ b/firmware/target/arm/rk27xx/backlight-rk27xx.c
@@ -24,6 +24,7 @@
#include "backlight.h"
#include "backlight-target.h"
#include "system.h"
+#include "lcd.h"
static int brightness = DEFAULT_BRIGHTNESS_SETTING;
@@ -76,6 +77,9 @@ bool _backlight_init(void)
void _backlight_on(void)
{
+#ifdef HAVE_LCD_ENABLE
+ lcd_enable(true);
+#endif
/* enable PWM clock */
SCU_CLKCFG &= ~(1<<29);
@@ -96,6 +100,9 @@ void _backlight_off(void)
/* disable PWM clock */
SCU_CLKCFG |= (1<<29);
+#ifdef HAVE_LCD_ENABLE
+ lcd_enable(false);
+#endif
}
void _backlight_set_brightness(int val)
diff --git a/firmware/target/arm/rk27xx/lcd-hifiman.c b/firmware/target/arm/rk27xx/lcd-hifiman.c
index 932154d..91e5589 100644
--- a/firmware/target/arm/rk27xx/lcd-hifiman.c
+++ b/firmware/target/arm/rk27xx/lcd-hifiman.c
@@ -27,12 +27,7 @@
#include "cpu.h"
#include "lcdif-rk27xx.h"
-
-/* TODO */
-static void lcd_sleep(unsigned int sleep)
-{
- (void)sleep;
-}
+static bool display_on = false;
void lcd_display_init()
{
@@ -110,9 +105,47 @@ void lcd_display_init()
for(y=0; y<LCD_HEIGHT; y++)
lcd_data(0x00);
- lcd_sleep(0);
+ display_on = true;
}
+void lcd_enable (bool on)
+{
+ if (on)
+ {
+ lcd_write_reg(0x18, 0x44);
+ lcd_write_reg(0x21, 0x01);
+ lcd_write_reg(0x01, 0x00);
+ lcd_write_reg(0x1C, 0x03);
+ lcd_write_reg(0x19, 0x06);
+ udelay(5);
+ lcd_write_reg(0x26, 0x84);
+ udelay(40);
+ lcd_write_reg(0x26, 0xB8);
+ udelay(40);
+ lcd_write_reg(0x26, 0xBC);
+ }
+ else
+ {
+ lcd_write_reg(0x26, 0xB8);
+ udelay(40);
+ lcd_write_reg(0x19, 0x01);
+ udelay(40);
+ lcd_write_reg(0x26, 0xA4);
+ udelay(40);
+ lcd_write_reg(0x26, 0x84);
+ udelay(40);
+ lcd_write_reg(0x1C, 0x00);
+ lcd_write_reg(0x01, 0x02);
+ lcd_write_reg(0x21, 0x00);
+ }
+ display_on = on;
+
+}
+
+bool lcd_active()
+{
+ return display_on;
+}
void lcd_update_rect(int x, int y, int width, int height)