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

Commit fa1fc246 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: merge common ColdFire QSPI platform setup code 



The ColdFire QSPI is common to quite a few ColdFire CPUs. No need to duplicate
its platform setup code for every CPU family member that has it. Merge all the
setup code into a single shared file.

This also results in few platforms no longer needing any local platform
setup code. In those cases remove the empty devices array and initcall
code as well.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent ed8a2798

arch/m68k/platform/520x/config.c

+3 −143
Original line number Diff line number Diff line
@@ -15,138 +15,14 @@ 
#include <linux/param.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/spi/spi.h>

#include <linux/gpio.h>

#include <asm/machdep.h>

#include <asm/coldfire.h>

#include <asm/mcfsim.h>

#include <asm/mcfuart.h>

#include <asm/mcfqspi.h>



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



#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

static struct resource m520x_qspi_resources[] = {

	{

		.start		= MCFQSPI_BASE,

		.end		= MCFQSPI_BASE + MCFQSPI_SIZE - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_QSPI,

		.end		= MCF_IRQ_QSPI,

		.flags		= IORESOURCE_IRQ,

	},

};



static int m520x_cs_setup(struct mcfqspi_cs_control *cs_control)

{

	int status;



	status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS0 failed\n");

		goto fail0;

	}

	status = gpio_direction_output(MCFQSPI_CS0, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n");

		goto fail1;

	}



	status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS1 failed\n");

		goto fail1;

	}

	status = gpio_direction_output(MCFQSPI_CS1, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n");

		goto fail2;

	}



	status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS2 failed\n");

		goto fail2;

	}

	status = gpio_direction_output(MCFQSPI_CS2, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n");

		goto fail3;

	}



	return 0;



fail3:

	gpio_free(MCFQSPI_CS2);

fail2:

	gpio_free(MCFQSPI_CS1);

fail1:

	gpio_free(MCFQSPI_CS0);

fail0:

	return status;

}



static void m520x_cs_teardown(struct mcfqspi_cs_control *cs_control)

{

	gpio_free(MCFQSPI_CS2);

	gpio_free(MCFQSPI_CS1);

	gpio_free(MCFQSPI_CS0);

}



static void m520x_cs_select(struct mcfqspi_cs_control *cs_control,

			    u8 chip_select, bool cs_high)

{

	switch (chip_select) {

	case 0:

		gpio_set_value(MCFQSPI_CS0, cs_high);

		break;

	case 1:

		gpio_set_value(MCFQSPI_CS1, cs_high);

		break;

	case 2:

		gpio_set_value(MCFQSPI_CS2, cs_high);

		break;

	}

}



static void m520x_cs_deselect(struct mcfqspi_cs_control *cs_control,

			      u8 chip_select, bool cs_high)

{

	switch (chip_select) {

	case 0:

		gpio_set_value(MCFQSPI_CS0, !cs_high);

		break;

	case 1:

		gpio_set_value(MCFQSPI_CS1, !cs_high);

		break;

	case 2:

		gpio_set_value(MCFQSPI_CS2, !cs_high);

		break;

	}

}



static struct mcfqspi_cs_control m520x_cs_control = {

	.setup                  = m520x_cs_setup,

	.teardown               = m520x_cs_teardown,

	.select                 = m520x_cs_select,

	.deselect               = m520x_cs_deselect,

};



static struct mcfqspi_platform_data m520x_qspi_data = {

	.bus_num		= 0,

	.num_chipselect		= 3,

	.cs_control		= &m520x_cs_control,

};



static struct platform_device m520x_qspi = {

	.name			= "mcfqspi",

	.id			= 0,

	.num_resources		= ARRAY_SIZE(m520x_qspi_resources),

	.resource		= m520x_qspi_resources,

	.dev.platform_data	= &m520x_qspi_data,

};

#ifdef CONFIG_SPI_COLDFIRE_QSPI



static void __init m520x_qspi_init(void)

{
@@ -158,14 +34,8 @@ static void __init m520x_qspi_init(void) 
	par &= 0x00ff;

	writew(par, MCF_GPIO_PAR_UART);

}

