LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [GIT PULL] MFD for v3.19
@ 2014-12-08 12:00 Lee Jones
  2014-12-09  4:06 ` Linus Torvalds
  0 siblings, 1 reply; 6+ messages in thread
From: Lee Jones @ 2014-12-08 12:00 UTC (permalink / raw)
  To: torvalds; +Cc: linux-kernel

Hi Linus,

 The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:

  Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/mfd-for-linus-3.19

for you to fetch changes up to a3b63979f8a32af9e975a793fd0f612d42072740:

  mfd: rtsx: Add func to split u32 into register (2014-12-08 10:05:39 +0000)

----------------------------------------------------------------
Changes to the core:
 - Honour PLATFORM_DEVID_NONE and PLATFORM_DEVID_AUTO dev IDs

Changes to existing drivers:
 - IRQ additions/fixes; axp20x, da9063-core
 - Code simplification; i2c-dln2
 - Regmap additions/fixes; max77693
 - Error checking/handling improvements; dln2, db8500-prcmu
 - Bug fixes; dln2, wm8350-core
 - DT support/documentation; max77693, max77686, tps65217, twl4030-power,
                             gpio-tc3589x
 - Decouple syscon interface from platform devices
 - Use MFD hotplug registration; rtsx_usb, viperboard, hid-sensor-hub
 - Regulator fixups; sec-core
 - Power Management additions/fixes; rts5227, tc6393xb
 - Remove relic/redundant code; ab8500-sysctrl, lpc_sch, max77693-private
 - Clean-up/coding style changes; tps65090
 - Clk additions/fixes; tc6393xb, tc6387xb, t7l66xb
 - Add USB-SPI support; dln2
 - Trivial changes; max14577, arizona-spi, lpc_sch, wm8997-tables, wm5102-tables
                    wm5110-tables, axp20x, atmel-hlcdc, rtsx_pci

New drivers/supported devices:
 - axp288 PMIC support added to axp20x
 - s2mps13 support added to sec-core
 - New support for Diolan DLN-2
 - New support for atmel-hlcdc

----------------------------------------------------------------
Aaron Lu (1):
      iio: adc: Add module device table for autoloading

Andy Shevchenko (1):
      mfd: lpc_sch: Don't call mfd_remove_devices()

Boris Brezillon (3):
      mfd: Add atmel-hlcdc driver
      mfd: Add documentation for atmel-hlcdc DT bindings
      mfd: atmel-hlcdc: Add Kconfig option description and name

Chanwoo Choi (4):
      mfd: sec-core: Add support for S2MPS13 device
      regulator: s2mps11: Add support S2MPS13 regulator device
      clk: s2mps11: Add the support for S2MPS13 PMIC clock
      mfd: s2mps11: Add binding documentation for Samsung S2MPS13 PMIC

Charles Keepax (3):
      mfd: wm8997: Mark INTERRUPT_STATUS_2_MASK as readable
      mfd: arizona: Document HP_CTRL_1L and HP_CTRL_1R registers
      mfd: wm5110: Add missing registers for AIF2 channels 3-6

Dan Carpenter (1):
      mfd: dln2: A couple endian fixes

Daniel Baluta (1):
      gpio: add support for the Diolan DLN-2 USB GPIO driver

Dmitry Eremin-Solenikov (4):
      mfd: tc6393xb: Fail ohci suspend if full state restore is required
      mfd: tc6393xb: Prepare/unprepare clocks
      mfd: tc6387xb: prepare/unprepare clocks
      mfd: t7l66xb: prepare/unprepare clocks

Dmitry Lavnikevich (1):
      mfd: da9063: Get irq base dynamically before registering device

Guenter Roeck (1):
      mfd: ab8500-sysctrl: Drop ab8500_restart

Jacob Pan (4):
      mfd: axp20x: Extend axp20x to support axp288 pmic
      iio: adc: Add support for axp288 adc
      mfd/axp20x: avoid irq numbering collision
      iio/axp288_adc: remove THIS_MODULE owner

Jaewon Kim (3):
      mfd: max77693: Initialize haptic register map
      mfd: max77693: Add haptic of_compatible in mfd_cell
      mfd: max77693: Update DT binding to support haptic

Javier Martinez Canillas (1):
      Revert "mfd: sec-core: Prepare regulators for suspend state to reduce power-consumption"

Joe Perches (1):
      mfd: wm8350-core: Fix probable mask then right shift defect

Johan Hovold (4):
      mfd: core: Add helper function to register hotplug devices
      mfd: Use mfd_add_hotplug_devices() helper
      HID: hid-sensor-hub: Use mfd_add_hotplug_devices() helper
      mfd: core: Fix platform-device id generation

Johannes Pointner (1):
      mfd: tps65217: Add compatible string for subdevices

Krzysztof Kozlowski (4):
      mfd: max77693: Remove unused define
      mfd: max77693: Map charger device to its own of_node
      mfd/regulator: dt-bindings: max77686: Document regulators off in suspend
      mfd: max14577: Fix obvious typo in company name in copyright

Laurentiu Palcu (2):
      i2c: add support for Diolan DLN-2 USB-I2C adapter
      mfd: dln2: add support for USB-SPI module

Lee Jones (4):
      Merge branches 'ib-mfd-gpio-i2c-3.19', 'ib-mfd-iio-3.19' and 'ib-mfd-regulator-v3.19', tag 'ib-mfd-regulator-clk-v3.19' into ibs-for-mfd-merged
      mfd: db8500-prcmu: Provide sane error path values
      mfd: tps65090: Fix bonkers indenting strategy
      mfd: axp20x: Constify axp20x_acpi_match and rid unused warning

Linus Walleij (1):
      mfd: tc3589x: get rid of static base

Micky Ching (2):
      mfd: rtsx: Fix PM suspend for 5227 & 5249
      mfd: rtsx: Add func to split u32 into register

Octavian Purdila (4):
      mfd: Add support for Diolan DLN-2 devices
      mfd: dln2: Fix _dln2_transfer return code
      i2c: dln2: Simplify return flow for dln2_i2c_enable
      mfd: dln2: Add a limit check for invalid echo

Pankaj Dubey (1):
      mfd: syscon: Decouple syscon interface from platform devices

Pramod Gurav (1):
      mfd: db8500-prcmu: Check return of devm_ioremap for error

Romain Perier (1):
      of: Add standard property for poweroff capability

Tony Lindgren (1):
      mfd: twl4030-power: Fix regression with missing compatible flag

Will Sheppard (1):
      mfd: arizona-spi: Add lines after declarations - checkpatch catch

 Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt |  51 +++++++++
 Documentation/devicetree/bindings/mfd/max77686.txt    |   6 +
 Documentation/devicetree/bindings/mfd/max77693.txt    |  21 ++++
 Documentation/devicetree/bindings/mfd/s2mps11.txt     |  22 ++--
 drivers/clk/clk-s2mps11.c                             |  24 ++++
 drivers/gpio/Kconfig                                  |  12 ++
 drivers/gpio/Makefile                                 |   1 +
 drivers/gpio/gpio-dln2.c                              | 553 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/gpio/gpio-tc3589x.c                           |   2 +-
 drivers/hid/hid-sensor-hub.c                          |   8 +-
 drivers/i2c/busses/Kconfig                            |  10 ++
 drivers/i2c/busses/Makefile                           |   1 +
 drivers/i2c/busses/i2c-dln2.c                         | 262 +++++++++++++++++++++++++++++++++++++++++++
 drivers/iio/adc/Kconfig                               |   8 ++
 drivers/iio/adc/Makefile                              |   1 +
 drivers/iio/adc/axp288_adc.c                          | 261 +++++++++++++++++++++++++++++++++++++++++++
 drivers/mfd/Kconfig                                   |  25 ++++-
 drivers/mfd/Makefile                                  |   4 +-
 drivers/mfd/ab8500-sysctrl.c                          |  57 ----------
 drivers/mfd/arizona-spi.c                             |   2 +
 drivers/mfd/atmel-hlcdc.c                             | 122 ++++++++++++++++++++
 drivers/mfd/axp20x.c                                  | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 drivers/mfd/da9063-core.c                             |   4 +-
 drivers/mfd/db8500-prcmu.c                            |  22 ++--
 drivers/mfd/dln2.c                                    | 781 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/mfd/lpc_sch.c                                 |   6 +-
 drivers/mfd/max14577.c                                |   2 +-
 drivers/mfd/max77693.c                                |  31 +++++-
 drivers/mfd/mfd-core.c                                |   8 +-
 drivers/mfd/rts5227.c                                 |   6 +
 drivers/mfd/rts5249.c                                 |   4 +
 drivers/mfd/rtsx_gops.c                               |  37 +++++++
 drivers/mfd/rtsx_pcr.h                                |   3 +
 drivers/mfd/rtsx_usb.c                                |   4 +-
 drivers/mfd/sec-core.c                                |  39 +++++--
 drivers/mfd/sec-irq.c                                 |  23 +++-
 drivers/mfd/syscon.c                                  |  96 ++++++++++++----
 drivers/mfd/t7l66xb.c                                 |  14 +--
 drivers/mfd/tc3589x.c                                 |   9 +-
 drivers/mfd/tc6387xb.c                                |  10 +-
 drivers/mfd/tc6393xb.c                                |  23 +++-
 drivers/mfd/tps65090.c                                |  62 +++++------
 drivers/mfd/tps65217.c                                |   2 +
 drivers/mfd/twl4030-power.c                           |   3 +
 drivers/mfd/viperboard.c                              |   4 +-
 drivers/mfd/wm5102-tables.c                           |   6 +-
 drivers/mfd/wm5110-tables.c                           |  20 ++++
 drivers/mfd/wm8350-core.c                             |   2 +-
 drivers/mfd/wm8997-tables.c                           |   6 +
 drivers/regulator/Kconfig                             |  10 +-
 drivers/regulator/s2mps11.c                           | 102 ++++++++++++++++-
 include/linux/mfd/abx500/ab8500-sysctrl.h             |   1 -
 include/linux/mfd/arizona/registers.h                 |  50 +++++++++
 include/linux/mfd/atmel-hlcdc.h                       |  85 ++++++++++++++
 include/linux/mfd/axp20x.h                            |  59 ++++++++++
 include/linux/mfd/core.h                              |   7 ++
 include/linux/mfd/dln2.h                              | 103 +++++++++++++++++
 include/linux/mfd/max77693-private.h                  |   1 -
 include/linux/mfd/rtsx_pci.h                          |  37 +++++++
 include/linux/mfd/samsung/core.h                      |   2 +
 include/linux/mfd/samsung/s2mps13.h                   | 186 +++++++++++++++++++++++++++++++
 include/linux/mfd/tc3589x.h                           |   8 --
 include/linux/of.h                                    |  11 ++
 63 files changed, 3431 insertions(+), 272 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
 create mode 100644 drivers/gpio/gpio-dln2.c
 create mode 100644 drivers/i2c/busses/i2c-dln2.c
 create mode 100644 drivers/iio/adc/axp288_adc.c
 create mode 100644 drivers/mfd/atmel-hlcdc.c
 create mode 100644 drivers/mfd/dln2.c
 create mode 100644 drivers/mfd/rtsx_gops.c
 create mode 100644 include/linux/mfd/atmel-hlcdc.h
 create mode 100644 include/linux/mfd/dln2.h
 create mode 100644 include/linux/mfd/samsung/s2mps13.h

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [GIT PULL] MFD for v3.19
  2014-12-08 12:00 [GIT PULL] MFD for v3.19 Lee Jones
@ 2014-12-09  4:06 ` Linus Torvalds
  2014-12-09 10:00   ` Johan Hovold
  0 siblings, 1 reply; 6+ messages in thread
From: Linus Torvalds @ 2014-12-09  4:06 UTC (permalink / raw)
  To: Lee Jones; +Cc: Linux Kernel Mailing List, Johan Hovold

On Mon, Dec 8, 2014 at 4:00 AM, Lee Jones <lee.jones@linaro.org> wrote:
>
> Johan Hovold (4):
>       mfd: Use mfd_add_hotplug_devices() helper

This clashed with the earlier fix "mfd: viperboard: Fix
platform-device id collision" also by Johan.

My merge resolution ends up taking the mfd_add_hotplug_devices() version.

See drivers/mfd/viperboard.c, and somebody should double-check and
test that this actually works. The "Fix platform-device id collision"
commit supposedly fixed a problem with multiple boards, I'm
hoping/assuming that the mfd_add_hotplug_devices() helper handles that
case correctly.

                     Linus

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [GIT PULL] MFD for v3.19
  2014-12-09  4:06 ` Linus Torvalds
