Initial framework for the Sandisk Sansa Clip Zip

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30365 a1c6a512-1295-4272-9138-f99709370657

8 files changed, 346 insertions, 2 deletions

diff --git a/firmware/target/arm/as3525/fmradio-i2c-as3525.c b/firmware/target/arm/as3525/fmradio-i2c-as3525.c
index 70287c38b8..1dbf2fde24 100644
--- a/firmware/target/arm/as3525/fmradio-i2c-as3525.c
+++ b/firmware/target/arm/as3525/fmradio-i2c-as3525.c
@@ -40,7 +40,8 @@
 #define I2C_SCL_PIN 4
 #define I2C_SDA_PIN 5
 
-#elif     defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS)
+#elif   defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS) \
+     || defined(SANSA_CLIPZIP)
 #define I2C_SCL_GPIO(x) GPIOB_PIN(x)
 #define I2C_SDA_GPIO(x) GPIOB_PIN(x)
 #define I2C_SCL_GPIO_DIR GPIOB_DIR
diff --git a/firmware/target/arm/as3525/memory-init.S b/firmware/target/arm/as3525/memory-init.S
index e45e28a608..49b05463e7 100644
--- a/firmware/target/arm/as3525/memory-init.S
+++ b/firmware/target/arm/as3525/memory-init.S
@@ -30,7 +30,8 @@
 #define MEMORY_MODEL 0x21
 
 #elif defined(SANSA_E200V2) || defined(SANSA_FUZE) || defined(SANSA_CLIPV2) \
-    || defined(SANSA_CLIPPLUS) || defined(SANSA_FUZEV2)
+    || defined(SANSA_CLIPPLUS) || defined(SANSA_FUZEV2) \
+    || defined(SANSA_CLIPZIP)
 /* 16 bits external bus, high performance SDRAM, 64 Mbits = 8 Mbytes */
 #define MEMORY_MODEL 0x5
 
diff --git a/firmware/target/arm/as3525/powermgmt-target.h b/firmware/target/arm/as3525/powermgmt-target.h
index fd13ec6c7f..f2762f3e47 100644
--- a/firmware/target/arm/as3525/powermgmt-target.h
+++ b/firmware/target/arm/as3525/powermgmt-target.h
@@ -78,6 +78,15 @@
 #define BATT_CHG_I          CHG_I_200MA
 #define CHARGER_TOTAL_TIMER (4*3600*2)
 
+#elif defined(SANSA_CLIPZIP)
+
+/* Check if topped-off and monitor voltage while plugged. */
+#define BATT_FULL_VOLTAGE   4160
+#define BATT_VAUTO_RECHARGE 4100
+#define BATT_CHG_V          CHG_V_4_20V
+#define BATT_CHG_I          CHG_I_150MA
+#define CHARGER_TOTAL_TIMER (4*3600*2)  /* about 1.5 * capacity / current */
+
 #elif defined(SANSA_C200V2)
 
 /* Check if topped-off and monitor voltage while plugged. */
