Commit 5d984ee7 authored Oct 15, 2015 by Arnd Bergmann

Merge tag 'berlin-dt-cpuclk-for-4.4-1' of...

Merge tag 'berlin-dt-cpuclk-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt

Pull "Marvell Berlin DT CPU clock for 4.4" from Sebastian Hesselbarth:
- add missing CLKID_CPU for Berlin BG2Q

* tag 'berlin-dt-cpuclk-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: berlin: dts: add CLKID_CPU for BG2Q

parents d819e7a7 28c039ee

include/dt-bindings/clock/berlin2q.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,3 +29,4 @@
		#define CLKID_SMEMC 24
		#define CLKID_PCIE 25
		#define CLKID_TWD 26
		#define CLKID_CPU 27