diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-16 17:35:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-16 17:35:38 +0100 |
| commit | a4fd1b818028114661cfcad45de6353ade42c8cf (patch) | |
| tree | b404d7a24491c0b54bb03aa8b51d0dc8b1a4ccda /arch/arm | |
| parent | 3461b12aebf5f8aaf6ff87b3c9044e31e80c4f39 (diff) | |
| parent | ddf5cf02b981e32aa5896cfd66fc191b9a58ed2e (diff) | |
| parent | db27dd05b1da6e658494a2570680f8d0ddbc578c (diff) | |
| parent | 5418820574d2b4d1da092a2f2d770e63d7ac520b (diff) | |
Merge branches 'next/defconfig', 'next/drivers' and 'next/dt' into for-next
* next/defconfig:
ARM: multi_v7_defconfig: enable pstore configs
ARM: multi_v7_defconfig: enable some newly added crypto modules
ARM: davinci_all_defconfig: enable SATA modules
* next/drivers:
sata: ahci-da850: un-hardcode the MPY bits
sata: ahci-da850: add a workaround for controller instability
sata: ahci: export ahci_do_hardreset() locally
sata: ahci-da850: implement a workaround for the softreset quirk
sata: ahci-da850: add device tree match table
sata: ahci-da850: get the sata clock using a connection id
* next/dt:
ARM: dts: am335x-chiliboard: Support charger
ARM: dts: am335x-chiliboard: Support power button
ARM: dts: da850-lcdk: enable the SATA node
ARM: dts: da850: add the SATA node
devicetree: bindings: add bindings for ahci-da850
ARM: dts: Add support for phyCORE-AM335x PCM-953 carrier board