Probably the result of a mismerge or rebase failing to notice that the
hunk had already been applied.
Signed-off-by: NMark Brown <broonie@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Ensure that get_maintainer.pl does the right thing for header only
changes.
Signed-off-by: NMark Brown <broonie@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

These were all used by the open coded I/O and IRQ implementations and are
no longer referenced now that the regmap core variants are used instead.
Signed-off-by: NMark Brown <broonie@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Add watchdog timer support for the on-board PLD found on some Kontron
embedded modules.

Originally-From: Michael Brunner <michael.brunner@kontron.com>
Signed-off-by: NKevin Strasser <kevin.strasser@linux.intel.com>
Acked-by: NGuenter Roeck <linux@roeck-us.net>
Acked-by: NDarren Hart <dvhart@linux.intel.com>
Acked-by: NWim Van Sebroeck <wim@iguana.be>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

This patch adds Device Tree support to max8998 driver.
Signed-off-by: NTomasz Figa <t.figa@samsung.com>
Acked-by: NMark Brown <broonie@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

This patch modifies the platform data of max8998 to use arrays for
specifying predefined voltages of buck1 and buck2 instead of separate
field for each voltage.

This allows to simplify the code a bit and will help in adding support
for Device Tree, which will be introduced in further patch.
Signed-off-by: NTomasz Figa <t.figa@samsung.com>
Acked-by: NMark Brown <broonie@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

This patch adds irq domain support for max8998 interrupts.

To keep both non-DT and DT worlds happy, simple domain is used, which is
linear when no explicit IRQ base is specified and legacy, with static
mapping, otherwise.
Signed-off-by: NTomasz Figa <t.figa@samsung.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Add TPS659038 support.
Signed-off-by: NJ Keerthy <j-keerthy@ti.com>
Acked-by: NMark Brown <broonie@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Add core MFD driver for the on-board PLD found on some Kontron embedded
modules. The PLD device may provide functions like watchdog, GPIO, UART
and I2C bus.

The following modules are supported:
	* COMe-bIP#
	* COMe-bPC2 (ETXexpress-PC)
	* COMe-bSC# (ETXexpress-SC T#)
	* COMe-cCT6
	* COMe-cDC2 (microETXexpress-DC)
	* COMe-cPC2 (microETXexpress-PC)
	* COMe-mCT10
	* ETX-OH

Originally-From: Michael Brunner <michael.brunner@kontron.com>
Signed-off-by: NKevin Strasser <kevin.strasser@linux.intel.com>
Acked-by: NGuenter Roeck <linux@roeck-us.net>
Acked-by: NDarren Hart <dvhart@linux.intel.com>
Acked-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

The Patch adds TPS659038 PMIC support in the palmas mfd driver.
The TPS659038 has almost the same registers as of the earlier
supported variants of PALMAS family such as the TWL6035.

The critical differences between TPS659038 and TWL6035 being:

1) TPS659038 has nothing related to battery charging and back up battery stuff.
2) TPS659038 does not have does not have SMPS10(Boost) step up convertor.
3) TPS659038 does not have Battery detection and anything related to battery.
4) SD card detection, Battery presence detection, Vibrator, USB OTG are missing
   when compared to TWL6035.
Signed-off-by: NJ Keerthy <j-keerthy@ti.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

The SMPS10 regulator is not presesnt in all the variants
of the PALMAS PMIC family. Hence adding a feature to distingush
between them.
Signed-off-by: NJ Keerthy <j-keerthy@ti.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Check if irq value obtained is valid. If it is not valid
then skip the irq request step and go ahead with the probe.
Signed-off-by: NJ Keerthy <j-keerthy@ti.com>
Reviewed-by: NMark Brown <broonie@linaro.org>
Reviewed-by: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

This patch adds the LPC Controller DeviceIDs for iTCO Watchdog for
the Intel Coleto Creek PCH.
Signed-off-by: NSeth Heasley <seth.heasley@intel.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

The TWL6025 was never released beyond sample form and was replaced by
the PhoenixLite range of chips - TWL6032. Change the references to
reference the TWL6032 class and name the registers to twl6032 in line with
an actual released chip name to avoid confusion.

Currently there are no users of TWL6025 in the code.
Signed-off-by: NGraeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: NOleksandr Kozaruk <oleksandr.kozaruk@ti.com>
Acked-by: NLee Jones <lee.jones@linaro.org>
Reviwed-by: NMark Brown <broonie@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Include the missing header file to fix the following build error:
drivers/mfd/davinci_voicecodec.c: In function ‘davinci_vc_probe’:
drivers/mfd/davinci_voicecodec.c:86:3: error: implicit declaration of function
‘io_v2p’ [-Werror=implicit-function-declaration]
   (dma_addr_t)(io_v2p(davinci_vc->base) + DAVINCI_VC_WFIFO);
