diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-07 21:04:46 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-07 21:04:46 -0800 |
| commit | f658f21c65d1d8a8c93d1a6505e86c285bb7897e (patch) | |
| tree | 14e11203aab46747b95e07f871cc1d4ec4894d9e /include/linux | |
| parent | c93a59938c11f447ff2964ab3c317311778edf66 (diff) | |
| parent | 192d367f218d0cd94aa9b5059992e4aa19ec5b36 (diff) | |
Merge branch 'scif-clk-sck-brg-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into tty-next
Geert writes:
Summary:
- Clean up the naming of clocks in the sh-sci driver and its DT bindings,
- Add support for the optional external clock on (H)SCI(F), where this pin
can serve as a clock input,
- Add support for the optional clock sources for the Baud Rate
Generator for External Clock (BRG), as found on some SCIF variants
and on HSCIF.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_sci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index 7c536ac5be05..9f2bfd055742 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h @@ -32,6 +32,7 @@ enum { SCIx_SH2_SCIF_FIFODATA_REGTYPE, SCIx_SH3_SCIF_REGTYPE, SCIx_SH4_SCIF_REGTYPE, + SCIx_SH4_SCIF_BRG_REGTYPE, SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, SCIx_SH4_SCIF_FIFODATA_REGTYPE, SCIx_SH7705_SCIF_REGTYPE, |