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

Commit 37320980 authored by eric miao's avatar eric miao Committed by Russell King
Browse files

[ARM] pxa: add pxa27x_keypad device and pxa_set_keypad_info() 



also update the clk definitions in pxa27x and pxa3xx.

Signed-off-by: default avatareric miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 450d2874

arch/arm/mach-pxa/devices.c

+26 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <asm/arch/irda.h>

#include <asm/arch/i2c.h>

#include <asm/arch/ohci.h>

#include <asm/arch/pxa27x_keypad.h>



#include "devices.h"
@@ -396,6 +397,31 @@ struct platform_device pxa25x_device_assp = { 


#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_ohci_dma_mask = DMA_BIT_MASK(32);



static struct resource pxa27x_resource_ohci[] = {

arch/arm/mach-pxa/devices.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ extern struct platform_device pxa_device_rtc; 


extern struct platform_device pxa27x_device_i2c_power;

extern struct platform_device pxa27x_device_ohci;

extern struct platform_device pxa27x_device_keypad;



extern struct platform_device pxa25x_device_ssp;

extern struct platform_device pxa25x_device_nssp;

arch/arm/mach-pxa/pxa27x.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static struct clk pxa27x_clks[] = { 


	INIT_CKEN("USBCLK", USBHOST, 48000000, 0, &pxa27x_device_ohci.dev),

	INIT_CKEN("I2CCLK", PWRI2C, 13000000, 0, &pxa27x_device_i2c_power.dev),

	INIT_CKEN("KBDCLK", KEYPAD, 32768, 0, NULL),

	INIT_CKEN("KBDCLK", KEYPAD, 32768, 0, &pxa27x_device_keypad.dev),



	INIT_CKEN("SSPCLK", SSP1, 13000000, 0, &pxa27x_device_ssp1.dev),

	INIT_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev),

arch/arm/mach-pxa/pxa3xx.c

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ static struct clk pxa3xx_clks[] = { 
	PXA3xx_CKEN("I2CCLK", I2C,  32842000, 0, &pxa_device_i2c.dev),

	PXA3xx_CKEN("UDCCLK", UDC,  48000000, 5, &pxa_device_udc.dev),

	PXA3xx_CKEN("USBCLK", USBH, 48000000, 0, &pxa27x_device_ohci.dev),

	PXA3xx_CKEN("KBDCLK", KEYPAD,  32768, 0, &pxa27x_device_keypad.dev),



	PXA3xx_CKEN("SSPCLK", SSP1, 13000000, 0, &pxa27x_device_ssp1.dev),

	PXA3xx_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev),

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

+2 −0
Original line number Diff line number Diff line
@@ -53,4 +53,6 @@ struct pxa27x_keypad_platform_data { 


#define KEY(row, col, val)	(((row) << 28) | ((col) << 24) | (val))



extern void pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info);



#endif /* __ASM_ARCH_PXA27x_KEYPAD_H */