Signed-off-by: NSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

The driver can be used on either arm or arm64 platforms, but
the latter doesn't have any platform-specific configuration
options, so it must be possible to manually enable the driver.

As the gpiolib is optional for arm64 arch, the gpio/led code
must be compiled conditionally.
Signed-off-by: NPawel Moll <pawel.moll@arm.com>
Acked-by: NCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Replace probe-time ioremap_nocache() call with devm_ioremap_nocache()
to avoid iounmap() missing and get rid of the corresponding iounmap()
call on remove.
Signed-off-by: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: NLee Jones <lee.jones@linaro.org>

devm_* APIs are device managed and make code simpler.
Signed-off-by: NSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: NLee Jones <lee.jones@linaro.org>

If an error occurs when loading power scripts or resources, the
registers are not correctly relocked. Fix it.
Signed-off-by: NFlorian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Remove unnecessary goto statements, causing duplicated if
conditions.
Signed-off-by: NFlorian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Support for loading twl4030-power module via devicetree.
For now, when booting with a DT, only the poweroff callback
feature is supported through the ti,use_poweroff property.
Signed-off-by: NFlorian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Increase lisibility when probing power scripts and resources by
creating dedicated functions.
Signed-off-by: NFlorian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

For now, the call to twl4030-power is hard-wired inside twl-core.
To ease the future transition to DT, make twl4030-power as a
separate module, like what is already done for twl4030-audio
and others.
Signed-off-by: NFlorian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Use devm_ioremap_resource and devm_kzalloc to simplify error
paths and reduce lines of code. Also use dev_err() to keep
consistency and drop the .remove function because the devm
functions take care of what it's doing besides the now obsolete
platform_set_drvdata() which we can just drop. Finally, use
module_platform_driver() to save some more lines.

Cc: David Brown <davidb@codeaurora.org>
Signed-off-by: NStephen Boyd <sboyd@codeaurora.org>
Acked-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

This allows the ssbi module to be autoloaded on boot.

Cc: David Brown <davidb@codeaurora.org>
Signed-off-by: NStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

The genirq IRQ wake method will default to failure if the irq_chip
does not provide a set_wake method.  However, for TWL4030 sub-chip
IRQs, we want the wake enable to succeed even though we don't provide
a set_wake method.  This allows sub-chip IRQs to still be flagged as
wakeup capable, and allow them to wakeup from suspend (or abort
suspend if they fire during suspend.)

To fix, use the IRQCHIP_SKIP_SET_WAKE flag in the irq_chip.
Signed-off-by: NKevin Hilman <khilman@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

use module_pci_driver instead of init/exit, make code cleaner.
Signed-off-by: NLibo Chen <libo.chen@huawei.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Separate the devices initialization into different functions.
It makes the probe function clearer.
Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Change the chip id definition and detection and then:

1. We no longer need to add PM800_CHIP_XXX for the coming revision.
2. We no longer need to pass driver_data in i2c_device_id as we
   can distinguish the chips from the CHIP_ID register.
Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

pm800_pages_init and pm800_pages_exit are called by pm800_probe.
Change the code to enhance error handling and remove unused code at
pm800_pages_init/exit and pm800_probe.
Signed-off-by: NYi Zhang <yizhang@marvell.com>
Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

88pm800 has two addtional pages - power and gpadc.
The address of the pages depends on the address of 88pm800.
So do not need pass the address of the power and gpadc in
platform data.
Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

88pm800/88pm805 interrupt is asserted low if the events happened.
So remove IRQF_TRIGGER_FALLING for irq request.
Also, the interrupt wiring is board dependent so do not set
IRQF_TRIGGER by default.
Signed-off-by: NYi Zhang <yizhang@marvell.com>
Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

mask_invert must be set otherwise interrupts cannot be cleared.
Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

88pm800 and 88pm805 shouldnot have the same driver name.
Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Move "device_800_init" to fix NULL pointer error when
calling "device_gpadc_init" as it needs "subchip->regmap_gpadc"
to set registers via regmap interface
Signed-off-by: NYi Zhang <yizhang@marvell.com>
Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

The wm8997 is a compact, high-performance audio hub CODEC with SLIMbus
interfacing, for smartphones, tablets and other portable audio devices
based on the Arizona platform.

This patch integrates the wm8997 into the Arizona mfd.
Signed-off-by: NCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Ensure that the device is in a known good state. This should have little
practical impact as the runtime PM will reset the device shortly after
probe but it's neater.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

Remove code which is not necessary for a device tree boot.

Boot tested on OMAP5-UEVM board.
Signed-off-by: NJ Keerthy <j-keerthy@ti.com>
Acked-by: NLaxman Dewangan  <ldewangan@nvidia.com>
Acked-by: NGraeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>