diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 10:00:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 10:00:10 -0800 |
| commit | c9b9f207b90468bf9583f7ed71c15d0142bbf9b1 (patch) | |
| tree | e6f1576e41cffa36da3a688bfb372aed199975c2 /include/soc | |
| parent | 345fb0a9a6340ba0b3b714d62f877fde88c8a755 (diff) | |
| parent | 744cc304a18f1c9de4f3215fbe93fe878f934179 (diff) | |
| download | linux-c9b9f207b90468bf9583f7ed71c15d0142bbf9b1.tar.gz linux-c9b9f207b90468bf9583f7ed71c15d0142bbf9b1.tar.bz2 linux-c9b9f207b90468bf9583f7ed71c15d0142bbf9b1.zip | |
Merge tag 'for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
"New drivers:
- sbs-charger driver
- max14656_charger_detector
- axp20x_ac_power
New chip/feature support"
- axp20x_usb_power: add AXP223 support
- tps65217: add usb charger support
- qcom_smbb: support otg regulator
- at91-reset: add samx7 support
Dropped drivers:
- intel_mid_battery (platform was dropped)
Fixes:
- at91-poweroff: avoid wearing off LPDDR memory
- replace deprecated extcon API
- lots of cleanup and style fixes
- misc minor functionality fixes"
* tag 'for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (84 commits)
power: supply: add AC power supply driver for AXP20X and AXP22X PMICs
dt-bindings: power: supply: add AXP20X/AXP22X AC power supply
power: supply: axp20x_usb_power: use IIO channels when available
power: supply: max14656: Export I2C and OF device ID as module aliases
power: supply: bq2415x: check for NULL acpi_id to avoid null pointer dereference
power: supply: bq24190_charger: Adjust formatting
power: supply: bq24190_charger: Handle fault before status on interrupt
power: supply: bq24190_charger: Don't read fault register outside irq_handle_thread()
power: supply: bq24190_charger: Call power_supply_changed() for relevant component
power: supply: bq24190_charger: Install irq_handler_thread() at end of probe()
power: supply: bq24190_charger: Call set_mode_host() on pm_resume()
power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING
power: supply: qcom_smbb: add regulator dependency
power: reset: at91-reset: remove leftover platform_device_id
power: reset: at91-reset: add samx7 support
power: supply: max14656: fix platform_no_drv_owner.cocci warnings
power: supply: pcf50633-charger: Compress return logic into one line.
power: supply: ab8500_btemp: Compress return logic into one line.
power: reset: at91-poweroff: timely shutdown LPDDR memories
ARM: at91: define LPDDR types
...
Diffstat (limited to 'include/soc')
| -rw-r--r-- | include/soc/at91/at91sam9_ddrsdr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/soc/at91/at91sam9_ddrsdr.h b/include/soc/at91/at91sam9_ddrsdr.h index dc10c52e0e91..393362bdb860 100644 --- a/include/soc/at91/at91sam9_ddrsdr.h +++ b/include/soc/at91/at91sam9_ddrsdr.h @@ -81,6 +81,7 @@ #define AT91_DDRSDRC_LPCB_POWER_DOWN 2 #define AT91_DDRSDRC_LPCB_DEEP_POWER_DOWN 3 #define AT91_DDRSDRC_CLKFR (1 << 2) /* Clock Frozen */ +#define AT91_DDRSDRC_LPDDR2_PWOFF (1 << 3) /* LPDDR Power Off */ #define AT91_DDRSDRC_PASR (7 << 4) /* Partial Array Self Refresh */ #define AT91_DDRSDRC_TCSR (3 << 8) /* Temperature Compensated Self Refresh */ #define AT91_DDRSDRC_DS (3 << 10) /* Drive Strength */ @@ -96,7 +97,9 @@ #define AT91_DDRSDRC_MD_SDR 0 #define AT91_DDRSDRC_MD_LOW_POWER_SDR 1 #define AT91_DDRSDRC_MD_LOW_POWER_DDR 3 +#define AT91_DDRSDRC_MD_LPDDR3 5 #define AT91_DDRSDRC_MD_DDR2 6 /* [SAM9 Only] */ +#define AT91_DDRSDRC_MD_LPDDR2 7 #define AT91_DDRSDRC_DBW (1 << 4) /* Data Bus Width */ #define AT91_DDRSDRC_DBW_32BITS (0 << 4) #define AT91_DDRSDRC_DBW_16BITS (1 << 4) |