From patchwork Fri Oct 13 17:21:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 115814 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp974588qgn; Fri, 13 Oct 2017 10:23:09 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBJgGW3nzWAI/n7KGnp8cSJiDX9TLaLD33jcrC859AJYwraTA3vLovC3+oFOq3v/bTQn8Qa X-Received: by 10.80.145.228 with SMTP id h33mr3073822eda.275.1507915389385; Fri, 13 Oct 2017 10:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507915389; cv=none; d=google.com; s=arc-20160816; b=POAYj1n9kMPLeiB4xxJz63kAxzek6ioPpV+wu0Jq82KdxcuMDOEzXub/0rE8xHMC0j oOxXPnutKjf2d/pYAYcMgNiyxoDdTQLWcg96z4Ne/isLlc+AZX3VA2KIhxrjsmrCtAZK 7di69KJIcQ7hSRaTVQgaExaEcXn9t5grR3QZr36SzfCvfUN125bUc7CrRIlh2NfxP3bV GiQifK8FOAnkakC14V7grj/TsLcwlmMOmcB/KOTtdyprJql9YUj/Hoa5pISG3Y34pl+v dd6PLcUK8DZBdEdDKCCQi3iWUbGr9Cf8ozc+/UJbaidF4lCjNemyJ2VC37Jn1em7yEv0 lXFA== 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:message-id:date:to:from:dkim-signature :dkim-filter:arc-authentication-results; bh=IaOQmWafz4+xkbpasAByubj8onzQcg40RNSrlvPlWjY=; b=ib3nEVifOiOHla3vGcvIEzm1iqi+nq2mz+fybSxnm7cnu8m4RlL7QWewoWzEgDdCDI fmLC+IYB+m/d8Et4ELZJsL/nIFIf7HWxktiffkXvdpfE94nzkK+jnmvJphIr1QNgadSp VK6gI7J4YA2S5eI1ePDFfTDt14dEu1NIU/bPU1+yiHOyL2/mGNPwlS5Mqctx5WxcVDCk YmMXHeqTzWUNunAijW5gVUCwMeahQ7Ty2JkkNigr9iL9oeerJ+5LzMeT/x4PfudMRu/K K6qF+rig7gxCE0lIo6KYghOn/dgQHmE3dAHOj1UOkEa5Zrw9nZAE+d1hl4RGj5rp0S52 QNyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=hVL0mKQv; 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 n21si1258959eda.511.2017.10.13.10.23.08; Fri, 13 Oct 2017 10:23:09 -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=hVL0mKQv; 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 9ACF3C2202C; Fri, 13 Oct 2017 17:23:04 +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 E6F44C21F7F; Fri, 13 Oct 2017 17:23:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AA142C21FF6; 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 9777BC21FC5 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 v9DHMXpf019395; Sat, 14 Oct 2017 02:22:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v9DHMXpf019395 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1507915353; bh=DQB9ws6ixkecU9DJ5h7FHFuEycHm9Bf9Mh/V9LwYbC0=; h=From:To:Cc:Subject:Date:From; b=hVL0mKQvOJ9ie0JHi08UfxXiIxDzylCYoPtu58i+Qa0uyofZfPQz/Mah1FesQbkrA 2oB+6ETwPXo7L1sM/KZkZxyjvGUWwoayr2utRKspn3h24QKlXLncQejmGe9RD5NPYN Tenzan6mqLYTs98yfWkeNvCTsL/0sCuLL4+ZhlLVILdruE7nswGqKJ0w6c/frd6agH gxgd5mXtcaBubyunJrPuA05t/KVOWqxIjAjSLEzcVCFwDY8FgzQUkUJJi+e8YRfnxT t2aXZS0JN91OFvDDSYihZXwavFFwtW+WAIgSP/okiU+oz4HGGGe7aMdO2RHAjM5s25 wNF1Q/ZyYHA3A== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 14 Oct 2017 02:21:16 +0900 Message-Id: <1507915279-25058-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH 1/4] ARM: uniphier: enable DWC3 xHCI driver 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" Enable CONFIGs for the DWC3 core and the UniPhier specific glue layer. Signed-off-by: Masahiro Yamada --- configs/uniphier_v7_defconfig | 2 ++ configs/uniphier_v8_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index 12b24bc..96e962d 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -48,4 +48,6 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_UNIPHIER=y CONFIG_USB_STORAGE=y diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig index 796839b..31dd9b3 100644 --- a/configs/uniphier_v8_defconfig +++ b/configs/uniphier_v8_defconfig @@ -45,4 +45,6 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_UNIPHIER=y CONFIG_USB_STORAGE=y 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 From patchwork Fri Oct 13 17:21:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 115817 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp976359qgn; Fri, 13 Oct 2017 10:25:02 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAkZ6LyTO+vGRf2VA5CZBIcd3u1Dn1KmJ4OuDijGXmHTa2xVY7GcJCOi57Rd8A4OGKsVrMY X-Received: by 10.80.147.16 with SMTP id m16mr3038053eda.121.1507915502574; Fri, 13 Oct 2017 10:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507915502; cv=none; d=google.com; s=arc-20160816; b=veyuzKAvs5N965zEha77bRF7CThB7pvClYSt8V+S0GyHp0r1uHRw+Cdj4wbcF7vDLw c4T9vOxSm5D0vMLkLxWchtr3Ds+ng4cDad2UGzB5q4sTjT92R4t57SEh4rXGw3/6roTV FZvMBCe9lBlw9OqFt5hsEyYYVliL8VkeyqJ1sIOqrzrqnVQn5AsCzxaj3N16yHrznmbE nHhCCM3D+O7kY5H6k9e1VG+DCiS4Iwged4ps/wdXWRFwnNKMJKYbYfBoy1CVY4skep6f XKv4QsVauseOSrsELDifruVBJVSjgp6Ku2bQGdx/a0/SSfUENRcZm+4mTv42J4iKcMM6 ZRtg== 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=8i9FAWKkNo0t10ULxmGm3xwJ69X1PG00ozPIaaM+dMU=; b=REThvprefCslttPFvEqkpuP1xYIli8RvUmPNY2s/NpEmhJWCYEiBpiUDOdXIXTYGpu ++p8AInONEnRxe5btCKE/tX26W4QMWJX+pAJjR7yzH1vEQht0RnarZBhLXvZg6gADIpA ctPSEGy9xtrHESAvqj3ATjQws/EYUqvhlwOLscPFB7ZbQAWeJmYP15kA54uz8//ZRQ38 xl6ZOvwVwAM1x4cBBdR2Ah0pd/ATNcu0pvCwY6Vbr221Ip5VL0qwydtqs3FCrSUOXSgw WKxPy4hxYDe1gUlhqMxo3/dKIF31MB8VRqiiSNFnH4WRaN0bWg6OsqeJq3uisP/bJqTD DzwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=anrktL+Q; 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 r44si1379269edr.204.2017.10.13.10.25.02; Fri, 13 Oct 2017 10:25:02 -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=anrktL+Q; 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 27F8BC2205B; Fri, 13 Oct 2017 17:23:52 +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 EEE38C22024; Fri, 13 Oct 2017 17:23:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B41F9C2202E; Fri, 13 Oct 2017 17:23:22 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id EA610C22024 for ; Fri, 13 Oct 2017 17:23:18 +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 v9DHMXph019395; Sat, 14 Oct 2017 02:22:34 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v9DHMXph019395 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1507915354; bh=VrjODINcIQP0xFjFNtruLc0Xi1vlki4eeeReIjYbG2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=anrktL+Q/1OjUg35a6vD6ZKARhkZDcgNp5egsdsVGGWeSncvLk0XUVkjzuqA8LosU xfy7jtppra4lVQDAFfji/C1eQbE4rWxTcAEHdm576FHI1CkImPMA/1dvFYkNpSukG3 GEnOdBfVNhNV79b1skEY91RV04gGd6uTUXi3z0ezpec+IAmhQOAZn0tC5UZ9hQlf6+ BQkkNj701hHLtSGhvSz8F49TObuT1PG/qOPVN2Q8hejmahIVFYUhsJjPHmqd5zBKuz 98Aryubb1RYhqr8TLiL1ieoQsL8x2B/ieVLlNuVCDfvhZj2fUcS+Z+o9d7shAaX7w0 HB+RCjVL0kmKw== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 14 Oct 2017 02:21:18 +0900 Message-Id: <1507915279-25058-3-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: Scott Wood , Scott Wood Subject: [U-Boot] [PATCH 3/4] mtd: nand: denali_dt: add clock support 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" Enable clock in the probe hook. The clock rate will be necessary when setup_data_interface hook is supported. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/denali.h | 1 + drivers/mtd/nand/denali_dt.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h index 08db488..f796f0d 100644 --- a/drivers/mtd/nand/denali.h +++ b/drivers/mtd/nand/denali.h @@ -435,6 +435,7 @@ struct nand_buf { struct denali_nand_info { struct nand_chip nand; + unsigned long clk_x_rate; /* bus interface clock rate */ int flash_bank; /* currently selected chip */ int status; int platform; diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/denali_dt.c index 4afd679..805c066 100644 --- a/drivers/mtd/nand/denali_dt.c +++ b/drivers/mtd/nand/denali_dt.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -52,6 +53,7 @@ static int denali_dt_probe(struct udevice *dev) { struct denali_nand_info *denali = dev_get_priv(dev); const struct denali_dt_data *data; + struct clk clk; struct resource res; int ret; @@ -73,6 +75,16 @@ static int denali_dt_probe(struct udevice *dev) denali->flash_mem = devm_ioremap(dev, res.start, resource_size(&res)); + ret = clk_get_by_index(dev, 0, &clk); + if (ret) + return ret; + + ret = clk_enable(&clk); + if (ret) + return ret; + + denali->clk_x_rate = clk_get_rate(&clk); + return denali_init(denali); } From patchwork Fri Oct 13 17:21:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 115815 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp975238qgn; Fri, 13 Oct 2017 10:23:50 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC25FXeQU6aZdZwPrKxcJErNYnY/4/20Y97sg2rGGyb3HMGUr5SfQGHEJPijtZAzxCBohqh X-Received: by 10.80.166.133 with SMTP id e5mr2990844edc.51.1507915430054; Fri, 13 Oct 2017 10:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507915430; cv=none; d=google.com; s=arc-20160816; b=NTJHaWE2xFN+8BYK642NbimC3oTnN3/zvkpGacNcT+IWsQvWAqI6RQrZY5wUKIsv/n bOO/lTgD54B4BfMogr0rlGkIKJ0r6Z07o1pxqo79H4IKOmNJk+AnBI4FUNDtpXpDcK9V nYqKEXXkNtnIidZiJDRpaJoBi7PRj5Yit0EbkbjHV08S5qgHsef9Z6fVvZKmCxdWpFcs STHbr0s4oC2VRXjy3j1Z8mj+G8KPWLbtzAJlDwTY+VQl2CmXh/GygfU8HMblRcwLWx/E ezThJRqXTzVFqtrQ8thKYB1UEV4dJ+0xgc0RR0ISxLOAbML9mVWbEsVkqyduud9iqvts x9Wg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=O4hBC/+9jcHo2wC8SvZ6H/x5Glv05LpSf3ItkxMFPF0=; b=0xcfKgGDyPEhg6ioPX/kB6j5Usp3dZ1k+AEITv8wDdOMuOqVOTWgXyVjyQ3N1PygF1 6x84UN8M61vNvjD9NSAGAz6j90bTk/kqgW0ZdSMr+6Kb/Eo7DvbqAB9SCXqJJdcAxtDr LcUaNpXt/TsjSKn5x2caeR+ON8ry8KMal3fEg/TFM33pv7FZFkGooKDvWNjqQa7p6qww zpPWY186fyCzk1pcmBgg0eCUVpa7McLxcwYqWt7sDkjH7H7CsWsqZ+jRIlNDNN+eVCiO K6tiymBS03dquaUTXfcNVXQVJqW0GS0k8fi0biL0qnsdcRft2m1YHF7weVUr/3cjSuiR ARtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=f128QxmW; 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 a3si1140183edd.224.2017.10.13.10.23.49; Fri, 13 Oct 2017 10:23:50 -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=f128QxmW; 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 A29ABC22022; Fri, 13 Oct 2017 17:23:19 +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 B041EC2201F; Fri, 13 Oct 2017 17:23:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B44C9C21CEC; 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 6BB3DC21CEC 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 v9DHMXpi019395; Sat, 14 Oct 2017 02:22:34 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v9DHMXpi019395 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1507915355; bh=uVDw0Jk1T3if+ph7SScjkqk1F1g8c26AtWNoY+lfb3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f128QxmWDhaucTlYW9aXIPEo57m2vJSNg5cA1FJq11iJUC5fLEOMG9j+W+BmkNnjx jnTOVdV1bwRy5TxSl4Lij+8G7CDRbHU2mzUndNKYvS34Cj/a1Jmu1Vvbv6Um97K7Yq y5bVo4ZW3pB43jr6xkSCG8u+K4+6rKbcm3NFVBerKSXIDLY1QReyMbtnXprq+osTU5 jhxXcgFsFbfYgn4EvuCFlYyYCXIt4UUu7wHsijIp9V5P3nMdZGl2R5oWAzIIL0+V48 u8g4ktorpWphy1VVRG3XbcbvZIhvbd+xq7VqGJ78NCIsUGE0yU7tnrPG5A8uL0nLFD P5BEpPUPpSrbg== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 14 Oct 2017 02:21:19 +0900 Message-Id: <1507915279-25058-4-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> Subject: [U-Boot] [PATCH 4/4] clk: uniphier: add NAND controller clock 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" This allows the NAND driver to enable clock and get its clock rate. Signed-off-by: Masahiro Yamada --- drivers/clk/uniphier/clk-uniphier-sys.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/clk/uniphier/clk-uniphier-sys.c b/drivers/clk/uniphier/clk-uniphier-sys.c index f8cf6da..c852c78 100644 --- a/drivers/clk/uniphier/clk-uniphier-sys.c +++ b/drivers/clk/uniphier/clk-uniphier-sys.c @@ -7,10 +7,20 @@ #include "clk-uniphier.h" +/* Denali driver requires clk_x rate (clk: 50MHz, clk_x & ecc_clk: 200MHz) */ +#define UNIPHIER_LD4_SYS_CLK_NAND(_id) \ + UNIPHIER_CLK_RATE(128, 200000000), \ + UNIPHIER_CLK_GATE((_id), 128, 0x2104, 2) + +#define UNIPHIER_LD11_SYS_CLK_NAND(_id) \ + UNIPHIER_CLK_RATE(128, 200000000), \ + UNIPHIER_CLK_GATE((_id), 128, 0x210c, 0) + const struct uniphier_clk_data uniphier_pxs2_sys_clk_data[] = { #if defined(CONFIG_ARCH_UNIPHIER_LD4) || defined(CONFIG_ARCH_UNIPHIER_SLD8) ||\ defined(CONFIG_ARCH_UNIPHIER_PRO4) || defined(CONFIG_ARCH_UNIPHIER_PRO5) ||\ defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B) + UNIPHIER_LD4_SYS_CLK_NAND(2), UNIPHIER_CLK_GATE_SIMPLE(8, 0x2104, 10), /* stdmac */ UNIPHIER_CLK_GATE_SIMPLE(12, 0x2104, 6), /* gio (Pro4, Pro5) */ UNIPHIER_CLK_GATE_SIMPLE(14, 0x2104, 16), /* usb30 (Pro4, Pro5, PXs2) */ @@ -23,6 +33,7 @@ const struct uniphier_clk_data uniphier_pxs2_sys_clk_data[] = { const struct uniphier_clk_data uniphier_ld20_sys_clk_data[] = { #if defined(CONFIG_ARCH_UNIPHIER_LD11) || defined(CONFIG_ARCH_UNIPHIER_LD20) + UNIPHIER_LD11_SYS_CLK_NAND(2), UNIPHIER_CLK_GATE_SIMPLE(8, 0x210c, 8), /* stdmac */ UNIPHIER_CLK_GATE_SIMPLE(14, 0x210c, 14), /* usb30 (LD20) */ UNIPHIER_CLK_GATE_SIMPLE(16, 0x210c, 12), /* usb30-phy0 (LD20) */ @@ -33,6 +44,7 @@ const struct uniphier_clk_data uniphier_ld20_sys_clk_data[] = { const struct uniphier_clk_data uniphier_pxs3_sys_clk_data[] = { #if defined(CONFIG_ARCH_UNIPHIER_PXS3) + UNIPHIER_LD11_SYS_CLK_NAND(2), UNIPHIER_CLK_GATE_SIMPLE(12, 0x210c, 4), /* usb30 (gio0) */ UNIPHIER_CLK_GATE_SIMPLE(13, 0x210c, 5), /* usb31-0 (gio1) */ UNIPHIER_CLK_GATE_SIMPLE(14, 0x210c, 6), /* usb31-1 (gio1-1) */