-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/k…
…ernel/git/lee/mfd
Pull MFD updates from Lee Jones:
"Core framework:
- Add the MFD bindings doc to MAINTAINERS
New drivers:
- X-Powers AC100 Audio CODEC and RTC
- TI LP873x PMIC
- Rockchip RK808 PMIC
- Samsung Exynos Low Power Audio
New device support:
- Add support for STMPE1600 variant to stmpe
- Add support for PM8018 PMIC to pm8921-core
- Add support for AXP806 PMIC in axp20x
- Add support for AXP209 GPIO in axp20x
New functionality:
- Add support for Reset to all STMPE variants
- Add support for MKBP event support to cros_ec
- Add support for USB to intel_soc_pmic_bxtwc
- Add support for IRQs and Power Button to tps65217
Fix-ups:
- Clean-up defunct author emails (da9063, max14577)
- Kconfig fixups (wm8350-i2c, as37220
- Constify (altera-a10sr, sm501)
- Supply PCI IDs (intel-lpss-pci)
- Improve clocking (qcom_rpm)
- Fix IRQ probing (ucb1x00-core)
- Ensure fault log is cleared (da9052)
- Remove NO_IRQ check (ucb1x00-core)
- Supply I2C properties (intel-lpss-acpi, intel-lpss-pci)
- Non standard declaration (tps65217, max8997-irq)
- Remove unused code (lp873x, db8500-prcmu, ab8500-debugfs,
cros_ec_spi)
- Make non-modular (altera-a10sr, intel_msic, smsc-ece1099,
sun6i-prcm, twl-core)
- OF bindings (ac100, stmpe, qcom-pm8xxx, qcom-rpm, rk808, axp20x,
lp873x, exynos5433-lpass, act8945a, aspeed-scu, twl6040, arizona)
Bugfixes:
- Release OF pointer (qcom_rpm)
- Avoid double shifting in suspend/resume (88pm80x)
- Fix 'defined but not used' error (exynos-lpass)
- Fix 'sleeping whilst attomic' (atmel-hlcdc)"
* tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (69 commits)
mfd: arizona: Handle probe deferral for reset GPIO
mfd: arizona: Remove arizona_of_get_named_gpio helper function
mfd: arizona: Add DT options for max_channels_clocked and PDM speaker config
mfd: twl6040: Register child device for twl6040-pdmclk
mfd: cros_ec_spi: Remove unused variable 'request'
mfd: omap-usb-host: Return value is not 'const int'
mfd: ab8500-debugfs: Remove 'weak' function suspend_test_wake_cause_interrupt_is_mine()
mfd: ab8500-debugfs: Remove ab8500_dump_all_banks_to_mem()
mfd: db8500-prcmu: Remove unused *prcmu_set_ddr_opp() calls
mfd: ab8500-debugfs: Prevent initialised field from being over-written
mfd: max8997-irq: 'inline' should be at the beginning of the declaration
mfd: rk808: Fix RK818_IRQ_DISCHG_ILIM initializer
mfd: tps65217: Fix nonstandard declaration
mfd: lp873x: Remove unused mutex lock from struct lp873x
mfd: atmel-hlcdc: Do not sleep in atomic context
mfd: exynos-lpass: Mark PM functions as __maybe_unused
mfd: intel-lpss: Add default I2C device properties for Apollo Lake
mfd: twl-core: Make it explicitly non-modular
mfd: sun6i-prcm: Make it explicitly non-modular
mfd: smsc-ece1099: Make it explicitly non-modular
...- Loading branch information
Showing
80 changed files
with
3,111 additions
and
445 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| X-Powers AC100 Codec/RTC IC Device Tree bindings | ||
|
|
||
| AC100 is a audio codec and RTC subsystem combo IC. The 2 parts are | ||
| separated, including power supplies and interrupt lines, but share | ||
| a common register address space and host interface. | ||
|
|
||
| Required properties: | ||
| - compatible: "x-powers,ac100" | ||
| - reg: The I2C slave address or RSB hardware address for the chip | ||
| - sub-nodes: | ||
| - codec | ||
| - compatible: "x-powers,ac100-codec" | ||
| - interrupt-parent: The parent interrupt controller | ||
| - interrupts: SoC NMI / GPIO interrupt connected to the | ||
| IRQ_AUDIO pin | ||
| - #clock-cells: Shall be 0 | ||
| - clock-output-names: "4M_adda" | ||
|
|
||
| - see clock/clock-bindings.txt for common clock bindings | ||
|
|
||
| - rtc | ||
| - compatible: "x-powers,ac100-rtc" | ||
| - interrupt-parent: The parent interrupt controller | ||
| - interrupts: SoC NMI / GPIO interrupt connected to the | ||
| IRQ_RTC pin | ||
| - clocks: A phandle to the codec's "4M_adda" clock | ||
| - #clock-cells: Shall be 1 | ||
| - clock-output-names: "cko1_rtc", "cko2_rtc", "cko3_rtc" | ||
|
|
||
| - see clock/clock-bindings.txt for common clock bindings | ||
|
|
||
| Example: | ||
|
|
||
| ac100: codec@e89 { | ||
| compatible = "x-powers,ac100"; | ||
| reg = <0xe89>; | ||
|
|
||
| ac100_codec: codec { | ||
| compatible = "x-powers,ac100-codec"; | ||
| interrupt-parent = <&r_pio>; | ||
| interrupts = <0 9 IRQ_TYPE_LEVEL_LOW>; /* PL9 */ | ||
| #clock-cells = <0>; | ||
| clock-output-names = "4M_adda"; | ||
| }; | ||
|
|
||
| ac100_rtc: rtc { | ||
| compatible = "x-powers,ac100-rtc"; | ||
| interrupt-parent = <&nmi_intc>; | ||
| interrupts = <0 IRQ_TYPE_LEVEL_LOW>; | ||
| clocks = <&ac100_codec>; | ||
| #clock-cells = <1>; | ||
| clock-output-names = "cko1_rtc", "cko2_rtc", "cko3_rtc"; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| The Aspeed System Control Unit manages the global behaviour of the SoC, | ||
| configuring elements such as clocks, pinmux, and reset. | ||
|
|
||
| Required properties: | ||
| - compatible: One of: | ||
| "aspeed,ast2400-scu", "syscon", "simple-mfd" | ||
| "aspeed,g4-scu", "syscon", "simple-mfd" | ||
| "aspeed,ast2500-scu", "syscon", "simple-mfd" | ||
| "aspeed,g5-scu", "syscon", "simple-mfd" | ||
|
|
||
| - reg: contains the offset and length of the SCU memory region | ||
|
|
||
| Example: | ||
|
|
||
| syscon: syscon@1e6e2000 { | ||
| compatible = "aspeed,ast2400-scu", "syscon", "simple-mfd"; | ||
| reg = <0x1e6e2000 0x1a8>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| TI LP873X PMIC MFD driver | ||
|
|
||
| Required properties: | ||
| - compatible: "ti,lp8732", "ti,lp8733" | ||
| - reg: I2C slave address. | ||
| - gpio-controller: Marks the device node as a GPIO Controller. | ||
| - #gpio-cells: Should be two. The first cell is the pin number and | ||
| the second cell is used to specify flags. | ||
| See ../gpio/gpio.txt for more information. | ||
| - regulators: List of child nodes that specify the regulator | ||
| initialization data. | ||
| Example: | ||
|
|
||
| pmic: lp8733@60 { | ||
| compatible = "ti,lp8733"; | ||
| reg = <0x60>; | ||
| gpio-controller; | ||
| #gpio-cells = <2>; | ||
|
|
||
| regulators { | ||
| lp8733_buck0: buck0 { | ||
| regulator-name = "lp8733-buck0"; | ||
| regulator-min-microvolt = <800000>; | ||
| regulator-max-microvolt = <1400000>; | ||
| regulator-min-microamp = <1500000>; | ||
| regulator-max-microamp = <4000000>; | ||
| regulator-ramp-delay = <10000>; | ||
| regulator-always-on; | ||
| regulator-boot-on; | ||
| }; | ||
|
|
||
| lp8733_buck1: buck1 { | ||
| regulator-name = "lp8733-buck1"; | ||
| regulator-min-microvolt = <800000>; | ||
| regulator-max-microvolt = <1400000>; | ||
| regulator-min-microamp = <1500000>; | ||
| regulator-max-microamp = <4000000>; | ||
| regulator-ramp-delay = <10000>; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| lp8733_ldo0: ldo0 { | ||
| regulator-name = "lp8733-ldo0"; | ||
| regulator-min-microvolt = <800000>; | ||
| regulator-max-microvolt = <3000000>; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| lp8733_ldo1: ldo1 { | ||
| regulator-name = "lp8733-ldo1"; | ||
| regulator-min-microvolt = <800000>; | ||
| regulator-max-microvolt = <3000000>; | ||
| regulator-always-on; | ||
| regulator-boot-on; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.