Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'pxa3xx-ssp-name' of... 

Merge tag 'pxa3xx-ssp-name' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux

 into next/soc

Pull "fix PXA3xx SSP naming issue" from Haojian Zhuang:

It's imported by 972a55b6 ASoC: fix pxa-ssp compiling issue under mach-mmp from v3.5

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'pxa3xx-ssp-name' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
  ARM: pxa3xx: provide specific platform_devices for all ssp ports
  ARM: pxa: ssp: provide platform_device_id for PXA3xx
parents 14b62fb0 0da0e227

arch/arm/mach-pxa/devices.c

+40 −2
Original line number Original line Diff line number Diff line
@@ -1071,9 +1071,47 @@ static struct resource pxa3xx_resource_ssp4[] = { 
	},

	},

};

};





/*

 * 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 = {

struct platform_device pxa3xx_device_ssp4 = {

	/* PXA3xx SSP is basically equivalent to PXA27x */

	.name		= "pxa3xx-ssp",

	.name		= "pxa27x-ssp",

	.id		= 3,

	.id		= 3,

	.dev		= {

	.dev		= {

		.dma_mask = &pxa3xx_ssp4_dma_mask,

		.dma_mask = &pxa3xx_ssp4_dma_mask,

arch/arm/mach-pxa/devices.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,9 @@ extern struct platform_device pxa25x_device_assp; 
extern struct platform_device pxa27x_device_ssp1;

extern struct platform_device pxa27x_device_ssp1;

extern struct platform_device pxa27x_device_ssp2;

extern struct platform_device pxa27x_device_ssp2;

extern struct platform_device pxa27x_device_ssp3;

extern struct platform_device pxa27x_device_ssp3;

extern struct platform_device pxa3xx_device_ssp1;

extern struct platform_device pxa3xx_device_ssp2;

extern struct platform_device pxa3xx_device_ssp3;

extern struct platform_device pxa3xx_device_ssp4;

extern struct platform_device pxa3xx_device_ssp4;





extern struct platform_device pxa25x_device_pwm0;

extern struct platform_device pxa25x_device_pwm0;

arch/arm/mach-pxa/pxa3xx.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -84,10 +84,10 @@ static struct clk_lookup pxa3xx_clkregs[] = { 
	INIT_CLKREG(&clk_pxa3xx_usbh, "pxa27x-ohci", NULL),

	INIT_CLKREG(&clk_pxa3xx_usbh, "pxa27x-ohci", NULL),

	INIT_CLKREG(&clk_pxa3xx_u2d, "pxa3xx-u2d", NULL),

	INIT_CLKREG(&clk_pxa3xx_u2d, "pxa3xx-u2d", NULL),

	INIT_CLKREG(&clk_pxa3xx_keypad, "pxa27x-keypad", NULL),

	INIT_CLKREG(&clk_pxa3xx_keypad, "pxa27x-keypad", NULL),

	INIT_CLKREG(&clk_pxa3xx_ssp1, "pxa27x-ssp.0", NULL),

	INIT_CLKREG(&clk_pxa3xx_ssp1, "pxa3xx-ssp.0", NULL),

	INIT_CLKREG(&clk_pxa3xx_ssp2, "pxa27x-ssp.1", NULL),

	INIT_CLKREG(&clk_pxa3xx_ssp2, "pxa3xx-ssp.1", NULL),

	INIT_CLKREG(&clk_pxa3xx_ssp3, "pxa27x-ssp.2", NULL),

	INIT_CLKREG(&clk_pxa3xx_ssp3, "pxa3xx-ssp.2", NULL),

	INIT_CLKREG(&clk_pxa3xx_ssp4, "pxa27x-ssp.3", NULL),

	INIT_CLKREG(&clk_pxa3xx_ssp4, "pxa3xx-ssp.3", NULL),

	INIT_CLKREG(&clk_pxa3xx_pwm0, "pxa27x-pwm.0", NULL),

	INIT_CLKREG(&clk_pxa3xx_pwm0, "pxa27x-pwm.0", NULL),

	INIT_CLKREG(&clk_pxa3xx_pwm1, "pxa27x-pwm.1", NULL),

	INIT_CLKREG(&clk_pxa3xx_pwm1, "pxa27x-pwm.1", NULL),

	INIT_CLKREG(&clk_pxa3xx_mmc1, "pxa2xx-mci.0", NULL),

	INIT_CLKREG(&clk_pxa3xx_mmc1, "pxa2xx-mci.0", NULL),
@@ -452,9 +452,9 @@ static struct platform_device *devices[] __initdata = { 
	&pxa_device_asoc_platform,

	&pxa_device_asoc_platform,

	&sa1100_device_rtc,

	&sa1100_device_rtc,

	&pxa_device_rtc,

	&pxa_device_rtc,

	&pxa27x_device_ssp1,

	&pxa3xx_device_ssp1,

	&pxa27x_device_ssp2,

	&pxa3xx_device_ssp2,

	&pxa27x_device_ssp3,

	&pxa3xx_device_ssp3,

	&pxa3xx_device_ssp4,

	&pxa3xx_device_ssp4,

	&pxa27x_device_pwm0,

	&pxa27x_device_pwm0,

	&pxa27x_device_pwm1,

	&pxa27x_device_pwm1,

arch/arm/plat-pxa/ssp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -258,6 +258,7 @@ static const struct platform_device_id ssp_id_table[] = { 
	{ "pxa25x-ssp",		PXA25x_SSP },

	{ "pxa25x-ssp",		PXA25x_SSP },

	{ "pxa25x-nssp",	PXA25x_NSSP },

	{ "pxa25x-nssp",	PXA25x_NSSP },

	{ "pxa27x-ssp",		PXA27x_SSP },

	{ "pxa27x-ssp",		PXA27x_SSP },

	{ "pxa3xx-ssp",		PXA3xx_SSP },

	{ "pxa168-ssp",		PXA168_SSP },

	{ "pxa168-ssp",		PXA168_SSP },

	{ "pxa910-ssp",		PXA910_SSP },

	{ "pxa910-ssp",		PXA910_SSP },

	{ },

	{ },