#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */





static struct platform_device *m520x_devices[] __initdata = {

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

	&m520x_qspi,

#endif

};

#endif /* CONFIG_SPI_COLDFIRE_QSPI */



/***************************************************************************/
@@ -218,19 +88,9 @@ void __init config_BSP(char *commandp, int size) 
	mach_sched_init = hw_timer_init;

	m520x_uarts_init();

	m520x_fec_init();

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#ifdef CONFIG_SPI_COLDFIRE_QSPI

	m520x_qspi_init();

#endif

}



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


static int __init init_BSP(void)

{

	platform_add_devices(m520x_devices, ARRAY_SIZE(m520x_devices));

	return 0;

}



arch_initcall(init_BSP);



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

arch/m68k/platform/523x/config.c

+3 −154
Original line number Diff line number Diff line
@@ -16,158 +16,14 @@ 
#include <linux/param.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/spi/spi.h>

#include <linux/gpio.h>

#include <asm/machdep.h>

#include <asm/coldfire.h>

#include <asm/mcfsim.h>

#include <asm/mcfuart.h>

#include <asm/mcfqspi.h>



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



#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

static struct resource m523x_qspi_resources[] = {

	{

		.start		= MCFQSPI_BASE,

		.end		= MCFQSPI_BASE + MCFQSPI_SIZE - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_QSPI,

		.end		= MCF_IRQ_QSPI,

		.flags		= IORESOURCE_IRQ,

	},

};



static int m523x_cs_setup(struct mcfqspi_cs_control *cs_control)

{

	int status;



	status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS0 failed\n");

		goto fail0;

	}

	status = gpio_direction_output(MCFQSPI_CS0, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n");

		goto fail1;

	}



	status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS1 failed\n");

		goto fail1;

	}

	status = gpio_direction_output(MCFQSPI_CS1, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n");

		goto fail2;

	}



	status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS2 failed\n");

		goto fail2;

	}

	status = gpio_direction_output(MCFQSPI_CS2, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n");

		goto fail3;

	}



	status = gpio_request(MCFQSPI_CS3, "MCFQSPI_CS3");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS3 failed\n");

		goto fail3;

	}

	status = gpio_direction_output(MCFQSPI_CS3, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS3 failed\n");

		goto fail4;

	}



	return 0;



fail4:

	gpio_free(MCFQSPI_CS3);

fail3:

	gpio_free(MCFQSPI_CS2);

fail2:

	gpio_free(MCFQSPI_CS1);

fail1:

	gpio_free(MCFQSPI_CS0);

fail0:

	return status;

}



static void m523x_cs_teardown(struct mcfqspi_cs_control *cs_control)

{

	gpio_free(MCFQSPI_CS3);

	gpio_free(MCFQSPI_CS2);

	gpio_free(MCFQSPI_CS1);

	gpio_free(MCFQSPI_CS0);

}



static void m523x_cs_select(struct mcfqspi_cs_control *cs_control,

			    u8 chip_select, bool cs_high)

{

	switch (chip_select) {

	case 0:

		gpio_set_value(MCFQSPI_CS0, cs_high);

		break;

	case 1:

		gpio_set_value(MCFQSPI_CS1, cs_high);

		break;

	case 2:

		gpio_set_value(MCFQSPI_CS2, cs_high);

		break;

	case 3:

		gpio_set_value(MCFQSPI_CS3, cs_high);

		break;

	}

}



static void m523x_cs_deselect(struct mcfqspi_cs_control *cs_control,

			      u8 chip_select, bool cs_high)

{

	switch (chip_select) {

	case 0:

		gpio_set_value(MCFQSPI_CS0, !cs_high);

		break;

	case 1:

		gpio_set_value(MCFQSPI_CS1, !cs_high);

		break;

	case 2:

		gpio_set_value(MCFQSPI_CS2, !cs_high);

		break;

	case 3:

		gpio_set_value(MCFQSPI_CS3, !cs_high);

		break;

	}

}



