diff for duplicates of <20110708130102.GB5783@atomide.com> diff --git a/a/1.txt b/N1/1.txt index eb3628c..02d489b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,3 +66,10 @@ Tony Lindgren (1): 24 files changed, 492 insertions(+), 988 deletions(-) create mode 100644 arch/arm/mach-omap2/twl-common.c create mode 100644 arch/arm/mach-omap2/twl-common.h +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: resolve.patch +Type: text/x-diff +Size: 2584 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110708/a96bac57/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 63fe079..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="resolve.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index e6059e1..0000000 --- a/a/2.txt +++ /dev/null @@ -1,93 +0,0 @@ ---- a/arch/arm/mach-omap2/board-4430sdp.c -+++ b/arch/arm/mach-omap2/board-4430sdp.c -@@@ -572,75 -395,10 +509,62 @@@ static struct regulator_init_data sdp44 - }, - }; - - +static struct regulator_init_data sdp4430_vana = { - + .constraints = { - + .min_uV = 2100000, - + .max_uV = 2100000, - + .valid_modes_mask = REGULATOR_MODE_NORMAL - + | REGULATOR_MODE_STANDBY, - + .valid_ops_mask = REGULATOR_CHANGE_MODE - + | REGULATOR_CHANGE_STATUS, - + }, - +}; - + - +static struct regulator_init_data sdp4430_vcxio = { - + .constraints = { - + .min_uV = 1800000, - + .max_uV = 1800000, - + .valid_modes_mask = REGULATOR_MODE_NORMAL - + | REGULATOR_MODE_STANDBY, - + .valid_ops_mask = REGULATOR_CHANGE_MODE - + | REGULATOR_CHANGE_STATUS, - + }, - +}; - + - +static struct regulator_init_data sdp4430_vdac = { - + .constraints = { - + .min_uV = 1800000, - + .max_uV = 1800000, - + .valid_modes_mask = REGULATOR_MODE_NORMAL - + | REGULATOR_MODE_STANDBY, - + .valid_ops_mask = REGULATOR_CHANGE_MODE - + | REGULATOR_CHANGE_STATUS, - + }, - +}; - + - +static struct regulator_init_data sdp4430_vusb = { - + .constraints = { - + .min_uV = 3300000, - + .max_uV = 3300000, - + .apply_uV = true, - + .valid_modes_mask = REGULATOR_MODE_NORMAL - + | REGULATOR_MODE_STANDBY, - + .valid_ops_mask = REGULATOR_CHANGE_MODE - + | REGULATOR_CHANGE_STATUS, - + }, - +}; - + - +static struct regulator_init_data sdp4430_clk32kg = { - + .constraints = { - + .valid_ops_mask = REGULATOR_CHANGE_STATUS, - + .always_on = true, - + }, - +}; - + - static struct twl4030_platform_data sdp4430_twldata = { -- .irq_base = TWL6030_IRQ_BASE, -- .irq_end = TWL6030_IRQ_END, -- - /* Regulators */ -- .vmmc = &sdp4430_vmmc, -- .vpp = &sdp4430_vpp, - .vusim = &sdp4430_vusim, -- .vana = &sdp4430_vana, -- .vcxio = &sdp4430_vcxio, -- .vdac = &sdp4430_vdac, -- .vusb = &sdp4430_vusb, - .vaux1 = &sdp4430_vaux1, -- .vaux2 = &sdp4430_vaux2, -- .vaux3 = &sdp4430_vaux3, -- .clk32kg = &sdp4430_clk32kg, -- .usb = &omap4_usbphy_data - }; - - static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = { ---- a/arch/arm/mach-omap2/board-rx51-peripherals.c -+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c -@@@ -916,13 -761,7 +884,12 @@@ static struct twl4030_platform_data rx5 - .vaux2 = &rx51_vaux2, - .vaux4 = &rx51_vaux4, - .vmmc1 = &rx51_vmmc1, - + .vpll1 = &rx51_vpll1, - + .vpll2 = &rx51_vpll2, - .vsim = &rx51_vsim, -- .vdac = &rx51_vdac, - + .vintana1 = &rx51_vintana1, - + .vintana2 = &rx51_vintana2, - + .vintdig = &rx51_vintdig, - .vio = &rx51_vio, - }; diff --git a/a/content_digest b/N1/content_digest index cc75330..4291fab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,8 @@ - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[GIT PULL] omap twl cleanup for v3.1 merge window\0" "Date\0Fri, 8 Jul 2011 06:01:02 -0700\0" - "To\0Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-omap@vger.kernel.org - Nicolas Pitre <nico@fluxnic.net> - " Thomas Gleixner <tglx@linutronix.de>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi Arnd,\n" "\n" @@ -75,102 +71,13 @@ " arch/arm/plat-omap/mcbsp.c | 3 -\n" " 24 files changed, 492 insertions(+), 988 deletions(-)\n" " create mode 100644 arch/arm/mach-omap2/twl-common.c\n" - create mode 100644 arch/arm/mach-omap2/twl-common.h - "\01:2\0" - "fn\0resolve.patch\0" - "b\0" - "--- a/arch/arm/mach-omap2/board-4430sdp.c\n" - "+++ b/arch/arm/mach-omap2/board-4430sdp.c\n" - "@@@ -572,75 -395,10 +509,62 @@@ static struct regulator_init_data sdp44\n" - " \t},\n" - " };\n" - " \n" - " +static struct regulator_init_data sdp4430_vana = {\n" - " +\t.constraints = {\n" - " +\t\t.min_uV\t\t\t= 2100000,\n" - " +\t\t.max_uV\t\t\t= 2100000,\n" - " +\t\t.valid_modes_mask\t= REGULATOR_MODE_NORMAL\n" - " +\t\t\t\t\t| REGULATOR_MODE_STANDBY,\n" - " +\t\t.valid_ops_mask\t = REGULATOR_CHANGE_MODE\n" - " +\t\t\t\t\t| REGULATOR_CHANGE_STATUS,\n" - " +\t},\n" - " +};\n" - " +\n" - " +static struct regulator_init_data sdp4430_vcxio = {\n" - " +\t.constraints = {\n" - " +\t\t.min_uV\t\t\t= 1800000,\n" - " +\t\t.max_uV\t\t\t= 1800000,\n" - " +\t\t.valid_modes_mask\t= REGULATOR_MODE_NORMAL\n" - " +\t\t\t\t\t| REGULATOR_MODE_STANDBY,\n" - " +\t\t.valid_ops_mask\t = REGULATOR_CHANGE_MODE\n" - " +\t\t\t\t\t| REGULATOR_CHANGE_STATUS,\n" - " +\t},\n" - " +};\n" - " +\n" - " +static struct regulator_init_data sdp4430_vdac = {\n" - " +\t.constraints = {\n" - " +\t\t.min_uV\t\t\t= 1800000,\n" - " +\t\t.max_uV\t\t\t= 1800000,\n" - " +\t\t.valid_modes_mask\t= REGULATOR_MODE_NORMAL\n" - " +\t\t\t\t\t| REGULATOR_MODE_STANDBY,\n" - " +\t\t.valid_ops_mask\t = REGULATOR_CHANGE_MODE\n" - " +\t\t\t\t\t| REGULATOR_CHANGE_STATUS,\n" - " +\t},\n" - " +};\n" - " +\n" - " +static struct regulator_init_data sdp4430_vusb = {\n" - " +\t.constraints = {\n" - " +\t\t.min_uV\t\t\t= 3300000,\n" - " +\t\t.max_uV\t\t\t= 3300000,\n" - " +\t\t.apply_uV\t\t= true,\n" - " +\t\t.valid_modes_mask\t= REGULATOR_MODE_NORMAL\n" - " +\t\t\t\t\t| REGULATOR_MODE_STANDBY,\n" - " +\t\t.valid_ops_mask\t =\tREGULATOR_CHANGE_MODE\n" - " +\t\t\t\t\t| REGULATOR_CHANGE_STATUS,\n" - " +\t},\n" - " +};\n" - " +\n" - " +static struct regulator_init_data sdp4430_clk32kg = {\n" - " +\t.constraints = {\n" - " +\t\t.valid_ops_mask\t\t= REGULATOR_CHANGE_STATUS,\n" - " +\t\t.always_on\t\t= true,\n" - " +\t},\n" - " +};\n" - " +\n" - " static struct twl4030_platform_data sdp4430_twldata = {\n" - "- \t.irq_base\t= TWL6030_IRQ_BASE,\n" - "- \t.irq_end\t= TWL6030_IRQ_END,\n" - "- \n" - " \t/* Regulators */\n" - "- \t.vmmc\t\t= &sdp4430_vmmc,\n" - "- \t.vpp\t\t= &sdp4430_vpp,\n" - " \t.vusim\t\t= &sdp4430_vusim,\n" - "- \t.vana\t\t= &sdp4430_vana,\n" - "- \t.vcxio\t\t= &sdp4430_vcxio,\n" - "- \t.vdac\t\t= &sdp4430_vdac,\n" - "- \t.vusb\t\t= &sdp4430_vusb,\n" - " \t.vaux1\t\t= &sdp4430_vaux1,\n" - "- \t.vaux2\t\t= &sdp4430_vaux2,\n" - "- \t.vaux3\t\t= &sdp4430_vaux3,\n" - "- \t.clk32kg\t= &sdp4430_clk32kg,\n" - "- \t.usb\t\t= &omap4_usbphy_data\n" - " };\n" - " \n" - " static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = {\n" - "--- a/arch/arm/mach-omap2/board-rx51-peripherals.c\n" - "+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c\n" - "@@@ -916,13 -761,7 +884,12 @@@ static struct twl4030_platform_data rx5\n" - " \t.vaux2\t\t\t= &rx51_vaux2,\n" - " \t.vaux4\t\t\t= &rx51_vaux4,\n" - " \t.vmmc1\t\t\t= &rx51_vmmc1,\n" - " +\t.vpll1\t\t\t= &rx51_vpll1,\n" - " +\t.vpll2\t\t\t= &rx51_vpll2,\n" - " \t.vsim\t\t\t= &rx51_vsim,\n" - "- \t.vdac\t\t\t= &rx51_vdac,\n" - " +\t.vintana1\t\t= &rx51_vintana1,\n" - " +\t.vintana2\t\t= &rx51_vintana2,\n" - " +\t.vintdig\t\t= &rx51_vintdig,\n" - " \t.vio\t\t\t= &rx51_vio,\n" - }; + " create mode 100644 arch/arm/mach-omap2/twl-common.h\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: resolve.patch\n" + "Type: text/x-diff\n" + "Size: 2584 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110708/a96bac57/attachment.bin> -220f18933eade0f0d822a3f51d32cab7412c6959b1741e3aab2727f9ebf23e77 +647a6d3e2ca3b476e69fee2085391bc96284da3d0832ad9a50355b001f651f25
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.