Commit 45c8fa87 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635-4/spi-devs 

Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s5pc100/include/mach/map.h
	arch/arm/mach-s5pv210/Makefile
parents 84eb9ecc ef2f07d3

arch/arm/mach-s5p6440/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,3 +21,4 @@ obj-$(CONFIG_MACH_SMDK6440) += mach-smdk6440.o 


# device support

obj-y				+= dev-audio.o

obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o

arch/arm/mach-s5p6440/dev-spi.c

0 → 100644
+176 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5p6440/dev-spi.c

 *

 * Copyright (C) 2010 Samsung Electronics Co. Ltd.

 *	Jaswinder Singh <jassi.brar@samsung.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/platform_device.h>

#include <linux/dma-mapping.h>



#include <mach/dma.h>

#include <mach/map.h>

#include <mach/irqs.h>

#include <mach/gpio.h>

#include <mach/spi-clocks.h>



#include <plat/s3c64xx-spi.h>

#include <plat/gpio-cfg.h>



static char *spi_src_clks[] = {

	[S5P6440_SPI_SRCCLK_PCLK] = "pclk",

	[S5P6440_SPI_SRCCLK_SCLK] = "spi_epll",

};



/* SPI Controller platform_devices */



/* Since we emulate multi-cs capability, we do not touch the CS.

 * The emulated CS is toggled by board specific mechanism, as it can

 * be either some immediate GPIO or some signal out of some other

 * chip in between ... or some yet another way.

 * We simply do not assume anything about CS.

 */

static int s5p6440_spi_cfg_gpio(struct platform_device *pdev)

{

	switch (pdev->id) {

	case 0:

		s3c_gpio_cfgpin(S5P6440_GPC(0), S3C_GPIO_SFN(2));

		s3c_gpio_cfgpin(S5P6440_GPC(1), S3C_GPIO_SFN(2));

		s3c_gpio_cfgpin(S5P6440_GPC(2), S3C_GPIO_SFN(2));

		s3c_gpio_setpull(S5P6440_GPC(0), S3C_GPIO_PULL_UP);

		s3c_gpio_setpull(S5P6440_GPC(1), S3C_GPIO_PULL_UP);

		s3c_gpio_setpull(S5P6440_GPC(2), S3C_GPIO_PULL_UP);

		break;



	case 1:

		s3c_gpio_cfgpin(S5P6440_GPC(4), S3C_GPIO_SFN(2));

		s3c_gpio_cfgpin(S5P6440_GPC(5), S3C_GPIO_SFN(2));

		s3c_gpio_cfgpin(S5P6440_GPC(6), S3C_GPIO_SFN(2));

		s3c_gpio_setpull(S5P6440_GPC(4), S3C_GPIO_PULL_UP);

		s3c_gpio_setpull(S5P6440_GPC(5), S3C_GPIO_PULL_UP);

		s3c_gpio_setpull(S5P6440_GPC(6), S3C_GPIO_PULL_UP);

		break;



	default:

		dev_err(&pdev->dev, "Invalid SPI Controller number!");

		return -EINVAL;

	}



	return 0;

}



static struct resource s5p6440_spi0_resource[] = {

	[0] = {

		.start = S5P6440_PA_SPI0,

		.end   = S5P6440_PA_SPI0 + 0x100 - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = DMACH_SPI0_TX,

		.end   = DMACH_SPI0_TX,

		.flags = IORESOURCE_DMA,

	},

	[2] = {

		.start = DMACH_SPI0_RX,

		.end   = DMACH_SPI0_RX,

		.flags = IORESOURCE_DMA,

	},

	[3] = {

		.start = IRQ_SPI0,

		.end   = IRQ_SPI0,

		.flags = IORESOURCE_IRQ,

	},

};



static struct s3c64xx_spi_info s5p6440_spi0_pdata = {

	.cfg_gpio = s5p6440_spi_cfg_gpio,

	.fifo_lvl_mask = 0x1ff,

	.rx_lvl_offset = 15,

};



static u64 spi_dmamask = DMA_BIT_MASK(32);



struct platform_device s5p6440_device_spi0 = {

	.name		  = "s3c64xx-spi",

	.id		  = 0,

	.num_resources	  = ARRAY_SIZE(s5p6440_spi0_resource),

	.resource	  = s5p6440_spi0_resource,

	.dev = {

		.dma_mask		= &spi_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data = &s5p6440_spi0_pdata,

	},

};



static struct resource s5p6440_spi1_resource[] = {

	[0] = {

		.start = S5P6440_PA_SPI1,

		.end   = S5P6440_PA_SPI1 + 0x100 - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = DMACH_SPI1_TX,

		.end   = DMACH_SPI1_TX,

		.flags = IORESOURCE_DMA,

	},

	[2] = {

		.start = DMACH_SPI1_RX,

		.end   = DMACH_SPI1_RX,

		.flags = IORESOURCE_DMA,

	},

	[3] = {

		.start = IRQ_SPI1,

		.end   = IRQ_SPI1,

		.flags = IORESOURCE_IRQ,

	},

};



static struct s3c64xx_spi_info s5p6440_spi1_pdata = {

	.cfg_gpio = s5p6440_spi_cfg_gpio,

	.fifo_lvl_mask = 0x7f,

	.rx_lvl_offset = 15,

};



struct platform_device s5p6440_device_spi1 = {

	.name		  = "s3c64xx-spi",

	.id		  = 1,

	.num_resources	  = ARRAY_SIZE(s5p6440_spi1_resource),

	.resource	  = s5p6440_spi1_resource,

	.dev = {

		.dma_mask		= &spi_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data = &s5p6440_spi1_pdata,

	},

};



void __init s5p6440_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)

{

	struct s3c64xx_spi_info *pd;



	/* Reject invalid configuration */

	if (!num_cs || src_clk_nr < 0

			|| src_clk_nr > S5P6440_SPI_SRCCLK_SCLK) {

		printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);

		return;

	}



	switch (cntrlr) {

	case 0:

		pd = &s5p6440_spi0_pdata;

		break;

	case 1:

		pd = &s5p6440_spi1_pdata;

		break;

	default:

		printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",

							__func__, cntrlr);

		return;

	}



	pd->num_cs = num_cs;

	pd->src_clk_nr = src_clk_nr;

	pd->src_clk_name = spi_src_clks[src_clk_nr];

}

arch/arm/mach-s5p6440/include/mach/map.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ 


#define S5P6440_PA_IIC0		(0xEC104000)



#define S5P6440_PA_SPI0		0xEC400000

#define S5P6440_PA_SPI1		0xEC500000



#define S5P6440_PA_HSOTG	(0xED100000)



#define S5P6440_PA_HSMMC0	(0xED800000)

arch/arm/mach-s5p6440/include/mach/spi-clocks.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5p6440/include/mach/spi-clocks.h

 *

 * Copyright (C) 2010 Samsung Electronics Co. Ltd.

 *	Jaswinder Singh <jassi.brar@samsung.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __S5P6440_PLAT_SPI_CLKS_H

#define __S5P6440_PLAT_SPI_CLKS_H __FILE__



#define S5P6440_SPI_SRCCLK_PCLK		0

#define S5P6440_SPI_SRCCLK_SCLK		1



#endif /* __S5P6440_PLAT_SPI_CLKS_H */

arch/arm/mach-s5p6442/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,3 +21,4 @@ obj-$(CONFIG_MACH_SMDK6442) += mach-smdk6442.o 


# device support

obj-y				+= dev-audio.o

obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o