summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2009-09-17 07:36:09 +0000
committerDave Chapman <dave@dchapman.com>2009-09-17 07:36:09 +0000
commitd67c4d2f6ba5bde26ca6e121064d4da116e868c5 (patch)
tree2769b9fff7e8e555e19d8ace569e77b4177fae77 /firmware
parent8dae933293223e28648ec72ac818ab2a98ee2482 (diff)
downloadrockbox-d67c4d2f6ba5bde26ca6e121064d4da116e868c5.tar.gz
rockbox-d67c4d2f6ba5bde26ca6e121064d4da116e868c5.tar.bz2
rockbox-d67c4d2f6ba5bde26ca6e121064d4da116e868c5.zip
Add PLL2 definitions for the S5L8701, plus some config file tweaks for the Nano2G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22715 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config-ipodnano2g.h20
-rw-r--r--firmware/export/config.h1
-rw-r--r--firmware/export/s5l8700.h2
3 files changed, 9 insertions, 14 deletions
diff --git a/firmware/export/config-ipodnano2g.h b/firmware/export/config-ipodnano2g.h
index 02277adcaa..31830fd2c1 100644
--- a/firmware/export/config-ipodnano2g.h
+++ b/firmware/export/config-ipodnano2g.h
@@ -9,11 +9,11 @@
#define MODEL_NAME "Apple iPod Nano 2g"
/* define this if you have recording possibility */
-//#define HAVE_RECORDING
+#define HAVE_RECORDING
/* Define bitmask of input sources - recordable bitmask can be defined
explicitly if different */
-#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO)
+#define INPUT_SRC_CAPS (SRC_CAP_LINEIN)
/* define the bitmask of hardware sample rates */
#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11)
@@ -86,7 +86,7 @@
#define CONFIG_LCD LCD_NANO2G
/* Define the type of audio codec */
-#define HAVE_UDA1380
+#define HAVE_WM8975
/* Define this for LCD backlight available */
#define HAVE_BACKLIGHT
@@ -101,14 +101,6 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
-/* FM Tuner */
-#define CONFIG_TUNER TEA5760
-#define CONFIG_TUNER_XTAL 32768
-
-//#define HAVE_TLV320
-
-/* TLV320 has no tone controls, so we use the software ones */
-#define HAVE_SW_TONE_CONTROLS
#define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */
@@ -124,10 +116,10 @@
/* Define this if your LCD can set contrast */
//#define HAVE_LCD_CONTRAST
-/* Define this if you have a Motorola SCF5250 */
+/* The exact type of CPU */
#define CONFIG_CPU S5L8701
-/* Define this if you want to use coldfire's i2c interface */
+/* I2C interface */
#define CONFIG_I2C I2C_S5L8700
/* define this if the hardware can be powered off while charging */
@@ -137,7 +129,7 @@
#define FLASH_SIZE 0x400000
/* Define this to the CPU frequency */
-#define CPU_FREQ 11289600
+#define CPU_FREQ 200000000
/* Define this if you have ATA power-off control */
//#define HAVE_ATA_POWER_OFF
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 331c7d75d9..a1a8a9df2a 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -197,6 +197,7 @@
#define LCD_LYRE_PROTO1 33 /* as used by the Lyre */
#define LCD_YH925 34 /* as used by Samsung YH-925 (similar to the H10 20GB) */
#define LCD_VIEW 35 /* as used by the Sansa View */
+#define LCD_NANO2G 36 /* as used by the iPod Nano 2nd Generation */
/* LCD_PIXELFORMAT */
#define HORIZONTAL_PACKING 1
diff --git a/firmware/export/s5l8700.h b/firmware/export/s5l8700.h
index 4360f14a2d..cfd8e59ad6 100644
--- a/firmware/export/s5l8700.h
+++ b/firmware/export/s5l8700.h
@@ -108,8 +108,10 @@
#define CLKCON (*(REG32_PTR_T)(0x3C500000)) /* Clock control Register */
#define PLL0PMS (*(REG32_PTR_T)(0x3C500004)) /* PLL PMS value Register */
#define PLL1PMS (*(REG32_PTR_T)(0x3C500008)) /* PLL PMS value Register */
+#define PLL2PMS (*(REG32_PTR_T)(0x3C50000C)) /* PLL PMS value Register - S5L8701 only? */
#define PLL0LCNT (*(REG32_PTR_T)(0x3C500014)) /* PLL0 lock count register */
#define PLL1LCNT (*(REG32_PTR_T)(0x3C500018)) /* PLL1 lock count register */
+#define PLL2LCNT (*(REG32_PTR_T)(0x3C50001C)) /* PLL2 lock count register - S5L8701 only? */
#define PLLLOCK (*(REG32_PTR_T)(0x3C500020)) /* PLL lock status register */
#define PLLCON (*(REG32_PTR_T)(0x3C500024)) /* PLL control register */
#define PWRCON (*(REG32_PTR_T)(0x3C500028)) /* Clock power control register */