diff for duplicates of <20100311235958.GX2900@atomide.com> diff --git a/a/1.txt b/N1/1.txt index e18ed1a..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,47 +1 @@ ->From 9c7ceeb2621349f180be4779d954352bcc8df9cd Mon Sep 17 00:00:00 2001 -From: Vaibhav Hiremath <hvaibhav@ti.com> -Date: Thu, 11 Mar 2010 08:55:17 +0000 -Subject: [PATCH] omap: Add DSI regulator supply to OMAP3EVM board file -With recent changes happened in OMAP2/3 DSS library for regulator interface, it -is required to define DSI regulator supply, without this DSS (in turn Fbdev) -fails to get regulator. - -Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> -Acked-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c -index 017bb2f..a05de10 100644 ---- a/arch/arm/mach-omap2/board-omap3evm.c -+++ b/arch/arm/mach-omap2/board-omap3evm.c -@@ -514,9 +514,15 @@ static struct regulator_init_data omap3_evm_vdac = { - }; - - /* VPLL2 for digital video outputs */ --static struct regulator_consumer_supply omap3_evm_vpll2_supply = { -- .supply = "vdvi", -- .dev = &omap3_evm_lcd_device.dev, -+static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = { -+ { -+ .supply = "vdvi", -+ .dev = &omap3_evm_lcd_device.dev, -+ }, -+ { -+ .supply = "vdds_dsi", -+ .dev = &omap3_evm_dss_device.dev, -+ }, - }; - - static struct regulator_init_data omap3_evm_vpll2 = { -@@ -530,8 +536,8 @@ static struct regulator_init_data omap3_evm_vpll2 = { - .valid_ops_mask = REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, - }, -- .num_consumer_supplies = 1, -- .consumer_supplies = &omap3_evm_vpll2_supply, -+ .num_consumer_supplies = ARRAY_SIZE(omap3_evm_vpll2_supplies), -+ .consumer_supplies = omap3_evm_vpll2_supplies, - }; - - static struct twl4030_platform_data omap3evm_twldata = { diff --git a/a/content_digest b/N1/content_digest index 33e305b..8ecc695 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,57 +1,9 @@ "ref\020100311234404.4500.82861.stgit@baageli.muru.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 18/19] omap: Add DSI regulator supply to OMAP3EVM board file\0" "Date\0Thu, 11 Mar 2010 15:59:58 -0800\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" - ">From 9c7ceeb2621349f180be4779d954352bcc8df9cd Mon Sep 17 00:00:00 2001\n" - "From: Vaibhav Hiremath <hvaibhav@ti.com>\n" - "Date: Thu, 11 Mar 2010 08:55:17 +0000\n" - "Subject: [PATCH] omap: Add DSI regulator supply to OMAP3EVM board file\n" - "\n" - "With recent changes happened in OMAP2/3 DSS library for regulator interface, it\n" - "is required to define DSI regulator supply, without this DSS (in turn Fbdev)\n" - "fails to get regulator.\n" - "\n" - "Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>\n" - "Acked-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c\n" - "index 017bb2f..a05de10 100644\n" - "--- a/arch/arm/mach-omap2/board-omap3evm.c\n" - "+++ b/arch/arm/mach-omap2/board-omap3evm.c\n" - "@@ -514,9 +514,15 @@ static struct regulator_init_data omap3_evm_vdac = {\n" - " };\n" - " \n" - " /* VPLL2 for digital video outputs */\n" - "-static struct regulator_consumer_supply omap3_evm_vpll2_supply = {\n" - "-\t.supply\t\t= \"vdvi\",\n" - "-\t.dev\t\t= &omap3_evm_lcd_device.dev,\n" - "+static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = {\n" - "+\t{\n" - "+\t\t.supply\t\t= \"vdvi\",\n" - "+\t\t.dev\t\t= &omap3_evm_lcd_device.dev,\n" - "+\t},\n" - "+\t{\n" - "+\t\t.supply\t\t= \"vdds_dsi\",\n" - "+\t\t.dev\t\t= &omap3_evm_dss_device.dev,\n" - "+\t},\n" - " };\n" - " \n" - " static struct regulator_init_data omap3_evm_vpll2 = {\n" - "@@ -530,8 +536,8 @@ static struct regulator_init_data omap3_evm_vpll2 = {\n" - " \t\t.valid_ops_mask\t\t= REGULATOR_CHANGE_MODE\n" - " \t\t\t\t\t| REGULATOR_CHANGE_STATUS,\n" - " \t},\n" - "-\t.num_consumer_supplies\t= 1,\n" - "-\t.consumer_supplies\t= &omap3_evm_vpll2_supply,\n" - "+\t.num_consumer_supplies\t= ARRAY_SIZE(omap3_evm_vpll2_supplies),\n" - "+\t.consumer_supplies\t= omap3_evm_vpll2_supplies,\n" - " };\n" - " \n" - static struct twl4030_platform_data omap3evm_twldata = { -0febc13e9c6c22fde5258e7fc170beba8326334ee0e13ced388865645f5a8243 +a4c36235fc623e2e40749e89b8e3718c76d8a01439b873a3ec12edf30f9621a6
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.