Skip to contentSkip to conversation

MFD for v4.4

GIT PULL Lee Jones 4 participants 8 messages Nov 6, 2015 – Nov 10, 2015

lore
Share & tools
lore

Lee Jones

author
#0 lore raw

Hi Linus,

The following changes since commit 049e6dde7e57f0054fdc49102e7ef4830c698b46:

Linux 4.3-rc4 (2015-10-04 16:57:17 +0100)

are available in the git repository at:

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

for you to fetch changes up to 271bb1773b1eeff6153f1bba16ff0cff23f064b6:

bindings: mfd: s2mps11: Add documentation for s2mps15 PMIC (2015-10-30 18:57:38 +0000)

----------------------------------------------------------------
- New Device Support
- Add support for 88pm860; 88pm80x
- Add support for 24c08 EEPROM; at24
- Add support for Broxton Whiskey Cove; intel*
- Add support for RTS522A; rts5227
- Add support for I2C devices; intel_quark_i2c_gpio
- New Functionality
- Add microphone support; arizona
- Add general purpose switch support; arizona
- Add fuel-gauge support; da9150-core
- Add shutdown support; sec-core
- Add charger support; tps65217
- Add flexible serial communication unit support; atmel-flexcom
- Add power button support; axp20x
- Add led-flash support; rt5033
- Core Frameworks
- Supply a generic macro for defining Regmap IRQs
- Rework ACPI child device matching
- Fix-ups
- Use Regmap to access registers; tps6105x
- Use DEFINE_RES_IRQ_NAMED() macro; da9150
- Re-arrange device registration order; intel_quark_i2c_gpio
- Allow OF matching; cros_ec_i2c, atmel-hlcdc, hi6421-pmic, max8997, sm501
- Handle deferred probe; twl6040
- Improve accuracy of headphone detect; arizona
- Unnecessary MODULE_ALIAS() removal; bcm590xx, rt5033
- Remove unused code; htc-i2cpld, arizona, pcf50633-irq, sec-core
- Simplify code; kempld, rts5209, da903x, lm3533, da9052, arizona
- Remove #iffery; arizona
- DT binding adaptions; many
- Bug Fixes
- Fix possible NULL pointer dereference; wm831x, tps6105x
- Fix 64bit bug; intel_soc_pmic_bxtwc
- Fix signedness issue; arizona

----------------------------------------------------------------
Aaron Sierra (1):
mfd: lpc_ich: Separate device cells for clarity

Adam Thomson (6):
mfd: da9150: Add support for Fuel-Gauge
mfd: da9150: Update DT bindings for Fuel-Gauge support
power: Add support for DA9150 Fuel-Gauge
power: da9150: Add DT bindings documentation for Fuel-Gauge
mfd: da9150: Use relative paths in DT bindings document
mfd: da9150: Use DEFINE_RES_IRQ_NAMED() help macro for IRQ resource

Andy Shevchenko (6):
mfd: core: redo ACPI matching of the children devices
mfd: intel_quark_i2c_gpio: load gpio driver first
mfd: intel_quark_i2c_gpio: support devices behind i2c bus
at24: enable ACPI device found on Galileo Gen2
mfd: intel-lpss: Use writeq() helper
mfd: lpss: Add Intel Broxton PCI IDs

Axel Lin (2):
mfd: da9062-core: Rename get_device_type to da9062_get_device_type
mfd: Make TPS6105X select REGMAP_I2C

Borun Fu (1):

      mfd: axp20x: Add a cell for the power button part of the, axp288 PMICs

Charles Keepax (14):
mfd: arizona: Add registers for ADC microphone detection
mfd: arizona: Add register bits for general purpose switch
mfd: arizona: Add TST_CAP bits for headphone detection
extcon: arizona: Add support for new ADC value mic detect
extcon: arizona: Add support for general purpose switch
extcon: arizona: Additional settings to improve accuracy of HP detect
extcon: arizona: Use the micd_clamp for interrupts if it is available
extcon: arizona: Don't disable debounce for inverted jacks
mfd: arizona: Fix typo in arizona_irq_map
mfd: arizona: Add register bits to support the ANC block
mfd: wm8998: Fixup register defaults/readables
mfd: arizona: Remove bindings covered in new subsystem specific docs
MAINTAINERS: Add binding docs for Cirrus Logic/Wolfson Arizona devices
extcon: arizona: Add extcon specific device tree binding document

Cyrille Pitchen (3):
mfd: atmel-flexcom: Create include file with macros used by DT bindings
mfd: devicetree: Add bindings for Atmel Flexcom
mfd: atmel-flexcom: Add a driver for Atmel Flexible Serial Communication Unit

Dan Carpenter (2):
mfd: intel_soc_pmic_bxtwc: 64 bit bug in bxtwc_val_store()
mfd: arizona: Signedness bug in arizona_runtime_suspend()

