diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:49:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:49:59 -0800 |
| commit | a7dcf5f2356506677c03be5760b5b2111a24a1ec (patch) | |
| tree | a75adb5005c01ad41a551d7cf1ae9050b3c1b9e1 /Documentation/devicetree/bindings/arm | |
| parent | 28b9aaac4cc5a11485b6f70656e4e9ead590cf5b (diff) | |
| parent | a72acc56f3e939b9e10f2dd460ac1e4519de621f (diff) | |
Merge tag 'for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
"Battery/charger driver changes:
- acer_a500: new fuel gauge driver for Acer Iconia Tab A500
- bq256xx: new charger driver
- bq27xxx: Support CHARGE_NOW for bq27z561/bq28z610/bq34z100
- bq27xxx: Fix inverted CURRENT_NOW sign
- cpcap: rework fuel gauge and charger drivers
- ltc4162l: new charger driver
- max8997-charger: add extcon based current limit configuration
- max8903, wm97xx, z2: convert to GPIO descriptors (incl. ARM board files)
- misc cleanup and fixes
Reset drivers:
- new poweroff driver for ATC260x
- at91-sama5d2_shdwc: add support for sama7g5
- drop zte zx driver (SoC support is removed from kernel)"
* tag 'for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (55 commits)
power-supply: use kobj_to_dev()
power: supply: charger-manager: fix typo
power/reset: remove zte zx driver
power: supply: bq25980: Fix repetive bq25975 with bq25960
power: supply: smb347-charger: Fix interrupt usage if interrupt is unavailable
power: supply: axp20x_usb_power: Init work before enabling IRQs
power: supply: fix sbs-charger build, needs REGMAP_I2C
power: supply: bq27xxx: fix polarity of current_now
power: supply: charger-manager: fix incorrect health status
power: reset: at91-sama5d2_shdwc: add support for sama7g5
dt-bindings: atmel-sysreg: add microchip,sama7g5-shdwc
power: reset: at91-sama5d2_shdwc: fix wkupdbc mask
dt-bindings: power/supply: Add ltc4162-l-charger
power: supply: bq24190_charger: convert comma to semicolon
power: supply: ab8500_fg: convert comma to semicolon
power: supply: ds2780: Switch to using the new API kobj_to_dev()
power: supply: bq27xxx: Support CHARGE_NOW for bq27z561/bq28z610/bq34z100
power: supply: cpcap-charger: Fix power_supply_put on null battery pointer
power: supply: cpcap-battery: constify psy_desc
power: supply: cpcap-battery: Fix typo
...
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt index 67719f15eb4c..807264a78edc 100644 --- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt +++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt @@ -91,7 +91,8 @@ SHDWC SAMA5D2-Compatible Shutdown Controller 1) shdwc node required properties: -- compatible: should be "atmel,sama5d2-shdwc" or "microchip,sam9x60-shdwc". +- compatible: should be "atmel,sama5d2-shdwc", "microchip,sam9x60-shdwc" or + "microchip,sama7g5-shdwc" - reg: should contain registers location and length - clocks: phandle to input clock. - #address-cells: should be one. The cell is the wake-up input index. @@ -103,7 +104,7 @@ optional properties: microseconds. It's usually a board-related property. - atmel,wakeup-rtc-timer: boolean to enable Real-Time Clock wake-up. -optional microchip,sam9x60-shdwc properties: +optional microchip,sam9x60-shdwc or microchip,sama7g5-shdwc properties: - atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up. The node contains child nodes for each wake-up input that the platform uses. |