From: Geert Uytterhoeven <geert+renesas@glider.be> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Simon Horman <horms@verge.net.au>, Magnus Damm <magnus.damm@gmail.com>, Yoshinori Sato <ysato@users.sourceforge.jp> Cc: linux-serial@vger.kernel.org, linux-sh@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v3 19/27] serial: sh-sci: Correct SCIF type on RZ/A1H Date: Mon, 14 Dec 2015 18:57:28 +0000 [thread overview] Message-ID: <1450119456-964-20-git-send-email-geert+renesas@glider.be> (raw) In-Reply-To: <1450119456-964-1-git-send-email-geert+renesas@glider.be> The "renesas,scif" compatible value is currently used for the SCIF variant in all Renesas SoCs of the R-Car and RZ families. However, the variant used in the RZ family is not the common "SH-4(A)" variant, but the "SH-2(A) with FIFO data count register" variant, as it has the "Serial Extension Mode Register" (SCEMR), just like on sh7203, sh7263, sh7264, and sh7269. Use the (already documented) SoC-specific "renesas,scif-r7s72100" compatible value to differentiate. The "renesas,scif" compatible value can still be used as a common denominator for SCIF variants with the "SH-4(A)" register layout (i.e. ignoring the SCEMR register). Note that currently both variants are treated the same, but this may change if support for the SCEMR register is ever added. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- v3: - Add Reviewed-by, Acked-by. --- drivers/tty/serial/sh-sci.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 13c6abe9d842c0a8..5b8504bfd42e9906 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2620,6 +2620,12 @@ static int sci_remove(struct platform_device *dev) #define SCI_OF_REGTYPE(data) ((unsigned long)(data) & 0xffff) static const struct of_device_id of_sci_match[] = { + /* SoC-specific types */ + { + .compatible = "renesas,scif-r7s72100", + .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH2_SCIF_FIFODATA_REGTYPE), + }, + /* Generic types */ { .compatible = "renesas,scif", .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH4_SCIF_REGTYPE), -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert+renesas@glider.be> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Simon Horman <horms@verge.net.au>, Magnus Damm <magnus.damm@gmail.com>, Yoshinori Sato <ysato@users.sourceforge.jp> Cc: linux-serial@vger.kernel.org, linux-sh@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v3 19/27] serial: sh-sci: Correct SCIF type on RZ/A1H Date: Mon, 14 Dec 2015 19:57:28 +0100 [thread overview] Message-ID: <1450119456-964-20-git-send-email-geert+renesas@glider.be> (raw) In-Reply-To: <1450119456-964-1-git-send-email-geert+renesas@glider.be> The "renesas,scif" compatible value is currently used for the SCIF variant in all Renesas SoCs of the R-Car and RZ families. However, the variant used in the RZ family is not the common "SH-4(A)" variant, but the "SH-2(A) with FIFO data count register" variant, as it has the "Serial Extension Mode Register" (SCEMR), just like on sh7203, sh7263, sh7264, and sh7269. Use the (already documented) SoC-specific "renesas,scif-r7s72100" compatible value to differentiate. The "renesas,scif" compatible value can still be used as a common denominator for SCIF variants with the "SH-4(A)" register layout (i.e. ignoring the SCEMR register). Note that currently both variants are treated the same, but this may change if support for the SCEMR register is ever added. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- v3: - Add Reviewed-by, Acked-by. --- drivers/tty/serial/sh-sci.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 13c6abe9d842c0a8..5b8504bfd42e9906 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2620,6 +2620,12 @@ static int sci_remove(struct platform_device *dev) #define SCI_OF_REGTYPE(data) ((unsigned long)(data) & 0xffff) static const struct of_device_id of_sci_match[] = { + /* SoC-specific types */ + { + .compatible = "renesas,scif-r7s72100", + .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH2_SCIF_FIFODATA_REGTYPE), + }, + /* Generic types */ { .compatible = "renesas,scif", .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH4_SCIF_REGTYPE), -- 1.9.1
next prev parent reply other threads:[~2015-12-14 18:57 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-14 18:57 [PATCH v3 00/27] serial: sh-sci: External Clock Support Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 02/27] serial: sh-sci: Add fallback compatibility strings Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-20 3:39 ` Rob Herring 2015-12-20 3:39 ` Rob Herring 2015-12-14 18:57 ` [PATCH v3 03/27] serial: sh-sci: Update DT binding documentation for external clock input Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-20 3:39 ` Rob Herring 2015-12-20 3:39 ` Rob Herring 2015-12-14 18:57 ` [PATCH v3 04/27] serial: sh-sci: Update DT binding documentation for BRG support Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-20 3:39 ` Rob Herring 2015-12-20 3:39 ` Rob Herring 2015-12-14 18:57 ` [PATCH v3 05/27] serial: sh-sci: Drop useless check for zero sampling_rate Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 06/27] serial: sh-sci: Grammar s/Get ... for/Get ... from/ Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 07/27] serial: sh-sci: Use existing local variable in sci_parse_dt() Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 08/27] serial: sh-sci: Drop unused frame_len parameter for sci_baud_calc_hscif() Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 09/27] serial: sh-sci: Don't overwrite clock selection in serial_console_write() Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 10/27] serial: sh-sci: Convert from clk_get() to devm_clk_get() Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 11/27] serial: sh-sci: Make unsigned values in sci_baud_calc_hscif() unsigned Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 12/27] serial: sh-sci: Avoid overflow in sci_baud_calc_hscif() Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 13/27] serial: sh-sci: Improve bit rate error calculation for HSCIF Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 14/27] serial: sh-sci: Avoid calculating the receive margin " Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 15/27] serial: sh-sci: Merge sci_scbrr_calc() and sci_baud_calc_hscif() Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 16/27] serial: sh-sci: Take into account sampling rate for max baud rate Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 17/27] serial: sh-sci: Add BRG register definitions Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 18/27] serial: sh-sci: Replace struct sci_port_info by type/regtype encoding Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven [this message] 2015-12-14 18:57 ` [PATCH v3 19/27] serial: sh-sci: Correct SCIF type on RZ/A1H Geert Uytterhoeven [not found] ` <1450119456-964-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> 2015-12-14 18:57 ` [PATCH v3 01/27] serial: sh-sci: Drop the interface clock Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 20/27] serial: sh-sci: Correct SCIF type on R-Car for BRG Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 21/27] serial: sh-sci: Prepare for multiple sampling clock sources Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 22/27] serial: sh-sci: Add support for optional external (H)SCK input Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 23/27] serial: sh-sci: Add support for optional BRG on (H)SCIF Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 24/27] sh: Rename sci_ick and sci_fck clock to fck Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 25/27] sh: Remove sci_ick clock alias Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 26/27] sh: sh7734: Correct SCIF type for BRG Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-14 18:57 ` [PATCH v3 27/27] serial: sh-sci: Drop the sci_fck clock fallback Geert Uytterhoeven 2015-12-14 18:57 ` Geert Uytterhoeven 2015-12-15 4:53 ` [PATCH v3 00/27] serial: sh-sci: External Clock Support Simon Horman 2015-12-15 4:53 ` Simon Horman 2015-12-15 5:23 ` Greg Kroah-Hartman 2015-12-15 5:23 ` Greg Kroah-Hartman 2015-12-15 13:54 ` Geert Uytterhoeven 2015-12-15 13:54 ` Geert Uytterhoeven 2015-12-17 10:28 ` Geert Uytterhoeven 2015-12-17 10:28 ` Geert Uytterhoeven
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1450119456-964-20-git-send-email-geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=gregkh@linuxfoundation.org \ --cc=horms@verge.net.au \ --cc=linux-serial@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=ysato@users.sourceforge.jp \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.