Emilio López (1):
bindings: mfd: cros ec: Document vbc EC property

Enric Balletbo i Serra (1):
mfd: tps65217: Add battery charger as subdevice

Grigoryev Denis (2):
mfd: tps6105x: Use i2c regmap to access registers
mfd: tps6105x: Fix possible NULL pointer access

Ingi Kim (1):
mfd: rt5033: Add RT5033 Flash led sub device

Javier Martinez Canillas (12):
mfd: cros_ec_i2c: Add OF match table
mfd: wm831x: Fix possible NULL pointer dereference
mfd: bcm590xx: Remove unnecessary MODULE_ALIAS()
mfd: rt5033: Remove unnecessary MODULE_ALIAS()
mfd: htc-i2cpld: Remove unneded ret variable
mfd: arizona: Remove unneded ret variable
mfd: pcf50633: Remove unneded ret variable
mfd: kempld-core: Simplify function return logic
mfd: rtsx: Simplify function return logic
mfd: da903x: Simplify function return logic
mfd: lm3533: Simplify function return logic
mfd: da9052: Simplify function return logic

Krzysztof Kozlowski (5):
mfd: s2mps11: Add manual shutdown method for Odroid XU3
mfd: sec-core: Dump PMIC revision to find out the HW
mfd: sec-core: Disable buck voltage reset on watchdog falling edge
mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X
mfd: sec-core: Remove unused s2mpu02-rtc and s2mpu02-clk children

Lee Jones (3):
Merge branches 'ib-extcon-mfd-4.4', 'ib-mfd-i2c-v4.4', 'ib-mfd-power-4.4', 'ib-mfd-regmap-4.4' and 'ib-mfd-regulator-4.4' into ibs-for-mfd-merged
platform: x86: PMC IPC depends on ACPI
MAINTAINERS: Remove Samuel Ortiz as MFD Maintainer

Linus Walleij (1):
mfd: stmpe: PWM on 24xx has altfunc 1

Luis de Bethencourt (5):
mfd: atmel-hlcdc: Fix module autoload for OF platform driver
mfd: hi6421-pmic: Fix module autoload for OF platform driver
mfd: max8997: Fix module autoload for OF platform driver
mfd: sm501: Fix module autoload for OF platform driver
mfd: Kconfig: Compile MFD_STW481X with COMPILE_TEST

Micky Ching (1):
mfd: rtsx: Add support for rts522A

Mika Westerberg (1):
mfd: lpss: Add Broxton ACPI IDs

Nariman Poushin (2):
extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS
mfd: Fixup clients of multi_reg_write/register_patch

Qipeng Zha (3):
regmap: Add generic macro to define regmap_irq
mfd: intel_soc_pmic: Add support for Broxton WC PMIC
mfd: add Intel Broxton Whiskey Cove PMIC driver

Richard Fitzgerald (6):
mfd: arizona: Factor out DCVDD isolation control
mfd: arizona: Factor out checking of jack detection state
mfd: arizona: Downgrade type mismatch messages to dev_warn
mfd: arizona: Simplify adding subdevices
mfd: arizona: Remove use of codec build config #ifdefs
mfd: arizona: Use correct type ID for device tree config

Steve Twiss (1):
mfd: da9053: Addition of extra registers for GPIOs 8-13

Sudeep Holla (1):
mfd: qcom_rpm: Drop use of IRQF_NO_SUSPEND flag

Sudip Mukherjee (1):
mfd: lm3533: Fix unused variable build warning

Thomas Abraham (1):
bindings: mfd: s2mps11: Add documentation for s2mps15 PMIC

Tony Lindgren (1):
mfd: twl6040: Fix deferred probe handling for clk32k