@ 2014-12-09 10:00   ` Johan Hovold
  2014-12-09 20:44     ` Linus Torvalds
  0 siblings, 1 reply; 6+ messages in thread
From: Johan Hovold @ 2014-12-09 10:00 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Lee Jones, Linux Kernel Mailing List, Johan Hovold

On Mon, Dec 08, 2014 at 08:06:11PM -0800, Linus Torvalds wrote:
> On Mon, Dec 8, 2014 at 4:00 AM, Lee Jones <lee.jones@linaro.org> wrote:
> >
> > Johan Hovold (4):
> >       mfd: Use mfd_add_hotplug_devices() helper
> 
> This clashed with the earlier fix "mfd: viperboard: Fix
> platform-device id collision" also by Johan.
> 
> My merge resolution ends up taking the mfd_add_hotplug_devices() version.
> 
> See drivers/mfd/viperboard.c, and somebody should double-check and
> test that this actually works. The "Fix platform-device id collision"
> commit supposedly fixed a problem with multiple boards, I'm
> hoping/assuming that the mfd_add_hotplug_devices() helper handles that
> case correctly.

The end result is correct since, as you assumed,
mfd_add_hotplug_devices() handles that case.

Just discussed this with Lee. The original patch adding the helper was
on top of the fix, but the latter never made it into mfd-next.

