Commit f7177c84 authored by Thomas Kunze's avatar Thomas Kunze Committed by Thomas Kunze
Browse files

collie: convert to gpiolib for ucb1x00 

Only the parts used for collie_battery are converted.
The rest will be cleaned up later.
parent 9ca3dc80

arch/arm/mach-sa1100/collie.c

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static struct scoop_pcmcia_config collie_pcmcia_config = { 
static struct mcp_plat_data collie_mcp_data = {

	.mccr0		= MCCR0_ADM | MCCR0_ExtClk,

	.sclk_rate	= 9216000,

	.gpio_base	= COLLIE_TC35143_GPIO_BASE,

};



#ifdef CONFIG_SHARP_LOCOMO

arch/arm/mach-sa1100/include/mach/collie.h

+18 −17
Original line number Diff line number Diff line
@@ -80,19 +80,20 @@ 
#define COLLIE_LCM_IRQ_GPIO_nSD_WP	IRQ_LOCOMO_GPIO14



/* GPIO's on the TC35143AF (Toshiba Analog Frontend) */

#define COLLIE_TC35143_GPIO_VERSION0    UCB_IO_0	/* GPIO0=Version                 */

#define COLLIE_TC35143_GPIO_TBL_CHK     UCB_IO_1	/* GPIO1=TBL_CHK                 */

#define COLLIE_TC35143_GPIO_VPEN_ON     UCB_IO_2	/* GPIO2=VPNE_ON                 */

#define COLLIE_TC35143_GPIO_IR_ON       UCB_IO_3	/* GPIO3=IR_ON                   */

#define COLLIE_TC35143_GPIO_AMP_ON      UCB_IO_4	/* GPIO4=AMP_ON                  */

#define COLLIE_TC35143_GPIO_VERSION1    UCB_IO_5	/* GPIO5=Version                 */

#define COLLIE_TC35143_GPIO_FS8KLPF     UCB_IO_5	/* GPIO5=fs 8k LPF               */

#define COLLIE_TC35143_GPIO_BUZZER_BIAS UCB_IO_6	/* GPIO6=BUZZER BIAS             */

#define COLLIE_TC35143_GPIO_MBAT_ON     UCB_IO_7	/* GPIO7=MBAT_ON                 */

#define COLLIE_TC35143_GPIO_BBAT_ON     UCB_IO_8	/* GPIO8=BBAT_ON                 */

#define COLLIE_TC35143_GPIO_TMP_ON      UCB_IO_9	/* GPIO9=TMP_ON                  */

#define COLLIE_TC35143_GPIO_BASE	(GPIO_MAX + 13)

#define COLLIE_TC35143_GPIO_VERSION0    UCB_IO_0

#define COLLIE_TC35143_GPIO_TBL_CHK     UCB_IO_1

#define COLLIE_TC35143_GPIO_VPEN_ON     UCB_IO_2

#define COLLIE_TC35143_GPIO_IR_ON       UCB_IO_3

#define COLLIE_TC35143_GPIO_AMP_ON      UCB_IO_4

#define COLLIE_TC35143_GPIO_VERSION1    UCB_IO_5

#define COLLIE_TC35143_GPIO_FS8KLPF     UCB_IO_5

#define COLLIE_TC35143_GPIO_BUZZER_BIAS UCB_IO_6

#define COLLIE_GPIO_MBAT_ON     	(COLLIE_TC35143_GPIO_BASE + 7)

#define COLLIE_GPIO_BBAT_ON     	(COLLIE_TC35143_GPIO_BASE + 8)

#define COLLIE_GPIO_TMP_ON      	(COLLIE_TC35143_GPIO_BASE + 9)

#define COLLIE_TC35143_GPIO_IN		(UCB_IO_0 | UCB_IO_2 | UCB_IO_5)

#define COLLIE_TC35143_GPIO_OUT		( UCB_IO_1 | UCB_IO_3 | UCB_IO_4 | UCB_IO_6 | \

					UCB_IO_7 | UCB_IO_8 | UCB_IO_9 )

#define COLLIE_TC35143_GPIO_OUT		(UCB_IO_1 | UCB_IO_3 | UCB_IO_4 \

						| UCB_IO_6)



#endif