Commit f29d2455 authored by Richard Purdie's avatar Richard Purdie Committed by Russell King
Browse files

[ARM] 2913/1: PXA Poodle: Cleanup some unneeded code 



Patch from Richard Purdie

This patch cleans up the PXA Poodle platform code removing an unneeded
static iomap. It also corrects errors in the platform header file and
adds a missing GPIO define.

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fdce05bb

arch/arm/mach-pxa/poodle.c

+10 −21
Original line number Diff line number Diff line
@@ -126,6 +126,15 @@ static void __init poodle_init(void) 
{

	int ret = 0;



	/* setup sleep mode values */

	PWER  = 0x00000002;

	PFER  = 0x00000000;

	PRER  = 0x00000002;

	PGSR0 = 0x00008000;

	PGSR1 = 0x003F0202;

	PGSR2 = 0x0001C000;

	PCFR |= PCFR_OPDE;



	/* cpu initialize */

	/* Pgsr Register */

  	PGSR0 = 0x0146dd80;
@@ -171,32 +180,12 @@ static void __init fixup_poodle(struct machine_desc *desc, 
	sharpsl_save_param();

}



static struct map_desc poodle_io_desc[] __initdata = {

 /* virtual     physical    length                   */

  { 0xef800000, 0x00000000, 0x00800000, MT_DEVICE }, /* Boot Flash */

};



static void __init poodle_map_io(void)

{

	pxa_map_io();

	iotable_init(poodle_io_desc, ARRAY_SIZE(poodle_io_desc));



	/* setup sleep mode values */

	PWER  = 0x00000002;

	PFER  = 0x00000000;

	PRER  = 0x00000002;

	PGSR0 = 0x00008000;

	PGSR1 = 0x003F0202;

	PGSR2 = 0x0001C000;

	PCFR |= PCFR_OPDE;

}



MACHINE_START(POODLE, "SHARP Poodle")

	.phys_ram	= 0xa0000000,

	.phys_io	= 0x40000000,

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.fixup		= fixup_poodle,

	.map_io		= poodle_map_io,

	.map_io		= pxa_map_io,

	.init_irq	= pxa_init_irq,

	.timer		= &pxa_timer,

	.init_machine	= poodle_init,

include/asm-arm/arch-pxa/poodle.h

+13 −12
Original line number Diff line number Diff line
@@ -37,24 +37,25 @@ 
#define POODLE_GPIO_nSD_DETECT		(9)

#define POODLE_GPIO_MAIN_BAT_LOW	(13)

#define POODLE_GPIO_BAT_COVER		(13)

#define POODLE_GPIO_USB_PULLUP		(20)

#define POODLE_GPIO_ADC_TEMP_ON		(21)

#define POODLE_GPIO_BYPASS_ON		(36)

#define POODLE_GPIO_CHRG_ON		(38)

#define POODLE_GPIO_CHRG_FULL		(16)



/* PXA GPIOs */

#define POODLE_IRQ_GPIO_ON_KEY		IRQ_GPIO0

#define POODLE_IRQ_GPIO_AC_IN		IRQ_GPIO1

#define POODLE_IRQ_GPIO_HP_IN		IRQ_GPIO4

#define POODLE_IRQ_GPIO_CO		IRQ_GPIO16

#define POODLE_IRQ_GPIO_TP_INT		IRQ_GPIO5

#define POODLE_IRQ_GPIO_WAKEUP		IRQ_GPIO11

#define POODLE_IRQ_GPIO_GA_INT		IRQ_GPIO10

#define POODLE_IRQ_GPIO_CF_IRQ		IRQ_GPIO17

#define POODLE_IRQ_GPIO_CF_CD		IRQ_GPIO14

#define POODLE_IRQ_GPIO_nSD_INT		IRQ_GPIO8

#define POODLE_IRQ_GPIO_nSD_DETECT	IRQ_GPIO9

#define POODLE_IRQ_GPIO_MAIN_BAT_LOW	IRQ_GPIO13

#define POODLE_IRQ_GPIO_ON_KEY		IRQ_GPIO(0)

#define POODLE_IRQ_GPIO_AC_IN		IRQ_GPIO(1)

#define POODLE_IRQ_GPIO_HP_IN		IRQ_GPIO(4)

#define POODLE_IRQ_GPIO_CO		IRQ_GPIO(16)

#define POODLE_IRQ_GPIO_TP_INT		IRQ_GPIO(5)

#define POODLE_IRQ_GPIO_WAKEUP		IRQ_GPIO(11)

#define POODLE_IRQ_GPIO_GA_INT		IRQ_GPIO(10)

#define POODLE_IRQ_GPIO_CF_IRQ		IRQ_GPIO(17)

#define POODLE_IRQ_GPIO_CF_CD		IRQ_GPIO(14)

#define POODLE_IRQ_GPIO_nSD_INT		IRQ_GPIO(8)

#define POODLE_IRQ_GPIO_nSD_DETECT	IRQ_GPIO(9)

#define POODLE_IRQ_GPIO_MAIN_BAT_LOW	IRQ_GPIO(13)



/* SCOOP GPIOs */

#define POODLE_SCOOP_CHARGE_ON	SCOOP_GPCR_PA11