linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the mfd tree
@ 2008-10-15  9:30 Stephen Rothwell
  2008-10-15 14:33 ` Samuel Ortiz
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2008-10-15  9:30 UTC (permalink / raw)
  To: Samuel Ortiz
  Cc: linux-next, "Marek Vašut", David Brownell, Eric Miao,
	Mark Brown, Liam Girdwood

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/Kconfig and drivers/mfd/Makefile between various commits from
Linus' tree and commits from the mfd tree.

Just overlapping additions.  I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/mfd/Kconfig
index 5eff8ad,fe3c083..0000000
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@ -50,15 -50,20 +50,29 @@@ config HTC_PASIC
  	  HTC Magician devices, respectively. Actual functionality is
  	  handled by the leds-pasic3 and ds1wm drivers.
  
 +config UCB1400_CORE
 +	tristate "Philips UCB1400 Core driver"
 +	help
 +	  This enables support for the Philips UCB1400 core functions.
 +	  The UCB1400 is an AC97 audio codec.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called ucb1400_core.
 +
+ config TWL4030_CORE
+ 	bool "Texas Instruments TWL4030/TPS659x0 Support"
+ 	depends on I2C=y && GENERIC_HARDIRQS && (ARCH_OMAP2 || ARCH_OMAP3)
+ 	help
+ 	  Say yes here if you have TWL4030 family chip on your board.
+ 	  This core driver provides register access and IRQ handling
+ 	  facilities, and registers devices for the various functions
+ 	  so that function-specific drivers can bind to them.
+ 
+ 	  These multi-function chips are found on many OMAP2 and OMAP3
+ 	  boards, providing power management, RTC, GPIO, keypad, a
+ 	  high speed USB OTG transceiver, an audio codec (on most
+ 	  versions) and many other features.
+ 
  config MFD_TMIO
  	bool
  	default n
@@@ -87,44 -92,17 +101,55 @@@ config MFD_TC6393X
  	help
  	  Support for Toshiba Mobile IO Controller TC6393XB
  
 +config MFD_WM8400
 +	tristate "Support Wolfson Microelectronics WM8400"
 +	help
 +	  Support for the Wolfson Microelecronics WM8400 PMIC and audio
 +	  CODEC.  This driver adds provides common support for accessing
 +	  the device, additional drivers must be enabled in order to use
 +	  the functionality of the device.
 +
 +config MFD_WM8350
 +	tristate
 +
 +config MFD_WM8350_CONFIG_MODE_0
 +	bool
 +	depends on MFD_WM8350
 +
 +config MFD_WM8350_CONFIG_MODE_1
 +	bool
 +	depends on MFD_WM8350
 +
 +config MFD_WM8350_CONFIG_MODE_2
 +	bool
 +	depends on MFD_WM8350
 +
 +config MFD_WM8350_CONFIG_MODE_3
 +	bool
 +	depends on MFD_WM8350
 +
 +config MFD_WM8350_I2C
 +	tristate "Support Wolfson Microelectronics WM8350 with I2C"
 +	select MFD_WM8350
 +	depends on I2C
 +	help
 +	  The WM8350 is an integrated audio and power management
 +	  subsystem with watchdog and RTC functionality for embedded
 +	  systems.  This option enables core support for the WM8350 with
 +	  I2C as the control interface.  Additional options must be
 +	  selected to enable support for the functionality of the chip.
 +
+ config PMIC_DA903X
+ 	bool "Dialog Semiconductor DA9030/DA9034 PMIC Support"
+ 	depends on I2C=y
+ 	help
+ 	  Say yes here to support for Dialog Semiconductor DA9030 (a.k.a
+ 	  ARAVA) and DA9034 (a.k.a MICCO), these are Power Management IC
+ 	  usually found on PXA processors-based platforms. This includes
+ 	  the I2C driver and the core APIs _only_, you have to select
+ 	  individual components like LCD backlight, voltage regulators,
+ 	  LEDs and battery-charger under the corresponding menus.
+ 
  endmenu
  
  menu "Multimedia Capabilities Port drivers"
diff --cc drivers/mfd/Makefile
index 759b1fe,8dcbb51..0000000
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@@ -12,10 -12,7 +12,11 @@@ obj-$(CONFIG_MFD_T7L66XB)	+= t7l66xb.
  obj-$(CONFIG_MFD_TC6387XB)	+= tc6387xb.o
  obj-$(CONFIG_MFD_TC6393XB)	+= tc6393xb.o
  
 +obj-$(CONFIG_MFD_WM8400)	+= wm8400-core.o
 +wm8350-objs			:= wm8350-core.o wm8350-regmap.o wm8350-gpio.o
 +obj-$(CONFIG_MFD_WM8350)	+= wm8350.o
 +obj-$(CONFIG_MFD_WM8350_I2C)	+= wm8350-i2c.o
+ obj-$(CONFIG_TWL4030_CORE)	+= twl4030-core.o
  
  obj-$(CONFIG_MFD_CORE)		+= mfd-core.o
  
@@@ -27,4 -24,5 +28,6 @@@ obj-$(CONFIG_MCP_UCB1200_TS)	+= ucb1x00
  ifeq ($(CONFIG_SA1100_ASSABET),y)
  obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-assabet.o
  endif
 +obj-$(CONFIG_UCB1400_CORE)	+= ucb1400_core.o
+ 
+ obj-$(CONFIG_PMIC_DA903X)	+= da903x.o

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the mfd tree
@ 2009-01-06  5:14 Stephen Rothwell
  2009-01-06 17:55 ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2009-01-06  5:14 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, David Brownell, Greg KH

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/i2c/chips/Makefile between commit
a234ae259954121886f7f589a9cf1915d6dfab88 ("USB: move isp1301_omap to
drivers/usb/otg") from the usb tree and commits
87c13493e6a59c0da55c2824f0205f9ef941b760 ("mfd: move
drivers/i2c/chips/tps65010.c to drivers/mfd") and
88e75cc347f66bc20e3c2b920431fc07253d69be ("mfd: move
drivers/i2c/chips/menelaus.c to drivers/mfd") from the mfd tree.

Again, just adjacent removals.  I fixed it up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/i2c/chips/Makefile
index aa7552d,8b95f41..0000000
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@@ -18,8 -18,7 +18,6 @@@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca953
  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
  obj-$(CONFIG_PCF8575)		+= pcf8575.o
  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
- obj-$(CONFIG_TPS65010)		+= tps65010.o
- obj-$(CONFIG_MENELAUS)		+= menelaus.o
 -obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o
  obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o
  obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.o
  

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the mfd tree
@ 2009-01-06  5:11 Stephen Rothwell
  2009-01-06 17:54 ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2009-01-06  5:11 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next, David Brownell, Greg KH

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/i2c/chips/Kconfig between commit
a234ae259954121886f7f589a9cf1915d6dfab88 ("USB: move isp1301_omap to
drivers/usb/otg") from the usb tree and commit
87c13493e6a59c0da55c2824f0205f9ef941b760 ("mfd: move
drivers/i2c/chips/tps65010.c to drivers/mfd") from the mfd tree.

Just context changes (due to adjacent deletions).  I fixed it up (see
below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/i2c/chips/Kconfig
index b2ea731,864ac56..0000000
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@@ -114,19 -114,18 +114,6 @@@ config SENSORS_PCF859
  	  These devices are hard to detect and rarely found on mainstream
  	  hardware.  If unsure, say N.
  
- config TPS65010
- 	tristate "TPS6501x Power Management chips"
- 	depends on GPIOLIB
- 	default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
- 	help
- 	  If you say yes here you get support for the TPS6501x series of
- 	  Power Management chips.  These include voltage regulators,
- 	  lithium ion/polymer battery charging, and other features that
- 	  are often used in portable devices like cell phones and cameras.
- 
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called tps65010.
- 
 -config ISP1301_OMAP
 -	tristate "Philips ISP1301 with OMAP OTG"
 -	depends on ARCH_OMAP_OTG
 -	help
 -	  If you say yes here you get support for the Philips ISP1301
 -	  USB-On-The-Go transceiver working with the OMAP OTG controller.
 -	  The ISP1301 is used in products including H2 and H3 development
 -	  boards for Texas Instruments OMAP processors.
 -	  
 -	  This driver can also be built as a module.  If so, the module
 -	  will be called isp1301_omap.
 -
  config SENSORS_MAX6875
  	tristate "Maxim MAX6875 Power supply supervisor"
  	depends on EXPERIMENTAL

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the mfd tree
@ 2008-07-08  7:11 Stephen Rothwell
  2008-07-10  0:11 ` Samuel Ortiz
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2008-07-08  7:11 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: linux-next

[-- Attachment #1: Type: text/plain, Size: 442 bytes --]

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in MAINTAINERS
between commit 4e0d13cbb71de2b1baf71ddd3c14f7ba8da810e5 ("MFD
maintainer") from Linus' tree and commit
52554ec1473a5334ffe589053268d7dd89007afa ("MFD maintainer") from the mfd
tree.

Same commit - different white space. I used Linus' version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-01-06 19:11 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-15  9:30 linux-next: manual merge of the mfd tree Stephen Rothwell
2008-10-15 14:33 ` Samuel Ortiz
  -- strict thread matches above, loose matches on Subject: below --
2009-01-06  5:14 Stephen Rothwell
2009-01-06 17:55 ` Greg KH
2009-01-06  5:11 Stephen Rothwell
2009-01-06 17:54 ` Greg KH
2008-07-08  7:11 Stephen Rothwell
2008-07-10  0:11 ` Samuel Ortiz
2008-07-10  0:42   ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).