SharpSL: Add new ARM PXA machines Spitz and Borzoi with partial Akita Support
PATCH 5/5 SharpSL: Add new ARM PXA machines Spitz and Borzoi with partial Akita Support
Add the platform support code for two new Sharp Zaurus Models, Spitz (SL-C3000) and Borzoi (SL-C3100).
This patch also adds most of the foundations for Akita (SL-C1000) Support. The missing link for Akita is the driver for its I2C io expander. Once this has been finished, the missing Kconfig option and machine declaration can easily be added to this code.
include/asm-arm/arch-pxa/spitz.h new file +160 -0
@@ -0,0 +1,161 @@ +/* +* Hardware specific definitions for SL-Cx000 series of PDAs +* +* Copyright (c) 2005 Alexander Wykes +* Copyright (c) 2005 Richard Purdie +* +* Based on Sharp's 2.4 kernel patches +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ +#ifndef __ASM_ARCH_SPITZ_H +#define __ASM_ARCH_SPITZ_H 1 +#endif + +/* Spitz/Akita GPIOs */ + +#define SPITZ_GPIO_KEY_INT (0)/* Key Interrupt */ +#define SPITZ_GPIO_RESET (1) +#define SPITZ_GPIO_nSD_DETECT (9) +#define SPITZ_GPIO_TP_INT (11)/* Touch Panel interrupt */ +#define SPITZ_GPIO_AK_INT (13)/* Remote Control */ +#define SPITZ_GPIO_ADS7846_CS (14) +#define SPITZ_GPIO_SYNC (16) +#define SPITZ_GPIO_MAX1111_CS (20) +#define SPITZ_GPIO_FATAL_BAT (21) +#define SPITZ_GPIO_HSYNC (22) +#define SPITZ_GPIO_nSD_CLK (32) +#define SPITZ_GPIO_USB_DEVICE (35) +#define SPITZ_GPIO_USB_HOST (37) +#define SPITZ_GPIO_USB_CONNECT (41) +#define SPITZ_GPIO_LCDCON_CS (53) +#define SPITZ_GPIO_nPCE (54) +#define SPITZ_GPIO_nSD_WP (81) +#define SPITZ_GPIO_ON_RESET (89) +#define SPITZ_GPIO_BAT_COVER (90) +#define SPITZ_GPIO_CF_CD (94) +#define SPITZ_GPIO_ON_KEY (95) +#define SPITZ_GPIO_SWA (97) +#define SPITZ_GPIO_SWB (96) +#define SPITZ_GPIO_CHRG_FULL (101) +#define SPITZ_GPIO_CO (101) +#define SPITZ_GPIO_CF_IRQ (105) +#define SPITZ_GPIO_AC_IN (115) +#define SPITZ_GPIO_HP_IN (116) + +/* Spitz Only GPIOs */ + +#define SPITZ_GPIO_CF2_IRQ (106)/* CF slot1 Ready */ +#define SPITZ_GPIO_CF2_CD (93) + + +/* Spitz/Akita Keyboard Definitions */ + +#define SPITZ_KEY_STROBE_NUM (12) +#define SPITZ_KEY_SENSE_NUM (8) +#define SPITZ_GPIO_G0_STROBE_BIT 0x0f800000 +#define SPITZ_GPIO_G1_STROBE_BIT 0x00100000 +#define SPITZ_GPIO_G2_STROBE_BIT 0x01000000 +#define SPITZ_GPIO_G3_STROBE_BIT 0x00041880 +#define SPITZ_GPIO_G0_SENSE_BIT 0x00021000 +#define SPITZ_GPIO_G1_SENSE_BIT 0x000000d4 +#define SPITZ_GPIO_G2_SENSE_BIT 0x08000000 +#define SPITZ_GPIO_G3_SENSE_BIT 0x00000000 + +#define SPITZ_GPIO_KEY_STROBE0 88 +#define SPITZ_GPIO_KEY_STROBE1 23 +#define SPITZ_GPIO_KEY_STROBE2 24 +#define SPITZ_GPIO_KEY_STROBE3 25 +#define SPITZ_GPIO_KEY_STROBE4 26 +#define SPITZ_GPIO_KEY_STROBE5 27 +#define SPITZ_GPIO_KEY_STROBE6 52 +#define SPITZ_GPIO_KEY_STROBE7 103 +#define SPITZ_GPIO_KEY_STROBE8 107 +#define SPITZ_GPIO_KEY_STROBE9 -1 +#define SPITZ_GPIO_KEY_STROBE10 108 +#define SPITZ_GPIO_KEY_STROBE11 114 + +#define SPITZ_GPIO_KEY_SENSE0 12 +#define SPITZ_GPIO_KEY_SENSE1 17 +#define SPITZ_GPIO_KEY_SENSE2 91 +#define SPITZ_GPIO_KEY_SENSE3 34 +#define SPITZ_GPIO_KEY_SENSE4 36 +#define SPITZ_GPIO_KEY_SENSE5 38 +#define SPITZ_GPIO_KEY_SENSE6 39 +#define SPITZ_GPIO_KEY_SENSE7 -1 + + +/* Spitz Scoop Device (No. 1) GPIOs */ +/* Suspend States in comments */ +#define SPITZ_SCP_LED_GREEN SCOOP_GPCR_PA11/* Keep */ +#define SPITZ_SCP_JK_B SCOOP_GPCR_PA12/* Keep */ +#define SPITZ_SCP_CHRG_ON SCOOP_GPCR_PA13/* Keep */ +#define SPITZ_SCP_MUTE_L SCOOP_GPCR_PA14/* Low */ +#define SPITZ_SCP_MUTE_R SCOOP_GPCR_PA15/* Low */ +#define SPITZ_SCP_CF_POWER SCOOP_GPCR_PA16/* Keep */ +#define SPITZ_SCP_LED_ORANGE SCOOP_GPCR_PA17/* Keep */ +#define SPITZ_SCP_JK_A SCOOP_GPCR_PA18/* Low */ +#define SPITZ_SCP_ADC_TEMP_ON SCOOP_GPCR_PA19/* Low */ + +#define SPITZ_SCP_IO_DIR (SPITZ_SCP_LED_GREEN | SPITZ_SCP_JK_B | SPITZ_SCP_CHRG_ON | \ + SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_LED_ORANGE | \ + SPITZ_SCP_CF_POWER | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON) +#define SPITZ_SCP_IO_OUT (SPITZ_SCP_CHRG_ON | SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R) +#define SPITZ_SCP_SUS_CLR (SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON) +#define SPITZ_SCP_SUS_SET 0 + +/* Spitz Scoop Device (No. 2) GPIOs */ +/* Suspend States in comments */ +#define SPITZ_SCP2_IR_ON SCOOP_GPCR_PA11/* High */ +#define SPITZ_SCP2_AKIN_PULLUP SCOOP_GPCR_PA12/* Keep */ +#define SPITZ_SCP2_RESERVED_1 SCOOP_GPCR_PA13/* High */ +#define SPITZ_SCP2_RESERVED_2 SCOOP_GPCR_PA14/* Low */ +#define SPITZ_SCP2_RESERVED_3 SCOOP_GPCR_PA15/* Low */ +#define SPITZ_SCP2_RESERVED_4 SCOOP_GPCR_PA16/* Low */ +#define SPITZ_SCP2_BACKLIGHT_CONT SCOOP_GPCR_PA17/* Low */ +#define SPITZ_SCP2_BACKLIGHT_ON SCOOP_GPCR_PA18/* Low */ +#define SPITZ_SCP2_MIC_BIAS SCOOP_GPCR_PA19/* Low */ + +#define SPITZ_SCP2_IO_DIR (SPITZ_SCP2_IR_ON | SPITZ_SCP2_AKIN_PULLUP | SPITZ_SCP2_RESERVED_1 | \ + SPITZ_SCP2_RESERVED_2 | SPITZ_SCP2_RESERVED_3 | SPITZ_SCP2_RESERVED_4 | \ + SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS) + +#define SPITZ_SCP2_IO_OUT (SPITZ_SCP2_IR_ON | SPITZ_SCP2_AKIN_PULLUP | SPITZ_SCP2_RESERVED_1) +#define SPITZ_SCP2_SUS_CLR (SPITZ_SCP2_RESERVED_2 | SPITZ_SCP2_RESERVED_3 | SPITZ_SCP2_RESERVED_4 | \ + SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS) +#define SPITZ_SCP2_SUS_SET (SPITZ_SCP2_IR_ON | SPITZ_SCP2_RESERVED_1) + + +/* Spitz IRQ Definitions */ + +#define SPITZ_IRQ_GPIO_KEY_INT IRQ_GPIO(SPITZ_GPIO_KEY_INT) +#define SPITZ_IRQ_GPIO_AC_IN IRQ_GPIO(SPITZ_GPIO_AC_IN) +#define SPITZ_IRQ_GPIO_AK_INT IRQ_GPIO(SPITZ_GPIO_AK_INT) +#define SPITZ_IRQ_GPIO_HP_IN IRQ_GPIO(SPITZ_GPIO_HP_IN) +#define SPITZ_IRQ_GPIO_TP_INT IRQ_GPIO(SPITZ_GPIO_TP_INT) +#define SPITZ_IRQ_GPIO_SYNC IRQ_GPIO(SPITZ_GPIO_SYNC) +#define SPITZ_IRQ_GPIO_ON_KEY IRQ_GPIO(SPITZ_GPIO_ON_KEY) +#define SPITZ_IRQ_GPIO_SWA IRQ_GPIO(SPITZ_GPIO_SWA) +#define SPITZ_IRQ_GPIO_SWB IRQ_GPIO(SPITZ_GPIO_SWB) +#define SPITZ_IRQ_GPIO_BAT_COVER IRQ_GPIO(SPITZ_GPIO_BAT_COVER) +#define SPITZ_IRQ_GPIO_FATAL_BAT IRQ_GPIO(SPITZ_GPIO_FATAL_BAT) +#define SPITZ_IRQ_GPIO_CO IRQ_GPIO(SPITZ_GPIO_CO) +#define SPITZ_IRQ_GPIO_CF_IRQ IRQ_GPIO(SPITZ_GPIO_CF_IRQ) +#define SPITZ_IRQ_GPIO_CF_CD IRQ_GPIO(SPITZ_GPIO_CF_CD) +#define SPITZ_IRQ_GPIO_CF2_IRQ IRQ_GPIO(SPITZ_GPIO_CF2_IRQ) +#define SPITZ_IRQ_GPIO_nSD_INT IRQ_GPIO(SPITZ_GPIO_nSD_INT) +#define SPITZ_IRQ_GPIO_nSD_DETECT IRQ_GPIO(SPITZ_GPIO_nSD_DETECT) + +/* +* Shared data structures +*/ +extern struct platform_device spitzscoop_device; +extern struct platform_device spitzscoop2_device; +extern struct platform_device spitzssp_device; +extern struct sharpsl_charger_machinfo spitz_pm_machinfo; + +extern void spitz_lcd_power (int on);
arch/arm/mach-pxa/spitz.c new file +384 -0
385 lines not on this page · raw message
arch/arm/mach-pxa/Makefile +1 -0
@@ -12,6 +12,7 @@ obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o obj-$(CONFIG_ARCH_PXA_IDP) += idp.o obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o corgi_ssp.o corgi_lcd.o ssp.o +obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o corgi_ssp.o corgi_lcd.o ssp.o obj-$(CONFIG_MACH_POODLE) += poodle.o # Support for blinky lights
include/asm-arm/arch-pxa/akita.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Hardware specific definitions for SL-C1000 (Akita) +* +* Copyright (c) 2005 Richard Purdie +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +/* Akita IO Expander GPIOs */ + +#define AKITA_IOEXP_RESERVED_7 (1 << 7) +#define AKITA_IOEXP_IR_ON (1 << 6) +#define AKITA_IOEXP_AKIN_PULLUP (1 << 5) +#define AKITA_IOEXP_BACKLIGHT_CONT (1 << 4) +#define AKITA_IOEXP_BACKLIGHT_ON (1 << 3) +#define AKITA_IOEXP_MIC_BIAS (1 << 2) +#define AKITA_IOEXP_RESERVED_1 (1 << 1) +#define AKITA_IOEXP_RESERVED_0 (1 << 0) + +/* Direction Bitfield 0=output 1=input */ +#define AKITA_IOEXP_IO_DIR 0 +/* Default Values */ +#define AKITA_IOEXP_IO_OUT (AKITA_IOEXP_IR_ON | AKITA_IOEXP_AKIN_PULLUP) + +void akita_set_ioexp (struct device *dev,unsigned char bitmask); +void akita_reset_ioexp (struct device *dev,unsigned char bitmask); +
arch/arm/mach-pxa/Kconfig +40 -9
84 lines not on this page · raw message
Quoted 7 lines · Richard Purdie
Add the platform support code for two new Sharp Zaurus Models, Spitz (SL-C3000) and Borzoi (SL-C3100).
This patch also adds most of the foundations for Akita (SL-C1000) Support. The missing link for Akita is the driver for its I2C io expander. Once this has been finished, the missing
Kconfigoption and machine declaration can easily be added to this code.
<snip>
===================================================================
Quoted 8 lines
arch/arm/mach-pxa/spitz.c 2005-09-06 00:18:59.000000000 +0100 renamed from dev/null 1970-01-01 00:00:00.000000000 +0000 +6
-0+/* + * MMC/SD Device + * + * The card detect interrupt isn't debounced so we delay it by HZ/4 + * to give the card a chance to fully insert/eject. + */
<snip>
arch/arm/mach-pxa/spitz.c 2005-09-06 00:18:59.000000000 +0100
Quoted 4 lines
arch/arm/mach-pxa/spitz.c 2005-09-06 00:18:59.000000000 +0100 renamed from dev/null 1970-01-01 00:00:00.000000000 +0000 +4
-0+static irqreturn_t spitz_mmc_detect_int(int irq, void *devid, struct pt_regs *regs) +{ + mmc_detect.devid=devid; + mod_timer(&mmc_detect.detect_timer, jiffies + HZ/4);
Can this be:
mod_timer(&mmc_detect.detect_timer, jiffies + msecs_to_jiffies(250));
?
Thanks,
Nish
arch/arm/mach-pxa/spitz.c line 196
Quoted 10 lines · Richard Purdie
arch/arm/mach-pxa/spitz.c new file +10
-0+/* +* MMC/SD Device +* +* The card detect interrupt isn't debounced so we delay it by HZ/4 +* to give the card a chance to fully insert/eject. +*/ +static struct mmc_detect { +struct timer_list detect_timer; +void *devid; +} mmc_detect;
This isn't necessary. The "devid" is in timer_list already - in the "data" element. This is passed to the callback function as its only argument. Sure, it means a couple of extra casts, but that's an mis-feature we all know about in the timer API. It should've been a void *.
arch/arm/mach-pxa/spitz.c line 205
Quoted 8 lines
arch/arm/mach-pxa/spitz.c new file +8
-0+static void mmc_detect_callback (unsigned long data) +{ +mmc_detect_change (mmc_detect.devid); +} + +static irqreturn_t spitz_mmc_detect_int (int irq,void *devid,struct pt_regs *regs) +{ + mmc_detect.devid=devid;
Also you don't need to set it each time. devid will be a constant.
arch/arm/mach-pxa/spitz.c line 207
Quoted 2 lines
arch/arm/mach-pxa/spitz.c new file +2
-0+mod_timer (&mmc_detect.detect_timer, jiffies +HZ /4 ); +printk (KERN_WARNING "MMC detect callback\n" );
Do you really want this obvious debugging noise here?
Review
Quoted 2 lines
(quoted diff) +2
-0+ return IRQ_HANDLED; +}
Hence, this becomes:
static void mmc_detect_callback(unsigned long devid)
{
mmc_detect_change((void *)devid);
}static irqreturn_t spitz_mmc_detect_int(int irq, void *devid, struct pt_regs *regs)
{
struct timer_list *timer = devid;
mod_timer(timer, jiffies + HZ/4);
return IRQ_HANDLED;
}Quoted 8 lines
arch/arm/mach-pxa/spitz.c new file +8
-0+ +static int spitz_mci_init (struct device *dev,irqreturn_t (*unused_detect_int)(int ,void *,struct pt_regs *),void *data) +{ +int err; + +/* setup GPIO for PXA27x MMC controller */ +pxa_gpio_mode (GPIO32_MMCCLK_MD ); +pxa_gpio_mode (GPIO112_MMCCMD_MD );
arch/arm/mach-pxa/spitz.c line 227
Quoted 10 lines
arch/arm/mach-pxa/spitz.c new file +10
-0+pxa_gpio_mode (GPIO92_MMCDAT0_MD ); +pxa_gpio_mode (GPIO109_MMCDAT1_MD ); +pxa_gpio_mode (GPIO110_MMCDAT2_MD ); +pxa_gpio_mode (GPIO111_MMCDAT3_MD ); +pxa_gpio_mode (SPITZ_GPIO_nSD_DETECT |GPIO_IN ); +pxa_gpio_mode (SPITZ_GPIO_nSD_WP |GPIO_IN ); + +init_timer (&mmc_detect.detect_timer); + mmc_detect.detect_timer.function = mmc_detect_callback; + mmc_detect.detect_timer.data = (unsigned long ) &mmc_detect;
init_timer(&mmc_detect_timer); mmc_detect_timer.function = mmc_detect_callback; mmc_detect_timer.data = (unsigned long)data;
arch/arm/mach-pxa/spitz.c line 230
Quoted 3 lines
arch/arm/mach-pxa/spitz.c new file +3
-0+ + err =request_irq (SPITZ_IRQ_GPIO_nSD_DETECT, spitz_mmc_detect_int,SA_INTERRUPT , +"MMC card detect" , data);
err = request_irq(SPITZ_IRQ_GPIO_nSD_DETECT, spitz_mmc_detect_int, SA_INTERRUPT, "MMC card detect", &mmc_detect_timer);
Quoted 21 lines
arch/arm/mach-pxa/spitz.c new file +21
-0+if (err) { +printk (KERN_ERR "spitz_mci_init: MMC/SD: can't request MMC card detect IRQ\n" ); +return -1 ; + } + +set_irq_type (SPITZ_IRQ_GPIO_nSD_DETECT,IRQT_BOTHEDGE ); + +return 0 ; +} + +/* Power control is shared with one of the CF slots so we have a mess */ +static void spitz_mci_setpower (struct device *dev,unsigned int vdd) +{ +struct pxamci_platform_data * p_d = dev->platform_data; + +unsigned short cpr =read_scoop_reg (&spitzscoop_device.dev,SCOOP_CPR ); + +if ((1 << vdd) & p_d->ocr_mask) { +/* printk(KERN_DEBUG "%s: on\n", __FUNCTION__); */ +set_scoop_gpio (&spitzscoop_device.dev,SPITZ_SCP_CF_POWER ); +mdelay (2 );
arch/arm/mach-pxa/spitz.c line 261
Quoted 10 lines
arch/arm/mach-pxa/spitz.c new file +10
-0+write_scoop_reg (&spitzscoop_device.dev,SCOOP_CPR , cpr |0x04 ); + }else { +/* printk(KERN_DEBUG "%s: off\n", __FUNCTION__); */ +write_scoop_reg (&spitzscoop_device.dev,SCOOP_CPR , cpr & ~0x04 ); + +if (!(cpr |0x02 )) { +mdelay (1 ); +reset_scoop_gpio (&spitzscoop_device.dev,SPITZ_SCP_CF_POWER ); + } + }
Hmm, this actually highlights an API issue - we need to call the setpower() function with an additional argument which says whether we want the power on or off - a vdd value of zero is used for both "off" and the lowest voltage.
Quoted 1 line
+ .pxafb_backlight_power = NULL,
We don't normally include NULL initialisers.
Quoted 2 lines
+#endif
\ No newline at end of file
This should be fixed.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core
Quoted 16 lines · Russell King
Review
Quoted 10 lines · Richard Purdie
(quoted diff) +10
-0+/* + * MMC/SD Device + * + * The card detect interrupt isn't debounced so we delay it by HZ/4 + * to give the card a chance to fully insert/eject. + */ +static struct mmc_detect { + struct timer_list detect_timer; + void *devid; +} mmc_detect;This isn't necessary. The "devid" is in
timer_listalready - in the "data" element. This is passed to the callback function as its only argument. Sure, it means a couple of extra casts, but that's an mis-feature we all know about in the timer API. It should've been a void *.
This was done because I didn't like to assume:
Quoted 5 lines
+static
irqreturn_tspitz_mmc_detect_int(int irq, void *devid, struct pt_regs *regs)Review
Quoted 2 lines
(quoted diff) +2
-0+{ + mmc_detect.devid=devid;Also you don't need to set it each time. devid will be a constan
Although if we're happy with that assumption (which I am), the simplification can be made.
Alternatively, would you accept a patch to add an optional delay option to mmc_detect_change()? Something like the patch below but with all the callers updated and the pxa platform data amended to pass the optional delay. As a case for this, the same debounce timer is needed for corgi, poodle, hx2750, spitz and tosa.
This also highlights that schedule_delayed_work() with delay=0 isn't special cased which perhaps it should be?
drivers/mmc/mmc.c +6 -2
@@ -1067,13 +1067,17 @@/** * mmc_detect_change - process change of state on a MMC socket * @host: host which changed state. +* @delay: optional delay to wait before detection (jiffies) * * All we know is that card(s) have been inserted or removed * from the socket(s). We don't know which socket or cards. */ -void mmc_detect_change (struct mmc_host *host) +void mmc_detect_change (struct mmc_host *host,unsigned long delay) { -schedule_work (&host->detect); +if (delay) +schedule_delayed_work (&host->detect, delay); +else +schedule_work (&host->detect); }
Quoted 2 lines · Richard Purdie
Alternatively, would you accept a patch to add an optional delay option to
mmc_detect_change()?
Yes, since a number of hosts seem to require this (and sometimes it even depends whether we're inserting or removing a card.)
Can I have a signed-off-by line for this patch please?
Quoted 25 lines
Index:
linux-2.6.13/drivers/mmc/mmc.c
===================================================================drivers/mmc/mmc.c +6
-2@@ -1067,13 +1067,17 @@/** * mmc_detect_change - process change of state on a MMC socket * @host: host which changed state. +* @delay: optional delay to wait before detection (jiffies) * * All we know is that card(s) have been inserted or removed * from the socket(s). We don't know which socket or cards. */ -void mmc_detect_change (struct mmc_host *host) +void mmc_detect_change (struct mmc_host *host,unsigned long delay) { -schedule_work (&host->detect); +if (delay) +schedule_delayed_work (&host->detect, delay); +else +schedule_work (&host->detect); }
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core