From mboxrd@z Thu Jan  1 00:00:00 1970
From: notasas@gmail.com (Grazvydas Ignotas)
Date: Thu, 7 Jan 2010 11:46:23 +0200
Subject: [PATCH 05/12] omap1: Add 7xx clocks and pin muxes for SPI
In-Reply-To: <20100107001934.21352.83656.stgit@baageli.muru.com>
References: <20100107001728.21352.38471.stgit@baageli.muru.com>
	<20100107001934.21352.83656.stgit@baageli.muru.com>
Message-ID: <6ed0b2681001070146x4dbf52d9h406d128ccea826cf@mail.gmail.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

<snip>

> diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
> index 23ded2d..17ebb47 100644
> --- a/arch/arm/mach-omap1/devices.c
> +++ b/arch/arm/mach-omap1/devices.c
> @@ -14,6 +14,7 @@
> ?#include <linux/init.h>
> ?#include <linux/platform_device.h>
> ?#include <linux/io.h>
> +#include <linux/spi/spi.h>
>
> ?#include <mach/hardware.h>
> ?#include <asm/mach/map.h>
> @@ -23,6 +24,7 @@
> ?#include <plat/mux.h>
> ?#include <mach/gpio.h>
> ?#include <plat/mmc.h>
> +#include <plat/omap7xx.h>
>
> ?/*-------------------------------------------------------------------------*/
>
> @@ -196,6 +198,38 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
>
> ?/*-------------------------------------------------------------------------*/
>
> +/* OMAP7xx SPI support */
> +#if defined(CONFIG_SPI_OMAP_100K) || defined(CONFIG_SPI_OMAP_100K_MODULE)
> +
> +struct platform_device omap_spi1 = {
> + ? ? ? .name ? ? ? ? ? = "omap1_spi100k",
> + ? ? ? .id ? ? ? ? ? ? = 1,
> +};
> +
> +struct platform_device omap_spi2 = {
> + ? ? ? .name ? ? ? ? ? = "omap1_spi100k",
> + ? ? ? .id ? ? ? ? ? ? = 2,
> +};
> +
> +static void omap_init_spi100k(void)
> +{
> + ? ? ? omap_spi1.dev.platform_data = ioremap(OMAP7XX_SPI1_BASE, 0x7ff);
> + ? ? ? if (omap_spi1.dev.platform_data)
> + ? ? ? ? ? ? ? platform_device_register(&omap_spi1);
> +
> + ? ? ? omap_spi2.dev.platform_data = ioremap(OMAP7XX_SPI2_BASE, 0x7ff);
> + ? ? ? ifi (omap_spi2.dev.platform_data)

a typo here?

> + ? ? ? ? ? ? ? platform_device_register(&omap_spi2);
> +}
> +
> +#else
> +static inline void omap_init_spi100k(void)
> +{
> +}
> +#endif
> +
> +/*-------------------------------------------------------------------------*/
> +
> ?#if defined(CONFIG_OMAP_STI)
>
> ?#define OMAP1_STI_BASE ? ? ? ? 0xfffea000