diff for duplicates of <20100107191502.GH11511@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 014490e..7ecb5c5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,29 +5,29 @@ > > +++ b/arch/arm/mach-omap1/devices.c > > @@ -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, +> > + ? ? ? .name ? ? ? ? ? = "omap1_spi100k", +> > + ? ? ? .id ? ? ? ? ? ? = 1, > > +}; > > + > > +struct platform_device omap_spi2 = { -> > + .name = "omap1_spi100k", -> > + .id = 2, +> > + ? ? ? .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_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) +> > + ? ? ? omap_spi2.dev.platform_data = ioremap(OMAP7XX_SPI2_BASE, 0x7ff); +> > + ? ? ? ifi (omap_spi2.dev.platform_data) > > a typo here? diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index d9e7c38..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="omap1-add-omap-7xx-pin-muxes-for-spi.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 114d1ff..0000000 --- a/a/2.txt +++ /dev/null @@ -1,148 +0,0 @@ ->From bb7c47c92b3e0d3a084d175163f71316ff1aa34e Mon Sep 17 00:00:00 2001 -From: Cory Maccarrone <darkstar6262@gmail.com> -Date: Wed, 6 Jan 2010 17:29:10 -0800 -Subject: [PATCH] omap1: Add 7xx clocks and pin muxes for SPI - -Commit 35c9049b27040d09461bc90928ad770be7ddf661 added -drivers/spi/omap_spi_100k.c. - -This patch add the related clocks and pin muxing -entries to make the driver work on omap7xx platforms. - -Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com> -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c -index 8a85bbb..65e7b5b 100644 ---- a/arch/arm/mach-omap1/clock_data.c -+++ b/arch/arm/mach-omap1/clock_data.c -@@ -658,6 +658,10 @@ static struct omap_clk omap_clks[] = { - CLK("i2c_omap.1", "fck", &i2c_fck, CK_16XX | CK_1510 | CK_310 | CK_7XX), - CLK("i2c_omap.1", "ick", &i2c_ick, CK_16XX), - CLK("i2c_omap.1", "ick", &dummy_ck, CK_1510 | CK_310 | CK_7XX), -+ CLK("omap1_spi100k.1", "fck", &dummy_ck, CK_7XX), -+ CLK("omap1_spi100k.1", "ick", &dummy_ck, CK_7XX), -+ CLK("omap1_spi100k.2", "fck", &dummy_ck, CK_7XX), -+ CLK("omap1_spi100k.2", "ick", &dummy_ck, CK_7XX), - CLK("omap_uwire", "fck", &armxor_ck.clk, CK_16XX | CK_1510 | CK_310), - CLK("omap-mcbsp.1", "ick", &dspper_ck, CK_16XX), - CLK("omap-mcbsp.1", "ick", &dummy_ck, CK_1510 | CK_310), -diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c -index 23ded2d..a2d07aa 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); -+ if (omap_spi2.dev.platform_data) -+ platform_device_register(&omap_spi2); -+} -+ -+#else -+static inline void omap_init_spi100k(void) -+{ -+} -+#endif -+ -+/*-------------------------------------------------------------------------*/ -+ - #if defined(CONFIG_OMAP_STI) - - #define OMAP1_STI_BASE 0xfffea000 -@@ -263,6 +297,7 @@ static int __init omap1_init_devices(void) - - omap_init_mbox(); - omap_init_rtc(); -+ omap_init_spi100k(); - omap_init_sti(); - - return 0; -diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c -index 07212cc..8434137 100644 ---- a/arch/arm/mach-omap1/mux.c -+++ b/arch/arm/mach-omap1/mux.c -@@ -62,6 +62,14 @@ MUX_CFG_7XX("MMC_7XX_DAT0", 2, 17, 0, 16, 1, 0) - /* I2C interface */ - MUX_CFG_7XX("I2C_7XX_SCL", 5, 1, 0, 0, 1, 0) - MUX_CFG_7XX("I2C_7XX_SDA", 5, 5, 0, 0, 1, 0) -+ -+/* SPI pins */ -+MUX_CFG_7XX("SPI_7XX_1", 6, 5, 4, 4, 1, 0) -+MUX_CFG_7XX("SPI_7XX_2", 6, 9, 4, 8, 1, 0) -+MUX_CFG_7XX("SPI_7XX_3", 6, 13, 4, 12, 1, 0) -+MUX_CFG_7XX("SPI_7XX_4", 6, 17, 4, 16, 1, 0) -+MUX_CFG_7XX("SPI_7XX_5", 8, 25, 0, 24, 0, 0) -+MUX_CFG_7XX("SPI_7XX_6", 9, 5, 0, 4, 0, 0) - }; - #define OMAP7XX_PINS_SZ ARRAY_SIZE(omap7xx_pins) - #else -diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/plat-omap/include/plat/mux.h -index 8f069cc..692c90e 100644 ---- a/arch/arm/plat-omap/include/plat/mux.h -+++ b/arch/arm/plat-omap/include/plat/mux.h -@@ -183,6 +183,14 @@ enum omap7xx_index { - /* I2C */ - I2C_7XX_SCL, - I2C_7XX_SDA, -+ -+ /* SPI */ -+ SPI_7XX_1, -+ SPI_7XX_2, -+ SPI_7XX_3, -+ SPI_7XX_4, -+ SPI_7XX_5, -+ SPI_7XX_6, - }; - - enum omap1xxx_index { -diff --git a/arch/arm/plat-omap/include/plat/omap7xx.h b/arch/arm/plat-omap/include/plat/omap7xx.h -index 53f5241..48e4757 100644 ---- a/arch/arm/plat-omap/include/plat/omap7xx.h -+++ b/arch/arm/plat-omap/include/plat/omap7xx.h -@@ -46,6 +46,9 @@ - #define OMAP7XX_DSPREG_SIZE SZ_128K - #define OMAP7XX_DSPREG_START 0xE1000000 - -+#define OMAP7XX_SPI1_BASE 0xfffc0800 -+#define OMAP7XX_SPI2_BASE 0xfffc1000 -+ - /* - * ---------------------------------------------------------------------------- - * OMAP7XX specific configuration registers diff --git a/a/content_digest b/N1/content_digest index 11d50ce..ee72a50 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,11 @@ "ref\020100107001728.21352.38471.stgit@baageli.muru.com\0" "ref\020100107001934.21352.83656.stgit@baageli.muru.com\0" "ref\06ed0b2681001070146x4dbf52d9h406d128ccea826cf@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 05/12] omap1: Add 7xx clocks and pin muxes for SPI\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 05/12] omap1: Add 7xx clocks and pin muxes for SPI\0" "Date\0Thu, 7 Jan 2010 11:15:03 -0800\0" - "To\0Grazvydas Ignotas <notasas@gmail.com>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-omap@vger.kernel.org - " Cory Maccarrone <darkstar6262@gmail.com>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Grazvydas Ignotas <notasas@gmail.com> [100107 01:44]:\n" "> <snip>\n" @@ -17,29 +14,29 @@ "> > +++ b/arch/arm/mach-omap1/devices.c\n" "> > @@ -196,6 +198,38 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,\n" "> >\n" - "> > \302\240/*-------------------------------------------------------------------------*/\n" + "> > ?/*-------------------------------------------------------------------------*/\n" "> >\n" "> > +/* OMAP7xx SPI support */\n" "> > +#if defined(CONFIG_SPI_OMAP_100K) || defined(CONFIG_SPI_OMAP_100K_MODULE)\n" "> > +\n" "> > +struct platform_device omap_spi1 = {\n" - "> > + \302\240 \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"omap1_spi100k\",\n" - "> > + \302\240 \302\240 \302\240 .id \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 = 1,\n" + "> > + ? ? ? .name ? ? ? ? ? = \"omap1_spi100k\",\n" + "> > + ? ? ? .id ? ? ? ? ? ? = 1,\n" "> > +};\n" "> > +\n" "> > +struct platform_device omap_spi2 = {\n" - "> > + \302\240 \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"omap1_spi100k\",\n" - "> > + \302\240 \302\240 \302\240 .id \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 = 2,\n" + "> > + ? ? ? .name ? ? ? ? ? = \"omap1_spi100k\",\n" + "> > + ? ? ? .id ? ? ? ? ? ? = 2,\n" "> > +};\n" "> > +\n" "> > +static void omap_init_spi100k(void)\n" "> > +{\n" - "> > + \302\240 \302\240 \302\240 omap_spi1.dev.platform_data = ioremap(OMAP7XX_SPI1_BASE, 0x7ff);\n" - "> > + \302\240 \302\240 \302\240 if (omap_spi1.dev.platform_data)\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 platform_device_register(&omap_spi1);\n" + "> > + ? ? ? omap_spi1.dev.platform_data = ioremap(OMAP7XX_SPI1_BASE, 0x7ff);\n" + "> > + ? ? ? if (omap_spi1.dev.platform_data)\n" + "> > + ? ? ? ? ? ? ? platform_device_register(&omap_spi1);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 omap_spi2.dev.platform_data = ioremap(OMAP7XX_SPI2_BASE, 0x7ff);\n" - "> > + \302\240 \302\240 \302\240 ifi (omap_spi2.dev.platform_data)\n" + "> > + ? ? ? omap_spi2.dev.platform_data = ioremap(OMAP7XX_SPI2_BASE, 0x7ff);\n" + "> > + ? ? ? ifi (omap_spi2.dev.platform_data)\n" "> \n" "> a typo here?\n" "\n" @@ -49,156 +46,5 @@ "Regards,\n" "\n" Tony - "\01:2\0" - "fn\0omap1-add-omap-7xx-pin-muxes-for-spi.patch\0" - "b\0" - ">From bb7c47c92b3e0d3a084d175163f71316ff1aa34e Mon Sep 17 00:00:00 2001\n" - "From: Cory Maccarrone <darkstar6262@gmail.com>\n" - "Date: Wed, 6 Jan 2010 17:29:10 -0800\n" - "Subject: [PATCH] omap1: Add 7xx clocks and pin muxes for SPI\n" - "\n" - "Commit 35c9049b27040d09461bc90928ad770be7ddf661 added\n" - "drivers/spi/omap_spi_100k.c.\n" - "\n" - "This patch add the related clocks and pin muxing\n" - "entries to make the driver work on omap7xx platforms.\n" - "\n" - "Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com>\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c\n" - "index 8a85bbb..65e7b5b 100644\n" - "--- a/arch/arm/mach-omap1/clock_data.c\n" - "+++ b/arch/arm/mach-omap1/clock_data.c\n" - "@@ -658,6 +658,10 @@ static struct omap_clk omap_clks[] = {\n" - " \tCLK(\"i2c_omap.1\", \"fck\",\t&i2c_fck,\tCK_16XX | CK_1510 | CK_310 | CK_7XX),\n" - " \tCLK(\"i2c_omap.1\", \"ick\",\t&i2c_ick,\tCK_16XX),\n" - " \tCLK(\"i2c_omap.1\", \"ick\",\t&dummy_ck,\tCK_1510 | CK_310 | CK_7XX),\n" - "+\tCLK(\"omap1_spi100k.1\", \"fck\",\t&dummy_ck,\tCK_7XX),\n" - "+\tCLK(\"omap1_spi100k.1\", \"ick\",\t&dummy_ck,\tCK_7XX),\n" - "+\tCLK(\"omap1_spi100k.2\", \"fck\",\t&dummy_ck,\tCK_7XX),\n" - "+\tCLK(\"omap1_spi100k.2\", \"ick\",\t&dummy_ck,\tCK_7XX),\n" - " \tCLK(\"omap_uwire\", \"fck\",\t&armxor_ck.clk,\tCK_16XX | CK_1510 | CK_310),\n" - " \tCLK(\"omap-mcbsp.1\", \"ick\",\t&dspper_ck,\tCK_16XX),\n" - " \tCLK(\"omap-mcbsp.1\", \"ick\",\t&dummy_ck,\tCK_1510 | CK_310),\n" - "diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c\n" - "index 23ded2d..a2d07aa 100644\n" - "--- a/arch/arm/mach-omap1/devices.c\n" - "+++ b/arch/arm/mach-omap1/devices.c\n" - "@@ -14,6 +14,7 @@\n" - " #include <linux/init.h>\n" - " #include <linux/platform_device.h>\n" - " #include <linux/io.h>\n" - "+#include <linux/spi/spi.h>\n" - " \n" - " #include <mach/hardware.h>\n" - " #include <asm/mach/map.h>\n" - "@@ -23,6 +24,7 @@\n" - " #include <plat/mux.h>\n" - " #include <mach/gpio.h>\n" - " #include <plat/mmc.h>\n" - "+#include <plat/omap7xx.h>\n" - " \n" - " /*-------------------------------------------------------------------------*/\n" - " \n" - "@@ -196,6 +198,38 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,\n" - " \n" - " /*-------------------------------------------------------------------------*/\n" - " \n" - "+/* OMAP7xx SPI support */\n" - "+#if defined(CONFIG_SPI_OMAP_100K) || defined(CONFIG_SPI_OMAP_100K_MODULE)\n" - "+\n" - "+struct platform_device omap_spi1 = {\n" - "+\t.name = \"omap1_spi100k\",\n" - "+\t.id = 1,\n" - "+};\n" - "+\n" - "+struct platform_device omap_spi2 = {\n" - "+\t.name = \"omap1_spi100k\",\n" - "+\t.id = 2,\n" - "+};\n" - "+\n" - "+static void omap_init_spi100k(void)\n" - "+{\n" - "+\tomap_spi1.dev.platform_data = ioremap(OMAP7XX_SPI1_BASE, 0x7ff);\n" - "+\tif (omap_spi1.dev.platform_data)\n" - "+\t\tplatform_device_register(&omap_spi1);\n" - "+\n" - "+\tomap_spi2.dev.platform_data = ioremap(OMAP7XX_SPI2_BASE, 0x7ff);\n" - "+\tif (omap_spi2.dev.platform_data)\n" - "+\t\tplatform_device_register(&omap_spi2);\n" - "+}\n" - "+\n" - "+#else\n" - "+static inline void omap_init_spi100k(void)\n" - "+{\n" - "+}\n" - "+#endif\n" - "+\n" - "+/*-------------------------------------------------------------------------*/\n" - "+\n" - " #if defined(CONFIG_OMAP_STI)\n" - " \n" - " #define OMAP1_STI_BASE\t\t0xfffea000\n" - "@@ -263,6 +297,7 @@ static int __init omap1_init_devices(void)\n" - " \n" - " \tomap_init_mbox();\n" - " \tomap_init_rtc();\n" - "+\tomap_init_spi100k();\n" - " \tomap_init_sti();\n" - " \n" - " \treturn 0;\n" - "diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c\n" - "index 07212cc..8434137 100644\n" - "--- a/arch/arm/mach-omap1/mux.c\n" - "+++ b/arch/arm/mach-omap1/mux.c\n" - "@@ -62,6 +62,14 @@ MUX_CFG_7XX(\"MMC_7XX_DAT0\", 2, 17, 0, 16, 1, 0)\n" - " /* I2C interface */\n" - " MUX_CFG_7XX(\"I2C_7XX_SCL\", 5, 1, 0, 0, 1, 0)\n" - " MUX_CFG_7XX(\"I2C_7XX_SDA\", 5, 5, 0, 0, 1, 0)\n" - "+\n" - "+/* SPI pins */\n" - "+MUX_CFG_7XX(\"SPI_7XX_1\", 6, 5, 4, 4, 1, 0)\n" - "+MUX_CFG_7XX(\"SPI_7XX_2\", 6, 9, 4, 8, 1, 0)\n" - "+MUX_CFG_7XX(\"SPI_7XX_3\", 6, 13, 4, 12, 1, 0)\n" - "+MUX_CFG_7XX(\"SPI_7XX_4\", 6, 17, 4, 16, 1, 0)\n" - "+MUX_CFG_7XX(\"SPI_7XX_5\", 8, 25, 0, 24, 0, 0)\n" - "+MUX_CFG_7XX(\"SPI_7XX_6\", 9, 5, 0, 4, 0, 0)\n" - " };\n" - " #define OMAP7XX_PINS_SZ\t\tARRAY_SIZE(omap7xx_pins)\n" - " #else\n" - "diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/plat-omap/include/plat/mux.h\n" - "index 8f069cc..692c90e 100644\n" - "--- a/arch/arm/plat-omap/include/plat/mux.h\n" - "+++ b/arch/arm/plat-omap/include/plat/mux.h\n" - "@@ -183,6 +183,14 @@ enum omap7xx_index {\n" - " \t/* I2C */\n" - " \tI2C_7XX_SCL,\n" - " \tI2C_7XX_SDA,\n" - "+\n" - "+\t/* SPI */\n" - "+\tSPI_7XX_1,\n" - "+\tSPI_7XX_2,\n" - "+\tSPI_7XX_3,\n" - "+\tSPI_7XX_4,\n" - "+\tSPI_7XX_5,\n" - "+\tSPI_7XX_6,\n" - " };\n" - " \n" - " enum omap1xxx_index {\n" - "diff --git a/arch/arm/plat-omap/include/plat/omap7xx.h b/arch/arm/plat-omap/include/plat/omap7xx.h\n" - "index 53f5241..48e4757 100644\n" - "--- a/arch/arm/plat-omap/include/plat/omap7xx.h\n" - "+++ b/arch/arm/plat-omap/include/plat/omap7xx.h\n" - "@@ -46,6 +46,9 @@\n" - " #define OMAP7XX_DSPREG_SIZE\tSZ_128K\n" - " #define OMAP7XX_DSPREG_START\t0xE1000000\n" - " \n" - "+#define OMAP7XX_SPI1_BASE\t0xfffc0800\n" - "+#define OMAP7XX_SPI2_BASE\t0xfffc1000\n" - "+\n" - " /*\n" - " * ----------------------------------------------------------------------------\n" - * OMAP7XX specific configuration registers -4107db088029fbc73c5d23a5ac9aac6e81002034633bf265f5ccf9beaeab7471 +74fc4cb560881d72affb4524298d6cda2c4b73b1901940beb92bf92b3bd51534
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.