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

Commit 09a5358d authored by Eric Miao's avatar Eric Miao
Browse files

[ARM] pxa: move pmu device back into mach-pxa/ 



Not tested and enabled on MMP at this moment, and since the IRQ
is different from mach-pxa, I'd prefer to move the PMU device
back into mach-pxa/. Will introduce the PMU device to MMP once
it's enabled and tested.

Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 1b84387a

arch/arm/mach-pxa/devices.c

+14 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/platform_device.h>

#include <linux/dma-mapping.h>



#include <asm/pmu.h>

#include <mach/udc.h>

#include <mach/pxafb.h>

#include <mach/mmc.h>
@@ -31,6 +32,19 @@ void __init pxa_register_device(struct platform_device *dev, void *data) 
		dev_err(&dev->dev, "unable to register device: %d\n", ret);

}



static struct resource pxa_resource_pmu = {

	.start	= IRQ_PMU,

	.end	= IRQ_PMU,

	.flags	= IORESOURCE_IRQ,

};



struct platform_device pxa_device_pmu = {

	.name		= "arm-pmu",

	.id		= ARM_PMU_DEVICE_CPU,

	.resource	= &pxa_resource_pmu,

	.num_resources	= 1,

};



static struct resource pxamci_resources[] = {

	[0] = {

		.start	= 0x41100000,

arch/arm/mach-pxa/devices.h

+1 −0
Original line number Diff line number Diff line 
extern struct platform_device pxa_device_pmu;

extern struct platform_device pxa_device_mci;

extern struct platform_device pxa3xx_device_mci2;

extern struct platform_device pxa3xx_device_mci3;

arch/arm/mach-pxa/pxa25x.c

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ void __init pxa26x_init_irq(void) 


static struct platform_device *pxa25x_devices[] __initdata = {

	&pxa25x_device_udc,

	&pxa_device_pmu,

	&pxa_device_i2s,

	&sa1100_device_rtc,

	&pxa25x_device_ssp,

arch/arm/mach-pxa/pxa27x.c

+1 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info) 


static struct platform_device *devices[] __initdata = {

	&pxa27x_device_udc,

	&pxa_device_pmu,

	&pxa_device_i2s,

	&sa1100_device_rtc,

	&pxa_device_rtc,

arch/arm/mach-pxa/pxa3xx.c

+1 −0
Original line number Diff line number Diff line
@@ -608,6 +608,7 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info) 


static struct platform_device *devices[] __initdata = {

	&pxa27x_device_udc,

	&pxa_device_pmu,

	&pxa_device_i2s,

	&sa1100_device_rtc,

	&pxa_device_rtc,