static struct mcfqspi_cs_control m523x_cs_control = {

	.setup                  = m523x_cs_setup,

	.teardown               = m523x_cs_teardown,

	.select                 = m523x_cs_select,

	.deselect               = m523x_cs_deselect,

};



static struct mcfqspi_platform_data m523x_qspi_data = {

	.bus_num		= 0,

	.num_chipselect		= 4,

	.cs_control		= &m523x_cs_control,

};



static struct platform_device m523x_qspi = {

	.name			= "mcfqspi",

	.id			= 0,

	.num_resources		= ARRAY_SIZE(m523x_qspi_resources),

	.resource		= m523x_qspi_resources,

	.dev.platform_data	= &m523x_qspi_data,

};

#ifdef CONFIG_SPI_COLDFIRE_QSPI



static void __init m523x_qspi_init(void)

{
@@ -180,14 +36,8 @@ static void __init m523x_qspi_init(void) 
	par &= 0x3f3f;

	writew(par, MCFGPIO_PAR_TIMER);

}

#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */



static struct platform_device *m523x_devices[] __initdata = {

	&m523x_fec,

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

	&m523x_qspi,

#endif

};

#endif /* CONFIG_SPI_COLDFIRE_QSPI */



/***************************************************************************/
@@ -223,10 +73,9 @@ void __init config_BSP(char *commandp, int size) 


static int __init init_BSP(void)

{

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#ifdef CONFIG_SPI_COLDFIRE_QSPI

	m523x_qspi_init();

#endif

	platform_add_devices(m523x_devices, ARRAY_SIZE(m523x_devices));

	return 0;

}

arch/m68k/platform/5249/config.c

+9 −153
Original line number Diff line number Diff line
@@ -12,12 +12,10 @@ 
#include <linux/param.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/spi/spi.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <asm/machdep.h>

#include <asm/coldfire.h>

#include <asm/mcfsim.h>

#include <asm/mcfqspi.h>



/***************************************************************************/
@@ -45,148 +43,15 @@ static struct platform_device m5249_smc91x = { 


#endif /* CONFIG_M5249C3 */



#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

static struct resource m5249_qspi_resources[] = {

	{

		.start		= MCFQSPI_BASE,

		.end		= MCFQSPI_BASE + MCFQSPI_SIZE - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_QSPI,

		.end		= MCF_IRQ_QSPI,

		.flags		= IORESOURCE_IRQ,

	},

};



static int m5249_cs_setup(struct mcfqspi_cs_control *cs_control)

{

	int status;



	status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS0 failed\n");

		goto fail0;

	}

	status = gpio_direction_output(MCFQSPI_CS0, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n");

		goto fail1;

	}



	status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS1 failed\n");

		goto fail1;

	}

	status = gpio_direction_output(MCFQSPI_CS1, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n");

		goto fail2;

	}



	status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS2 failed\n");

		goto fail2;

	}

	status = gpio_direction_output(MCFQSPI_CS2, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n");

		goto fail3;

	}



	status = gpio_request(MCFQSPI_CS3, "MCFQSPI_CS3");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS3 failed\n");

		goto fail3;

	}

	status = gpio_direction_output(MCFQSPI_CS3, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS3 failed\n");

		goto fail4;

	}



	return 0;



fail4:

	gpio_free(MCFQSPI_CS3);

fail3:

	gpio_free(MCFQSPI_CS2);

fail2:

	gpio_free(MCFQSPI_CS1);

fail1:

	gpio_free(MCFQSPI_CS0);

fail0:

	return status;

}



static void m5249_cs_teardown(struct mcfqspi_cs_control *cs_control)

{

	gpio_free(MCFQSPI_CS3);

	gpio_free(MCFQSPI_CS2);

	gpio_free(MCFQSPI_CS1);

	gpio_free(MCFQSPI_CS0);

}



static void m5249_cs_select(struct mcfqspi_cs_control *cs_control,

			    u8 chip_select, bool cs_high)