Vaibhav Hiremath (1):

      mfd: 88pm80x: Add 88pm860 chip type support
 Documentation/acpi/enumeration.txt                 |  11 +-
 .../devicetree/bindings/extcon/extcon-arizona.txt  |  15 +
 Documentation/devicetree/bindings/mfd/arizona.txt  |  15 +-
 .../devicetree/bindings/mfd/atmel-flexcom.txt      |  63 +++
 Documentation/devicetree/bindings/mfd/cros-ec.txt  |   4 +
 Documentation/devicetree/bindings/mfd/da9150.txt   |  33 +-
 Documentation/devicetree/bindings/mfd/s2mps11.txt  |  24 +-
 .../devicetree/bindings/power/da9150-fg.txt        |  23 +
 MAINTAINERS                                        |   4 +-
 drivers/extcon/extcon-arizona.c                    | 106 +++-
 drivers/mfd/88pm80x.c                              |   2 +
 drivers/mfd/Kconfig                                |  21 +-
 drivers/mfd/Makefile                               |   2 +
 drivers/mfd/arizona-core.c                         | 300 ++++++-----
 drivers/mfd/arizona-i2c.c                          |  33 +-
 drivers/mfd/arizona-irq.c                          |   2 +-
 drivers/mfd/arizona-spi.c                          |  23 +-
 drivers/mfd/atmel-flexcom.c                        | 104 ++++
 drivers/mfd/atmel-hlcdc.c                          |   1 +
 drivers/mfd/axp20x.c                               |  20 +
 drivers/mfd/bcm590xx.c                             |   1 -
 drivers/mfd/cros_ec_i2c.c                          |   7 +
 drivers/mfd/da903x.c                               |   6 +-
 drivers/mfd/da9052-core.c                          |   6 +
 drivers/mfd/da9052-i2c.c                           |   6 +-
 drivers/mfd/da9052-spi.c                           |   6 +-
 drivers/mfd/da9062-core.c                          |   4 +-
 drivers/mfd/da9150-core.c                          | 191 +++++--
 drivers/mfd/hi6421-pmic-core.c                     |   1 +
 drivers/mfd/htc-i2cpld.c                           |   3 +-
 drivers/mfd/intel-lpss-acpi.c                      |  16 +
 drivers/mfd/intel-lpss-pci.c                       |  45 ++
 drivers/mfd/intel-lpss.c                           |  12 +-
 drivers/mfd/intel_quark_i2c_gpio.c                 |  33 +-
 drivers/mfd/intel_soc_pmic_bxtwc.c                 | 477 +++++++++++++++++
 drivers/mfd/kempld-core.c                          |  14 +-
 drivers/mfd/lm3533-core.c                          |  13 +-
 drivers/mfd/lpc_ich.c                              |  42 +-
 drivers/mfd/max8997.c                              |   1 +
 drivers/mfd/mfd-core.c                             |  52 +-
 drivers/mfd/pcf50633-irq.c                         |   4 +-
 drivers/mfd/qcom_rpm.c                             |   2 +-
 drivers/mfd/rt5033.c                               |   4 +-
 drivers/mfd/rts5209.c                              |   6 +-
 drivers/mfd/rts5227.c                              |  83 ++-
 drivers/mfd/rts5229.c                              |   6 +-
 drivers/mfd/rts5249.c                              |   6 +-
 drivers/mfd/rtsx_pcr.c                             |  11 +-
 drivers/mfd/rtsx_pcr.h                             |   3 +
 drivers/mfd/sec-core.c                             |  73 ++-
 drivers/mfd/sm501.c                                |   1 +
 drivers/mfd/stmpe.c                                |   1 +
 drivers/mfd/tps6105x.c                             | 150 ++----
 drivers/mfd/tps65217.c                             |   4 +
 drivers/mfd/twl6040.c                              |   2 +
 drivers/mfd/wm5110-tables.c                        | 194 ++++++-
 drivers/mfd/wm831x-core.c                          |   4 +-
 drivers/mfd/wm8998-tables.c                        |  10 +-
 drivers/misc/eeprom/at24.c                         |  22 +-
 drivers/platform/x86/Kconfig                       |   1 +
 drivers/power/Kconfig                              |  10 +
 drivers/power/Makefile                             |   1 +
 drivers/power/da9150-fg.c                          | 579 +++++++++++++++++++++
 drivers/regulator/tps6105x-regulator.c             |  16 +-
 include/dt-bindings/mfd/arizona.h                  |   2 +
 include/dt-bindings/mfd/atmel-flexcom.h            |  26 +
 include/linux/mfd/88pm80x.h                        |   1 +
 include/linux/mfd/arizona/pdata.h                  |   6 +
 include/linux/mfd/arizona/registers.h              |  84 ++-
 include/linux/mfd/core.h                           |  10 +-
 include/linux/mfd/da9052/reg.h                     |   3 +
 include/linux/mfd/da9150/core.h                    |  19 +-
 include/linux/mfd/intel_bxtwc.h                    |  69 +++
 include/linux/mfd/intel_soc_pmic.h                 |   2 +
 include/linux/mfd/rtsx_pci.h                       |   6 +
 include/linux/mfd/samsung/core.h                   |   4 +
 include/linux/mfd/samsung/s2mps11.h                |   1 +
 include/linux/mfd/samsung/s2mps13.h                |   1 +
 include/linux/mfd/tps6105x.h                       |  10 +-
 include/linux/regmap.h                             |   3 +
 80 files changed, 2671 insertions(+), 511 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/extcon/extcon-arizona.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
 create mode 100644 Documentation/devicetree/bindings/power/da9150-fg.txt
 create mode 100644 drivers/mfd/atmel-flexcom.c
 create mode 100644 drivers/mfd/intel_soc_pmic_bxtwc.c
 create mode 100644 drivers/power/da9150-fg.c
 create mode 100644 include/dt-bindings/mfd/atmel-flexcom.h
 create mode 100644 include/linux/mfd/intel_bxtwc.h
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#1 lore raw
Quoted 2 lines · Lee Jones

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

