forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
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-next-4.18' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/lee/mfd Pull MFD updates from Lee Jones: "New Device Support: - Add support for AXP813 ADC to AXP20x - Add support for PM8005, PM8998 and PMI8998 New Functionality: - Add support for Battery Power Supply to AXP813 - Add support for SYSCON to SPARD SC27XX SPI - Add support for RTC to ChromeOS Embedded-Controller Fix-ups: - Remove unused code; exynos{4,5}-pmu, cros_ec, cros_ec_acpi_gpe - Remove duplicate error messages (-ENOMEM, etc); htc-i2cpld, janz-cmodio, max8997, rc5t583, sm501, smsc-ece1099, abx500-core, si476x-i2c, ti_am335x_tscadc, tps65090, tps6586x, tps65910, tps80031, twl6030-irq, viperboard - Succinctly use ptr to struct in sizeof(); rc5t583, abx500-core, sm501, smsc-ece1099 - Simplify syntax for NULL ptr checking; abx500-core, sm501 - No not unnecessarily initialise variables; tps65910, tps65910 - Reorganise and simplify driver data; omap-usb-tll - Move to SPDX license statement; tps68470 - Probe ADCs via DT; axp20x - Use new GPIOD API; arizona-core - Constify things; axp20x - Reduce code-size (use MACROS, etc); axp20x, omap-usb-host - Add DT support/docs; motorola-cpcap - Remove VLAs; rave-sp - Use devm_* managed resources; cros_ec - Interrogate HW for firmware version; rave-sp - Provide ACPI support for ChromeOS Embedded-Controller Bug Fixes: - Reorder ordered (enum) device list; tps65218 - Only accept valid data from the offset; rave-sp - Refrain from copying junk from failed SPI read; cros_ec_dev - Fix potential memory leaks; pcf50633-core - Fix clock initialisation; twl-core - Fix build-issue; tps65911 - Fix off-by-one error; tps65911 - Fix code ordering issues; intel-lpss - Fix COMPILE_TEST related issues; pwm-stm32 - Fix broken MMC card detection; asic3 - Fix clocking related issues; intel-lpss-pci" * tag 'mfd-next-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (84 commits) mfd: cros_ec: Remove unused __remove function mfd: wm97xx-core: Platform data can be NULL mfd: cros_ec_dev: Don't advertise junk features on failure mfd: cros_ec: Use devm_kzalloc for private data mfd: intel-lpss: Fix Intel Cannon Lake LPSS I2C input clock mfd: asic3: Fix broken MMC card detection mfd: timberdale: Fix spelling mistake "Uknown" -> "Unknown" mfd: omap-usb-host: Use match_string() helper mfd: stm32-timers: Fix pwm-stm32 linker issue with COMPILE_TEST pwm: stm32: Initialize raw local variables mfd: arizona: Update DT doc to support more standard Reset binding dt-bindings: mfd: Add bindings for DA9063L mfd: intel-lpss: Correct names of RESETS register bits mfd: qcom-spmi-pmic: Add support for pm8005, pm8998 and pmi8998 mfd: intel-lpss: Program REMAP register in PIO mode mfd: cros_ec_i2c: Moving the system sleep pm ops to late mfd: cros_ec_i2c: Add ACPI module device table mfd: cros_ec_dev: Register shutdown function for debugfs mfd: cros_ec_dev: Register cros-ec-rtc driver as a subdevice mfd: cros_ec: Don't try to grab log when suspended ...
- Loading branch information
Showing
64 changed files
with
1,574 additions
and
994 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,43 @@ | ||
MediaTek MT6397/MT6323 PMIC Keys Device Driver | ||
|
||
There are two key functions provided by MT6397/MT6323 PMIC, pwrkey | ||
and homekey. The key functions are defined as the subnode of the function | ||
node provided by MT6397/MT6323 PMIC that is being defined as one kind | ||
of Muti-Function Device (MFD) | ||
|
||
For MT6397/MT6323 MFD bindings see: | ||
Documentation/devicetree/bindings/mfd/mt6397.txt | ||
|
||
Required properties: | ||
- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys" | ||
- linux,keycodes: See Documentation/devicetree/bindings/input/keys.txt | ||
|
||
Optional Properties: | ||
- wakeup-source: See Documentation/devicetree/bindings/power/wakeup-source.txt | ||
- mediatek,long-press-mode: Long press key shutdown setting, 1 for | ||
pwrkey only, 2 for pwrkey/homekey together, others for disabled. | ||
- power-off-time-sec: See Documentation/devicetree/bindings/input/keys.txt | ||
|
||
Example: | ||
|
||
pmic: mt6397 { | ||
compatible = "mediatek,mt6397"; | ||
|
||
... | ||
|
||
mt6397keys: mt6397keys { | ||
compatible = "mediatek,mt6397-keys"; | ||
mediatek,long-press-mode = <1>; | ||
power-off-time-sec = <0>; | ||
|
||
power { | ||
linux,keycodes = <116>; | ||
wakeup-source; | ||
}; | ||
|
||
home { | ||
linux,keycodes = <114>; | ||
}; | ||
}; | ||
|
||
}; |
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
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 |
---|---|---|
|
@@ -13562,6 +13562,16 @@ T: git git://linuxtv.org/media_tree.git | |
S: Maintained | ||
F: drivers/media/usb/stk1160/ | ||
|
||
STM32 TIMER/LPTIMER DRIVERS | ||
M: Fabrice Gasnier <[email protected]> | ||
S: Maintained | ||
F: drivers/*/stm32-*timer* | ||
F: drivers/pwm/pwm-stm32* | ||
F: include/linux/*/stm32-*tim* | ||
F: Documentation/ABI/testing/*timer-stm32 | ||
F: Documentation/devicetree/bindings/*/stm32-*timer | ||
F: Documentation/devicetree/bindings/pwm/pwm-stm32* | ||
|
||
STMMAC ETHERNET DRIVER | ||
M: Giuseppe Cavallaro <[email protected]> | ||
M: Alexandre Torgue <[email protected]> | ||
|
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.