diff for duplicates of <4B7C30DF.90805@inov.pt> diff --git a/a/1.txt b/N1/1.txt index 0ce1e04..84c4c4a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,4 +9,11 @@ added FIFOs, even if not used. The following patch is needed to make the driver to work on the S3C2412 chip (and probably on the S3C2413). Regards, -José Miguel Gonçalves +Jos? Miguel Gon?alves +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: linux-2.6.git-spi_s3c2412.patch +Type: text/x-patch +Size: 2286 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100217/dd567841/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index ee89bba..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: text/x-patch; - name="linux-2.6.git-spi_s3c2412.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: inline; - filename="linux-2.6.git-spi_s3c2412.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index f6c72bc..0000000 --- a/a/2.txt +++ /dev/null @@ -1,69 +0,0 @@ -Signed-off-by: Jose Miguel Goncalves <jose.goncalves@inov.pt> - -diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c -index bef39f7..c58330f 100644 ---- a/arch/arm/mach-s3c2412/s3c2412.c -+++ b/arch/arm/mach-s3c2412/s3c2412.c -@@ -100,11 +100,9 @@ void __init s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no) - s3c_device_sdi.resource[1].end = IRQ_S3C2412_SDI; - - /* spi channel related changes, s3c2412/13 specific */ -- s3c_device_spi0.name = "s3c2412-spi"; -- s3c_device_spi0.resource[0].end = S3C24XX_PA_SPI + 0x24; -- s3c_device_spi1.name = "s3c2412-spi"; -+ s3c_device_spi0.resource[0].end = S3C24XX_PA_SPI + 0x2F; - s3c_device_spi1.resource[0].start = S3C24XX_PA_SPI + S3C2412_SPI1; -- s3c_device_spi1.resource[0].end = S3C24XX_PA_SPI + S3C2412_SPI1 + 0x24; -+ s3c_device_spi1.resource[0].end = S3C24XX_PA_SPI + S3C2412_SPI1 + 0x2F; - - } - -diff --git a/arch/arm/plat-s3c24xx/include/plat/regs-spi.h b/arch/arm/plat-s3c24xx/include/plat/regs-spi.h -index 2b35479..57e799c 100644 ---- a/arch/arm/plat-s3c24xx/include/plat/regs-spi.h -+++ b/arch/arm/plat-s3c24xx/include/plat/regs-spi.h -@@ -75,7 +75,8 @@ - #define S3C2410_SPRDAT (0x14) - - #define S3C2412_TXFIFO (0x18) --#define S3C2412_RXFIFO (0x18) -+#define S3C2412_RXFIFO (0x1C) -+#define S3C2412_SPRDATB (0x20) - #define S3C2412_SPFIC (0x24) - - -diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c -index c010733..9c57715 100644 ---- a/drivers/spi/spi_s3c24xx.c -+++ b/drivers/spi/spi_s3c24xx.c -@@ -440,6 +440,12 @@ static int s3c24xx_spi_txrx(struct spi_device *spi, struct spi_transfer *t) - return hw->count; - } - -+#ifdef CONFIG_CPU_S3C2412 -+#define SPRDAT S3C2412_SPRDATB -+#else -+#define SPRDAT S3C2410_SPRDAT -+#endif -+ - static irqreturn_t s3c24xx_spi_irq(int irq, void *dev) - { - struct s3c24xx_spi *hw = dev; -@@ -462,7 +468,7 @@ static irqreturn_t s3c24xx_spi_irq(int irq, void *dev) - hw->count++; - - if (hw->rx) -- hw->rx[count] = readb(hw->regs + S3C2410_SPRDAT); -+ hw->rx[count] = readb(hw->regs + SPRDAT); - - count++; - -@@ -475,7 +481,7 @@ static irqreturn_t s3c24xx_spi_irq(int irq, void *dev) - hw->fiq_inuse = 0; - - if (hw->rx) -- hw->rx[hw->len-1] = readb(hw->regs + S3C2410_SPRDAT); -+ hw->rx[hw->len-1] = readb(hw->regs + SPRDAT); - - complete(&hw->done); - } diff --git a/a/content_digest b/N1/content_digest index ef7cf95..4b1ad7d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,8 @@ - "From\0Jos\303\251 Miguel Gon\303\247alves <jose.goncalves@inov.pt>\0" + "From\0jose.goncalves@inov.pt (Jos\303\251 Miguel Gon\303\247alves)\0" "Subject\0[PATCH] spi_s3c24xx: Fix for SPI on S3C2412\0" "Date\0Wed, 17 Feb 2010 18:09:35 +0000\0" - "To\0Russell King <linux@arm.linux.org.uk>" - " Ben Dooks <ben@simtec.co.uk>\0" - "Cc\0David Brownell <dbrownell@users.sourceforge.net>" - Grant Likely <grant.likely@secretlab.ca> - Andrew Morton <akpm@linux-foundation.org> - Simtec Linux Team <linux@simtec.co.uk> - Alexey Dobriyan <adobriyan@gmail.com> - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " spi-devel-general@lists.sourceforge.net\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi,\n" "\n" @@ -24,78 +15,13 @@ "driver to work on the S3C2412 chip (and probably on the S3C2413).\n" "\n" "Regards,\n" - "Jos\303\251 Miguel Gon\303\247alves" - "\01:2\0" - "fn\0linux-2.6.git-spi_s3c2412.patch\0" - "b\0" - "Signed-off-by: Jose Miguel Goncalves <jose.goncalves@inov.pt>\n" - "\n" - "diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c\n" - "index bef39f7..c58330f 100644\n" - "--- a/arch/arm/mach-s3c2412/s3c2412.c\n" - "+++ b/arch/arm/mach-s3c2412/s3c2412.c\n" - "@@ -100,11 +100,9 @@ void __init s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no)\n" - " \ts3c_device_sdi.resource[1].end = IRQ_S3C2412_SDI;\n" - " \n" - " \t/* spi channel related changes, s3c2412/13 specific */\n" - "-\ts3c_device_spi0.name = \"s3c2412-spi\";\n" - "-\ts3c_device_spi0.resource[0].end = S3C24XX_PA_SPI + 0x24;\n" - "-\ts3c_device_spi1.name = \"s3c2412-spi\";\n" - "+\ts3c_device_spi0.resource[0].end = S3C24XX_PA_SPI + 0x2F;\n" - " \ts3c_device_spi1.resource[0].start = S3C24XX_PA_SPI + S3C2412_SPI1;\n" - "-\ts3c_device_spi1.resource[0].end = S3C24XX_PA_SPI + S3C2412_SPI1 + 0x24;\n" - "+\ts3c_device_spi1.resource[0].end = S3C24XX_PA_SPI + S3C2412_SPI1 + 0x2F;\n" - " \n" - " }\n" - " \n" - "diff --git a/arch/arm/plat-s3c24xx/include/plat/regs-spi.h b/arch/arm/plat-s3c24xx/include/plat/regs-spi.h\n" - "index 2b35479..57e799c 100644\n" - "--- a/arch/arm/plat-s3c24xx/include/plat/regs-spi.h\n" - "+++ b/arch/arm/plat-s3c24xx/include/plat/regs-spi.h\n" - "@@ -75,7 +75,8 @@\n" - " #define S3C2410_SPRDAT\t (0x14)\n" - " \n" - " #define S3C2412_TXFIFO\t (0x18)\n" - "-#define S3C2412_RXFIFO\t (0x18)\n" - "+#define S3C2412_RXFIFO\t (0x1C)\n" - "+#define S3C2412_SPRDATB\t (0x20)\n" - " #define S3C2412_SPFIC\t (0x24)\n" - " \n" - " \n" - "diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c\n" - "index c010733..9c57715 100644\n" - "--- a/drivers/spi/spi_s3c24xx.c\n" - "+++ b/drivers/spi/spi_s3c24xx.c\n" - "@@ -440,6 +440,12 @@ static int s3c24xx_spi_txrx(struct spi_device *spi, struct spi_transfer *t)\n" - " \treturn hw->count;\n" - " }\n" - " \n" - "+#ifdef CONFIG_CPU_S3C2412\n" - "+#define SPRDAT S3C2412_SPRDATB\n" - "+#else\n" - "+#define SPRDAT S3C2410_SPRDAT\n" - "+#endif\n" - "+\n" - " static irqreturn_t s3c24xx_spi_irq(int irq, void *dev)\n" - " {\n" - " \tstruct s3c24xx_spi *hw = dev;\n" - "@@ -462,7 +468,7 @@ static irqreturn_t s3c24xx_spi_irq(int irq, void *dev)\n" - " \t\thw->count++;\n" - " \n" - " \t\tif (hw->rx)\n" - "-\t\t\thw->rx[count] = readb(hw->regs + S3C2410_SPRDAT);\n" - "+\t\t\thw->rx[count] = readb(hw->regs + SPRDAT);\n" - " \n" - " \t\tcount++;\n" - " \n" - "@@ -475,7 +481,7 @@ static irqreturn_t s3c24xx_spi_irq(int irq, void *dev)\n" - " \t\thw->fiq_inuse = 0;\n" - " \n" - " \t\tif (hw->rx)\n" - "-\t\t\thw->rx[hw->len-1] = readb(hw->regs + S3C2410_SPRDAT);\n" - "+\t\t\thw->rx[hw->len-1] = readb(hw->regs + SPRDAT);\n" - " \n" - " \t\tcomplete(&hw->done);\n" - " \t}" + "Jos? Miguel Gon?alves\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: linux-2.6.git-spi_s3c2412.patch\n" + "Type: text/x-patch\n" + "Size: 2286 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100217/dd567841/attachment.bin> -fdde5ebcdd17dae87f20f8ffd6c9be73e4cbad4d46731c1e7f25855dbf55ef3e +ed45585f4ee6b43d674aec8b351a4feeb342b9d9f4c5936282dc6f38a5bf3cb0
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.