diff for duplicates of <874nztfw6w.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 55938ef..aba328e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,98 +33,3 @@ of voltage layer cleanups to fix that up. Kevin - ->From 1cd49077829a262155b96f8fdcdcdd6c54d83ed5 Mon Sep 17 00:00:00 2001 -From: Kevin Hilman <khilman@ti.com> -Date: Fri, 30 Sep 2011 11:24:04 -0700 -Subject: [PATCH] ARM: OMAP2+: PM: only register TWL with voltage layer when - device is present - -Current code registers voltage layer details for TWL PMIC even when a TWL -has not been registered. Fix this to only register the TWL with voltage -layer when the TWL PMIC is initialized by board-level code. - -Signed-off-by: Kevin Hilman <khilman@ti.com> ---- - arch/arm/mach-omap2/pm.c | 6 ++---- - arch/arm/mach-omap2/twl-common.c | 11 +++++++++++ - arch/arm/mach-omap2/twl-common.h | 3 +++ - 3 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c -index d34fc52..602fc66 100644 ---- a/arch/arm/mach-omap2/pm.c -+++ b/arch/arm/mach-omap2/pm.c -@@ -23,6 +23,7 @@ - #include "powerdomain.h" - #include "clockdomain.h" - #include "pm.h" -+#include "twl-common.h" - - static struct omap_device_pm_latency *pm_lats; - -@@ -251,11 +252,8 @@ postcore_initcall(omap2_common_pm_init); - - static int __init omap2_common_pm_late_init(void) - { -- /* Init the OMAP TWL parameters */ -- omap3_twl_init(); -- omap4_twl_init(); -- - /* Init the voltage layer */ -+ omap_pmic_late_init(); - omap_voltage_late_init(); - - /* Initialize the voltages */ -diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c -index daa056e..47133fa 100644 ---- a/arch/arm/mach-omap2/twl-common.c -+++ b/arch/arm/mach-omap2/twl-common.c -@@ -30,6 +30,7 @@ - #include <plat/usb.h> - - #include "twl-common.h" -+#include "pm.h" - - static struct i2c_board_info __initdata pmic_i2c_board_info = { - .addr = 0x48, -@@ -48,6 +49,16 @@ void __init omap_pmic_init(int bus, u32 clkrate, - omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1); - } - -+void __init omap_pmic_late_init(void) -+{ -+ /* Init the OMAP TWL parameters (if PMIC has been registerd) */ -+ if (!pmic_i2c_board_info.irq) -+ return; -+ -+ omap3_twl_init(); -+ omap4_twl_init(); -+} -+ - #if defined(CONFIG_ARCH_OMAP3) - static struct twl4030_usb_data omap3_usb_pdata = { - .usb_mode = T2_USB_MODE_ULPI, -diff --git a/arch/arm/mach-omap2/twl-common.h b/arch/arm/mach-omap2/twl-common.h -index 5e83a5b..275dde8 100644 ---- a/arch/arm/mach-omap2/twl-common.h -+++ b/arch/arm/mach-omap2/twl-common.h -@@ -1,6 +1,8 @@ - #ifndef __OMAP_PMIC_COMMON__ - #define __OMAP_PMIC_COMMON__ - -+#include <plat/irqs.h> -+ - #define TWL_COMMON_PDATA_USB (1 << 0) - #define TWL_COMMON_PDATA_BCI (1 << 1) - #define TWL_COMMON_PDATA_MADC (1 << 2) -@@ -30,6 +32,7 @@ struct twl4030_platform_data; - - void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq, - struct twl4030_platform_data *pmic_data); -+void omap_pmic_late_init(void); - - static inline void omap2_pmic_init(const char *pmic_type, - struct twl4030_platform_data *pmic_data) --- -1.7.6 diff --git a/a/content_digest b/N1/content_digest index ed9e08c..d70c5f1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,21 +2,10 @@ "ref\01317363153-10259-2-git-send-email-abhilash.kv@ti.com\0" "ref\01317363153-10259-3-git-send-email-abhilash.kv@ti.com\0" "ref\087r52xhhkb.fsf@ti.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH v5 2/3] omap_twl: Prevent SR to enable for am3517/am3505 devices\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH v5 2/3] omap_twl: Prevent SR to enable for am3517/am3505 devices\0" "Date\0Fri, 30 Sep 2011 16:27:03 -0700\0" - "To\0Abhilash K V <abhilash.kv@ti.com>\0" - "Cc\0paul@pwsan.com" - linux@arm.linux.org.uk - b-cousson@ti.com - tony@atomide.com - linux-kernel@vger.kernel.org - Vaibhav Hiremath <hvaibhav@ti.com> - christian.gmeiner@gmail.com - aneesh@ti.com - santosh.shilimkar@ti.com - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Abhilash,\n" @@ -53,101 +42,6 @@ "of voltage layer cleanups to fix that up. \n" "\n" "\n" - "Kevin\n" - "\n" - ">From 1cd49077829a262155b96f8fdcdcdd6c54d83ed5 Mon Sep 17 00:00:00 2001\n" - "From: Kevin Hilman <khilman@ti.com>\n" - "Date: Fri, 30 Sep 2011 11:24:04 -0700\n" - "Subject: [PATCH] ARM: OMAP2+: PM: only register TWL with voltage layer when\n" - " device is present\n" - "\n" - "Current code registers voltage layer details for TWL PMIC even when a TWL\n" - "has not been registered. Fix this to only register the TWL with voltage\n" - "layer when the TWL PMIC is initialized by board-level code.\n" - "\n" - "Signed-off-by: Kevin Hilman <khilman@ti.com>\n" - "---\n" - " arch/arm/mach-omap2/pm.c | 6 ++----\n" - " arch/arm/mach-omap2/twl-common.c | 11 +++++++++++\n" - " arch/arm/mach-omap2/twl-common.h | 3 +++\n" - " 3 files changed, 16 insertions(+), 4 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c\n" - "index d34fc52..602fc66 100644\n" - "--- a/arch/arm/mach-omap2/pm.c\n" - "+++ b/arch/arm/mach-omap2/pm.c\n" - "@@ -23,6 +23,7 @@\n" - " #include \"powerdomain.h\"\n" - " #include \"clockdomain.h\"\n" - " #include \"pm.h\"\n" - "+#include \"twl-common.h\"\n" - " \n" - " static struct omap_device_pm_latency *pm_lats;\n" - " \n" - "@@ -251,11 +252,8 @@ postcore_initcall(omap2_common_pm_init);\n" - " \n" - " static int __init omap2_common_pm_late_init(void)\n" - " {\n" - "-\t/* Init the OMAP TWL parameters */\n" - "-\tomap3_twl_init();\n" - "-\tomap4_twl_init();\n" - "-\n" - " \t/* Init the voltage layer */\n" - "+\tomap_pmic_late_init();\n" - " \tomap_voltage_late_init();\n" - " \n" - " \t/* Initialize the voltages */\n" - "diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c\n" - "index daa056e..47133fa 100644\n" - "--- a/arch/arm/mach-omap2/twl-common.c\n" - "+++ b/arch/arm/mach-omap2/twl-common.c\n" - "@@ -30,6 +30,7 @@\n" - " #include <plat/usb.h>\n" - " \n" - " #include \"twl-common.h\"\n" - "+#include \"pm.h\"\n" - " \n" - " static struct i2c_board_info __initdata pmic_i2c_board_info = {\n" - " \t.addr\t\t= 0x48,\n" - "@@ -48,6 +49,16 @@ void __init omap_pmic_init(int bus, u32 clkrate,\n" - " \tomap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1);\n" - " }\n" - " \n" - "+void __init omap_pmic_late_init(void)\n" - "+{\n" - "+\t/* Init the OMAP TWL parameters (if PMIC has been registerd) */\n" - "+\tif (!pmic_i2c_board_info.irq)\n" - "+\t\treturn;\n" - "+\n" - "+\tomap3_twl_init();\n" - "+\tomap4_twl_init();\n" - "+}\n" - "+\n" - " #if defined(CONFIG_ARCH_OMAP3)\n" - " static struct twl4030_usb_data omap3_usb_pdata = {\n" - " \t.usb_mode\t= T2_USB_MODE_ULPI,\n" - "diff --git a/arch/arm/mach-omap2/twl-common.h b/arch/arm/mach-omap2/twl-common.h\n" - "index 5e83a5b..275dde8 100644\n" - "--- a/arch/arm/mach-omap2/twl-common.h\n" - "+++ b/arch/arm/mach-omap2/twl-common.h\n" - "@@ -1,6 +1,8 @@\n" - " #ifndef __OMAP_PMIC_COMMON__\n" - " #define __OMAP_PMIC_COMMON__\n" - " \n" - "+#include <plat/irqs.h>\n" - "+\n" - " #define TWL_COMMON_PDATA_USB\t\t(1 << 0)\n" - " #define TWL_COMMON_PDATA_BCI\t\t(1 << 1)\n" - " #define TWL_COMMON_PDATA_MADC\t\t(1 << 2)\n" - "@@ -30,6 +32,7 @@ struct twl4030_platform_data;\n" - " \n" - " void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,\n" - " \t\t struct twl4030_platform_data *pmic_data);\n" - "+void omap_pmic_late_init(void);\n" - " \n" - " static inline void omap2_pmic_init(const char *pmic_type,\n" - " \t\t\t\t struct twl4030_platform_data *pmic_data)\n" - "-- \n" - 1.7.6 + Kevin -7fe7b183a8c7b45b255737b10532585815fc32c7c5ca711bbbcab5e039e0c141 +c5c465b34797affe1e2b889bf17bd42dd3152a6612dfd116bf9cf6d7a1459691
diff --git a/a/content_digest b/N2/content_digest index ed9e08c..fea189a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,17 +6,17 @@ "Subject\0Re: [PATCH v5 2/3] omap_twl: Prevent SR to enable for am3517/am3505 devices\0" "Date\0Fri, 30 Sep 2011 16:27:03 -0700\0" "To\0Abhilash K V <abhilash.kv@ti.com>\0" - "Cc\0paul@pwsan.com" - linux@arm.linux.org.uk - b-cousson@ti.com - tony@atomide.com - linux-kernel@vger.kernel.org - Vaibhav Hiremath <hvaibhav@ti.com> - christian.gmeiner@gmail.com - aneesh@ti.com - santosh.shilimkar@ti.com - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "Cc\0<linux-omap@vger.kernel.org>" + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + <tony@atomide.com> + <linux@arm.linux.org.uk> + <b-cousson@ti.com> + <paul@pwsan.com> + <aneesh@ti.com> + <santosh.shilimkar@ti.com> + <christian.gmeiner@gmail.com> + " Vaibhav Hiremath <hvaibhav@ti.com>\0" "\00:1\0" "b\0" "Abhilash,\n" @@ -150,4 +150,4 @@ "-- \n" 1.7.6 -7fe7b183a8c7b45b255737b10532585815fc32c7c5ca711bbbcab5e039e0c141 +209c0b2012b66e972e451327e40fd94362f07e20351a045c655a41bad99e28bb
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.