diff --git a/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c
new file mode 100644
index 0000000000..a592715c90
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright © 2011 Bertrik Sikken
+ *
+ * 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 "backlight-target.h"
+#include "lcd.h"
+#include "as3525v2.h"
+#include "ascodec-target.h"
+
+void _backlight_init()
+{
+    /* GPIO B2 controls backlight */
+    GPIOB_DIR |= (1 << 2);
+}
+
+void _backlight_on(void)
+{
+    /* TODO */
+}
+
+void _backlight_off(void)
+{
+    /* TODO */
+}
+
diff --git a/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h b/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h
new file mode 100644
index 0000000000..e19334b5c5
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h
@@ -0,0 +1,30 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright © 2011 Bertrik Sikken
+ *
+ * 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 BACKLIGHT_TARGET_H
+#define BACKLIGHT_TARGET_H
+
+void _backlight_init(void);
+void _backlight_on(void);
+void _backlight_off(void);
+
+#define _backlight_panic_on() _backlight_on()
+
+#endif
diff --git a/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c
new file mode 100644
index 0000000000..104c227378
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c
@@ -0,0 +1,103 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 François Dinel
+ * Copyright ©   2008-2009 Rafaël Carré
+ *
+ * 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 "config.h"
+
+#include "button-target.h"
+#include "as3525v2.h"
+#include "kernel.h"
+#include "system-target.h"
+
+void button_init_device(void)
+{
+    /* GPIO A6, A7 and D6 are direct button inputs */
+    GPIOA_DIR &= ~(1 << 6);
+    GPIOA_DIR &= ~(1 << 7);
+    GPIOD_DIR &= ~(1 << 6);
+    
+    /* GPIO C1, C2, C3, C4, C5 are used in a column/row key scan matrix */
+    GPIOC_DIR |= ((1 << 1) | (1 << 2));
+    GPIOC_DIR &= ~((1 << 3) | (1 << 4) | (1 << 5));
+}
+
+/*  TODO:
+    Instead of using udelay to wait for buttons to settle, we could use a
+    simple state machine to alternate between key matrix rows (like we do on
+    the clip) and this way avoid burning cycles in the udelay.
+    
+    TODO:
+    Figure out the real mappings from GPIOs to buttons.
+    The current mapping is just an educated guess.
+*/
+int button_read_device(void)
+{
+    int buttons = 0;
+
+    /* power */
+    if (GPIOD_PIN(6)) {
+        buttons |= BUTTON_POWER;
+    }
+
+    /* volume */
+    if (GPIOA_PIN(6)) {
+        buttons |= BUTTON_VOL_DOWN;
+    }
+    if (GPIOA_PIN(7)) {
+        buttons |= BUTTON_VOL_UP;
+    }
+
+    /* key matrix buttons, first row */
+    GPIOC_PIN(1) = (1 << 1);
+    GPIOC_PIN(2) = 0;
+    udelay(500);
+    
+    if (GPIOC_PIN(3)) {
+        buttons |= BUTTON_LEFT;
+    }
+    if (GPIOC_PIN(4)) {
+        buttons |= BUTTON_SELECT;
+    }
+    if (GPIOC_PIN(5)) {
+        buttons |= BUTTON_RIGHT;
+    }
+    
+    /* key matrix buttons, second row */
+    GPIOC_PIN(1) = 0;
+    GPIOC_PIN(2) = (1 << 2);
+    udelay(500);
+    
+    if (GPIOC_PIN(3)) {
+        buttons |= BUTTON_UP;
+    }
+    if (GPIOC_PIN(4)) {
+        buttons |= BUTTON_HOME;
+    }
+    if (GPIOC_PIN(5)) {
+        buttons |= BUTTON_DOWN;
+    }
+    
+    /* deselect scan rows */
+    GPIOC_PIN(2) = 0;
+
+    return buttons;
+}
+
diff --git a/firmware/target/arm/as3525/sansa-clipzip/button-target.h b/firmware/target/arm/as3525/sansa-clipzip/button-target.h
new file mode 100644
index 0000000000..8a93d45daa
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-clipzip/button-target.h
@@ -0,0 +1,55 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 François Dinel
+ *
+ * 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 _BUTTON_TARGET_H_
+#define _BUTTON_TARGET_H_
+
+#include "config.h"
+
+void button_init_device(void);
+int button_read_device(void);
+
+/* Main unit's buttons */
+#define BUTTON_HOME         0x00000001
+
+#define BUTTON_VOL_UP       0x00000002
+#define BUTTON_VOL_DOWN     0x00000004
+
+#define BUTTON_UP           0x00000008
+#define BUTTON_DOWN         0x00000010
+#define BUTTON_LEFT         0x00000020
+#define BUTTON_RIGHT        0x00000040
+
+#define BUTTON_SELECT       0x00000080
+
+#define BUTTON_POWER        0x00000100
+
+#define BUTTON_MAIN (BUTTON_HOME|BUTTON_VOL_UP|BUTTON_VOL_DOWN\
+                    |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\
+                    |BUTTON_SELECT|BUTTON_POWER)
+
+#define BUTTON_REMOTE 0
+
+/* Software power-off */
+#define POWEROFF_BUTTON BUTTON_POWER
+#define POWEROFF_COUNT 10
+
+#endif /* _BUTTON_TARGET_H_ */
diff --git a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c
new file mode 100644
index 0000000000..8efbdf77b9
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c
@@ -0,0 +1,103 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 François Dinel
+ * Copyright (C) 2008-2009 Rafaël Carré
+ *
+ * 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 "config.h"
+
+#include "lcd.h"
+#include "lcd-clip.h"
+#include "system.h"
+#include "cpu.h"
+
+static int display_type;
+
+int lcd_hw_init(void)
+{
+    bitset32(&CGU_PERI, CGU_SSP_CLOCK_ENABLE);
+
+    SSP_CPSR = AS3525_SSP_PRESCALER;    /* OF = 0x10 */
+    SSP_CR0 = (1<<7) | (1<<6) | 7;  /* Motorola SPI frame format, 8 bits */
+    SSP_CR1 = (1<<3) | (1<<1);  /* SSP Operation enabled */
+    SSP_IMSC = 0;       /* No interrupts */
+
+    /* configure GPIO B2 (display D/C#) as output */
+    GPIOB_DIR |= (1<<2);
+
+    /* configure GPIO B3 (display type detect) as input */
+    GPIOB_DIR &= ~(1<<3);
+
+    /* set GPIO A5 (display RESET# ?) */
+    GPIOA_DIR |= (1<<5);
+    GPIOA_PIN(5) = (1<<5);
+
+    /* detect display type on GPIO B3 */    
+    return GPIOB_PIN(3) ? 1 : 0;
+}
+
+void lcd_write_command(int byte)
+{
+    while(SSP_SR & (1<<4))  /* BSY flag */
+        ;
+
+    /* LCD command mode */
+    GPIOB_PIN(2) = 0;
+    
+    SSP_DATA = byte;
+    while(SSP_SR & (1<<4))  /* BSY flag */
+        ;
+}
+
+void lcd_write_data(const fb_data* p_bytes, int count)
+{
+    /* LCD data mode */
+    GPIOB_PIN(2) = (1<<2);
+
+    while (count--)
+    {
+        while(!(SSP_SR & (1<<1)))   /* wait until transmit FIFO is not full */
+            ;
+
+        SSP_DATA = *p_bytes++;
+    }
+}
+
+void lcd_update(void)
+{
+    /* TODO */
+}
+
+void lcd_init_device(void)
+{
+    /* TODO */
+    display_type = lcd_hw_init();
+}
+
+/* Update a fraction of the display. */
+void lcd_update_rect(int x, int y, int width, int height)
+{
+    (void) x;
+    (void) y;
+    (void) width;
+    (void) height;
+    
+    /* TODO not implemented yet, do a full update instead */
+    lcd_update();
+}
+