From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 3 Jun 2014 07:08:40 +0000 (+0100)
Subject: Merge branches 'ib-from-asoc-3.16', 'ib-from-pm-3.16', 'ib-from-regulator-3.16',... 
X-Git-Tag: v3.16-rc1~82^2~6^2~69
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=28fee3fa0e33eca809ea0bb75c45f4910360322c;p=linux-2.6-block.git

Merge branches 'ib-from-asoc-3.16', 'ib-from-pm-3.16', 'ib-from-regulator-3.16', 'ib-mfd-gpio-3.16' and 'ib-mfd-mmc-memstick-3.16', tags 'ib-mfd-extcon-3.16', 'ib-mfd-omap-3.16' and 'ib-mfd-regulator-3.16' into ibs-for-mfd-merged
---

28fee3fa0e33eca809ea0bb75c45f4910360322c
diff --cc drivers/cpufreq/longhaul.c
index 5c4369b5d834,d00e5d1abd25,f4024d4d3534,d00e5d1abd25,d00e5d1abd25,5c4369b5d834,d00e5d1abd25,45bafddfd8ea,d00e5d1abd25..c913906a719e
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@@@@@@@@@ -271,6 -269,8 -269,8 -269,8 -269,8 -271,6 -269,8 -269,8 -269,8 +271,6 @@@@@@@@@@ static int longhaul_setstate(struct cpu
         	freqs.old = calc_speed(longhaul_get_cpu_mult());
         	freqs.new = speed;
         
 ---- - -	cpufreq_freq_transition_begin(policy, &freqs);
       - 	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 ---- ---
         	pr_debug("Setting to FSB:%dMHz Mult:%d.%dx (%s)\n",
         			fsb, mult/10, mult%10, print_speed(speed/1000));
         retry_loop:
@@@@@@@@@@ -385,14 -385,12 -385,12 -385,12 -385,12 -385,14 -385,12 -385,12 -385,12 +385,14 @@@@@@@@@@
         			goto retry_loop;
         		}
         	}
 ---- ---	/* Report true CPU frequency */
 ---- - -	cpufreq_freq_transition_end(policy, &freqs, 0);
       - 	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         
 ---- ---	if (!bm_timeout)
 ++++ +++	if (!bm_timeout) {
         		printk(KERN_INFO PFX "Warning: Timeout while waiting for "
         				"idle PCI bus.\n");
 ++++ +++		return -EBUSY;
 ++++ +++	}
 ++++ +++
 ++++ +++	return 0;
         }
         
         /*
diff --cc drivers/cpufreq/powernow-k6.c
index 78904e6ca4a0,49f120e1bc7b,a133236a0013,49f120e1bc7b,49f120e1bc7b,78904e6ca4a0,49f120e1bc7b,b9a444e358b5,49f120e1bc7b..c8012bc86910
--- a/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@@@@@@@@@ -144,8 -145,15 -145,15 -145,15 -145,15 -144,8 -145,15 -145,15 -145,15 +144,8 @@@@@@@@@@ static int powernow_k6_target(struct cp
         		return -EINVAL;
         	}
         
 ---- ---	freqs.old = busfreq * powernow_k6_get_cpu_multiplier();
 ---- ---	freqs.new = busfreq * clock_ratio[best_i].driver_data;
 ---- ---
 ---- - -	cpufreq_freq_transition_begin(policy, &freqs);
       - 	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 ---- ---
         	powernow_k6_set_cpu_multiplier(best_i);
         
 ---- - -	cpufreq_freq_transition_end(policy, &freqs, 0);
       - 	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 ---- ---
         	return 0;
         }
         
@@@@@@@@@@ -219,21 -227,10 -227,10 -227,10 -227,10 -219,21 -227,10 -227,11 -227,10 +219,21 @@@@@@@@@@ have_busfreq
         static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)
         {
         	unsigned int i;
 ---- ---	for (i = 0; i < 8; i++) {
 ---- ---		if (i == max_multiplier)
 ++++ +++
 ++++ +++	for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
 ++++ +++		if (clock_ratio[i].driver_data == max_multiplier) {
 ++++ +++			struct cpufreq_freqs freqs;
 ++++ +++
 ++++ +++			freqs.old = policy->cur;
 ++++ +++			freqs.new = clock_ratio[i].frequency;
 ++++ +++			freqs.flags = 0;
 ++++ +++
 ++++ +++			cpufreq_freq_transition_begin(policy, &freqs);
         			powernow_k6_target(policy, i);
 ++++ +++			cpufreq_freq_transition_end(policy, &freqs, 0);
 ++++ +++			break;
 ++++ +++		}
         	}
       - 	cpufreq_frequency_table_put_attr(policy->cpu);
         	return 0;
         }
         
diff --cc drivers/mfd/Kconfig
index 33834120d057,33834120d057,33834120d057,33834120d057,5bdefe72625e,29be025d5835,33834120d057,49bb445d846a,33834120d057..e166d7176d7a
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@@@@@@@@ -335,11 -335,11 -335,11 -335,11 -335,11 -335,11 -335,11 -322,10 -335,11 +335,11 @@@@@@@@@@ config MFD_MAX1457
         	depends on I2C=y
         	select MFD_CORE
         	select REGMAP_I2C
       + 	select REGMAP_IRQ
         	select IRQ_DOMAIN
         	help
---- -- -	  Say yes here to add support for Maxim Semiconductor MAX14577.
       - 	  Say yes here to support for Maxim Semiconductor MAX14577.
---- ----	  This is a Micro-USB IC with Charger controls on chip.
++++ ++++	  Say yes here to add support for Maxim Semiconductor MAX14577 and
++++ ++++	  MAX77836 Micro-USB ICs with battery charger.
         	  This driver provides common support for accessing the device;
         	  additional drivers must be enabled in order to use the functionality
         	  of the device.