{

	switch (chip_select) {

	case 0:

		gpio_set_value(MCFQSPI_CS0, cs_high);

		break;

	case 1:

		gpio_set_value(MCFQSPI_CS1, cs_high);

		break;

	case 2:

		gpio_set_value(MCFQSPI_CS2, cs_high);

		break;

	case 3:

		gpio_set_value(MCFQSPI_CS3, cs_high);

		break;

	}

}



static void m5249_cs_deselect(struct mcfqspi_cs_control *cs_control,

			      u8 chip_select, bool cs_high)

{

	switch (chip_select) {

	case 0:

		gpio_set_value(MCFQSPI_CS0, !cs_high);

		break;

	case 1:

		gpio_set_value(MCFQSPI_CS1, !cs_high);

		break;

	case 2:

		gpio_set_value(MCFQSPI_CS2, !cs_high);

		break;

	case 3:

		gpio_set_value(MCFQSPI_CS3, !cs_high);

		break;

	}

}



static struct mcfqspi_cs_control m5249_cs_control = {

	.setup                  = m5249_cs_setup,

	.teardown               = m5249_cs_teardown,

	.select                 = m5249_cs_select,

	.deselect               = m5249_cs_deselect,

static struct platform_device *m5249_devices[] __initdata = {

#ifdef CONFIG_M5249C3

	&m5249_smc91x,

#endif

};



static struct mcfqspi_platform_data m5249_qspi_data = {

	.bus_num		= 0,

	.num_chipselect		= 4,

	.cs_control		= &m5249_cs_control,

};

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



static struct platform_device m5249_qspi = {

	.name			= "mcfqspi",

	.id			= 0,

	.num_resources		= ARRAY_SIZE(m5249_qspi_resources),

	.resource		= m5249_qspi_resources,

	.dev.platform_data	= &m5249_qspi_data,

};

#ifdef CONFIG_SPI_COLDFIRE_QSPI



static void __init m5249_qspi_init(void)

{
@@ -195,17 +60,8 @@ static void __init m5249_qspi_init(void) 
	       MCF_MBAR + MCFSIM_QSPIICR);

	mcf_mapirq2imr(MCF_IRQ_QSPI, MCFINTC_QSPI);

}

#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */





static struct platform_device *m5249_devices[] __initdata = {

#ifdef CONFIG_M5249C3

	&m5249_smc91x,

#endif

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

	&m5249_qspi,

#endif

};

#endif /* CONFIG_SPI_COLDFIRE_QSPI */



/***************************************************************************/
@@ -263,7 +119,7 @@ void __init config_BSP(char *commandp, int size) 
#ifdef CONFIG_M5249C3

	m5249_smc91x_init();

#endif

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#ifdef CONFIG_SPI_COLDFIRE_QSPI

	m5249_qspi_init();

#endif

}

arch/m68k/platform/527x/config.c

+3 −162
Original line number Diff line number Diff line
@@ -16,158 +16,14 @@ 
#include <linux/param.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/spi/spi.h>

#include <linux/gpio.h>

#include <asm/machdep.h>

#include <asm/coldfire.h>

#include <asm/mcfsim.h>

#include <asm/mcfuart.h>

#include <asm/mcfqspi.h>



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



#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

static struct resource m527x_qspi_resources[] = {

	{

		.start		= MCFQSPI_BASE,

		.end		= MCFQSPI_BASE + MCFQSPI_SIZE - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_QSPI,

		.end		= MCF_IRQ_QSPI,

		.flags		= IORESOURCE_IRQ,

	},

};



static int m527x_cs_setup(struct mcfqspi_cs_control *cs_control)

{

	int status;



	status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS0 failed\n");

		goto fail0;

	}

	status = gpio_direction_output(MCFQSPI_CS0, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n");

		goto fail1;

	}



	status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS1 failed\n");

		goto fail1;

	}

	status = gpio_direction_output(MCFQSPI_CS1, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n");

		goto fail2;

	}



	status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS2 failed\n");

		goto fail2;

	}

	status = gpio_direction_output(MCFQSPI_CS2, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n");

		goto fail3;

	}



	status = gpio_request(MCFQSPI_CS3, "MCFQSPI_CS3");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS3 failed\n");

		goto fail3;

	}

	status = gpio_direction_output(MCFQSPI_CS3, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS3 failed\n");

		goto fail4;

	}



	return 0;



