diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-01-24 11:42:59 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-01-24 11:42:59 -0800 |
| commit | d9df942c07bb4f7c4da23f1dbf0cd9aa17206827 (patch) | |
| tree | 4b69ea99bb916242930a53667951e13ccad64f57 /include | |
| parent | bfeffd155283772bbe78c6a05dec7c0128ee500c (diff) | |
| parent | d9286d9743b6e8cfbf1a13f8db84e9c65c0b09c7 (diff) | |
Merge tag 'clk-renesas-for-v5.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-renesas
Pull Renesas clk driver updates from Geert Uytterhoeven:
- Add missing CANFD clocks on RZ/G2M and RZ/G2E,
- Correct the DU (display unit) parent clock on RZ/G2E.
* tag 'clk-renesas-for-v5.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
clk: renesas: r8a774c0: Correct parent clock of DU
clk: renesas: r8a774a1: Add missing CANFD clock
clk: renesas: r8a774c0: Add missing CANFD clock
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/r8a774a1-cpg-mssr.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/r8a774c0-cpg-mssr.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/r8a774a1-cpg-mssr.h b/include/dt-bindings/clock/r8a774a1-cpg-mssr.h index 9bc5d45ff4b5..e355363f40c2 100644 --- a/include/dt-bindings/clock/r8a774a1-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a774a1-cpg-mssr.h @@ -54,5 +54,6 @@ #define R8A774A1_CLK_CPEX 43 #define R8A774A1_CLK_R 44 #define R8A774A1_CLK_OSC 45 +#define R8A774A1_CLK_CANFD 46 #endif /* __DT_BINDINGS_CLOCK_R8A774A1_CPG_MSSR_H__ */ diff --git a/include/dt-bindings/clock/r8a774c0-cpg-mssr.h b/include/dt-bindings/clock/r8a774c0-cpg-mssr.h index 8fe51b6aca28..8ad9cd6be8e9 100644 --- a/include/dt-bindings/clock/r8a774c0-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a774c0-cpg-mssr.h @@ -56,5 +56,6 @@ #define R8A774C0_CLK_CSI0 45 #define R8A774C0_CLK_CP 46 #define R8A774C0_CLK_CPEX 47 +#define R8A774C0_CLK_CANFD 48 #endif /* __DT_BINDINGS_CLOCK_R8A774C0_CPG_MSSR_H__ */ |