From patchwork Tue May 28 12:22:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 2624481 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 81EFC3FDBC for ; Tue, 28 May 2013 12:22:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933827Ab3E1MWs (ORCPT ); Tue, 28 May 2013 08:22:48 -0400 Received: from mail-bk0-f53.google.com ([209.85.214.53]:50882 "EHLO mail-bk0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933730Ab3E1MWr (ORCPT ); Tue, 28 May 2013 08:22:47 -0400 Received: by mail-bk0-f53.google.com with SMTP id mx1so4224202bkb.12 for ; Tue, 28 May 2013 05:22:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=BU7IfQ6KvUOi05HENznmewq/RtxJESbWyQzRtx5lvBY=; b=FOdi8b5/9spzCL4vT5MIP5zuw6YKyp5+njOH9kFDHqkVxqJIOY/Wo7GSz0RF+Ql8Jt lfy5d/LX0Xcs872Ov7NG523n4E1xm0YQAn02ohpgMk4ITcTmxGwXtMGX7zaden6OyvJz 2glgAPL9i/6+cuhRyAFIeM6tPM/v9ILHB2uumqhN3DPjEj0QF8++C9VBIgn8oIwPlimZ aPwU3RCb/P7qkJ9uvE3I1tzalDYi6WXhPEHTfgJHkHod9IAw9BKK4k92A4Wntu4gGsXz ORGkteKYv6hIXbAYXaQ+ShWJgJhdilUBKRuyt9c62o7psfrQdqIqxch5PXhvzomET2dt BKQg== X-Received: by 10.205.40.68 with SMTP id tp4mr4135048bkb.175.1369743766245; Tue, 28 May 2013 05:22:46 -0700 (PDT) Received: from groucho.site (188-194-147-14-dynip.superkabel.de. [188.194.147.14]) by mx.google.com with ESMTPSA id rj5sm9163269bkb.1.2013.05.28.05.22.44 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 28 May 2013 05:22:45 -0700 (PDT) From: Ulrich Hecht To: linux-sh@vger.kernel.org, lethal@linux-sh.org, shinya.kuribayashi.px@renesas.com, takashi.yoshii.zj@renesas.com, magnus.damm@gmail.com Cc: Ulrich Hecht Subject: [PATCH 2/5] ARM: shmobile: r8a7790: HSCIF support Date: Tue, 28 May 2013 14:22:05 +0200 Message-Id: <1369743728-26084-3-git-send-email-ulrich.hecht@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1369743728-26084-1-git-send-email-ulrich.hecht@gmail.com> References: <1369743728-26084-1-git-send-email-ulrich.hecht@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Adds support for HSCIF0 and HSCIF1 on the r8a7790. Signed-off-by: Ulrich Hecht --- arch/arm/mach-shmobile/clock-r8a7790.c | 6 +++++- arch/arm/mach-shmobile/setup-r8a7790.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c index b393592..02a05e4 100644 --- a/arch/arm/mach-shmobile/clock-r8a7790.c +++ b/arch/arm/mach-shmobile/clock-r8a7790.c @@ -180,7 +180,7 @@ static struct clk div6_clks[DIV6_NR] = { /* MSTP */ enum { - MSTP721, MSTP720, + MSTP721, MSTP720, MSTP717, MSTP716, MSTP304, MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP_NR @@ -196,6 +196,8 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP204] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 4, 0), /* SCIFA0 */ [MSTP203] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 3, 0), /* SCIFA1 */ [MSTP202] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 2, 0), /* SCIFA2 */ + [MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */ + [MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */ }; static struct clk_lookup lookups[] = { @@ -249,6 +251,8 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP202]), CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP721]), CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]), + CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]), + CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]), }; #define R8A7790_CLOCK_ROOT(e, m, p0, p1, p30, p31) \ diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index ed7ee24..5b7a770 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c @@ -99,7 +99,15 @@ void __init r8a7790_pinmux_init(void) .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, \ } -enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFA2, SCIF0, SCIF1 }; +#define HSCIF_DATA(index, baseaddr, irq) \ +[index] = { \ + SCIF_COMMON(PORT_HSCIF, baseaddr, irq), \ + .scbrr_algo_id = SCBRR_ALGO_6, \ + .scscr = SCSCR_RE | SCSCR_TE, \ +} + +enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFA2, SCIF0, SCIF1, + HSCIF0, HSCIF1 }; static const struct plat_sci_port scif[] = { SCIFA_DATA(SCIFA0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */ @@ -110,6 +118,8 @@ static const struct plat_sci_port scif[] = { SCIFA_DATA(SCIFA2, 0xe6c60000, gic_spi(151)), /* SCIFA2 */ SCIF_DATA(SCIF0, 0xe6e60000, gic_spi(152)), /* SCIF0 */ SCIF_DATA(SCIF1, 0xe6e68000, gic_spi(153)), /* SCIF1 */ + HSCIF_DATA(HSCIF0, 0xe62c0000, gic_spi(154)), /* HSCIF0 */ + HSCIF_DATA(HSCIF1, 0xe62c8000, gic_spi(155)), /* HSCIF1 */ }; static inline void r8a7790_register_scif(int idx) @@ -147,6 +157,8 @@ void __init r8a7790_add_standard_devices(void) r8a7790_register_scif(SCIFA2); r8a7790_register_scif(SCIF0); r8a7790_register_scif(SCIF1); + r8a7790_register_scif(HSCIF0); + r8a7790_register_scif(HSCIF1); r8a7790_register_irqc(0); }