So I had some of the patches you listed from before throughthe regmap merge etc. So you and Mark Brown merged some of the same branches.

That all looks fine, I just want to confirm that it was intentional and you were both aware of this, and it happened because you both wanted some of the infrastructure?

Linus

#3 lore raw
In reply to Lee Jones
Quoted 2 lines · Lee Jones

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

Ugh.

Maintainers, *please* check new warnings you introduce. We don't have that many compiler warnings in the kernel, you shouldn't be introducing new ones and not notice.

This pull request introduces this silly new warning:

drivers/mfd/rtsx_pcr.c: In function ‘rtsx_pci_set_pull_ctl’:
drivers/mfd/rtsx_pcr.c:565:6: warning: unused variable ‘err’
[-Wunused-variable]

      int err;
          ^

due to commit b158b69a3765 ("mfd: rtsx: Simplify function return logic") that removes the actual use of the variable, but not the variable itself.

Linus

#2 lore raw
In reply to Linus Torvalds
Quoted 10 lines · Linus Torvalds
Quoted 1 line · Lee Jones

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

So I had some of the patches you listed from before throughthe regmap merge etc. So you and Mark Brown merged some of the same branches.

That all looks fine, I just want to confirm that it was intentional and you were both aware of this, and it happened because you both wanted some of the infrastructure?

Yup, some of the MFD drivers wanted new regmap functionality so Lee pulled in some branches I tagged. At least for my stuff in general if someone's merged something from a tag I signed I was expecting that.

author
#4 lore raw
In reply to Linus Torvalds
Quoted 15 lines · Linus Torvalds
Quoted 2 lines · Lee Jones

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

Ugh.

Maintainers, *please* check new warnings you introduce. We don't have that many compiler warnings in the kernel, you shouldn't be introducing new ones and not notice.

This pull request introduces this silly new warning:

drivers/mfd/rtsx_pcr.c: In function ‘rtsx_pci_set_pull_ctl’:
drivers/mfd/rtsx_pcr.c:565:6: warning: unused variable ‘err’
[-Wunused-variable]

Quoted 6 lines
      int err;
          ^

due to commit b158b69a3765 ("mfd: rtsx: Simplify function return logic") that removes the actual use of the variable, but not the variable itself.

I thought these were cleaned up. Apologies for that.

Do you want me to submit a fix, or did you already rectify?

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#5 lore raw
Quoted 2 lines · Lee Jones

Do you want me to submit a fix, or did you already rectify?

I fixed it up already.

Linus

#6 lore raw
In reply to Lee Jones
Quoted 20 lines · Lee Jones
Quoted 18 lines · Linus Torvalds
Quoted 2 lines · Lee Jones

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

Ugh.

Maintainers, *please* check new warnings you introduce. We don't have that many compiler warnings in the kernel, you shouldn't be introducing new ones and not notice.

This pull request introduces this silly new warning:

drivers/mfd/rtsx_pcr.c: In function ‘rtsx_pci_set_pull_ctl’:
drivers/mfd/rtsx_pcr.c:565:6: warning: unused variable ‘err’
[-Wunused-variable]

      int err;
          ^
Quoted 5 lines
Quoted 3 lines

due to commit b158b69a3765 ("mfd: rtsx: Simplify function return logic") that removes the actual use of the variable, but not the variable itself.

I thought these were cleaned up. Apologies for that.

Yes, Fix was submitted. https://lkml.org/lkml/2015/10/7/301

I even got your applied message. (https://lkml.org/lkml/2015/10/13/149)

regards
sudip

author
#7 lore raw
Quoted 25 lines · Sudip Mukherjee
Quoted 24 lines · Lee Jones
Quoted 21 lines · Linus Torvalds
Quoted 2 lines · Lee Jones

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

Ugh.

Maintainers, *please* check new warnings you introduce. We don't have that many compiler warnings in the kernel, you shouldn't be introducing new ones and not notice.

This pull request introduces this silly new warning:

drivers/mfd/rtsx_pcr.c: In function ‘rtsx_pci_set_pull_ctl’:
drivers/mfd/rtsx_pcr.c:565:6: warning: unused variable ‘err’
[-Wunused-variable]

      int err;
          ^

due to commit b158b69a3765 ("mfd: rtsx: Simplify function return logic") that removes the actual use of the variable, but not the variable itself.

Quoted 5 lines
Quoted 1 line

I thought these were cleaned up. Apologies for that.

Yes, Fix was submitted. https://lkml.org/lkml/2015/10/7/301

I even got your applied message. (https://lkml.org/lkml/2015/10/13/149)

Very odd.

Appologies for this. I'm still unsure as to excactly what happened.

Thanks for fixing-up though.

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