fail4:

	gpio_free(MCFQSPI_CS3);

fail3:

	gpio_free(MCFQSPI_CS2);

fail2:

	gpio_free(MCFQSPI_CS1);

fail1:

	gpio_free(MCFQSPI_CS0);

fail0:

	return status;

}



static void m527x_cs_teardown(struct mcfqspi_cs_control *cs_control)

{

	gpio_free(MCFQSPI_CS3);

	gpio_free(MCFQSPI_CS2);

	gpio_free(MCFQSPI_CS1);

	gpio_free(MCFQSPI_CS0);

}



static void m527x_cs_select(struct mcfqspi_cs_control *cs_control,

			    u8 chip_select, bool cs_high)

{

	switch (chip_select) {

	case 0:

		gpio_set_value(MCFQSPI_CS0, cs_high);

		break;

	case 1:

		gpio_set_value(MCFQSPI_CS1, cs_high);

		break;

	case 2:

		gpio_set_value(MCFQSPI_CS2, cs_high);

		break;

	case 3:

		gpio_set_value(MCFQSPI_CS3, cs_high);

		break;

	}

}



static void m527x_cs_deselect(struct mcfqspi_cs_control *cs_control,

			      u8 chip_select, bool cs_high)

{

	switch (chip_select) {

	case 0:

		gpio_set_value(MCFQSPI_CS0, !cs_high);

		break;

	case 1:

		gpio_set_value(MCFQSPI_CS1, !cs_high);

		break;

	case 2:

		gpio_set_value(MCFQSPI_CS2, !cs_high);

		break;

	case 3:

		gpio_set_value(MCFQSPI_CS3, !cs_high);

		break;

	}

}



static struct mcfqspi_cs_control m527x_cs_control = {

	.setup                  = m527x_cs_setup,

	.teardown               = m527x_cs_teardown,

	.select                 = m527x_cs_select,

	.deselect               = m527x_cs_deselect,

};



static struct mcfqspi_platform_data m527x_qspi_data = {

	.bus_num		= 0,

	.num_chipselect		= 4,

	.cs_control		= &m527x_cs_control,

};



static struct platform_device m527x_qspi = {

	.name			= "mcfqspi",

	.id			= 0,

	.num_resources		= ARRAY_SIZE(m527x_qspi_resources),

	.resource		= m527x_qspi_resources,

	.dev.platform_data	= &m527x_qspi_data,

};

#ifdef CONFIG_SPI_COLDFIRE_QSPI



static void __init m527x_qspi_init(void)

{
@@ -185,13 +41,8 @@ static void __init m527x_qspi_init(void) 
	writew(0x003e, MCFGPIO_PAR_QSPI);

#endif

}

#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */



static struct platform_device *m527x_devices[] __initdata = {

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

	&m527x_qspi,

#endif

};

#endif /* CONFIG_SPI_COLDFIRE_QSPI */



/***************************************************************************/
@@ -250,19 +101,9 @@ void __init config_BSP(char *commandp, int size) 
	mach_sched_init = hw_timer_init;

	m527x_uarts_init();

	m527x_fec_init();

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#ifdef CONFIG_SPI_COLDFIRE_QSPI

	m527x_qspi_init();

#endif

}



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


static int __init init_BSP(void)

{

	platform_add_devices(m527x_devices, ARRAY_SIZE(m527x_devices));

	return 0;

}



arch_initcall(init_BSP);



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

arch/m68k/platform/528x/config.c

+3 −127
Original line number Diff line number Diff line
@@ -17,145 +17,22 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/spi/spi.h>

#include <linux/gpio.h>

#include <asm/machdep.h>

#include <asm/coldfire.h>

#include <asm/mcfsim.h>

