From patchwork Fri Jul 27 21:09:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Brandt X-Patchwork-Id: 10547727 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 031129093 for ; Fri, 27 Jul 2018 21:09:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E870A2C63C for ; Fri, 27 Jul 2018 21:09:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCA472C642; Fri, 27 Jul 2018 21:09:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85DDB2C63C for ; Fri, 27 Jul 2018 21:09:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389727AbeG0WdW (ORCPT ); Fri, 27 Jul 2018 18:33:22 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:50705 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2389211AbeG0WdW (ORCPT ); Fri, 27 Jul 2018 18:33:22 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 28 Jul 2018 06:09:41 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id CC8D44AC74; Sat, 28 Jul 2018 06:09:41 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.51,411,1526310000"; d="scan'208";a="286584339" Received: from unknown (HELO rtamta01.rta.renesas.com) ([143.103.48.75]) by relmlii1.idc.renesas.com with ESMTP; 28 Jul 2018 06:09:39 +0900 Received: from ubuntu.localdomain (unknown [143.103.58.70]) by rtamta01.rta.renesas.com (Postfix) with ESMTP id BD3731FC; Fri, 27 Jul 2018 21:09:34 +0000 (UTC) From: Chris Brandt To: Greg Kroah-Hartman , Rob Herring , Mark Rutland , Geert Uytterhoeven Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Simon Horman , Chris Brandt Subject: [PATCH 3/4] serial: sh-sci: Remove SCIx_RZ_SCIFA_REGTYPE Date: Fri, 27 Jul 2018 16:09:15 -0500 Message-Id: <20180727210916.66642-4-chris.brandt@renesas.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180727210916.66642-1-chris.brandt@renesas.com> References: <20180727210916.66642-1-chris.brandt@renesas.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is no more need for SCIx_RZ_SCIFA_REGTYPE now that SCIx_SH4_SCIF_REGTYPE can provide the same register/address definitions. Also, R7S9210 no longer needs a special compatible since the standard "renesas,scif" will work just fine. Signed-off-by: Chris Brandt Reviewed-by: Geert Uytterhoeven --- drivers/tty/serial/sh-sci.c | 31 ------------------------------- include/linux/serial_sci.h | 1 - 2 files changed, 32 deletions(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 138296ec9a7d..cb4f7d3e7192 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -293,33 +293,6 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = { .error_clear = SCIF_ERROR_CLEAR, }, - /* - * The "SCIFA" that is in RZ/T and RZ/A2. - * It looks like a normal SCIF with FIFO data, but with a - * compressed address space. Also, the break out of interrupts - * are different: ERI/BRI, RXI, TXI, TEI, DRI. - */ - [SCIx_RZ_SCIFA_REGTYPE] = { - .regs = { - [SCSMR] = { 0x00, 16 }, - [SCBRR] = { 0x02, 8 }, - [SCSCR] = { 0x04, 16 }, - [SCxTDR] = { 0x06, 8 }, - [SCxSR] = { 0x08, 16 }, - [SCxRDR] = { 0x0A, 8 }, - [SCFCR] = { 0x0C, 16 }, - [SCFDR] = { 0x0E, 16 }, - [SCSPTR] = { 0x10, 16 }, - [SCLSR] = { 0x12, 16 }, - }, - .fifosize = 16, - .overrun_reg = SCLSR, - .overrun_mask = SCLSR_ORER, - .sampling_rate_mask = SCI_SR(32), - .error_mask = SCIF_DEFAULT_ERROR_MASK, - .error_clear = SCIF_ERROR_CLEAR, - }, - /* * Common SH-3 SCIF definitions. */ @@ -3147,10 +3120,6 @@ static const struct of_device_id of_sci_match[] = { .compatible = "renesas,scif-r7s72100", .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH2_SCIF_FIFODATA_REGTYPE), }, - { - .compatible = "renesas,scif-r7s9210", - .data = SCI_OF_DATA(PORT_SCIF, SCIx_RZ_SCIFA_REGTYPE), - }, /* Family-specific types */ { .compatible = "renesas,rcar-gen1-scif", diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index 1c89611e0e06..c0e795d95477 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h @@ -36,7 +36,6 @@ enum { SCIx_SH4_SCIF_FIFODATA_REGTYPE, SCIx_SH7705_SCIF_REGTYPE, SCIx_HSCIF_REGTYPE, - SCIx_RZ_SCIFA_REGTYPE, SCIx_NR_REGTYPES, };