Commit 5b99d534 authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

[ARM] Kirkwood: register internal devices in a common place 



The RTC and the two XOR engines are internal to the chip, and therefore
always available since they don't depend on a particular board layout.

Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 249cbfa3

arch/arm/mach-kirkwood/common.c

+8 −3
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static struct resource kirkwood_rtc_resource = { 
	.flags	= IORESOURCE_MEM,

};



void __init kirkwood_rtc_init(void)

static void __init kirkwood_rtc_init(void)

{

	platform_device_register_simple("rtc-mv", -1, &kirkwood_rtc_resource, 1);

}
@@ -547,7 +547,7 @@ static struct platform_device kirkwood_xor01_channel = { 
	},

};



void __init kirkwood_xor0_init(void)

static void __init kirkwood_xor0_init(void)

{

	platform_device_register(&kirkwood_xor0_shared);
@@ -645,7 +645,7 @@ static struct platform_device kirkwood_xor11_channel = { 
	},

};



void __init kirkwood_xor1_init(void)

static void __init kirkwood_xor1_init(void)

{

	platform_device_register(&kirkwood_xor1_shared);
@@ -753,4 +753,9 @@ void __init kirkwood_init(void) 
#ifdef CONFIG_CACHE_FEROCEON_L2

	kirkwood_l2_init();

#endif



	/* internal devices that every board has */

	kirkwood_rtc_init();

	kirkwood_xor0_init();

	kirkwood_xor1_init();

}

arch/arm/mach-kirkwood/common.h

+0 −3
Original line number Diff line number Diff line
@@ -34,14 +34,11 @@ void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); 
void kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data);

void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq);

void kirkwood_pcie_init(void);

void kirkwood_rtc_init(void);

void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);

void kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data);

void kirkwood_spi_init(void);

void kirkwood_uart0_init(void);

void kirkwood_uart1_init(void);

void kirkwood_xor0_init(void);

void kirkwood_xor1_init(void);



extern struct sys_timer kirkwood_timer;

arch/arm/mach-kirkwood/db88f6281-bp-setup.c

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ static void __init db88f6281_init(void) 


	kirkwood_ehci_init();

	kirkwood_ge00_init(&db88f6281_ge00_data);

	kirkwood_rtc_init();

	kirkwood_sata_init(&db88f6281_sata_data);

	kirkwood_uart0_init();

	kirkwood_sdio_init(&db88f6281_mvsdio_data);

arch/arm/mach-kirkwood/rd88f6192-nas-setup.c

+0 −3
Original line number Diff line number Diff line
@@ -57,14 +57,11 @@ static void __init rd88f6192_init(void) 


	kirkwood_ehci_init();

	kirkwood_ge00_init(&rd88f6192_ge00_data);

	kirkwood_rtc_init();

	kirkwood_sata_init(&rd88f6192_sata_data);

	spi_register_board_info(rd88F6192_spi_slave_info,

				ARRAY_SIZE(rd88F6192_spi_slave_info));

	kirkwood_spi_init();

	kirkwood_uart0_init();

	kirkwood_xor0_init();

	kirkwood_xor1_init();

}



static int __init rd88f6192_pci_init(void)

arch/arm/mach-kirkwood/rd88f6281-setup.c

+0 −3
Original line number Diff line number Diff line
@@ -121,12 +121,9 @@ static void __init rd88f6281_init(void) 
	}

	kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ);



	kirkwood_rtc_init();

	kirkwood_sata_init(&rd88f6281_sata_data);

	kirkwood_sdio_init(&rd88f6281_mvsdio_data);

	kirkwood_uart0_init();

	kirkwood_xor0_init();

	kirkwood_xor1_init();



	platform_device_register(&rd88f6281_nand_flash);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE