From patchwork Fri Oct 13 17:21:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 115816 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp975682qgn; Fri, 13 Oct 2017 10:24:20 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA7iTNow3OTBJgU2nG2wUlZk30YLwVOJwR2rXfZXrzUyLfxy6yVe+T4WsL44/sGKOgVmIXA X-Received: by 10.80.145.228 with SMTP id h33mr3077435eda.275.1507915460435; Fri, 13 Oct 2017 10:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507915460; cv=none; d=google.com; s=arc-20160816; b=rx/q4LBv02mJmQZDv17mHkPg+Hc7eSaBoElt7aBtR0bc/Qs5PaC0VNfp0p7yYjf/RD 2Ubs7jBOwujbckCDFKHlFs3J8VOAOJlyhm3SouMifxNmdl01LhwBtL4vvVdg7XpcJ/aS tScedZWjpwfFGzWb+87hsUv1075nKhRXa9J53JmSVuWWw7MnuuszsRuGaHCdh8rgVd0e esx4HWgA69nf+DudifBL8IN+2bLwvsNja/ni0WeOA6ZnWeJkizzVrOdBAn8hs0CtUSPG ueiT+J4OiFBoGkd5/RJNMYF03u1hLEA7TsCDqBE+iflSmQFK+VYzCQ93A2ix1XqivA9K h46g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=PhNMQlarMBiEdy7/sP9QkPA2ARBTEQucx0IfxHw8HdE=; b=aQGzz/DAiJIy6bF3HX0q8jxlgGViZ5MiIk/fh9xV8lCe5BWLyZJ1EShPxqpGBNjOiq b/UvR8c53U2TjD0aY8tlcyseVVL5irnR3oByRoGJchC3OyGg2Fkr39w0b7EtBEGF0YTZ rx0bxFrSAiNHhjpgJHt2VliMGmqhNcVzWzUgfJvKzSNz0yRYKtOK2G+6vfC+6pUKVVzU /8ctc2NvET7LMnSmZpvqwq7YXmaL34Q/zAlA/pJ3uYeGfdlIQxIviMRg1KW2oNobuA/5 iQzmEEQ9X9gXxEOxJpLaqdU9cKAdhcxPl2ZYOaeJ2tqqcmMUmv4Z8baPhZGPYk+dhVPX 9fbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=y0qREabs; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id q31si1264716eda.85.2017.10.13.10.24.19; Fri, 13 Oct 2017 10:24:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=y0qREabs; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id D2DBEC22051; Fri, 13 Oct 2017 17:23:36 +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=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 25566C2202E; Fri, 13 Oct 2017 17:23:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C4C63C21FC5; Fri, 13 Oct 2017 17:23:01 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id 92D2DC21F7F for ; Fri, 13 Oct 2017 17:23:00 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-08.nifty.com with ESMTP id v9DHMXpg019395; Sat, 14 Oct 2017 02:22:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v9DHMXpg019395 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1507915353; bh=ksIVyfecbo0KuD0iJChS3l/GUDiMguo7numCWXtfpRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y0qREabssG0IkFCuFIIe6TEk1pN4kpv3zqgcvBS1lcgGHi+TmjokqBoY3hE6YxblH qln/48PodS5nu5XVE1XCRBOek4XUnK0etY4uyMQ+2wrmr1rReKAn8uClBti43BMTz8 A32UMVsDCocCT4Mj/b35H//27Y6XnGiYFv9JCtnm+RSe5Kdu+UffNaKTwx/UIxQhxo Tx2Kba7vo+eBeGrPKf+tYRKzJlCddP6+ycVm/bGMgKzpB5ckt5D8NQoIIjArgOtVAy YwMnCgFOWW2MivF8Tb5uudNIlkVk3hzG+0KO3s+4UBsI9LEtS+jQKO9XpeO5HAbmqi g7cDakjjUKa9w== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 14 Oct 2017 02:21:17 +0900 Message-Id: <1507915279-25058-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507915279-25058-1-git-send-email-yamada.masahiro@socionext.com> References: <1507915279-25058-1-git-send-email-yamada.masahiro@socionext.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH 2/4] ARM: uniphier: adjust ifdefs for new UniPhier DWC3 CONFIG 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" Now USB 3.0 feature is enabled/disabled by CONFIG_USB_DWC3_UNIPHIER. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/clk/clk-pro4.c | 6 +++--- arch/arm/mach-uniphier/clk/clk-pro5.c | 6 +++--- arch/arm/mach-uniphier/clk/clk-pxs2.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-uniphier/clk/clk-pro4.c b/arch/arm/mach-uniphier/clk/clk-pro4.c index 19be4f3..8a978d2 100644 --- a/arch/arm/mach-uniphier/clk/clk-pro4.c +++ b/arch/arm/mach-uniphier/clk/clk-pro4.c @@ -17,7 +17,7 @@ void uniphier_pro4_clk_init(void) /* deassert reset */ tmp = readl(SC_RSTCTRL); -#ifdef CONFIG_USB_XHCI_UNIPHIER +#ifdef CONFIG_USB_DWC3_UNIPHIER tmp |= SC_RSTCTRL_NRST_USB3B0 | SC_RSTCTRL_NRST_USB3C0 | SC_RSTCTRL_NRST_GIO; #endif @@ -30,7 +30,7 @@ void uniphier_pro4_clk_init(void) writel(tmp, SC_RSTCTRL); readl(SC_RSTCTRL); /* dummy read */ -#ifdef CONFIG_USB_XHCI_UNIPHIER +#ifdef CONFIG_USB_DWC3_UNIPHIER tmp = readl(SC_RSTCTRL2); tmp |= SC_RSTCTRL2_NRST_USB3B1 | SC_RSTCTRL2_NRST_USB3C1; writel(tmp, SC_RSTCTRL2); @@ -39,7 +39,7 @@ void uniphier_pro4_clk_init(void) /* provide clocks */ tmp = readl(SC_CLKCTRL); -#ifdef CONFIG_USB_XHCI_UNIPHIER +#ifdef CONFIG_USB_DWC3_UNIPHIER tmp |= SC_CLKCTRL_CEN_USB31 | SC_CLKCTRL_CEN_USB30 | SC_CLKCTRL_CEN_GIO; #endif diff --git a/arch/arm/mach-uniphier/clk/clk-pro5.c b/arch/arm/mach-uniphier/clk/clk-pro5.c index 823bb06..dd86cad 100644 --- a/arch/arm/mach-uniphier/clk/clk-pro5.c +++ b/arch/arm/mach-uniphier/clk/clk-pro5.c @@ -15,7 +15,7 @@ void uniphier_pro5_clk_init(void) /* deassert reset */ tmp = readl(SC_RSTCTRL); -#ifdef CONFIG_USB_XHCI_UNIPHIER +#ifdef CONFIG_USB_DWC3_UNIPHIER tmp |= SC_RSTCTRL_NRST_USB3B0 | SC_RSTCTRL_NRST_GIO; #endif #ifdef CONFIG_NAND_DENALI @@ -24,7 +24,7 @@ void uniphier_pro5_clk_init(void) writel(tmp, SC_RSTCTRL); readl(SC_RSTCTRL); /* dummy read */ -#ifdef CONFIG_USB_XHCI_UNIPHIER +#ifdef CONFIG_USB_DWC3_UNIPHIER tmp = readl(SC_RSTCTRL2); tmp |= SC_RSTCTRL2_NRST_USB3B1; writel(tmp, SC_RSTCTRL2); @@ -33,7 +33,7 @@ void uniphier_pro5_clk_init(void) /* provide clocks */ tmp = readl(SC_CLKCTRL); -#ifdef CONFIG_USB_XHCI_UNIPHIER +#ifdef CONFIG_USB_DWC3_UNIPHIER tmp |= SC_CLKCTRL_CEN_USB31 | SC_CLKCTRL_CEN_USB30 | SC_CLKCTRL_CEN_GIO; #endif diff --git a/arch/arm/mach-uniphier/clk/clk-pxs2.c b/arch/arm/mach-uniphier/clk/clk-pxs2.c index 0d92405..9775127 100644 --- a/arch/arm/mach-uniphier/clk/clk-pxs2.c +++ b/arch/arm/mach-uniphier/clk/clk-pxs2.c @@ -16,7 +16,7 @@ void uniphier_pxs2_clk_init(void) /* deassert reset */ tmp = readl(SC_RSTCTRL); -#ifdef CONFIG_USB_XHCI_UNIPHIER +#ifdef CONFIG_USB_DWC3_UNIPHIER tmp |= SC_RSTCTRL_NRST_USB3B0 | SC_RSTCTRL_NRST_GIO; #endif #ifdef CONFIG_UNIPHIER_ETH @@ -28,7 +28,7 @@ void uniphier_pxs2_clk_init(void) writel(tmp, SC_RSTCTRL); readl(SC_RSTCTRL); /* dummy read */ -#ifdef CONFIG_USB_XHCI_UNIPHIER +#ifdef CONFIG_USB_DWC3_UNIPHIER tmp = readl(SC_RSTCTRL2); tmp |= SC_RSTCTRL2_NRST_USB3B1; writel(tmp, SC_RSTCTRL2); @@ -41,7 +41,7 @@ void uniphier_pxs2_clk_init(void) /* provide clocks */ tmp = readl(SC_CLKCTRL); -#ifdef CONFIG_USB_XHCI_UNIPHIER +#ifdef CONFIG_USB_DWC3_UNIPHIER tmp |= BIT(20) | BIT(19) | SC_CLKCTRL_CEN_USB31 | SC_CLKCTRL_CEN_USB30 | SC_CLKCTRL_CEN_GIO; #endif