Not sure what happened to the git history after your merge, though,
since commit

	b6684228726c ("mfd: viperboard: Fix platform-device id collision")

no longer shows up when doing

	git log origin/master -- drivers/mfd/viperboard.c

and the diff of

	1ab589c72ef6 ("mfd: Use mfd_add_hotplug_devices() helper")

looks like the first patch has never been applied, even though it is
listed when doing "git log origin/master".

Johan

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [GIT PULL] MFD for v3.19
  2014-12-09 10:00   ` Johan Hovold
@ 2014-12-09 20:44     ` Linus Torvalds
  2014-12-10  9:55       ` Lee Jones
  2014-12-10  9:59       ` Johan Hovold
  0 siblings, 2 replies; 6+ messages in thread
From: Linus Torvalds @ 2014-12-09 20:44 UTC (permalink / raw)
  To: Johan Hovold; +Cc: Lee Jones, Linux Kernel Mailing List

On Tue, Dec 9, 2014 at 2:00 AM, Johan Hovold <johan@kernel.org> wrote:
>
> Not sure what happened to the git history after your merge, though,
> since commit
>
>         b6684228726c ("mfd: viperboard: Fix platform-device id collision")
>
> no longer shows up when doing
>
>         git log origin/master -- drivers/mfd/viperboard.c

