From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Apr 2014 17:24:18 +0000 (-0700)
Subject: Merge tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5744abb2fa3629aa5a94e21ca1eae32ff2fe00b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'mfd-for-linus-3.15' of git://git./linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "Changes to existing drivers:
   - Use of managed resources - omap, twl4030, ti_am335x_tscadc
   - Advanced error handling - omap
   - Rework clk management - omap
   - Device Tree (re-)work - tc3589x, pm8921, da9055, sec
   - IRC management overhaul and !BROKEN - pm8921
   - Convert to regmap - ssbi, pm8921
   - Use simple power-management ops - ucb1x00
   - Include file clean-up - adp5520, cs5535, janz, lpc_ich,
      - lpc_sch, max14577, mcp-sa11x0, pcf50633-adc, rc5t583,
      	rdc321x-southbridge, retu, smsc-ece1099, ti-ssp, ti_am335x_tscadc,
	tps65912, vexpress-config, wm8350, ywm8350
   - Various bug fixes across the subsystem
      - NULL/invalid pointer dereference prevention
      - Resource leak mitigation,
      - Variable used initialised
      - Staticise various containers
      - Enforce return value checks

  New drivers/supported devices:
   - Add support for s2mps14 and s2mpa01 to sec
   - Add support for da9063 (v5) to da9063
   - Add support for atom-c2000 to gpio-ich
   - Add support for come-{mbt10,cbt6,chl6} to kempld
   - Add support for da9053 to da9052
   - Add support for itco-wdt (v3) and baytrail to lpc_ich
   - Add new drivers for tps65218, rtsx_usb, bcm590xx

  (Re-)moved drivers:
   - twl4030 ==> drivers/iio
   - ti-ssp  ==> /dev/null"

* tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (103 commits)
  mfd: wm5110: Correct default for HEADPHONE_DETECT_1
  mfd: arizona: Correct small errors in the DT binding documentation
  mfd: arizona: Mark DSP clocking register as volatile
  mfd: devicetree: bindings: Add pm8xxx RTC description
  mfd: kempld-core: Fix potential hang-up during boot
  mfd: sec-core: Fix uninitialized 'regmap_rtc' on S2MPA01
  mfd: tps65910: Fix regmap_irq_chip_data leak on mfd_add_devices fail
  mfd: tps65910: Fix possible invalid pointer dereference on regmap_add_irq_chip fail
  mfd: sec-core: Fix I2C dummy device resource leak on probe failure
  mfd: sec-core: Add of_compatible strings for clock MFD cells
  mfd: Remove obsolete ti-ssp driver
  Documentation: mfd: s2mps11: Describe S5M8767 and S2MPS14 clocks
  mfd: bcm590xx: Fix type argument for module device table
  mfd: lpc_ich: Add support for Intel Bay Trail SoC
  mfd: lpc_ich: Add support for NM10 GPIO
  mfd: lpc_ich: Change Avoton to iTCO v3
  watchdog: iTCO_wdt: Add support for v3 silicon
  mfd: lpc_ich: Add support for iTCO v3
  mfd: lpc_ich: Remove lpc_ich_cfg struct use
  mfd: lpc_ich: Only configure watchdog or GPIO when present
  ...
---

e5744abb2fa3629aa5a94e21ca1eae32ff2fe00b
diff --cc arch/arm/boot/dts/omap4.dtsi
index fe61976dc1a5,39a05ce52e9c..0769ec57a3f5
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@@ -733,9 -697,15 +733,15 @@@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges;
+ 			clocks = <&init_60m_fclk>,
+ 				 <&xclk60mhsp1_ck>,
+ 				 <&xclk60mhsp2_ck>;
+ 			clock-names = "refclk_60m_int",
+ 				      "refclk_60m_ext_p1",
+ 				      "refclk_60m_ext_p2";
  
  			usbhsohci: ohci@4a064800 {
 -				compatible = "ti,ohci-omap3", "usb-ohci";
 +				compatible = "ti,ohci-omap3";
  				reg = <0x4a064800 0x400>;
  				interrupt-parent = <&gic>;
  				interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
diff --cc arch/arm/boot/dts/omap5.dtsi
index 8292ad0fe69f,d4dae488decc..19155bb84835
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@@ -814,9 -775,15 +814,15 @@@
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges;
+ 			clocks = <&l3init_60m_fclk>,
+ 				 <&xclk60mhsp1_ck>,
+ 				 <&xclk60mhsp2_ck>;
+ 			clock-names = "refclk_60m_int",
+ 				      "refclk_60m_ext_p1",
+ 				      "refclk_60m_ext_p2";
  
  			usbhsohci: ohci@4a064800 {
 -				compatible = "ti,ohci-omap3", "usb-ohci";
 +				compatible = "ti,ohci-omap3";
  				reg = <0x4a064800 0x400>;
  				interrupt-parent = <&gic>;
  				interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
diff --cc drivers/iio/adc/Makefile
index bb252540664a,9acf2df2c1a8..ab346d88c688
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@@ -21,8 -20,6 +21,9 @@@ obj-$(CONFIG_MEN_Z188_ADC) += men_z188_
  obj-$(CONFIG_NAU7802) += nau7802.o
  obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o
  obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o
+ obj-$(CONFIG_TWL4030_MADC) += twl4030-madc.o
  obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o
 +obj-$(CONFIG_VF610_ADC) += vf610_adc.o
  obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o
 +xilinx-xadc-y := xilinx-xadc-core.o xilinx-xadc-events.o
 +obj-$(CONFIG_XILINX_XADC) += xilinx-xadc.o