diff for duplicates of <4D62DAF0.9050301@ti.com> diff --git a/a/1.txt b/N1/1.txt index 4fa8208..7eec666 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,121 +22,3 @@ Regards, Benoit --- ->From b2190f0d339c9d843eb5e370d0db8b7090fbcfab Mon Sep 17 00:00:00 2001 -From: Benoit Cousson <b-cousson@ti.com> -Date: Fri, 18 Feb 2011 14:01:06 +0100 -Subject: [PATCH] OMAP4: hwmod data: Add rev and dev_attr fields in McSPI - -- Add a rev attribute to identify various McSPI IP version. -- Add a dev_attr structure to provide the number of chipselect - supported by the instance. - -Signed-off-by: Benoit Cousson <b-cousson@ti.com> -Cc: Paul Walmsley <paul@pwsan.com> -Cc: Govindraj.R <govindraj.raja@ti.com> ---- - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -index 84e795c..182aa79 100644 ---- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -@@ -24,6 +24,7 @@ - #include <plat/cpu.h> - #include <plat/gpio.h> - #include <plat/dma.h> -+#include <plat/mcspi.h> - - #include "omap_hwmod_common_data.h" - -@@ -3114,6 +3115,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_mcspi_sysc = { - static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = { - .name = "mcspi", - .sysc = &omap44xx_mcspi_sysc, -+ .rev = OMAP4_MCSPI_REV, - }; - - /* mcspi1 */ -@@ -3156,6 +3158,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi1_slaves[] = { - &omap44xx_l4_per__mcspi1, - }; - -+/* mcspi1 dev_attr */ -+static struct omap2_mcspi_dev_attr mcspi1_dev_attr = { -+ .num_chipselect = 4, -+}; -+ - static struct omap_hwmod omap44xx_mcspi1_hwmod = { - .name = "mcspi1", - .class = &omap44xx_mcspi_hwmod_class, -@@ -3169,6 +3176,7 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI1_CLKCTRL, - }, - }, -+ .dev_attr = &mcspi1_dev_attr, - .slaves = omap44xx_mcspi1_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi1_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), -@@ -3210,6 +3218,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi2_slaves[] = { - &omap44xx_l4_per__mcspi2, - }; - -+/* mcspi2 dev_attr */ -+static struct omap2_mcspi_dev_attr mcspi2_dev_attr = { -+ .num_chipselect = 2, -+}; -+ - static struct omap_hwmod omap44xx_mcspi2_hwmod = { - .name = "mcspi2", - .class = &omap44xx_mcspi_hwmod_class, -@@ -3223,6 +3236,7 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI2_CLKCTRL, - }, - }, -+ .dev_attr = &mcspi2_dev_attr, - .slaves = omap44xx_mcspi2_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi2_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), -@@ -3264,6 +3278,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi3_slaves[] = { - &omap44xx_l4_per__mcspi3, - }; - -+/* mcspi3 dev_attr */ -+static struct omap2_mcspi_dev_attr mcspi3_dev_attr = { -+ .num_chipselect = 2, -+}; -+ - static struct omap_hwmod omap44xx_mcspi3_hwmod = { - .name = "mcspi3", - .class = &omap44xx_mcspi_hwmod_class, -@@ -3277,6 +3296,7 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI3_CLKCTRL, - }, - }, -+ .dev_attr = &mcspi3_dev_attr, - .slaves = omap44xx_mcspi3_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi3_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), -@@ -3316,6 +3336,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi4_slaves[] = { - &omap44xx_l4_per__mcspi4, - }; - -+/* mcspi4 dev_attr */ -+static struct omap2_mcspi_dev_attr mcspi4_dev_attr = { -+ .num_chipselect = 1, -+}; -+ - static struct omap_hwmod omap44xx_mcspi4_hwmod = { - .name = "mcspi4", - .class = &omap44xx_mcspi_hwmod_class, -@@ -3329,6 +3354,7 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI4_CLKCTRL, - }, - }, -+ .dev_attr = &mcspi4_dev_attr, - .slaves = omap44xx_mcspi4_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi4_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), --- -1.7.0.4 diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 049f892..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,6 +0,0 @@ -Content-Type: text/plain; - name="0001-OMAP4-hwmod-data-Add-rev-and-dev_attr-fields-in-McSP.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename*0="0001-OMAP4-hwmod-data-Add-rev-and-dev_attr-fields-in-McSP.pa"; - filename*1="tch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index dbb8b67..0000000 --- a/a/2.txt +++ /dev/null @@ -1,118 +0,0 @@ ->From b2190f0d339c9d843eb5e370d0db8b7090fbcfab Mon Sep 17 00:00:00 2001 -From: Benoit Cousson <b-cousson@ti.com> -Date: Fri, 18 Feb 2011 14:01:06 +0100 -Subject: [PATCH] OMAP4: hwmod data: Add rev and dev_attr fields in McSPI - -- Add a rev attribute to identify various McSPI IP version. -- Add a dev_attr structure to provide the number of chipselect - supported by the instance. - -Signed-off-by: Benoit Cousson <b-cousson@ti.com> -Cc: Paul Walmsley <paul@pwsan.com> -Cc: Govindraj.R <govindraj.raja@ti.com> ---- - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -index 84e795c..182aa79 100644 ---- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -@@ -24,6 +24,7 @@ - #include <plat/cpu.h> - #include <plat/gpio.h> - #include <plat/dma.h> -+#include <plat/mcspi.h> - - #include "omap_hwmod_common_data.h" - -@@ -3114,6 +3115,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_mcspi_sysc = { - static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = { - .name = "mcspi", - .sysc = &omap44xx_mcspi_sysc, -+ .rev = OMAP4_MCSPI_REV, - }; - - /* mcspi1 */ -@@ -3156,6 +3158,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi1_slaves[] = { - &omap44xx_l4_per__mcspi1, - }; - -+/* mcspi1 dev_attr */ -+static struct omap2_mcspi_dev_attr mcspi1_dev_attr = { -+ .num_chipselect = 4, -+}; -+ - static struct omap_hwmod omap44xx_mcspi1_hwmod = { - .name = "mcspi1", - .class = &omap44xx_mcspi_hwmod_class, -@@ -3169,6 +3176,7 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI1_CLKCTRL, - }, - }, -+ .dev_attr = &mcspi1_dev_attr, - .slaves = omap44xx_mcspi1_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi1_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), -@@ -3210,6 +3218,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi2_slaves[] = { - &omap44xx_l4_per__mcspi2, - }; - -+/* mcspi2 dev_attr */ -+static struct omap2_mcspi_dev_attr mcspi2_dev_attr = { -+ .num_chipselect = 2, -+}; -+ - static struct omap_hwmod omap44xx_mcspi2_hwmod = { - .name = "mcspi2", - .class = &omap44xx_mcspi_hwmod_class, -@@ -3223,6 +3236,7 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI2_CLKCTRL, - }, - }, -+ .dev_attr = &mcspi2_dev_attr, - .slaves = omap44xx_mcspi2_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi2_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), -@@ -3264,6 +3278,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi3_slaves[] = { - &omap44xx_l4_per__mcspi3, - }; - -+/* mcspi3 dev_attr */ -+static struct omap2_mcspi_dev_attr mcspi3_dev_attr = { -+ .num_chipselect = 2, -+}; -+ - static struct omap_hwmod omap44xx_mcspi3_hwmod = { - .name = "mcspi3", - .class = &omap44xx_mcspi_hwmod_class, -@@ -3277,6 +3296,7 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI3_CLKCTRL, - }, - }, -+ .dev_attr = &mcspi3_dev_attr, - .slaves = omap44xx_mcspi3_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi3_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), -@@ -3316,6 +3336,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi4_slaves[] = { - &omap44xx_l4_per__mcspi4, - }; - -+/* mcspi4 dev_attr */ -+static struct omap2_mcspi_dev_attr mcspi4_dev_attr = { -+ .num_chipselect = 1, -+}; -+ - static struct omap_hwmod omap44xx_mcspi4_hwmod = { - .name = "mcspi4", - .class = &omap44xx_mcspi_hwmod_class, -@@ -3329,6 +3354,7 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI4_CLKCTRL, - }, - }, -+ .dev_attr = &mcspi4_dev_attr, - .slaves = omap44xx_mcspi4_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi4_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), --- -1.7.0.4 diff --git a/a/content_digest b/N1/content_digest index 8b4d9e0..103b604 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,21 +9,11 @@ "ref\020110218154135.GF11151@legolas.emea.dhcp.ti.com\0" "ref\04D5EA36A.4000903@ti.com\0" "ref\020110221182213.GD15225@atomide.com\0" - "From\0Cousson, Benoit <b-cousson@ti.com>\0" - "Subject\0Re: [patch-v2.6.39 6/7] OMAP4430: hwmod data: Adding USBOTG\0" + "From\0b-cousson@ti.com (Cousson, Benoit)\0" + "Subject\0[patch-v2.6.39 6/7] OMAP4430: hwmod data: Adding USBOTG\0" "Date\0Mon, 21 Feb 2011 22:36:48 +0100\0" - "To\0Tony Lindgren <tony@atomide.com>\0" - "Cc\0Balbi" - Felipe <balbi@ti.com> - Linux OMAP Mailing List <linux-omap@vger.kernel.org> - Linux ARM Kernel Mailing List <linux-arm-kernel@lists.infradead.org> - Kalliguddi - Hema <hemahk@ti.com> - Kevin Hilman <khilman@deeprootsystems.com> - Paul Walmsley <paul@pwsan.com> - Raja - " Govindraj <govindraj.raja@ti.com>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "On 2/21/2011 7:22 PM, Tony Lindgren wrote:\n" "> * Cousson, Benoit<b-cousson@ti.com> [110218 08:49]:\n" @@ -48,245 +38,6 @@ "Regards,\n" "Benoit\n" "\n" - "---\n" - ">From b2190f0d339c9d843eb5e370d0db8b7090fbcfab Mon Sep 17 00:00:00 2001\n" - "From: Benoit Cousson <b-cousson@ti.com>\n" - "Date: Fri, 18 Feb 2011 14:01:06 +0100\n" - "Subject: [PATCH] OMAP4: hwmod data: Add rev and dev_attr fields in McSPI\n" - "\n" - "- Add a rev attribute to identify various McSPI IP version.\n" - "- Add a dev_attr structure to provide the number of chipselect\n" - " supported by the instance.\n" - "\n" - "Signed-off-by: Benoit Cousson <b-cousson@ti.com>\n" - "Cc: Paul Walmsley <paul@pwsan.com>\n" - "Cc: Govindraj.R <govindraj.raja@ti.com>\n" - "---\n" - " arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 26 ++++++++++++++++++++++++++\n" - " 1 files changed, 26 insertions(+), 0 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "index 84e795c..182aa79 100644\n" - "--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "@@ -24,6 +24,7 @@\n" - " #include <plat/cpu.h>\n" - " #include <plat/gpio.h>\n" - " #include <plat/dma.h>\n" - "+#include <plat/mcspi.h>\n" - " \n" - " #include \"omap_hwmod_common_data.h\"\n" - " \n" - "@@ -3114,6 +3115,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_mcspi_sysc = {\n" - " static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = {\n" - " \t.name\t= \"mcspi\",\n" - " \t.sysc\t= &omap44xx_mcspi_sysc,\n" - "+\t.rev\t= OMAP4_MCSPI_REV,\n" - " };\n" - " \n" - " /* mcspi1 */\n" - "@@ -3156,6 +3158,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi1_slaves[] = {\n" - " \t&omap44xx_l4_per__mcspi1,\n" - " };\n" - " \n" - "+/* mcspi1 dev_attr */\n" - "+static struct omap2_mcspi_dev_attr mcspi1_dev_attr = {\n" - "+\t.num_chipselect\t= 4,\n" - "+};\n" - "+\n" - " static struct omap_hwmod omap44xx_mcspi1_hwmod = {\n" - " \t.name\t\t= \"mcspi1\",\n" - " \t.class\t\t= &omap44xx_mcspi_hwmod_class,\n" - "@@ -3169,6 +3176,7 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_MCSPI1_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &mcspi1_dev_attr,\n" - " \t.slaves\t\t= omap44xx_mcspi1_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_mcspi1_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "@@ -3210,6 +3218,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi2_slaves[] = {\n" - " \t&omap44xx_l4_per__mcspi2,\n" - " };\n" - " \n" - "+/* mcspi2 dev_attr */\n" - "+static struct omap2_mcspi_dev_attr mcspi2_dev_attr = {\n" - "+\t.num_chipselect\t= 2,\n" - "+};\n" - "+\n" - " static struct omap_hwmod omap44xx_mcspi2_hwmod = {\n" - " \t.name\t\t= \"mcspi2\",\n" - " \t.class\t\t= &omap44xx_mcspi_hwmod_class,\n" - "@@ -3223,6 +3236,7 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_MCSPI2_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &mcspi2_dev_attr,\n" - " \t.slaves\t\t= omap44xx_mcspi2_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_mcspi2_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "@@ -3264,6 +3278,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi3_slaves[] = {\n" - " \t&omap44xx_l4_per__mcspi3,\n" - " };\n" - " \n" - "+/* mcspi3 dev_attr */\n" - "+static struct omap2_mcspi_dev_attr mcspi3_dev_attr = {\n" - "+\t.num_chipselect\t= 2,\n" - "+};\n" - "+\n" - " static struct omap_hwmod omap44xx_mcspi3_hwmod = {\n" - " \t.name\t\t= \"mcspi3\",\n" - " \t.class\t\t= &omap44xx_mcspi_hwmod_class,\n" - "@@ -3277,6 +3296,7 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_MCSPI3_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &mcspi3_dev_attr,\n" - " \t.slaves\t\t= omap44xx_mcspi3_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_mcspi3_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "@@ -3316,6 +3336,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi4_slaves[] = {\n" - " \t&omap44xx_l4_per__mcspi4,\n" - " };\n" - " \n" - "+/* mcspi4 dev_attr */\n" - "+static struct omap2_mcspi_dev_attr mcspi4_dev_attr = {\n" - "+\t.num_chipselect\t= 1,\n" - "+};\n" - "+\n" - " static struct omap_hwmod omap44xx_mcspi4_hwmod = {\n" - " \t.name\t\t= \"mcspi4\",\n" - " \t.class\t\t= &omap44xx_mcspi_hwmod_class,\n" - "@@ -3329,6 +3354,7 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_MCSPI4_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &mcspi4_dev_attr,\n" - " \t.slaves\t\t= omap44xx_mcspi4_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_mcspi4_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "-- \n" - 1.7.0.4 - "\01:2\0" - "fn\00001-OMAP4-hwmod-data-Add-rev-and-dev_attr-fields-in-McSP.patch\0" - "b\0" - ">From b2190f0d339c9d843eb5e370d0db8b7090fbcfab Mon Sep 17 00:00:00 2001\n" - "From: Benoit Cousson <b-cousson@ti.com>\n" - "Date: Fri, 18 Feb 2011 14:01:06 +0100\n" - "Subject: [PATCH] OMAP4: hwmod data: Add rev and dev_attr fields in McSPI\n" - "\n" - "- Add a rev attribute to identify various McSPI IP version.\n" - "- Add a dev_attr structure to provide the number of chipselect\n" - " supported by the instance.\n" - "\n" - "Signed-off-by: Benoit Cousson <b-cousson@ti.com>\n" - "Cc: Paul Walmsley <paul@pwsan.com>\n" - "Cc: Govindraj.R <govindraj.raja@ti.com>\n" - "---\n" - " arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 26 ++++++++++++++++++++++++++\n" - " 1 files changed, 26 insertions(+), 0 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "index 84e795c..182aa79 100644\n" - "--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "@@ -24,6 +24,7 @@\n" - " #include <plat/cpu.h>\n" - " #include <plat/gpio.h>\n" - " #include <plat/dma.h>\n" - "+#include <plat/mcspi.h>\n" - " \n" - " #include \"omap_hwmod_common_data.h\"\n" - " \n" - "@@ -3114,6 +3115,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_mcspi_sysc = {\n" - " static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = {\n" - " \t.name\t= \"mcspi\",\n" - " \t.sysc\t= &omap44xx_mcspi_sysc,\n" - "+\t.rev\t= OMAP4_MCSPI_REV,\n" - " };\n" - " \n" - " /* mcspi1 */\n" - "@@ -3156,6 +3158,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi1_slaves[] = {\n" - " \t&omap44xx_l4_per__mcspi1,\n" - " };\n" - " \n" - "+/* mcspi1 dev_attr */\n" - "+static struct omap2_mcspi_dev_attr mcspi1_dev_attr = {\n" - "+\t.num_chipselect\t= 4,\n" - "+};\n" - "+\n" - " static struct omap_hwmod omap44xx_mcspi1_hwmod = {\n" - " \t.name\t\t= \"mcspi1\",\n" - " \t.class\t\t= &omap44xx_mcspi_hwmod_class,\n" - "@@ -3169,6 +3176,7 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_MCSPI1_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &mcspi1_dev_attr,\n" - " \t.slaves\t\t= omap44xx_mcspi1_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_mcspi1_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "@@ -3210,6 +3218,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi2_slaves[] = {\n" - " \t&omap44xx_l4_per__mcspi2,\n" - " };\n" - " \n" - "+/* mcspi2 dev_attr */\n" - "+static struct omap2_mcspi_dev_attr mcspi2_dev_attr = {\n" - "+\t.num_chipselect\t= 2,\n" - "+};\n" - "+\n" - " static struct omap_hwmod omap44xx_mcspi2_hwmod = {\n" - " \t.name\t\t= \"mcspi2\",\n" - " \t.class\t\t= &omap44xx_mcspi_hwmod_class,\n" - "@@ -3223,6 +3236,7 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_MCSPI2_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &mcspi2_dev_attr,\n" - " \t.slaves\t\t= omap44xx_mcspi2_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_mcspi2_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "@@ -3264,6 +3278,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi3_slaves[] = {\n" - " \t&omap44xx_l4_per__mcspi3,\n" - " };\n" - " \n" - "+/* mcspi3 dev_attr */\n" - "+static struct omap2_mcspi_dev_attr mcspi3_dev_attr = {\n" - "+\t.num_chipselect\t= 2,\n" - "+};\n" - "+\n" - " static struct omap_hwmod omap44xx_mcspi3_hwmod = {\n" - " \t.name\t\t= \"mcspi3\",\n" - " \t.class\t\t= &omap44xx_mcspi_hwmod_class,\n" - "@@ -3277,6 +3296,7 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_MCSPI3_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &mcspi3_dev_attr,\n" - " \t.slaves\t\t= omap44xx_mcspi3_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_mcspi3_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "@@ -3316,6 +3336,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi4_slaves[] = {\n" - " \t&omap44xx_l4_per__mcspi4,\n" - " };\n" - " \n" - "+/* mcspi4 dev_attr */\n" - "+static struct omap2_mcspi_dev_attr mcspi4_dev_attr = {\n" - "+\t.num_chipselect\t= 1,\n" - "+};\n" - "+\n" - " static struct omap_hwmod omap44xx_mcspi4_hwmod = {\n" - " \t.name\t\t= \"mcspi4\",\n" - " \t.class\t\t= &omap44xx_mcspi_hwmod_class,\n" - "@@ -3329,6 +3354,7 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_MCSPI4_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &mcspi4_dev_attr,\n" - " \t.slaves\t\t= omap44xx_mcspi4_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_mcspi4_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "-- \n" - 1.7.0.4 + --- -ec6880213d8edfa7b799a02f7994a9a39755cd6130857c722db729a204e988d9 +97d8ad357769b813f16f02bd39c04a9eab41f8be26dad493fc4e707ab21de445
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.