From patchwork Wed Jan 24 22:16:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 865501 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FhzvUKJU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zRfhf6MZ0z9s0g for ; Thu, 25 Jan 2018 09:18:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8F003C21F75; Wed, 24 Jan 2018 22:17:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A2892C21F9F; Wed, 24 Jan 2018 22:16:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 53A28C21F94; Wed, 24 Jan 2018 22:16:56 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id A3B10C21F94 for ; Wed, 24 Jan 2018 22:16:48 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id e41so5624009wre.9 for ; Wed, 24 Jan 2018 14:16:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=8TshsyrQiHbjcASfV7jjJHiiE4i46/Y+ohKRrCS1XmY=; b=FhzvUKJUmcHQRW6h0/jKMvq//EGVaZTrmYdQOon9yxs5CcRzoLa9HPwKmY85C+VtKo NdysiP3U1a5Qm3gy0VAwsiMAUGxEs1fdCRRSmXq/RxYAhXH6hHMBhukUIzhHbZ3cbVDm dvamaMxbQgN5iXabMVmZ8NDkKXM8o/lULeHDMMe/+3dV0MjjnHnFaiLWRq03aBRkADYI mOXmriyF8aUuMh/EsBAi1/mmYHFRe59lMiCBJ248GW7+LCrws7zbQVrTOAI3zR/WOorT /qhQN/YKaufLsqgeJkIsQo2gSXaI5vWMhXz29dE8P87/ZBJuE4QMP4UnAhir9Y6nfTO9 O60Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8TshsyrQiHbjcASfV7jjJHiiE4i46/Y+ohKRrCS1XmY=; b=D2H9Um+tT4utNQ/N11Fy8RPNVRNrQXClktKHKqCXPRvQEwqGqVhXOqlnDjFOCbm0HM n8nHheLrRq67M5nv2jsNkXaJ4KH3UTHG/b4rYbzPMxqoSD/rQVrhqC5SiYay+ORDBmIG CgI3Pe5G+9IGWsBL3pMsK7HsWSyH7K/eK8YFLswdk4PPk62JZ9MXNy7iU1pzLNFRR8i3 Rm7zqQWOF3wtxLZmTPDxKT2VDXao5cLYVu+3gGZCCxGgVN/FqdgcRv6ltrzDlrdnB1In +zhZoq4rAaGk3j9i4Qwhe+PdM0JzytWCZfnUmdxhG7hUenzhSCqFrlrjph4sVJRqZ/Lj JxiQ== X-Gm-Message-State: AKwxytdcFGRSHiCU5b8Lgp2o8NirKsoLnQh7k8vvYhYCBy1yG3SaHjVt arJxHnxA0axxeL15EK/+rFVtkRvq X-Google-Smtp-Source: AH8x224vSrEc8Y12JfCRPJzTjsQ4GZlHAki82xMl/Idna0vrvuRMBHhmhS5qBTdpDQ7BHKzG/x6lXQ== X-Received: by 10.223.163.134 with SMTP id l6mr6667416wrb.220.1516832208115; Wed, 24 Jan 2018 14:16:48 -0800 (PST) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id d73sm1517315wma.16.2018.01.24.14.16.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 14:16:47 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Wed, 24 Jan 2018 23:16:11 +0100 Message-Id: <20180124221612.14309-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.15.1 Cc: Marek Vasut Subject: [U-Boot] [PATCH 1/2] serial: sh: Replace fdtdec_get_addr() with devfdt_get_addr() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Replace fdtdec_get_addr() with devfdt_get_addr() as the later one is the current recommended practice. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- drivers/serial/serial_sh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index d9db702803..c07ddc70dc 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -219,8 +219,8 @@ static int sh_serial_ofdata_to_platdata(struct udevice *dev) fdt_addr_t addr; int ret; - addr = fdtdec_get_addr(gd->fdt_blob, dev_of_offset(dev), "reg"); - if (addr == FDT_ADDR_T_NONE) + addr = devfdt_get_addr(dev); + if (!addr) return -EINVAL; plat->base = addr; From patchwork Wed Jan 24 22:16:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 865500 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sr928IuH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zRfhY4bkXz9s0g for ; Thu, 25 Jan 2018 09:18:53 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0C2B9C21E4D; Wed, 24 Jan 2018 22:18:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 83D16C21FC3; Wed, 24 Jan 2018 22:17:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4CC38C21ECC; Wed, 24 Jan 2018 22:17:01 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id BE35FC21EC2 for ; Wed, 24 Jan 2018 22:16:53 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id g21so5594434wrb.13 for ; Wed, 24 Jan 2018 14:16:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zAt/ADmN7I92jCjHMHWazH2Nw8ozKrnEsdoXcwMw2cY=; b=Sr928IuHfuFJU1QlvpcX0pQMQzI8scxDqIBHUuvzW8HYF4otbGwPesX6N350hlOUds R1B/4MgM8G60jamQya257acMBCi7ZWfoDCwQRsttXIn7kpeuD2QUmJLI35MW+19/E4MQ YrLdzFH6xkzF5p39YskTmlRdSE7IQ18u2aEPnW9LQVx0KJfiEnPT9N3FfQxYsTUWhO67 I9UB5N81xdY10cIWpOvFaO1+8wiHZXkaJxUEHYZ5d7+m86g9uD44kj9BsYG0LW7T1TLh vSmB9xwyfGaPfdPqyBXThqtMuBxy2v8O4IMWdUeQfWUKvasbi9xLpzmT7R3CUHHKy3mG 8gqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zAt/ADmN7I92jCjHMHWazH2Nw8ozKrnEsdoXcwMw2cY=; b=dtQS9dcmICXGh1j2hmeRb0VFvHHCcunUvIollT0e4aBEEuKijUHS0YTb1sr+RbJ8Yi jjJE3imQgUHot7B4v904YJUd9oUyg/wGP8m+a0Bl2rlcjtQGFFSO8t65dBmQoHSFv0gJ De0YXLWPl6ABqsYsoRPMT+wEo4bPpS77gCVmo6CHvvSpuBSrKXvbV7bhxSPuThZM+g88 cODVBVva/fvkIzikUFbQ5n+O6p1+eFkJUoy+jw2frVNacrPJGR4FGM7Vav0Vq9R1prIv 6k7LXKIBRHpYfN20wgZlVdEFLyZDzyEj9gRxeqWoi+PE8HB8dDiQQ7CgsuGU3jFxNGg5 eSqg== X-Gm-Message-State: AKwxyte8hfKBZ0QYJhG5D/OOoA/5smnTwUOWl7mGpI8F0840Z0gCd7fK l4lSB/lpuyMNPJAyrBwvkwXnT5zG X-Google-Smtp-Source: AH8x224PWqFao5FGcyptk63aKzHzzabGvUGJXYBJ62Iv0YgH1YO+qnaApN5fCxSx8tTMNUdV0i6feg== X-Received: by 10.223.162.138 with SMTP id s10mr3182454wra.263.1516832213201; Wed, 24 Jan 2018 14:16:53 -0800 (PST) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id d73sm1517315wma.16.2018.01.24.14.16.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 14:16:51 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Wed, 24 Jan 2018 23:16:12 +0100 Message-Id: <20180124221612.14309-2-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180124221612.14309-1-marek.vasut+renesas@gmail.com> References: <20180124221612.14309-1-marek.vasut+renesas@gmail.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH 2/2] serial: sh: Unify CONFIG_R8A779[01234] as CONFIG_RCAR_GEN2 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Use the common RCAR_GEN2 config option instead of enumerating each SoC and having a lengthy ifdef clause. No functional change. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- drivers/serial/serial_sh.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index 1b8d742f1c..229e331d72 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -224,9 +224,7 @@ struct uart_port { # define SCSPTR3 0xffc60020 /* 16 bit SCIF */ # define SCIF_ORER 0x0001 /* Overrun error bit */ # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ - defined(CONFIG_R8A7792) || defined(CONFIG_R8A7793) || \ - defined(CONFIG_R8A7794) || defined(CONFIG_RCAR_GEN3) +#elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_RCAR_GEN3) # if defined(CONFIG_SCIF_A) # define SCIF_ORER 0x0200 # else @@ -308,8 +306,7 @@ struct uart_port { /* SH7763 SCIF2 support */ # define SCIF2_RFDC_MASK 0x001f # define SCIF2_TXROOM_MAX 16 -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || defined(CONFIG_R8A7792) || \ - defined(CONFIG_R8A7793) || defined(CONFIG_R8A7794) +#elif defined(CONFIG_RCAR_GEN2) # define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK) # if defined(CONFIG_SCIF_A) # define SCIF_RFDC_MASK 0x007f @@ -566,8 +563,7 @@ SCIF_FNS(SCFCR, 0x18, 16) SCIF_FNS(SCFDR, 0x1c, 16) SCIF_FNS(SCLSR, 0x24, 16) SCIF_FNS(DL, 0x00, 0) /* dummy */ -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || defined(CONFIG_R8A7792) || \ - defined(CONFIG_R8A7793) || defined(CONFIG_R8A7794) +#elif defined(CONFIG_RCAR_GEN2) /* SCIFA and SCIF register offsets and size */ SCIx_FNS(SCSMR, 0, 0, 0x00, 16, 0, 0, 0x00, 16, 0, 0) SCIx_FNS(SCBRR, 0, 0, 0x04, 8, 0, 0, 0x04, 8, 0, 0) @@ -762,8 +758,7 @@ static inline int scbrr_calc(struct uart_port *port, int bps, int clk) #define SCBRR_VALUE(bps, clk) scbrr_calc(port, bps, clk) #elif defined(__H8300H__) || defined(__H8300S__) #define SCBRR_VALUE(bps, clk) (((clk*1000/32)/bps)-1) -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || defined(CONFIG_R8A7792) || \ - defined(CONFIG_R8A7793) || defined(CONFIG_R8A7794) +#elif defined(CONFIG_RCAR_GEN2) #define DL_VALUE(bps, clk) (clk / bps / 16) /* External Clock */ #if defined(CONFIG_SCIF_A) #define SCBRR_VALUE(bps, clk) (clk / bps / 16 - 1) /* Internal Clock */