diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 18:21:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 18:21:15 -0700 |
commit | 021723e6c5a5e7b50eb68f9812418406de9860b2 (patch) | |
tree | fe22465563a9056925f0e4edd236d9a6c456e6cc /drivers/power/reset/st-poweroff.c | |
parent | c6594fc6af1924b7fdce600088b10e3b3b159fb7 (diff) | |
parent | 1d72706f0485b58e151b5a7584c4c65d66670587 (diff) |
Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
- move power supply drivers to drivers/power/supply
- unify location of power supply DT documentation
- tps65217-charger: IRQ support
- act8945a-charger: misc. cleanups & improvements
- sbs-battery cleanup
- fix users of deprecated create_singlethread_workqueue()
- misc fixes.
* tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (46 commits)
power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update
power: supply: sbs-battery: Cleanup removal of chip->pdata
power: reset: st: Remove obsolete platforms from dt doc
power: reset: st-poweroff: Remove obsolete platforms.
power: reset: zx-reboot: Unmap region obtained by of_iomap
power: reset: xgene-reboot: Unmap region obtained by of_iomap
power: supply: ab8500: cleanup with list_first_entry_or_null()
power: reset: add in missing white space in error message text
sbs-battery: make writes to ManufacturerAccess optional
power: bq24257: Fix use of uninitialized pointer bq->charger
power: supply: sbs-battery: simplify DT parsing
power: supply: bq24735-charger: Request status GPIO with initial input setup
power: supply: sbs-battery: Use gpio_desc and sleeping calls for battery detect
power: supply: act8945a_charger: Add max current property
power: supply: act8945a_charger: Add capacity level property
doc: bindings: power: act8945a-charger: Update properties.
power: supply: act8945a_charger: Fix the power supply type
power: supply: act8945a_charger: Add status change update support
power: supply: act8945a_charger: Improve state handling
power: supply: act8945a_charger: Remove "battery_temperature"
...
Diffstat (limited to 'drivers/power/reset/st-poweroff.c')
-rw-r--r-- | drivers/power/reset/st-poweroff.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/drivers/power/reset/st-poweroff.c b/drivers/power/reset/st-poweroff.c index a488877a3538..2046b31232f7 100644 --- a/drivers/power/reset/st-poweroff.c +++ b/drivers/power/reset/st-poweroff.c @@ -28,28 +28,6 @@ struct reset_syscfg { unsigned int mask_rst_msk; }; -/* STiH415 */ -#define STIH415_SYSCFG_11 0x2c -#define STIH415_SYSCFG_15 0x3c - -static struct reset_syscfg stih415_reset = { - .offset_rst = STIH415_SYSCFG_11, - .mask_rst = BIT(0), - .offset_rst_msk = STIH415_SYSCFG_15, - .mask_rst_msk = BIT(0) -}; - -/* STiH416 */ -#define STIH416_SYSCFG_500 0x7d0 -#define STIH416_SYSCFG_504 0x7e0 - -static struct reset_syscfg stih416_reset = { - .offset_rst = STIH416_SYSCFG_500, - .mask_rst = BIT(0), - .offset_rst_msk = STIH416_SYSCFG_504, - .mask_rst_msk = BIT(0) -}; - /* STiH407 */ #define STIH407_SYSCFG_4000 0x0 #define STIH407_SYSCFG_4008 0x20 @@ -61,16 +39,6 @@ static struct reset_syscfg stih407_reset = { .mask_rst_msk = BIT(0) }; -/* STiD127 */ -#define STID127_SYSCFG_700 0x0 -#define STID127_SYSCFG_773 0x124 - -static struct reset_syscfg stid127_reset = { - .offset_rst = STID127_SYSCFG_773, - .mask_rst = BIT(0), - .offset_rst_msk = STID127_SYSCFG_700, - .mask_rst_msk = BIT(8) -}; static struct reset_syscfg *st_restart_syscfg; @@ -99,17 +67,8 @@ static struct notifier_block st_restart_nb = { static const struct of_device_id st_reset_of_match[] = { { - .compatible = "st,stih415-restart", - .data = (void *)&stih415_reset, - }, { - .compatible = "st,stih416-restart", - .data = (void *)&stih416_reset, - }, { .compatible = "st,stih407-restart", .data = (void *)&stih407_reset, - }, { - .compatible = "st,stid127-restart", - .data = (void *)&stid127_reset, }, {} }; |