diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 17:55:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 17:55:26 +0200 |
| commit | bac6dd36e355d5b1f089ed507b6579938e4c07c1 (patch) | |
| tree | 61190b9a7ad86b187df0658d7345f644d8710f24 /drivers/clk/sunxi-ng/ccu_nkm.c | |
| parent | da9070b35ca82465d6fce0f82cf5969f1ec66d6c (diff) | |
| parent | bdb249fce9ad44aab340be3b7a77060114f7193b (diff) | |
| download | linux-next-bac6dd36e355d5b1f089ed507b6579938e4c07c1.tar.gz | |
Merge tag 'integrator-armsoc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/late
Pull "This is a bunch of Integrator changes for v4.9" Linus Walleij:
- Add and fix a bunch of clocks in the DTS corresponding
to the new clock support merged into the clk tree.
- Move the CLCD display configuration from boardfile to
device tree using the new CLCD support merged into the
fbdev tree.
- Cut some auxdata.
- Cut some static remappings.
- Move the sched_clock() counter to use syscon+regmap.
* tag 'integrator-armsoc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: integrator: read counter using syscon/regmap
ARM: integrator: cut down on static maps
ARM: integrator: delete some auxdata
ARM: integrator: move CP CLCD display to DTS
ARM: dts: add the core module clocks to Integrator/CP
ARM: dts: Add the core module clocks to Integrator/AP
ARM: dts: add the Integrator/AP baseboard clocks
ARM: dts: set the 24MHz xtal as parent of the UART clock
Diffstat (limited to 'drivers/clk/sunxi-ng/ccu_nkm.c')
0 files changed, 0 insertions, 0 deletions