summaryrefslogtreecommitdiffstats
path: root/include/dt-bindings
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-10-15 22:41:04 +0200
committerArnd Bergmann <arnd@arndb.de>2015-10-15 22:41:04 +0200
commit41e602e8af1300471e79e298a7276226344071db (patch)
tree79b49827adbd9ab6221444f956538cced52be15b /include/dt-bindings
parent7a0205bc1895132d6a56fbbadf01885c4a4f0743 (diff)
parent515f1a2027006839c08c842da919abfcc3c7ae2a (diff)
downloadlinux-41e602e8af1300471e79e298a7276226344071db.tar.bz2
Merge tag 'berlin-new-cpuclk-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/drivers
Merge "Marvell Berlin BG2Q CPU clock driver" from Sebastian Hesselbarth: - add BG2Q CPU clock to clk driver * tag 'berlin-new-cpuclk-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin: clk: berlin: add cpuclk ARM: berlin: dts: add CLKID_CPU for BG2Q
Diffstat (limited to 'include/dt-bindings')
-rw-r--r--include/dt-bindings/clock/berlin2q.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/berlin2q.h b/include/dt-bindings/clock/berlin2q.h
index 287fc3b4afb2..72eaf91c9ca6 100644
--- a/include/dt-bindings/clock/berlin2q.h
+++ b/include/dt-bindings/clock/berlin2q.h
@@ -29,3 +29,4 @@
#define CLKID_SMEMC 24
#define CLKID_PCIE 25
#define CLKID_TWD 26
+#define CLKID_CPU 27