Commit 58d37dc1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: move perseus spi pinconf to board file 



The driver has always had a FIXME about this, and it seems
like this trivial code move avoids a mach header inclusion,
so just do it.

With that out of the way, and the header file inclusions
changed to global files, the driver can also be compile-tested
on other platforms.

Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 1e9ca7c8

arch/arm/mach-omap1/board-perseus2.c

+6 −0
Original line number Diff line number Diff line
@@ -289,6 +289,12 @@ static void __init omap_perseus2_init(void) 
	omap_cfg_reg(F4_7XX_KBC3);

	omap_cfg_reg(E3_7XX_KBC4);



	if (IS_ENABLED(CONFIG_SPI_OMAP_UWIRE)) {

		/* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */

		int val = omap_readl(OMAP7XX_IO_CONF_9) & ~0x00EEE000;

		omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9);

	}



	platform_add_devices(devices, ARRAY_SIZE(devices));



	omap_serial_init();

drivers/spi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ config SPI_OCTEON 


config SPI_OMAP_UWIRE

	tristate "OMAP1 MicroWire"

	depends on ARCH_OMAP1

	depends on ARCH_OMAP1 || (ARM && COMPILE_TEST)

	select SPI_BITBANG

	help

	  This hooks up to the MicroWire controller on OMAP1 chips.

drivers/spi/spi-omap-uwire.c

+3 −12
Original line number Diff line number Diff line
@@ -44,13 +44,10 @@ 
#include <linux/module.h>

#include <linux/io.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>



#include <mach/mux.h>



#include <mach/omap7xx.h>	/* OMAP7XX_IO_CONF registers */



#include <linux/soc/ti/omap1-io.h>

#include <linux/soc/ti/omap1-soc.h>

#include <linux/soc/ti/omap1-mux.h>



/* FIXME address is now a platform device resource,

 * and irqs should show there too...
@@ -548,12 +545,6 @@ static int __init omap_uwire_init(void) 
		omap_cfg_reg(N14_1610_UWIRE_CS0);

		omap_cfg_reg(N15_1610_UWIRE_CS1);

	}

	if (machine_is_omap_perseus2()) {

		/* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */

		int val = omap_readl(OMAP7XX_IO_CONF_9) & ~0x00EEE000;

		omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9);

	}



	return platform_driver_register(&uwire_driver);

}