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

Commit ebe6c6fe authored by Rabin Vincent's avatar Rabin Vincent Committed by Linus Walleij
Browse files

ARM: ux500: register DB5500 PMU dynamically 



Use platform_device_register_simple() rather than a static
struct, so we create and register the PMU device on-the-fly.

Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d5608bbf

arch/arm/mach-ux500/cpu-db5500.c

+20 −21
Original line number Original line Diff line number Diff line
@@ -47,26 +47,6 @@ static struct map_desc u5500_io_desc[] __initdata = { 
	__IO_DEV_DESC(U5500_PRCMU_TCDM_BASE, SZ_4K),

	__IO_DEV_DESC(U5500_PRCMU_TCDM_BASE, SZ_4K),

};

};





static struct resource db5500_pmu_resources[] = {

	[0] = {

		.start		= IRQ_DB5500_PMU0,

		.end		= IRQ_DB5500_PMU0,

		.flags		= IORESOURCE_IRQ,

	},

	[1] = {

		.start		= IRQ_DB5500_PMU1,

		.end		= IRQ_DB5500_PMU1,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device db5500_pmu_device = {

	.name			= "arm-pmu",

	.id			= ARM_PMU_DEVICE_CPU,

	.num_resources		= ARRAY_SIZE(db5500_pmu_resources),

	.resource		= db5500_pmu_resources,

};



static struct resource mbox0_resources[] = {

static struct resource mbox0_resources[] = {

	{

	{

		.name = "mbox_peer",

		.name = "mbox_peer",
@@ -152,7 +132,6 @@ static struct platform_device mbox2_device = { 
};

};





static struct platform_device *db5500_platform_devs[] __initdata = {

static struct platform_device *db5500_platform_devs[] __initdata = {

	&db5500_pmu_device,

	&mbox0_device,

	&mbox0_device,

	&mbox1_device,

	&mbox1_device,

	&mbox2_device,

	&mbox2_device,
@@ -193,6 +172,25 @@ void __init u5500_map_io(void) 
	_PRCMU_BASE = __io_address(U5500_PRCMU_BASE);

	_PRCMU_BASE = __io_address(U5500_PRCMU_BASE);

}

}





static void __init db5500_pmu_init(void)

{

	struct resource res[] = {

		[0] = {

			.start		= IRQ_DB5500_PMU0,

			.end		= IRQ_DB5500_PMU0,

			.flags		= IORESOURCE_IRQ,

		},

		[1] = {

			.start		= IRQ_DB5500_PMU1,

			.end		= IRQ_DB5500_PMU1,

			.flags		= IORESOURCE_IRQ,

		},

	};



	platform_device_register_simple("arm-pmu", ARM_PMU_DEVICE_CPU,

					res, ARRAY_SIZE(res));

}



static int usb_db5500_rx_dma_cfg[] = {

static int usb_db5500_rx_dma_cfg[] = {

	DB5500_DMA_DEV4_USB_OTG_IEP_1_9,

	DB5500_DMA_DEV4_USB_OTG_IEP_1_9,

	DB5500_DMA_DEV5_USB_OTG_IEP_2_10,

	DB5500_DMA_DEV5_USB_OTG_IEP_2_10,
@@ -218,6 +216,7 @@ static int usb_db5500_tx_dma_cfg[] = { 
void __init u5500_init_devices(void)

void __init u5500_init_devices(void)

{

{

	db5500_add_gpios();

	db5500_add_gpios();

	db5500_pmu_init();

	db5500_dma_init();

	db5500_dma_init();

	db5500_add_rtc();

	db5500_add_rtc();

	db5500_add_usb(usb_db5500_rx_dma_cfg, usb_db5500_tx_dma_cfg);

	db5500_add_usb(usb_db5500_rx_dma_cfg, usb_db5500_tx_dma_cfg);