So when you do "git log" with a pathname specifier, git obviously no
longer shows you all the history. In particular, it shows you the
relevant history for just that file. And by "relevant", it not only
skips commits that don't change the file, but it also does merge
simplification: if it hits a merge, and all changes to the file came
from one side of the merge, it will ignore the other side.

And in this case, since after my merge the file was identical to your
branch, clearly the other side didn't bring anything interesting to
the table, and that history simplification basically means that it's
ignoring all the changes done in the other side of the merge that got
thrown away and aren't really relevant for the end result.

You can get rid of that extra simplification with "--full-history",
but then you'll usually also want to skip all the merges that aren't
really intersting, so you'd usually end up doing "--full-history
--no-merges" or something.

Thenm you'll see that commit that didn't actually matter fot the end result..

                    Linus

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [GIT PULL] MFD for v3.19
  2014-12-09 20:44     ` Linus Torvalds
@ 2014-12-10  9:55       ` Lee Jones
  2014-12-10  9:59       ` Johan Hovold
  1 sibling, 0 replies; 6+ messages in thread
From: Lee Jones @ 2014-12-10  9:55 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Johan Hovold, Linux Kernel Mailing List

On Tue, 09 Dec 2014, Linus Torvalds wrote:

> On Tue, Dec 9, 2014 at 2:00 AM, Johan Hovold <johan@kernel.org> wrote:
> >
> > Not sure what happened to the git history after your merge, though,
> > since commit
> >
> >         b6684228726c ("mfd: viperboard: Fix platform-device id collision")
> >
> > no longer shows up when doing
> >
> >         git log origin/master -- drivers/mfd/viperboard.c
> 
> So when you do "git log" with a pathname specifier, git obviously no
> longer shows you all the history. In particular, it shows you the
> relevant history for just that file. And by "relevant", it not only
> skips commits that don't change the file, but it also does merge
> simplification: if it hits a merge, and all changes to the file came
> from one side of the merge, it will ignore the other side.
> 
> And in this case, since after my merge the file was identical to your
> branch, clearly the other side didn't bring anything interesting to
> the table, and that history simplification basically means that it's
> ignoring all the changes done in the other side of the merge that got
> thrown away and aren't really relevant for the end result.
> 
> You can get rid of that extra simplification with "--full-history",
> but then you'll usually also want to skip all the merges that aren't
> really intersting, so you'd usually end up doing "--full-history
> --no-merges" or something.
> 
> Thenm you'll see that commit that didn't actually matter fot the end result..

Interesting.  I know Git does some pretty amazing things, but I wasn't
aware it was capable of this kind of simplification when displaying
logs.  I would have expected it to display all commits pertaining to a
file if you'd specified it implicitly.  Thanks for clearing that up.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [GIT PULL] MFD for v3.19
  2014-12-09 20:44     ` Linus Torvalds
  2014-12-10  9:55       ` Lee Jones
@ 2014-12-10  9:59       ` Johan Hovold
  1 sibling, 0 replies; 6+ messages in thread
From: Johan Hovold @ 2014-12-10  9:59 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Johan Hovold, Lee Jones, Linux Kernel Mailing List

On Tue, Dec 09, 2014 at 12:44:09PM -0800, Linus Torvalds wrote:
> On Tue, Dec 9, 2014 at 2:00 AM, Johan Hovold <johan@kernel.org> wrote:

> So when you do "git log" with a pathname specifier, git obviously no
> longer shows you all the history. In particular, it shows you the
> relevant history for just that file. And by "relevant", it not only
> skips commits that don't change the file, but it also does merge
> simplification: if it hits a merge, and all changes to the file came
> from one side of the merge, it will ignore the other side.

Thanks for the explanation.

Johan

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-12-10  9:59 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-08 12:00 [GIT PULL] MFD for v3.19 Lee Jones
2014-12-09  4:06 ` Linus Torvalds
2014-12-09 10:00   ` Johan Hovold
2014-12-09 20:44     ` Linus Torvalds
2014-12-10  9:55       ` Lee Jones
2014-12-10  9:59       ` Johan Hovold

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).