Commit ce79f3a1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: pxa: prune unused device support 



pxa3xx is now DT-only, and the remaining pxa2xx board files
only use a subset of the possible devices, so remove all
definitions that are not referenced any more.

Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 8ca79aaa

arch/arm/mach-pxa/devices.c

+0 −338
Original line number Diff line number Diff line
@@ -16,11 +16,7 @@ 
#include <linux/platform_data/mmc-pxamci.h>

#include "irqs.h"

#include <linux/platform_data/usb-ohci-pxa27x.h>

#include <linux/platform_data/keypad-pxa27x.h>

#include <linux/platform_data/media/camera-pxa.h>

#include <linux/platform_data/asoc-pxa.h>

#include <linux/platform_data/mmp_dma.h>

#include <linux/platform_data/mtd-nand-pxa3xx.h>



#include "regs-ost.h"

#include "reset.h"
@@ -82,16 +78,10 @@ void __init pxa_set_mci_info(struct pxamci_platform_data *info) 
	pxa_register_device(&pxa_device_mci, info);

}





static struct pxa2xx_udc_mach_info pxa_udc_info = {

	.gpio_pullup = -1,

};



void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)

{

	memcpy(&pxa_udc_info, info, sizeof *info);

}



static struct resource pxa2xx_udc_resources[] = {

