Hi Greg, On Tue, Dec 15, 2015 at 6:23 AM, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > On Tue, Dec 15, 2015 at 01:53:51PM +0900, Simon Horman wrote: >> thanks for taking care of this, is quite a task! >> >> On Mon, Dec 14, 2015 at 07:57:09PM +0100, Geert Uytterhoeven wrote: >> > This patch series contains several patches for the Renesas SCI serial >> > driver: >> > - Clean up the naming of clocks in the driver and its DT bindings, >> > - Add support for the optional external clock on (H)SCI(F) and some >> > SCIFA, 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. >> > Using external clocks increases the range and accuracy of supported baud >> > rates. >> > >> > This series is an updated version of the core (driver) changes of two >> > series I sent before: >> > - [PATCH v2 00/16] serial: sh-sci: Clock Cleanups >> > (http://www.spinics.net/lists/linux-serial/msg19762.html) >> > - [PATCH 00/25] serial: sh-sci: Add external clock and BRG Support >> > (https://lkml.org/lkml/2015/11/19/550) >> > To reduce (cross) dependencies, I split off the integration (DTS) >> > patches into separate series: >> > - "[PATCH 0/7] ARM: shmobile: dtsi: Add SCIF fallback compatibility >> > strings", >> > - "[PATCH v3 00/12] ARM: shmobile: dtsi: Rename the serial port >> > clock to fck", >> > - "[PATCH v2 0/7] ARM: shmobile: dtsi: Add BRG support for (H)SCIF", >> > - "[PATCH v2 0/9] ARM: shmobile: dts: Enable SCIF_CLK frequency and >> > pins". >> > As the SH architecture is orphaned, and the risk of conflicts is small, >> > I have bundled all SH-specific changes with the core changes. This >> > reduces dependencies, too. >> >> At this point I see two ways to move things forwards: >> >> 1. Greg can consider taking this series and I can take the >> related integration (DTS) series (noted below) into v4.6. >> 2. I can get some missing Acks from Greg (patches 02 and 07 I believe) >> and try and queue up this series and the related integration (DTS) >> series (noted below). >> >> As it (perhaps surprisingly) it is late in the merge cycle for me to take >> changes for v4.5 that will go though the ARM SoC tree and I am trying to >> stabilise things a little. Thus, I favour option 1. > > I can take them, one question: > >> > I've also pushed this series (against v4.4-rc1) to the >> > topic/scif-clk-sck-brg-core-v3 branch of my renesas-drivers git >> > repository at >> > https://git.kernel.org/cgit/linux/kernel/git/geert/renesas-drivers.git >> > >> > For testing, you best use the renesas-drivers-2015-12-14-v4.4-rc5 tag, >> > as it includes the integration part. > > Can I just pull from that tag to get everything? That would be the > simplest for me... Please don't pull the renesas-drivers-2015-12-14-v4.4-rc5 tag, else you'll import half of linux-next plus some v4.6 stuff ;-) You can pull the topic/scif-clk-sck-brg-core-v3 branch, though, which is just this series. Let's formalize, cfr. below. Thanks a lot! >From 830fe6beabc4ab6e4a0f8a688c5a150af69dd95e Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> Date: Tue, 15 Dec 2015 14:43:40 +0100 To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Subject: [git pull] serial: sh-sci: External Clock Support Hi Greg, The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec: Linux 4.4-rc1 (2015-11-15 17:00:27 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git topic/scif-clk-sck-brg-core-v3 for you to fetch changes up to 830fe6beabc4ab6e4a0f8a688c5a150af69dd95e: serial: sh-sci: Drop the sci_fck clock fallback (2015-12-14 13:14:43 +0100) 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. Thanks for pulling! ---------------------------------------------------------------- Geert Uytterhoeven (23): serial: sh-sci: Add fallback compatibility strings serial: sh-sci: Update DT binding documentation for external clock input serial: sh-sci: Update DT binding documentation for BRG support serial: sh-sci: Drop useless check for zero sampling_rate serial: sh-sci: Grammar s/Get ... for/Get ... from/ serial: sh-sci: Use existing local variable in sci_parse_dt() serial: sh-sci: Drop unused frame_len parameter for sci_baud_calc_hscif() serial: sh-sci: Don't overwrite clock selection in serial_console_write() serial: sh-sci: Convert from clk_get() to devm_clk_get() serial: sh-sci: Make unsigned values in sci_baud_calc_hscif() unsigned serial: sh-sci: Avoid overflow in sci_baud_calc_hscif() serial: sh-sci: Improve bit rate error calculation for HSCIF serial: sh-sci: Avoid calculating the receive margin for HSCIF serial: sh-sci: Merge sci_scbrr_calc() and sci_baud_calc_hscif() serial: sh-sci: Take into account sampling rate for max baud rate serial: sh-sci: Add BRG register definitions serial: sh-sci: Replace struct sci_port_info by type/regtype encoding serial: sh-sci: Correct SCIF type on RZ/A1H serial: sh-sci: Correct SCIF type on R-Car for BRG serial: sh-sci: Prepare for multiple sampling clock sources serial: sh-sci: Add support for optional external (H)SCK input serial: sh-sci: Add support for optional BRG on (H)SCIF sh: sh7734: Correct SCIF type for BRG Laurent Pinchart (4): serial: sh-sci: Drop the interface clock sh: Rename sci_ick and sci_fck clock to fck sh: Remove sci_ick clock alias serial: sh-sci: Drop the sci_fck clock fallback .../bindings/serial/renesas,sci-serial.txt | 32 +- arch/sh/kernel/cpu/clock-cpg.c | 1 - arch/sh/kernel/cpu/sh2a/clock-sh7264.c | 9 +- arch/sh/kernel/cpu/sh2a/clock-sh7269.c | 16 +- arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 8 +- arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 6 +- arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 12 +- arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 12 +- arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 6 +- arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 12 +- arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 12 +- arch/sh/kernel/cpu/sh4a/clock-shx3.c | 8 +- arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 12 +- drivers/tty/serial/sh-sci.c | 555 +++++++++++++++------ drivers/tty/serial/sh-sci.h | 10 + include/linux/serial_sci.h | 1 + 16 files changed, 500 insertions(+), 212 deletions(-) Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
