diff options
author | Michael Sparmann <theseven@rockbox.org> | 2009-10-11 18:20:56 +0000 |
---|---|---|
committer | Michael Sparmann <theseven@rockbox.org> | 2009-10-11 18:20:56 +0000 |
commit | b729a7d75ec5b2fb73aa67c8f986e2793f8efcaf (patch) | |
tree | 8cb993512eff44090b8db093c985ee3ecb9a0f28 /firmware/export | |
parent | 4ecc5a1e9babe84d815fcf77328a18b86f6edda1 (diff) | |
download | rockbox-b729a7d75ec5b2fb73aa67c8f986e2793f8efcaf.tar.gz rockbox-b729a7d75ec5b2fb73aa67c8f986e2793f8efcaf.zip |
iPod Nano 2G PMU rework, added backlight brightness setting and USB charging speed setting
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23114 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config-ipodnano2g.h | 12 | ||||
-rw-r--r-- | firmware/export/s5l8700.h | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/firmware/export/config-ipodnano2g.h b/firmware/export/config-ipodnano2g.h index 5e92ea889a..cca87aabce 100644 --- a/firmware/export/config-ipodnano2g.h +++ b/firmware/export/config-ipodnano2g.h | |||
@@ -104,7 +104,7 @@ | |||
104 | 104 | ||
105 | /* Define this for LCD backlight available */ | 105 | /* Define this for LCD backlight available */ |
106 | #define HAVE_BACKLIGHT | 106 | #define HAVE_BACKLIGHT |
107 | /* #define HAVE_BACKLIGHT_BRIGHTNESS - not yet */ | 107 | #define HAVE_BACKLIGHT_BRIGHTNESS |
108 | 108 | ||
109 | /* Define this if you have a software controlled poweroff */ | 109 | /* Define this if you have a software controlled poweroff */ |
110 | #define HAVE_SW_POWEROFF | 110 | #define HAVE_SW_POWEROFF |
@@ -138,6 +138,8 @@ | |||
138 | /* I2C interface */ | 138 | /* I2C interface */ |
139 | #define CONFIG_I2C I2C_S5L8700 | 139 | #define CONFIG_I2C I2C_S5L8700 |
140 | 140 | ||
141 | #define HAVE_USB_CHARGING_ENABLE | ||
142 | |||
141 | /* The size of the flash ROM */ | 143 | /* The size of the flash ROM */ |
142 | #define FLASH_SIZE 0x400000 | 144 | #define FLASH_SIZE 0x400000 |
143 | 145 | ||
@@ -187,9 +189,9 @@ | |||
187 | #define MIN_CONTRAST_SETTING 1 | 189 | #define MIN_CONTRAST_SETTING 1 |
188 | #define MAX_CONTRAST_SETTING 30 | 190 | #define MAX_CONTRAST_SETTING 30 |
189 | #define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ | 191 | #define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ |
192 | #endif | ||
190 | 193 | ||
191 | /* Main LCD backlight brightness range and defaults */ | 194 | /* Main LCD backlight brightness range and defaults */ |
192 | #define MIN_BRIGHTNESS_SETTING 0 | 195 | #define MIN_BRIGHTNESS_SETTING 1 |
193 | #define MAX_BRIGHTNESS_SETTING 31 | 196 | #define MAX_BRIGHTNESS_SETTING 0x2e |
194 | #define DEFAULT_BRIGHTNESS_SETTING 20 | 197 | #define DEFAULT_BRIGHTNESS_SETTING 0x20 |
195 | #endif | ||
diff --git a/firmware/export/s5l8700.h b/firmware/export/s5l8700.h index e649b92c14..f08abee8ff 100644 --- a/firmware/export/s5l8700.h +++ b/firmware/export/s5l8700.h | |||
@@ -552,14 +552,14 @@ | |||
552 | #define PDAT7 (*(REG32_PTR_T)(0x3CF00074)) /* The data register for port 7 */ | 552 | #define PDAT7 (*(REG32_PTR_T)(0x3CF00074)) /* The data register for port 7 */ |
553 | #define PCON10 (*(REG32_PTR_T)(0x3CF000A0)) /* Configures the pins of port 10 */ | 553 | #define PCON10 (*(REG32_PTR_T)(0x3CF000A0)) /* Configures the pins of port 10 */ |
554 | #define PDAT10 (*(REG32_PTR_T)(0x3CF000A4)) /* The data register for port 10 */ | 554 | #define PDAT10 (*(REG32_PTR_T)(0x3CF000A4)) /* The data register for port 10 */ |
555 | #define PCON11 (*(REG32_PTR_T)(0x3CF000B0)) /* Configures the pins of port 11 */ | ||
556 | #define PDAT11 (*(REG32_PTR_T)(0x3CF000B4)) /* The data register for port 11 */ | ||
555 | #define PCON13 (*(REG32_PTR_T)(0x3CF000D0)) /* Configures the pins of port 13 */ | 557 | #define PCON13 (*(REG32_PTR_T)(0x3CF000D0)) /* Configures the pins of port 13 */ |
556 | #define PDAT13 (*(REG32_PTR_T)(0x3CF000D4)) /* The data register for port 13 */ | 558 | #define PDAT13 (*(REG32_PTR_T)(0x3CF000D4)) /* The data register for port 13 */ |
557 | #define PCON14 (*(REG32_PTR_T)(0x3CF000E0)) /* Configures the pins of port 14 */ | 559 | #define PCON14 (*(REG32_PTR_T)(0x3CF000E0)) /* Configures the pins of port 14 */ |
558 | #define PDAT14 (*(REG32_PTR_T)(0x3CF000E4)) /* The data register for port 14 */ | 560 | #define PDAT14 (*(REG32_PTR_T)(0x3CF000E4)) /* The data register for port 14 */ |
559 | #define PCON_ASRAM (*(REG32_PTR_T)(0x3CF000F0)) /* Configures the pins of port nor flash */ | 561 | #define PCON_ASRAM (*(REG32_PTR_T)(0x3CF000F0)) /* Configures the pins of port nor flash */ |
560 | #define PCON_SDRAM (*(REG32_PTR_T)(0x3CF000F4)) /* Configures the pins of port sdram */ | 562 | #define PCON_SDRAM (*(REG32_PTR_T)(0x3CF000F4)) /* Configures the pins of port sdram */ |
561 | #define PCON11 (*(REG32_PTR_T)(0x3CF000F8)) /* Configures the pins of port 11 */ | ||
562 | #define PDAT11 (*(REG32_PTR_T)(0x3CF000FC)) /* The data register for port 11 */ | ||
563 | 563 | ||
564 | /* 25. UART */ | 564 | /* 25. UART */ |
565 | 565 | ||