#include <asm/mcfuart.h>

#include <asm/mcfqspi.h>



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



#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

static struct resource m528x_qspi_resources[] = {

	{

		.start		= MCFQSPI_BASE,

		.end		= MCFQSPI_BASE + MCFQSPI_SIZE - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_QSPI,

		.end		= MCF_IRQ_QSPI,

		.flags		= IORESOURCE_IRQ,

	},

};



static int m528x_cs_setup(struct mcfqspi_cs_control *cs_control)

{

	int status;



	status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS0 failed\n");

		goto fail0;

	}

	status = gpio_direction_output(MCFQSPI_CS0, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n");

		goto fail1;

	}



	status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS1 failed\n");

		goto fail1;

	}

	status = gpio_direction_output(MCFQSPI_CS1, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n");

		goto fail2;

	}



	status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS2 failed\n");

		goto fail2;

	}

	status = gpio_direction_output(MCFQSPI_CS2, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n");

		goto fail3;

	}



	status = gpio_request(MCFQSPI_CS3, "MCFQSPI_CS3");

	if (status) {

		pr_debug("gpio_request for MCFQSPI_CS3 failed\n");

		goto fail3;

	}

	status = gpio_direction_output(MCFQSPI_CS3, 1);

	if (status) {

		pr_debug("gpio_direction_output for MCFQSPI_CS3 failed\n");

		goto fail4;

	}



	return 0;



fail4:

	gpio_free(MCFQSPI_CS3);

fail3:

	gpio_free(MCFQSPI_CS2);

fail2:

	gpio_free(MCFQSPI_CS1);

fail1:

	gpio_free(MCFQSPI_CS0);

fail0:

	return status;

}



static void m528x_cs_teardown(struct mcfqspi_cs_control *cs_control)

{

	gpio_free(MCFQSPI_CS3);

	gpio_free(MCFQSPI_CS2);

	gpio_free(MCFQSPI_CS1);

	gpio_free(MCFQSPI_CS0);

}



static void m528x_cs_select(struct mcfqspi_cs_control *cs_control,

			    u8 chip_select, bool cs_high)

{

	gpio_set_value(MCFQSPI_CS0 + chip_select, cs_high);

}



static void m528x_cs_deselect(struct mcfqspi_cs_control *cs_control,

			      u8 chip_select, bool cs_high)

{

	gpio_set_value(MCFQSPI_CS0 + chip_select, !cs_high);

}



static struct mcfqspi_cs_control m528x_cs_control = {

	.setup                  = m528x_cs_setup,

	.teardown               = m528x_cs_teardown,

	.select                 = m528x_cs_select,

	.deselect               = m528x_cs_deselect,

};



static struct mcfqspi_platform_data m528x_qspi_data = {

	.bus_num		= 0,

	.num_chipselect		= 4,

	.cs_control		= &m528x_cs_control,

};



static struct platform_device m528x_qspi = {

	.name			= "mcfqspi",

	.id			= 0,

	.num_resources		= ARRAY_SIZE(m528x_qspi_resources),

	.resource		= m528x_qspi_resources,

	.dev.platform_data	= &m528x_qspi_data,

};

#ifdef CONFIG_SPI_COLDFIRE_QSPI



static void __init m528x_qspi_init(void)

{

	/* setup Port QS for QSPI with gpio CS control */

	__raw_writeb(0x07, MCFGPIO_PQSPAR);

}

#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */



static struct platform_device *m528x_devices[] __initdata = {

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

	&m528x_qspi,

#endif

};

#endif /* CONFIG_SPI_COLDFIRE_QSPI */



/***************************************************************************/
@@ -236,10 +113,9 @@ static int __init init_BSP(void) 
	mach_sched_init = hw_timer_init;

	m528x_uarts_init();

	m528x_fec_init();

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#ifdef CONFIG_SPI_COLDFIRE_QSPI

	m528x_qspi_init();

#endif

	platform_add_devices(m528x_devices, ARRAY_SIZE(m528x_devices));

	return 0;

}