Commit 18365d18 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Lennert Buytenhek
Browse files

[ARM] Kirkwood: instantiate the orion_spi driver in the platform code 



Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
parent 60296c71

arch/arm/mach-kirkwood/common.c

+32 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/mbus.h>

#include <linux/mv643xx_eth.h>

#include <linux/ata_platform.h>

#include <linux/spi/orion_spi.h>

#include <asm/page.h>

#include <asm/timex.h>

#include <asm/mach/map.h>
@@ -196,6 +197,37 @@ void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data) 
}





/*****************************************************************************

 * SPI

 ****************************************************************************/

static struct orion_spi_info kirkwood_spi_plat_data = {

	.tclk		= KIRKWOOD_TCLK,

};



static struct resource kirkwood_spi_resources[] = {

	{

		.start	= SPI_PHYS_BASE,

		.end	= SPI_PHYS_BASE + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device kirkwood_spi = {

	.name		= "orion_spi",

	.id		= 0,

	.resource	= kirkwood_spi_resources,

	.dev		= {

		.platform_data	= &kirkwood_spi_plat_data,

	},

	.num_resources	= ARRAY_SIZE(kirkwood_spi_resources),

};



void __init kirkwood_spi_init()

{

	platform_device_register(&kirkwood_spi);

}





/*****************************************************************************

 * UART0

 ****************************************************************************/

arch/arm/mach-kirkwood/common.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); 
void kirkwood_pcie_init(void);

void kirkwood_rtc_init(void);

void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);

void kirkwood_spi_init(void);

void kirkwood_uart0_init(void);

void kirkwood_uart1_init(void);

void kirkwood_xor0_init(void);

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

+21 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#include <linux/timer.h>

#include <linux/ata_platform.h>

#include <linux/mv643xx_eth.h>

#include <linux/spi/flash.h>

#include <linux/spi/spi.h>

#include <linux/spi/orion_spi.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/pci.h>
@@ -34,6 +37,21 @@ static struct mv_sata_platform_data rd88f6192_sata_data = { 
	.n_ports	= 2,

};



static const struct flash_platform_data rd88F6192_spi_slave_data = {

	.type		= "m25p128",

};



static struct spi_board_info __initdata rd88F6192_spi_slave_info[] = {

	{

		.modalias	= "m25p80",

		.platform_data	= &rd88F6192_spi_slave_data,

		.irq		= -1,

		.max_speed_hz	= 20000000,

		.bus_num	= 0,

		.chip_select	= 0,

	},

};



static void __init rd88f6192_init(void)

{

	/*
@@ -45,6 +63,9 @@ static void __init rd88f6192_init(void) 
	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();