* [PATCH 0/5] remove spi-s3c24xx-gpio driver
@ 2011-06-28 12:49 Peter Korsgaard
[not found] ` <1309265357-15879-1-git-send-email-jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Peter Korsgaard @ 2011-06-28 12:49 UTC (permalink / raw)
To: ben-linux, grant.likely, linux-arm-kernel, spi-devel-general
The spi-s3c24xx-gpio driver is functionally equivalent to the spi-gpio
driver (but precedes it). The driver has seen very little development
since it got added back in 2006, and there's only 2 in-tree users of it.
This patch series moves the remaining users to the spi-gpio driver and
then finally removes the driver.
Compile tested only as I don't have access to the hardware.
arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 28 ----
arch/arm/mach-s3c2410/mach-qt2410.c | 34 +----
arch/arm/mach-s3c2412/mach-jive.c | 41 ++----
arch/arm/mach-s3c2440/mach-gta02.c | 1 -
drivers/spi/Kconfig | 10 --
drivers/spi/Makefile | 1 -
drivers/spi/spi-s3c24xx-gpio.c | 200 -------------------------
7 files changed, 22 insertions(+), 293 deletions(-)
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/5] mach-jive: convert to spi_gpio
[not found] ` <1309265357-15879-1-git-send-email-jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
@ 2011-06-28 12:49 ` Peter Korsgaard
2011-06-28 12:49 ` [PATCH 2/5] mach-qt2410: " Peter Korsgaard
` (2 subsequent siblings)
3 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2011-06-28 12:49 UTC (permalink / raw)
To: ben-linux-elnMNo+KYs3YtjvyW6yDsg,
grant.likely-s3s/WqlpOiPyB63q8FvJNQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: Peter Korsgaard
Rather than the deprecated spi_s3c24xx_gpio driver. Compile tested only.
Signed-off-by: Peter Korsgaard <jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
---
arch/arm/mach-s3c2412/mach-jive.c | 41 ++++++++++++------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c
index 85dcaeb..5eeb475 100644
--- a/arch/arm/mach-s3c2412/mach-jive.c
+++ b/arch/arm/mach-s3c2412/mach-jive.c
@@ -25,6 +25,7 @@
#include <video/ili9320.h>
#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -38,7 +39,6 @@
#include <mach/regs-gpio.h>
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
-#include <mach/spi-gpio.h>
#include <mach/fb.h>
#include <asm/mach-types.h>
@@ -389,45 +389,30 @@ static struct ili9320_platdata jive_lcm_config = {
/* LCD SPI support */
-static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs)
-{
- gpio_set_value(S3C2410_GPB(7), cs ? 0 : 1);
-}
-
-static struct s3c2410_spigpio_info jive_lcd_spi = {
- .bus_num = 1,
- .pin_clk = S3C2410_GPG(8),
- .pin_mosi = S3C2410_GPB(8),
- .num_chipselect = 1,
- .chip_select = jive_lcd_spi_chipselect,
+static struct spi_gpio_platform_data jive_lcd_spi = {
+ .sck = S3C2410_GPG(8),
+ .mosi = S3C2410_GPB(8),
+ .miso = SPI_GPIO_NO_MISO,
};
static struct platform_device jive_device_lcdspi = {
- .name = "spi_s3c24xx_gpio",
+ .name = "spi-gpio",
.id = 1,
- .num_resources = 0,
.dev.platform_data = &jive_lcd_spi,
};
-/* WM8750 audio code SPI definition */
-static void jive_wm8750_chipselect(struct s3c2410_spigpio_info *spi, int cs)
-{
- gpio_set_value(S3C2410_GPH(10), cs ? 0 : 1);
-}
+/* WM8750 audio code SPI definition */
-static struct s3c2410_spigpio_info jive_wm8750_spi = {
- .bus_num = 2,
- .pin_clk = S3C2410_GPB(4),
- .pin_mosi = S3C2410_GPB(9),
- .num_chipselect = 1,
- .chip_select = jive_wm8750_chipselect,
+static struct spi_gpio_platform_data jive_wm8750_spi = {
+ .sck = S3C2410_GPB(4),
+ .mosi = S3C2410_GPB(9),
+ .miso = SPI_GPIO_NO_MISO,
};
static struct platform_device jive_device_wm8750 = {
- .name = "spi_s3c24xx_gpio",
+ .name = "spi-gpio",
.id = 2,
- .num_resources = 0,
.dev.platform_data = &jive_wm8750_spi,
};
@@ -441,12 +426,14 @@ static struct spi_board_info __initdata jive_spi_devs[] = {
.mode = SPI_MODE_3, /* CPOL=1, CPHA=1 */
.max_speed_hz = 100000,
.platform_data = &jive_lcm_config,
+ .controller_data = (void *)S3C2410_GPB(7),
}, {
.modalias = "WM8750",
.bus_num = 2,
.chip_select = 0,
.mode = SPI_MODE_0, /* CPOL=0, CPHA=0 */
.max_speed_hz = 100000,
+ .controller_data = (void *)S3C2410_GPH(10),
},
};
--
1.7.5.4
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/5] mach-qt2410: convert to spi_gpio
[not found] ` <1309265357-15879-1-git-send-email-jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
2011-06-28 12:49 ` [PATCH 1/5] mach-jive: convert to spi_gpio Peter Korsgaard
@ 2011-06-28 12:49 ` Peter Korsgaard
2011-06-28 12:49 ` [PATCH 4/5] spi: remove obsolete spi-s3c24xx-gpio driver Peter Korsgaard
2011-06-28 12:49 ` [PATCH 5/5] mach-s3c2410: remove unused spi-gpio.h file Peter Korsgaard
3 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2011-06-28 12:49 UTC (permalink / raw)
To: ben-linux-elnMNo+KYs3YtjvyW6yDsg,
grant.likely-s3s/WqlpOiPyB63q8FvJNQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: Peter Korsgaard
Rather than the deprecated spi_s3c24xx_gpio driver.
Only compile tested. Notice that the board support seems quite broken
as the spi_s3c24xx_gpio platform device name was misspelled and there
is no struct spi_board_info defined, but this atleast didn't make it
any worse.
Signed-off-by: Peter Korsgaard <jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
---
arch/arm/mach-s3c2410/mach-qt2410.c | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
index e8f49fe..f44f775 100644
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -32,7 +32,7 @@
#include <linux/platform_device.h>
#include <linux/serial_core.h>
#include <linux/spi/spi.h>
-#include <linux/spi/spi_bitbang.h>
+#include <linux/spi/spi_gpio.h>
#include <linux/io.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
@@ -53,8 +53,6 @@
#include <mach/fb.h>
#include <plat/nand.h>
#include <plat/udc.h>
-#include <mach/spi.h>
-#include <mach/spi-gpio.h>
#include <plat/iic.h>
#include <plat/common-smdk.h>
@@ -216,32 +214,16 @@ static struct platform_device qt2410_led = {
/* SPI */
-static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
-{
- switch (cs) {
- case BITBANG_CS_ACTIVE:
- gpio_set_value(S3C2410_GPB(5), 0);
- break;
- case BITBANG_CS_INACTIVE:
- gpio_set_value(S3C2410_GPB(5), 1);
- break;
- }
-}
-
-static struct s3c2410_spigpio_info spi_gpio_cfg = {
- .pin_clk = S3C2410_GPG(7),
- .pin_mosi = S3C2410_GPG(6),
- .pin_miso = S3C2410_GPG(5),
- .chip_select = &spi_gpio_cs,
+static struct spi_gpio_platform_data spi_gpio_cfg = {
+ .sck = S3C2410_GPG(7),
+ .mosi = S3C2410_GPG(6),
+ .miso = S3C2410_GPG(5),
};
-
static struct platform_device qt2410_spi = {
- .name = "s3c24xx-spi-gpio",
- .id = 1,
- .dev = {
- .platform_data = &spi_gpio_cfg,
- },
+ .name = "spi-gpio",
+ .id = 1,
+ .dev.platform_data = &spi_gpio_cfg,
};
/* Board devices */
--
1.7.5.4
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/5] mach-gta2: remove unused spi-gpio.h include
2011-06-28 12:49 [PATCH 0/5] remove spi-s3c24xx-gpio driver Peter Korsgaard
[not found] ` <1309265357-15879-1-git-send-email-jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
@ 2011-06-28 12:49 ` Peter Korsgaard
2011-06-28 21:24 ` [PATCH 0/5] remove spi-s3c24xx-gpio driver Ben Dooks
2011-07-04 16:48 ` Grant Likely
3 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2011-06-28 12:49 UTC (permalink / raw)
To: ben-linux, grant.likely, linux-arm-kernel, spi-devel-general
Cc: Peter Korsgaard
Not needed, and the file is going away.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
arch/arm/mach-s3c2440/mach-gta02.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 7166620..c10ddf4 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -74,7 +74,6 @@
#include <mach/fb.h>
#include <mach/spi.h>
-#include <mach/spi-gpio.h>
#include <plat/usb-control.h>
#include <mach/regs-mem.h>
#include <mach/hardware.h>
--
1.7.5.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/5] spi: remove obsolete spi-s3c24xx-gpio driver
[not found] ` <1309265357-15879-1-git-send-email-jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
2011-06-28 12:49 ` [PATCH 1/5] mach-jive: convert to spi_gpio Peter Korsgaard
2011-06-28 12:49 ` [PATCH 2/5] mach-qt2410: " Peter Korsgaard
@ 2011-06-28 12:49 ` Peter Korsgaard
2011-06-28 12:49 ` [PATCH 5/5] mach-s3c2410: remove unused spi-gpio.h file Peter Korsgaard
3 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2011-06-28 12:49 UTC (permalink / raw)
To: ben-linux-elnMNo+KYs3YtjvyW6yDsg,
grant.likely-s3s/WqlpOiPyB63q8FvJNQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: Peter Korsgaard
It was equivalent to spi-gpio, and there's no longer any in-tree users
of it, so get rid of it.
Signed-off-by: Peter Korsgaard <jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
---
drivers/spi/Kconfig | 10 --
drivers/spi/Makefile | 1 -
drivers/spi/spi-s3c24xx-gpio.c | 200 ----------------------------------------
3 files changed, 0 insertions(+), 211 deletions(-)
delete mode 100644 drivers/spi/spi-s3c24xx-gpio.c
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index c013481..9aafa98 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -313,16 +313,6 @@ config SPI_S3C24XX_FIQ
no free DMA channels, or when doing transfers that required both
TX and RX data paths.
-config SPI_S3C24XX_GPIO
- tristate "Samsung S3C24XX series SPI by GPIO"
- depends on ARCH_S3C2410 && EXPERIMENTAL
- select SPI_BITBANG
- help
- SPI driver for Samsung S3C24XX series ARM SoCs using
- GPIO lines to provide the SPI bus. This can be used where
- the inbuilt hardware cannot provide the transfer mode, or
- where the board is using non hardware connected pins.
-
config SPI_S3C64XX
tristate "Samsung S3C64XX series type SPI"
depends on (ARCH_S3C64XX || ARCH_S5P64X0)
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index b60b04b..61c3261 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -44,7 +44,6 @@ obj-$(CONFIG_SPI_PL022) += spi-pl022.o
obj-$(CONFIG_SPI_PPC4xx) += spi-ppc4xx.o
obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx.o
obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o
-obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi-s3c24xx-gpio.o
obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o
spi-s3c24xx-hw-y := spi-s3c24xx.o
spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o
diff --git a/drivers/spi/spi-s3c24xx-gpio.c b/drivers/spi/spi-s3c24xx-gpio.c
deleted file mode 100644
index 2d3c085..0000000
--- a/drivers/spi/spi-s3c24xx-gpio.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2006 Ben Dooks
- * Copyright (c) 2006 Simtec Electronics
- *
- * S3C24XX GPIO based SPI driver
- *
- * 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/init.h>
-#include <linux/delay.h>
-#include <linux/spinlock.h>
-#include <linux/workqueue.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-
-#include <linux/spi/spi.h>
-#include <linux/spi/spi_bitbang.h>
-
-#include <mach/regs-gpio.h>
-#include <mach/spi-gpio.h>
-#include <mach/hardware.h>
-
-struct s3c2410_spigpio {
- struct spi_bitbang bitbang;
-
- struct s3c2410_spigpio_info *info;
- struct platform_device *dev;
-};
-
-static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi)
-{
- return spi_master_get_devdata(spi->master);
-}
-
-static inline void setsck(struct spi_device *dev, int on)
-{
- struct s3c2410_spigpio *sg = spidev_to_sg(dev);
- s3c2410_gpio_setpin(sg->info->pin_clk, on ? 1 : 0);
-}
-
-static inline void setmosi(struct spi_device *dev, int on)
-{
- struct s3c2410_spigpio *sg = spidev_to_sg(dev);
- s3c2410_gpio_setpin(sg->info->pin_mosi, on ? 1 : 0);
-}
-
-static inline u32 getmiso(struct spi_device *dev)
-{
- struct s3c2410_spigpio *sg = spidev_to_sg(dev);
- return s3c2410_gpio_getpin(sg->info->pin_miso) ? 1 : 0;
-}
-
-#define spidelay(x) ndelay(x)
-
-#include "spi-bitbang-txrx.h"
-
-
-static u32 s3c2410_spigpio_txrx_mode0(struct spi_device *spi,
- unsigned nsecs, u32 word, u8 bits)
-{
- return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
-}
-
-static u32 s3c2410_spigpio_txrx_mode1(struct spi_device *spi,
- unsigned nsecs, u32 word, u8 bits)
-{
- return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
-}
-
-static u32 s3c2410_spigpio_txrx_mode2(struct spi_device *spi,
- unsigned nsecs, u32 word, u8 bits)
-{
- return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
-}
-
-static u32 s3c2410_spigpio_txrx_mode3(struct spi_device *spi,
- unsigned nsecs, u32 word, u8 bits)
-{
- return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
-}
-
-
-static void s3c2410_spigpio_chipselect(struct spi_device *dev, int value)
-{
- struct s3c2410_spigpio *sg = spidev_to_sg(dev);
-
- if (sg->info && sg->info->chip_select)
- (sg->info->chip_select)(sg->info, value);
-}
-
-static int s3c2410_spigpio_probe(struct platform_device *dev)
-{
- struct s3c2410_spigpio_info *info;
- struct spi_master *master;
- struct s3c2410_spigpio *sp;
- int ret;
-
- master = spi_alloc_master(&dev->dev, sizeof(struct s3c2410_spigpio));
- if (master == NULL) {
- dev_err(&dev->dev, "failed to allocate spi master\n");
- ret = -ENOMEM;
- goto err;
- }
-
- sp = spi_master_get_devdata(master);
-
- platform_set_drvdata(dev, sp);
-
- /* copy in the plkatform data */
- info = sp->info = dev->dev.platform_data;
-
- /* setup spi bitbang adaptor */
- sp->bitbang.master = spi_master_get(master);
- sp->bitbang.master->bus_num = info->bus_num;
- sp->bitbang.master->num_chipselect = info->num_chipselect;
- sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
-
- sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;
- sp->bitbang.txrx_word[SPI_MODE_1] = s3c2410_spigpio_txrx_mode1;
- sp->bitbang.txrx_word[SPI_MODE_2] = s3c2410_spigpio_txrx_mode2;
- sp->bitbang.txrx_word[SPI_MODE_3] = s3c2410_spigpio_txrx_mode3;
-
- /* set state of spi pins, always assume that the clock is
- * available, but do check the MOSI and MISO. */
- s3c2410_gpio_setpin(info->pin_clk, 0);
- s3c2410_gpio_cfgpin(info->pin_clk, S3C2410_GPIO_OUTPUT);
-
- if (info->pin_mosi < S3C2410_GPH10) {
- s3c2410_gpio_setpin(info->pin_mosi, 0);
- s3c2410_gpio_cfgpin(info->pin_mosi, S3C2410_GPIO_OUTPUT);
- }
-
- if (info->pin_miso != S3C2410_GPA0 && info->pin_miso < S3C2410_GPH10)
- s3c2410_gpio_cfgpin(info->pin_miso, S3C2410_GPIO_INPUT);
-
- ret = spi_bitbang_start(&sp->bitbang);
- if (ret)
- goto err_no_bitbang;
-
- return 0;
-
- err_no_bitbang:
- spi_master_put(sp->bitbang.master);
- err:
- return ret;
-
-}
-
-static int s3c2410_spigpio_remove(struct platform_device *dev)
-{
- struct s3c2410_spigpio *sp = platform_get_drvdata(dev);
-
- spi_bitbang_stop(&sp->bitbang);
- spi_master_put(sp->bitbang.master);
-
- return 0;
-}
-
-/* all gpio should be held over suspend/resume, so we should
- * not need to deal with this
-*/
-
-#define s3c2410_spigpio_suspend NULL
-#define s3c2410_spigpio_resume NULL
-
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:spi_s3c24xx_gpio");
-
-static struct platform_driver s3c2410_spigpio_drv = {
- .probe = s3c2410_spigpio_probe,
- .remove = s3c2410_spigpio_remove,
- .suspend = s3c2410_spigpio_suspend,
- .resume = s3c2410_spigpio_resume,
- .driver = {
- .name = "spi_s3c24xx_gpio",
- .owner = THIS_MODULE,
- },
-};
-
-static int __init s3c2410_spigpio_init(void)
-{
- return platform_driver_register(&s3c2410_spigpio_drv);
-}
-
-static void __exit s3c2410_spigpio_exit(void)
-{
- platform_driver_unregister(&s3c2410_spigpio_drv);
-}
-
-module_init(s3c2410_spigpio_init);
-module_exit(s3c2410_spigpio_exit);
-
-MODULE_DESCRIPTION("S3C24XX SPI Driver");
-MODULE_AUTHOR("Ben Dooks, <ben-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org>");
-MODULE_LICENSE("GPL");
--
1.7.5.4
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 5/5] mach-s3c2410: remove unused spi-gpio.h file
[not found] ` <1309265357-15879-1-git-send-email-jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
` (2 preceding siblings ...)
2011-06-28 12:49 ` [PATCH 4/5] spi: remove obsolete spi-s3c24xx-gpio driver Peter Korsgaard
@ 2011-06-28 12:49 ` Peter Korsgaard
3 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2011-06-28 12:49 UTC (permalink / raw)
To: ben-linux-elnMNo+KYs3YtjvyW6yDsg,
grant.likely-s3s/WqlpOiPyB63q8FvJNQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: Peter Korsgaard
Not used anymore as the spi_s3c24xx_gpio driver is gone (replaced by
the generic spi-gpio).
Signed-off-by: Peter Korsgaard <jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
---
arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 28 -------------------------
1 files changed, 0 insertions(+), 28 deletions(-)
delete mode 100644 arch/arm/mach-s3c2410/include/mach/spi-gpio.h
diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
deleted file mode 100644
index dcef228..0000000
--- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/spi-gpio.h
- *
- * Copyright (c) 2006 Simtec Electronics
- * Ben Dooks <ben-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org>
- *
- * S3C2410 - SPI Controller platform_device info
- *
- * 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 __ASM_ARCH_SPIGPIO_H
-#define __ASM_ARCH_SPIGPIO_H __FILE__
-
-struct s3c2410_spigpio_info {
- unsigned long pin_clk;
- unsigned long pin_mosi;
- unsigned long pin_miso;
-
- int num_chipselect;
- int bus_num;
-
- void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
-};
-
-
-#endif /* __ASM_ARCH_SPIGPIO_H */
--
1.7.5.4
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 0/5] remove spi-s3c24xx-gpio driver
2011-06-28 12:49 [PATCH 0/5] remove spi-s3c24xx-gpio driver Peter Korsgaard
[not found] ` <1309265357-15879-1-git-send-email-jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
2011-06-28 12:49 ` [PATCH 3/5] mach-gta2: remove unused spi-gpio.h include Peter Korsgaard
@ 2011-06-28 21:24 ` Ben Dooks
2011-06-29 17:00 ` Peter Korsgaard
2011-07-04 16:48 ` Grant Likely
3 siblings, 1 reply; 13+ messages in thread
From: Ben Dooks @ 2011-06-28 21:24 UTC (permalink / raw)
To: Peter Korsgaard
Cc: grant.likely, spi-devel-general, linux-arm-kernel, ben-linux
On Tue, Jun 28, 2011 at 02:49:12PM +0200, Peter Korsgaard wrote:
> The spi-s3c24xx-gpio driver is functionally equivalent to the spi-gpio
> driver (but precedes it). The driver has seen very little development
> since it got added back in 2006, and there's only 2 in-tree users of it.
>
> This patch series moves the remaining users to the spi-gpio driver and
> then finally removes the driver.
>
> Compile tested only as I don't have access to the hardware.
I've not really got much in the way of access either, however the
series looks sane to me.
Acked-by: Ben Dooks <ben-linux@fluff.org>
> arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 28 ----
> arch/arm/mach-s3c2410/mach-qt2410.c | 34 +----
> arch/arm/mach-s3c2412/mach-jive.c | 41 ++----
> arch/arm/mach-s3c2440/mach-gta02.c | 1 -
> drivers/spi/Kconfig | 10 --
> drivers/spi/Makefile | 1 -
> drivers/spi/spi-s3c24xx-gpio.c | 200 -------------------------
> 7 files changed, 22 insertions(+), 293 deletions(-)
>
> --
> Bye, Peter Korsgaard
--
Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/
Large Hadron Colada: A large Pina Colada that makes the universe disappear.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/5] remove spi-s3c24xx-gpio driver
2011-06-28 21:24 ` [PATCH 0/5] remove spi-s3c24xx-gpio driver Ben Dooks
@ 2011-06-29 17:00 ` Peter Korsgaard
2011-06-29 17:17 ` Grant Likely
0 siblings, 1 reply; 13+ messages in thread
From: Peter Korsgaard @ 2011-06-29 17:00 UTC (permalink / raw)
To: Ben Dooks; +Cc: grant.likely, spi-devel-general, linux-arm-kernel, ben-linux
>>>>> "Ben" == Ben Dooks <ben@trinity.fluff.org> writes:
>> The spi-s3c24xx-gpio driver is functionally equivalent to the spi-gpio
>> driver (but precedes it). The driver has seen very little development
>> since it got added back in 2006, and there's only 2 in-tree users of it.
>>
>> This patch series moves the remaining users to the spi-gpio driver and
>> then finally removes the driver.
>>
>> Compile tested only as I don't have access to the hardware.
Ben> I've not really got much in the way of access either, however the
Ben> series looks sane to me.
Ben> Acked-by: Ben Dooks <ben-linux@fluff.org>
Great, will you handle the series or should it go through the spi tree?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/5] remove spi-s3c24xx-gpio driver
2011-06-29 17:00 ` Peter Korsgaard
@ 2011-06-29 17:17 ` Grant Likely
[not found] ` <BANLkTi=693aHH=8BTAyrKWc1padiozpT6A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 13+ messages in thread
From: Grant Likely @ 2011-06-29 17:17 UTC (permalink / raw)
To: Peter Korsgaard; +Cc: linux-arm-kernel, spi-devel-general, ben-linux, Ben Dooks
On Wed, Jun 29, 2011 at 11:00 AM, Peter Korsgaard <jacmet@sunsite.dk> wrote:
>>>>>> "Ben" == Ben Dooks <ben@trinity.fluff.org> writes:
>
> >> The spi-s3c24xx-gpio driver is functionally equivalent to the spi-gpio
> >> driver (but precedes it). The driver has seen very little development
> >> since it got added back in 2006, and there's only 2 in-tree users of it.
> >>
> >> This patch series moves the remaining users to the spi-gpio driver and
> >> then finally removes the driver.
> >>
> >> Compile tested only as I don't have access to the hardware.
>
> Ben> I've not really got much in the way of access either, however the
> Ben> series looks sane to me.
>
> Ben> Acked-by: Ben Dooks <ben-linux@fluff.org>
>
> Great, will you handle the series or should it go through the spi tree?
With the big spi driver rename, it should probably either go via the
spi tree, or be put into a topic branch that can be merged by both the
spi and samsung trees.
g.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/5] remove spi-s3c24xx-gpio driver
[not found] ` <BANLkTi=693aHH=8BTAyrKWc1padiozpT6A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2011-06-29 17:51 ` Peter Korsgaard
2011-07-04 16:51 ` Grant Likely
0 siblings, 1 reply; 13+ messages in thread
From: Peter Korsgaard @ 2011-06-29 17:51 UTC (permalink / raw)
To: Grant Likely
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
ben-linux-elnMNo+KYs3YtjvyW6yDsg, Ben Dooks
>>>>> "Grant" == Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> writes:
>> Great, will you handle the series or should it go through the spi tree?
Grant> With the big spi driver rename, it should probably either go via the
Grant> spi tree, or be put into a topic branch that can be merged by both the
Grant> spi and samsung trees.
Both is fine by me. Let me know if you want me to do something.
--
Bye, Peter Korsgaard
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/5] remove spi-s3c24xx-gpio driver
2011-06-28 12:49 [PATCH 0/5] remove spi-s3c24xx-gpio driver Peter Korsgaard
` (2 preceding siblings ...)
2011-06-28 21:24 ` [PATCH 0/5] remove spi-s3c24xx-gpio driver Ben Dooks
@ 2011-07-04 16:48 ` Grant Likely
3 siblings, 0 replies; 13+ messages in thread
From: Grant Likely @ 2011-07-04 16:48 UTC (permalink / raw)
To: Peter Korsgaard; +Cc: spi-devel-general, kgene.kim, linux-arm-kernel, ben-linux
On Tue, Jun 28, 2011 at 02:49:12PM +0200, Peter Korsgaard wrote:
> The spi-s3c24xx-gpio driver is functionally equivalent to the spi-gpio
> driver (but precedes it). The driver has seen very little development
> since it got added back in 2006, and there's only 2 in-tree users of it.
>
> This patch series moves the remaining users to the spi-gpio driver and
> then finally removes the driver.
>
> Compile tested only as I don't have access to the hardware.
>
> arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 28 ----
> arch/arm/mach-s3c2410/mach-qt2410.c | 34 +----
> arch/arm/mach-s3c2412/mach-jive.c | 41 ++----
> arch/arm/mach-s3c2440/mach-gta02.c | 1 -
> drivers/spi/Kconfig | 10 --
> drivers/spi/Makefile | 1 -
> drivers/spi/spi-s3c24xx-gpio.c | 200 -------------------------
I'm tempted to merge this, just because I like the diffstat. Kgene,
what say you?
g.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/5] remove spi-s3c24xx-gpio driver
2011-06-29 17:51 ` Peter Korsgaard
@ 2011-07-04 16:51 ` Grant Likely
2011-07-05 5:45 ` Kukjin Kim
0 siblings, 1 reply; 13+ messages in thread
From: Grant Likely @ 2011-07-04 16:51 UTC (permalink / raw)
To: Peter Korsgaard; +Cc: linux-arm-kernel, spi-devel-general, ben-linux, Ben Dooks
On Wed, Jun 29, 2011 at 07:51:10PM +0200, Peter Korsgaard wrote:
> >>>>> "Grant" == Grant Likely <grant.likely@secretlab.ca> writes:
>
> >> Great, will you handle the series or should it go through the spi tree?
>
> Grant> With the big spi driver rename, it should probably either go via the
> Grant> spi tree, or be put into a topic branch that can be merged by both the
> Grant> spi and samsung trees.
>
> Both is fine by me. Let me know if you want me to do something.
It's pretty minimal arch/arm impact, and it depends on the big rename
patch, so why don't I just merge it directly into spi/next without a
topic branch.
g.
>
> --
> Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH 0/5] remove spi-s3c24xx-gpio driver
2011-07-04 16:51 ` Grant Likely
@ 2011-07-05 5:45 ` Kukjin Kim
0 siblings, 0 replies; 13+ messages in thread
From: Kukjin Kim @ 2011-07-05 5:45 UTC (permalink / raw)
To: 'Grant Likely', 'Peter Korsgaard'
Cc: spi-devel-general, 'Ben Dooks', ben-linux,
linux-arm-kernel
Grant Likely wrote:
>
> On Wed, Jun 29, 2011 at 07:51:10PM +0200, Peter Korsgaard wrote:
> > >>>>> "Grant" == Grant Likely <grant.likely@secretlab.ca> writes:
> >
> > >> Great, will you handle the series or should it go through the spi
tree?
> >
> > Grant> With the big spi driver rename, it should probably either go via
the
> > Grant> spi tree, or be put into a topic branch that can be merged by
both the
> > Grant> spi and samsung trees.
> >
> > Both is fine by me. Let me know if you want me to do something.
>
> It's pretty minimal arch/arm impact, and it depends on the big rename
> patch, so why don't I just merge it directly into spi/next without a
> topic branch.
Hi Grant,
I agree with you, it is not expected this makes some conflicts between spi
and samsung tree.
I think Ben's ack is enough on this, if required,
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2011-07-05 5:45 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-28 12:49 [PATCH 0/5] remove spi-s3c24xx-gpio driver Peter Korsgaard
[not found] ` <1309265357-15879-1-git-send-email-jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
2011-06-28 12:49 ` [PATCH 1/5] mach-jive: convert to spi_gpio Peter Korsgaard
2011-06-28 12:49 ` [PATCH 2/5] mach-qt2410: " Peter Korsgaard
2011-06-28 12:49 ` [PATCH 4/5] spi: remove obsolete spi-s3c24xx-gpio driver Peter Korsgaard
2011-06-28 12:49 ` [PATCH 5/5] mach-s3c2410: remove unused spi-gpio.h file Peter Korsgaard
2011-06-28 12:49 ` [PATCH 3/5] mach-gta2: remove unused spi-gpio.h include Peter Korsgaard
2011-06-28 21:24 ` [PATCH 0/5] remove spi-s3c24xx-gpio driver Ben Dooks
2011-06-29 17:00 ` Peter Korsgaard
2011-06-29 17:17 ` Grant Likely
[not found] ` <BANLkTi=693aHH=8BTAyrKWc1padiozpT6A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-06-29 17:51 ` Peter Korsgaard
2011-07-04 16:51 ` Grant Likely
2011-07-05 5:45 ` Kukjin Kim
2011-07-04 16:48 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).