diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-16 17:15:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-16 17:15:39 +0100 |
| commit | af1d09eefa72089300ddde13bbaf9af1a82c6be1 (patch) | |
| tree | 001a2680400ab2ae8cfb99b72c0dfa41c0e79f25 /arch/arm/plat-orion/mpp.c | |
| parent | ARM: ux500: remove deleted file from Makefile (diff) | |
| parent | ARM: davinci: remove BUG_ON() from da850_register_sata() (diff) | |
| download | linux-af1d09eefa72089300ddde13bbaf9af1a82c6be1.tar.xz linux-af1d09eefa72089300ddde13bbaf9af1a82c6be1.zip | |
Merge tag 'davinci-for-v4.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull "SoC updates needed for SATA support on DA850" from Sekhar Nori:
This includes a merge of non-critical-fixes
branch already queued for v4.11 because
SATA clock addition conflicts with the fix-up
done earlier.
* tag 'davinci-for-v4.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: remove BUG_ON() from da850_register_sata()
ARM: davinci: da850: model the SATA refclk
ARM: davinci: da850: add con_id for the SATA clock
ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for SATA
ARM: davinci: add skeleton for pdata-quirks
bus: da850-mstpri: fix my e-mail address
ARM: davinci: da850: fix da850_set_pll0rate()
ARM: davinci: da850: coding style fix
Diffstat (limited to 'arch/arm/plat-orion/mpp.c')
0 files changed, 0 insertions, 0 deletions