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

Commit 8a44930a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next-samsung-cleanup-spi4' of... 

Merge branch 'next-samsung-cleanup-spi4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/cleanup
parents cecd902a 7d38af51

arch/arm/mach-s3c64xx/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ config S3C64XX_SETUP_SDHCI_GPIO 
	help

	  Common setup code for S3C64XX SDHCI GPIO configurations



config S3C64XX_SETUP_SPI

	bool

	help

	 Common setup code for SPI GPIO configurations



# S36400 Macchine support



config MACH_SMDK6400
@@ -276,6 +281,7 @@ config MACH_WLF_CRAGG_6410 
	select S3C64XX_SETUP_IDE

	select S3C64XX_SETUP_FB_24BPP

	select S3C64XX_SETUP_KEYPAD

	select S3C64XX_SETUP_SPI

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_KEYPAD

	select S3C_DEV_USB_HOST
@@ -286,7 +292,7 @@ config MACH_WLF_CRAGG_6410 
	select S3C_DEV_I2C1

	select S3C_DEV_WDT

	select S3C_DEV_RTC

	select S3C64XX_DEV_SPI

	select S3C64XX_DEV_SPI0

	select S3C24XX_GPIO_EXTRA128

	select I2C

	help

arch/arm/mach-s3c64xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o 
obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o

obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o

obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o

obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o



# PM
@@ -59,4 +60,3 @@ obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o 


obj-y				+= dev-uart.o

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

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

deleted100644 → 0
+0 −173
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c64xx/dev-spi.c

 *

 * Copyright (C) 2009 Samsung Electronics 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/kernel.h>

#include <linux/string.h>

#include <linux/export.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/gpio.h>



#include <mach/dma.h>

#include <mach/map.h>

#include <mach/spi-clocks.h>

#include <mach/irqs.h>



#include <plat/s3c64xx-spi.h>

#include <plat/gpio-cfg.h>

#include <plat/devs.h>



/* SPI Controller platform_devices */



/* Since we emulate multi-cs capability, we do not touch the GPC-3,7.

 * 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 s3c64xx_spi_cfg_gpio(struct platform_device *pdev)

{

	unsigned int base;



	switch (pdev->id) {

	case 0:

		base = S3C64XX_GPC(0);

		break;



	case 1:

		base = S3C64XX_GPC(4);

		break;



	default:

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

		return -EINVAL;

	}



	s3c_gpio_cfgall_range(base, 3,

			      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);



	return 0;

}



static struct resource s3c64xx_spi0_resource[] = {

	[0] = {

		.start = S3C64XX_PA_SPI0,

		.end   = S3C64XX_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 s3c64xx_spi0_pdata = {

	.cfg_gpio = s3c64xx_spi_cfg_gpio,

	.fifo_lvl_mask = 0x7f,

	.rx_lvl_offset = 13,

	.tx_st_done = 21,

};



static u64 spi_dmamask = DMA_BIT_MASK(32);



struct platform_device s3c64xx_device_spi0 = {

	.name		  = "s3c64xx-spi",

	.id		  = 0,

	.num_resources	  = ARRAY_SIZE(s3c64xx_spi0_resource),

	.resource	  = s3c64xx_spi0_resource,

	.dev = {

		.dma_mask		= &spi_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data = &s3c64xx_spi0_pdata,

	},

};

EXPORT_SYMBOL(s3c64xx_device_spi0);



static struct resource s3c64xx_spi1_resource[] = {

	[0] = {

		.start = S3C64XX_PA_SPI1,

		.end   = S3C64XX_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 s3c64xx_spi1_pdata = {

	.cfg_gpio = s3c64xx_spi_cfg_gpio,

	.fifo_lvl_mask = 0x7f,

	.rx_lvl_offset = 13,

	.tx_st_done = 21,

};



struct platform_device s3c64xx_device_spi1 = {

	.name		  = "s3c64xx-spi",

	.id		  = 1,

	.num_resources	  = ARRAY_SIZE(s3c64xx_spi1_resource),

	.resource	  = s3c64xx_spi1_resource,

	.dev = {

		.dma_mask		= &spi_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data = &s3c64xx_spi1_pdata,

	},

};

EXPORT_SYMBOL(s3c64xx_device_spi1);



void __init s3c64xx_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 > S3C64XX_SPI_SRCCLK_48M) {

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

		return;

	}



	switch (cntrlr) {

	case 0:

		pd = &s3c64xx_spi0_pdata;

		break;

	case 1:

		pd = &s3c64xx_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;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ 
#define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG

#define S3C_PA_RTC		S3C64XX_PA_RTC

#define S3C_PA_WDT		S3C64XX_PA_WATCHDOG

#define S3C_PA_SPI0		S3C64XX_PA_SPI0

#define S3C_PA_SPI1		S3C64XX_PA_SPI1



#define SAMSUNG_PA_ADC		S3C64XX_PA_ADC

#define SAMSUNG_PA_CFCON	S3C64XX_PA_CFCON

arch/arm/mach-s3c64xx/setup-spi.c

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s3c64xx/setup-spi.c

 *

 * Copyright (C) 2011 Samsung Electronics Ltd.

 *		http://www.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/gpio.h>

#include <linux/platform_device.h>



#include <plat/gpio-cfg.h>

#include <plat/s3c64xx-spi.h>



#ifdef CONFIG_S3C64XX_DEV_SPI0

struct s3c64xx_spi_info s3c64xx_spi0_pdata __initdata = {

	.fifo_lvl_mask	= 0x7f,

	.rx_lvl_offset	= 13,

	.tx_st_done	= 21,

};



int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)

{

	s3c_gpio_cfgall_range(S3C64XX_GPC(0), 3,

				S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);

	return 0;

}

#endif



#ifdef CONFIG_S3C64XX_DEV_SPI1

struct s3c64xx_spi_info s3c64xx_spi1_pdata __initdata = {

	.fifo_lvl_mask	= 0x7f,

	.rx_lvl_offset	= 13,

	.tx_st_done	= 21,

};



int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)

{

	s3c_gpio_cfgall_range(S3C64XX_GPC(4), 3,

				S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);

	return 0;

}

#endif