diff for duplicates of <87d3et4zj9.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 30a7b64..025f208 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,81 +18,3 @@ is already pulled into arm-soc/next/voltage) so just re-pulling will pick up the fix. Kevin - - ->From 473dc975c3ea468049732155467ff08fe3701f98 Mon Sep 17 00:00:00 2001 -From: Kevin Hilman <khilman@ti.com> -Date: Wed, 21 Sep 2011 09:24:53 -0700 -Subject: [PATCH] ARM: OMAP: voltage layer present, even when CONFIG_PM=n - -Even when CONFIG_PM=n, we try to scale the boot voltage to a sane, -known value using OPP table to find matching voltage based on boot -frequency. This should be done, even when CONFIG_PM=n to avoid -mis-configured bootloaders and/or boot voltage assumptions made by -boot loaders. - -Also fixes various compile problems due to depenencies between voltage -domain and powerdomain code (also present when CONFIG_PM=n). - -Reported-by: Arnd Bergmann <arnd@arndb.de> -Signed-off-by: Kevin Hilman <khilman@ti.com> ---- -Compile tested with CONFIG_PM=n -Applies to arm-soc/next/voltage - - arch/arm/mach-omap2/Makefile | 2 -- - arch/arm/mach-omap2/voltage.h | 14 -------------- - 2 files changed, 0 insertions(+), 16 deletions(-) - -diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile -index 8bd389d..5129785 100644 ---- a/arch/arm/mach-omap2/Makefile -+++ b/arch/arm/mach-omap2/Makefile -@@ -89,7 +89,6 @@ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ - vp44xx_data.o - - # OMAP voltage domains --ifeq ($(CONFIG_PM),y) - voltagedomain-common := voltage.o vc.o vp.o - obj-$(CONFIG_ARCH_OMAP2) += $(voltagedomain-common) \ - voltagedomains2xxx_data.o -@@ -97,7 +96,6 @@ obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) \ - voltagedomains3xxx_data.o - obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) \ - voltagedomains44xx_data.o --endif - - # OMAP powerdomain framework - powerdomain-common += powerdomain.o powerdomain-common.o -diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h -index 4c09809..16a1b09 100644 ---- a/arch/arm/mach-omap2/voltage.h -+++ b/arch/arm/mach-omap2/voltage.h -@@ -148,25 +148,11 @@ void omap_voltage_get_volttable(struct voltagedomain *voltdm, - struct omap_volt_data **volt_data); - struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm, - unsigned long volt); --#ifdef CONFIG_PM - int omap_voltage_register_pmic(struct voltagedomain *voltdm, - struct omap_voltdm_pmic *pmic); - void omap_change_voltscale_method(struct voltagedomain *voltdm, - int voltscale_method); - int omap_voltage_late_init(void); --#else --static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm, -- struct omap_voltdm_pmic *pmic) --{ -- return -EINVAL; --} --static inline void omap_change_voltscale_method(struct voltagedomain *voltdm, -- int voltscale_method) {} --static inline int omap_voltage_late_init(void) --{ -- return -EINVAL; --} --#endif - - extern void omap2xxx_voltagedomains_init(void); - extern void omap3xxx_voltagedomains_init(void); --- -1.7.6 diff --git a/a/content_digest b/N1/content_digest index 8a2ee5a..322d9e9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,13 +2,10 @@ "ref\0201109202334.43213.arnd@arndb.de\0" "ref\0201109202346.11393.arnd@arndb.de\0" "ref\02241590.uiCS2D9jjt@wuerfel\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [GIT PULL] omap cleanup part1 for v3.2 merge window\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[GIT PULL] omap cleanup part1 for v3.2 merge window\0" "Date\0Wed, 21 Sep 2011 09:43:06 -0700\0" - "To\0Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - Tony Lindgren <tony@atomide.com> - " linux-omap@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Arnd,\n" @@ -30,84 +27,6 @@ "is already pulled into arm-soc/next/voltage) so just re-pulling will\n" "pick up the fix.\n" "\n" - "Kevin\n" - "\n" - "\n" - ">From 473dc975c3ea468049732155467ff08fe3701f98 Mon Sep 17 00:00:00 2001\n" - "From: Kevin Hilman <khilman@ti.com>\n" - "Date: Wed, 21 Sep 2011 09:24:53 -0700\n" - "Subject: [PATCH] ARM: OMAP: voltage layer present, even when CONFIG_PM=n\n" - "\n" - "Even when CONFIG_PM=n, we try to scale the boot voltage to a sane,\n" - "known value using OPP table to find matching voltage based on boot\n" - "frequency. This should be done, even when CONFIG_PM=n to avoid\n" - "mis-configured bootloaders and/or boot voltage assumptions made by\n" - "boot loaders.\n" - "\n" - "Also fixes various compile problems due to depenencies between voltage\n" - "domain and powerdomain code (also present when CONFIG_PM=n).\n" - "\n" - "Reported-by: Arnd Bergmann <arnd@arndb.de>\n" - "Signed-off-by: Kevin Hilman <khilman@ti.com>\n" - "---\n" - "Compile tested with CONFIG_PM=n\n" - "Applies to arm-soc/next/voltage\n" - "\n" - " arch/arm/mach-omap2/Makefile | 2 --\n" - " arch/arm/mach-omap2/voltage.h | 14 --------------\n" - " 2 files changed, 0 insertions(+), 16 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile\n" - "index 8bd389d..5129785 100644\n" - "--- a/arch/arm/mach-omap2/Makefile\n" - "+++ b/arch/arm/mach-omap2/Makefile\n" - "@@ -89,7 +89,6 @@ obj-$(CONFIG_ARCH_OMAP4)\t\t+= prcm.o cm2xxx_3xxx.o cminst44xx.o \\\n" - " \t\t\t\t\t vp44xx_data.o\n" - " \n" - " # OMAP voltage domains\n" - "-ifeq ($(CONFIG_PM),y)\n" - " voltagedomain-common\t\t\t:= voltage.o vc.o vp.o\n" - " obj-$(CONFIG_ARCH_OMAP2)\t\t+= $(voltagedomain-common) \\\n" - " \t\t\t\t\t voltagedomains2xxx_data.o\n" - "@@ -97,7 +96,6 @@ obj-$(CONFIG_ARCH_OMAP3)\t\t+= $(voltagedomain-common) \\\n" - " \t\t\t\t\t voltagedomains3xxx_data.o\n" - " obj-$(CONFIG_ARCH_OMAP4)\t\t+= $(voltagedomain-common) \\\n" - " \t\t\t\t\t voltagedomains44xx_data.o\n" - "-endif\n" - " \n" - " # OMAP powerdomain framework\n" - " powerdomain-common\t\t\t+= powerdomain.o powerdomain-common.o\n" - "diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h\n" - "index 4c09809..16a1b09 100644\n" - "--- a/arch/arm/mach-omap2/voltage.h\n" - "+++ b/arch/arm/mach-omap2/voltage.h\n" - "@@ -148,25 +148,11 @@ void omap_voltage_get_volttable(struct voltagedomain *voltdm,\n" - " \t\tstruct omap_volt_data **volt_data);\n" - " struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,\n" - " \t\tunsigned long volt);\n" - "-#ifdef CONFIG_PM\n" - " int omap_voltage_register_pmic(struct voltagedomain *voltdm,\n" - " \t\t\t struct omap_voltdm_pmic *pmic);\n" - " void omap_change_voltscale_method(struct voltagedomain *voltdm,\n" - " \t\tint voltscale_method);\n" - " int omap_voltage_late_init(void);\n" - "-#else\n" - "-static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm,\n" - "-\t\t\t\t\t struct omap_voltdm_pmic *pmic)\n" - "-{\n" - "-\treturn -EINVAL;\n" - "-}\n" - "-static inline void omap_change_voltscale_method(struct voltagedomain *voltdm,\n" - "-\t\tint voltscale_method) {}\n" - "-static inline int omap_voltage_late_init(void)\n" - "-{\n" - "-\treturn -EINVAL;\n" - "-}\n" - "-#endif\n" - " \n" - " extern void omap2xxx_voltagedomains_init(void);\n" - " extern void omap3xxx_voltagedomains_init(void);\n" - "-- \n" - 1.7.6 + Kevin -77f362b96f0ce45acf2235abda96946f3b5adf1732d37b174280d9e0d95a6047 +4413e608620fde5db5a74a83be64cee59078d7ce6f7ef783f2bfd575bd175129
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.