	[0] = {

		.start	= 0x40600000,
@@ -383,49 +373,6 @@ struct platform_device sa1100_device_rtc = { 
	.resource       = pxa_rtc_resources,

};



static struct resource pxa_ac97_resources[] = {

	[0] = {

		.start  = 0x40500000,

		.end	= 0x40500000 + 0xfff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = IRQ_AC97,

		.end    = IRQ_AC97,

		.flags  = IORESOURCE_IRQ,

	},

};



static u64 pxa_ac97_dmamask = 0xffffffffUL;



struct platform_device pxa_device_ac97 = {

	.name           = "pxa2xx-ac97",

	.id             = -1,

	.dev            = {

		.dma_mask = &pxa_ac97_dmamask,

		.coherent_dma_mask = 0xffffffff,

	},

	.num_resources  = ARRAY_SIZE(pxa_ac97_resources),

	.resource       = pxa_ac97_resources,

};



void __init pxa_set_ac97_info(pxa2xx_audio_ops_t *ops)

{

	int ret;



	ret = clk_add_alias("ac97_clk", "pxa2xx-ac97:0", "AC97CLK",

			   &pxa_device_ac97.dev);

	if (ret)

		pr_err("PXA AC97 clock1 alias error: %d\n", ret);



	ret = clk_add_alias("ac97_clk", "pxa2xx-ac97:1", "AC97CLK",

			    &pxa_device_ac97.dev);

	if (ret)

		pr_err("PXA AC97 clock2 alias error: %d\n", ret);



	pxa_register_device(&pxa_device_ac97, ops);

}



#ifdef CONFIG_PXA25x



static struct resource pxa25x_resource_pwm0[] = {
@@ -539,44 +486,6 @@ struct platform_device pxa25x_device_assp = { 
#endif /* CONFIG_PXA25x */



#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)

static struct resource pxa27x_resource_camera[] = {

	[0] = {

		.start	= 0x50000000,

		.end	= 0x50000fff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_CAMERA,

		.end	= IRQ_CAMERA,

		.flags	= IORESOURCE_IRQ,

	},

};



static u64 pxa27x_dma_mask_camera = DMA_BIT_MASK(32);



static struct platform_device pxa27x_device_camera = {

	.name		= "pxa27x-camera",

	.id		= 0, /* This is used to put cameras on this interface */

	.dev		= {

		.dma_mask      		= &pxa27x_dma_mask_camera,

		.coherent_dma_mask	= 0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(pxa27x_resource_camera),

	.resource	= pxa27x_resource_camera,

};



void __init pxa_set_camera_info(struct pxacamera_platform_data *info)

{

	struct clk *mclk;



	/* Register a fixed-rate clock for camera sensors. */

	mclk = clk_register_fixed_rate(NULL, "pxa_camera_clk", NULL, 0,

					     info->mclk_10khz * 10000);

	if (!IS_ERR(mclk))

		clkdev_create(mclk, "mclk", NULL);

	pxa_register_device(&pxa27x_device_camera, info);

}



static u64 pxa27x_ohci_dma_mask = DMA_BIT_MASK(32);



static struct resource pxa27x_resource_ohci[] = {
@@ -610,31 +519,6 @@ void __init pxa_set_ohci_info(struct pxaohci_platform_data *info) 
#endif /* CONFIG_PXA27x || CONFIG_PXA3xx */



#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)

static struct resource pxa27x_resource_keypad[] = {

	[0] = {

		.start	= 0x41500000,

		.end	= 0x4150004c,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_KEYPAD,

		.end	= IRQ_KEYPAD,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device pxa27x_device_keypad = {

	.name		= "pxa27x-keypad",

	.id		= -1,

	.resource	= pxa27x_resource_keypad,

	.num_resources	= ARRAY_SIZE(pxa27x_resource_keypad),

};



void __init pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info)

{

	pxa_register_device(&pxa27x_device_keypad, info);

}



static u64 pxa27x_ssp1_dma_mask = DMA_BIT_MASK(32);



static struct resource pxa27x_resource_ssp1[] = {
@@ -744,210 +628,6 @@ struct platform_device pxa27x_device_pwm1 = { 
};

#endif /* CONFIG_PXA27x || CONFIG_PXA3xx */



#ifdef CONFIG_PXA3xx

static struct resource pxa3xx_resources_mci2[] = {

	[0] = {

		.start	= 0x42000000,

		.end	= 0x42000fff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_MMC2,

		.end	= IRQ_MMC2,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device pxa3xx_device_mci2 = {

	.name		= "pxa2xx-mci",

	.id		= 1,

	.dev		= {

		.dma_mask = &pxamci_dmamask,

		.coherent_dma_mask =	0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(pxa3xx_resources_mci2),

	.resource	= pxa3xx_resources_mci2,

};



void __init pxa3xx_set_mci2_info(struct pxamci_platform_data *info)

{

	pxa_register_device(&pxa3xx_device_mci2, info);

}



static struct resource pxa3xx_resources_mci3[] = {

	[0] = {

		.start	= 0x42500000,

		.end	= 0x42500fff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_MMC3,

		.end	= IRQ_MMC3,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device pxa3xx_device_mci3 = {

	.name		= "pxa2xx-mci",

	.id		= 2,

	.dev		= {

		.dma_mask = &pxamci_dmamask,

		.coherent_dma_mask = 0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(pxa3xx_resources_mci3),

	.resource	= pxa3xx_resources_mci3,

};



void __init pxa3xx_set_mci3_info(struct pxamci_platform_data *info)

{

	pxa_register_device(&pxa3xx_device_mci3, info);

}



static struct resource pxa3xx_resources_gcu[] = {

	{

		.start	= 0x54000000,

		.end	= 0x54000fff,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IRQ_GCU,

		.end	= IRQ_GCU,

		.flags	= IORESOURCE_IRQ,

	},

};



static u64 pxa3xx_gcu_dmamask = DMA_BIT_MASK(32);



struct platform_device pxa3xx_device_gcu = {

	.name		= "pxa3xx-gcu",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(pxa3xx_resources_gcu),

	.resource	= pxa3xx_resources_gcu,

	.dev		= {

		.dma_mask = &pxa3xx_gcu_dmamask,

		.coherent_dma_mask = 0xffffffff,

	},

};



#endif /* CONFIG_PXA3xx */



#if defined(CONFIG_PXA3xx)

static struct resource pxa3xx_resources_i2c_power[] = {

	{

		.start  = 0x40f500c0,

		.end    = 0x40f500d3,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IRQ_PWRI2C,

		.end	= IRQ_PWRI2C,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device pxa3xx_device_i2c_power = {

	.name		= "pxa3xx-pwri2c",

	.id		= 1,

	.resource	= pxa3xx_resources_i2c_power,

	.num_resources	= ARRAY_SIZE(pxa3xx_resources_i2c_power),

};



static struct resource pxa3xx_resources_nand[] = {

	[0] = {

		.start	= 0x43100000,

		.end	= 0x43100053,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_NAND,

		.end	= IRQ_NAND,

		.flags	= IORESOURCE_IRQ,

	},

};



static u64 pxa3xx_nand_dma_mask = DMA_BIT_MASK(32);



struct platform_device pxa3xx_device_nand = {

	.name		= "pxa3xx-nand",

	.id		= -1,

	.dev		= {

		.dma_mask = &pxa3xx_nand_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.num_resources	= ARRAY_SIZE(pxa3xx_resources_nand),

	.resource	= pxa3xx_resources_nand,

};



void __init pxa3xx_set_nand_info(struct pxa3xx_nand_platform_data *info)

{

	pxa_register_device(&pxa3xx_device_nand, info);

}



static u64 pxa3xx_ssp4_dma_mask = DMA_BIT_MASK(32);



static struct resource pxa3xx_resource_ssp4[] = {

	[0] = {

		.start	= 0x41a00000,

		.end	= 0x41a0003f,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_SSP4,

		.end	= IRQ_SSP4,

		.flags	= IORESOURCE_IRQ,

	},

};



/*

 * PXA3xx SSP is basically equivalent to PXA27x.

 * However, we need to register the device by the correct name in order to

 * make the driver set the correct internal type, hence we provide specific

 * platform_devices for each of them.

 */

struct platform_device pxa3xx_device_ssp1 = {

	.name		= "pxa3xx-ssp",

	.id		= 0,

	.dev		= {

		.dma_mask = &pxa27x_ssp1_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.resource	= pxa27x_resource_ssp1,

	.num_resources	= ARRAY_SIZE(pxa27x_resource_ssp1),

};



struct platform_device pxa3xx_device_ssp2 = {

	.name		= "pxa3xx-ssp",

	.id		= 1,

	.dev		= {

		.dma_mask = &pxa27x_ssp2_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.resource	= pxa27x_resource_ssp2,

	.num_resources	= ARRAY_SIZE(pxa27x_resource_ssp2),

};



struct platform_device pxa3xx_device_ssp3 = {

	.name		= "pxa3xx-ssp",

	.id		= 2,

	.dev		= {

		.dma_mask = &pxa27x_ssp3_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.resource	= pxa27x_resource_ssp3,

	.num_resources	= ARRAY_SIZE(pxa27x_resource_ssp3),

};



struct platform_device pxa3xx_device_ssp4 = {

	.name		= "pxa3xx-ssp",

	.id		= 3,

	.dev		= {

		.dma_mask = &pxa3xx_ssp4_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.resource	= pxa3xx_resource_ssp4,

	.num_resources	= ARRAY_SIZE(pxa3xx_resource_ssp4),

};

#endif /* CONFIG_PXA3xx */



struct resource pxa_resource_gpio[] = {

	{

		.start	= 0x40e00000,
@@ -972,11 +652,7 @@ struct resource pxa_resource_gpio[] = { 
};



struct platform_device pxa25x_device_gpio = {

#ifdef CONFIG_CPU_PXA26x

	.name		= "pxa26x-gpio",

#else

	.name		= "pxa25x-gpio",

#endif

	.id		= -1,

	.num_resources	= ARRAY_SIZE(pxa_resource_gpio),

	.resource	= pxa_resource_gpio,
@@ -989,20 +665,6 @@ struct platform_device pxa27x_device_gpio = { 
	.resource	= pxa_resource_gpio,

};



struct platform_device pxa3xx_device_gpio = {

	.name		= "pxa3xx-gpio",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(pxa_resource_gpio),

	.resource	= pxa_resource_gpio,

};



struct platform_device pxa93x_device_gpio = {

	.name		= "pxa93x-gpio",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(pxa_resource_gpio),

	.resource	= pxa_resource_gpio,

};



/* pxa2xx-spi platform-device ID equals respective SSP platform-device ID + 1.

 * See comment in arch/arm/mach-pxa/ssp.c::ssp_probe() */

void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_controller *info)

arch/arm/mach-pxa/mfp-pxa25x.h

+0 −33
Original line number Diff line number Diff line
@@ -158,39 +158,6 @@ 
#define GPIO76_LCD_PCLK		MFP_CFG_OUT(GPIO76, AF2, DRIVE_LOW)

#define GPIO77_LCD_BIAS		MFP_CFG_OUT(GPIO77, AF2, DRIVE_LOW)



#ifdef CONFIG_CPU_PXA26x

/* GPIO */

#define GPIO85_GPIO		MFP_CFG_IN(GPIO85, AF0)

#define GPIO86_GPIO		MFP_CFG_IN(GPIO86, AF1)

#define GPIO87_GPIO		MFP_CFG_IN(GPIO87, AF1)

#define GPIO88_GPIO		MFP_CFG_IN(GPIO88, AF1)

#define GPIO89_GPIO		MFP_CFG_IN(GPIO89, AF1)



/* SDRAM */

#define GPIO86_nSDCS2		MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH)

#define GPIO87_nSDCS3		MFP_CFG_OUT(GPIO87, AF0, DRIVE_HIGH)

#define GPIO88_RDnWR		MFP_CFG_OUT(GPIO88, AF0, DRIVE_HIGH)



/* USB */

#define GPIO9_USB_RCV		MFP_CFG_IN(GPIO9, AF1)

#define GPIO32_USB_VP		MFP_CFG_IN(GPIO32, AF2)

#define GPIO34_USB_VM		MFP_CFG_IN(GPIO34, AF2)

#define GPIO39_USB_VPO		MFP_CFG_OUT(GPIO39, AF3, DRIVE_LOW)

#define GPIO56_USB_VMO		MFP_CFG_OUT(GPIO56, AF1, DRIVE_LOW)

#define GPIO57_USB_nOE		MFP_CFG_OUT(GPIO57, AF1, DRIVE_HIGH)



/* ASSP */

#define GPIO28_ASSP_BITCLK_IN	MFP_CFG_IN(GPIO28, AF3)

#define GPIO28_ASSP_BITCLK_OUT	MFP_CFG_OUT(GPIO28, AF3, DRIVE_LOW)

#define GPIO29_ASSP_RXD		MFP_CFG_IN(GPIO29, AF3)

#define GPIO30_ASSP_TXD		MFP_CFG_OUT(GPIO30, AF3, DRIVE_LOW)

#define GPIO31_ASSP_SFRM_IN	MFP_CFG_IN(GPIO31, AF1)

#define GPIO31_ASSP_SFRM_OUT	MFP_CFG_OUT(GPIO31, AF3, DRIVE_LOW)



/* AC97 */

#define GPIO89_AC97_nRESET	MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH)

#endif	/* CONFIG_CPU_PXA26x */



/* commonly used pin configurations */

#define GPIOxx_LCD_16BPP	\

	GPIO58_LCD_LDD_0,	\

arch/arm/mach-pxa/mfp-pxa2xx.c

+0 −4
Original line number Diff line number Diff line
@@ -226,11 +226,7 @@ static void __init pxa25x_mfp_init(void) 
	int i;



	/* running before pxa_gpio_probe() */

#ifdef CONFIG_CPU_PXA26x

	pxa_last_gpio = 89;

#else

	pxa_last_gpio = 84;

#endif

	for (i = 0; i <= pxa_last_gpio; i++)

		gpio_desc[i].valid = 1;

arch/arm/mach-pxa/pm.c

+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ int pxa_pm_enter(suspend_state_t state) 
		/* if invalid, display message and wait for a hardware reset */

		if (checksum != sleep_save_checksum) {



			lubbock_set_hexled(0xbadbadc5);



			while (1)

				pxa_cpu_pm_fns->enter(state);

		}

arch/arm/mach-pxa/pm.h

+0 −10
Original line number Diff line number Diff line
@@ -27,13 +27,3 @@ extern void pxa_pm_finish(void); 


extern const char pm_enter_standby_start[], pm_enter_standby_end[];

extern int pxa3xx_finish_suspend(unsigned long);
 


/* NOTE: this is for PM debugging on Lubbock,  it's really a big

 * ugly, but let's keep the crap minimum here, instead of direct

 * accessing the LUBBOCK CPLD registers in arch/arm/mach-pxa/pm.c

 */

#ifdef CONFIG_ARCH_LUBBOCK

extern void lubbock_set_hexled(uint32_t value);

#else

#define lubbock_set_hexled(x)

#endif