diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 20:50:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 20:50:02 +0200 |
| commit | 5d984ee707a6774aa0f28722a99fdeac85e47f2c (patch) | |
| tree | 69ece3c3c7b49a77ccf3fb458dc6d526e7875590 /include/dt-bindings | |
| parent | d819e7a7524fe0f43591b7c274685f6e66e48342 (diff) | |
| parent | 28c039eebaaa28def9364b9a12a30192be8b4730 (diff) | |
| download | op-kernel-dev-5d984ee707a6774aa0f28722a99fdeac85e47f2c.zip op-kernel-dev-5d984ee707a6774aa0f28722a99fdeac85e47f2c.tar.gz | |
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
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/berlin2q.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/berlin2q.h b/include/dt-bindings/clock/berlin2q.h index 287fc3b..72eaf91 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 |
