From patchwork Tue Oct 17 12:19:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116076 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4821220qgn; Tue, 17 Oct 2017 05:20:01 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCqOvkeMrZjKK7iQ7R0K3bBzQ81EkkhBRtdIPcp02T7wNaB9nPJr6qCkmE+w7gXmnFqE0kp X-Received: by 10.80.208.155 with SMTP id v27mr16239954edd.62.1508242801741; Tue, 17 Oct 2017 05:20:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508242801; cv=none; d=google.com; s=arc-20160816; b=MZutw7iGNVobtTdvNgmlpMlVGtbUBaS82MQp1VV4c7B4nj8cVLes3fpk8iTn1AsBoD ltrKc++tPZ695NErebyPD7LGP1Y2nBsUvf7/Vl1pU5AIxcAHdgyDQfwQdDCdQl65ogAl RmiZPBpLSd3Lu+caSCxo+CfUzUOiZAnTT+6E5TX5gXpJbIPGKeP6qMdKwI3Qq2m7SLgr MZfcUbfH3YYqPWXq+RlxhhZBI6kJuxwxlyU5xE56l9gvLJR6UUSnDw7iPii07X7zg7/y zz4VpgboRYK5NThpfjrWDJ+0UnxejNC0pV2grFWFN8cI4E3VtwMoDfBGN5ITTXS4DmnG wo7g== 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=IKPsB9NuZUymRL1Ba9lQRXTd2+G+OvFazpKNfZPvX4Q=; b=pMFu0FlHCkqsiVHMHs2L2BOD3gzompRr11CERPKE2zmByZPimCSU8BG7Lxs+WacwYp k6mohHQvpTHPmiVztPcB/iOFMW5fYRSujx2J1+0WkodeapsXdIp4uhqqwKt2n4UFIj7f CaE9KErtmm6SfDecu8nMyASPpSRVPETbRTWtZB8ho9/TrMyjtps/HvgF2HNRZldgyFmY HTTJWVd5KlTU5lrGTZmXCFilOhFHY2ssCw198I2be1FM0Fi2n0QQ1IUKN3MxqRspHOqf 3LKzmYG9OLuZ4Muvr+TqNY+UauQo0fYKxNHIoZ0sQRLtb8xVM6QMq+bwIpId0Fc/EQfl o5Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=JNt98Fxf; 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 m20si2493927edc.113.2017.10.17.05.20.01; Tue, 17 Oct 2017 05:20:01 -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=JNt98Fxf; 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 EA53DC21DC3; Tue, 17 Oct 2017 12:19:57 +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 D13F7C21C71; Tue, 17 Oct 2017 12:19:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CDE71C21C71; Tue, 17 Oct 2017 12:19:54 +0000 (UTC) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lists.denx.de (Postfix) with ESMTPS id 8A02DC21C40 for ; Tue, 17 Oct 2017 12:19:51 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-11.nifty.com with ESMTP id v9HCJkdS004480; Tue, 17 Oct 2017 21:19:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v9HCJkdS004480 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508242786; bh=nuEbonqg7bsuldQJnAF2MCVUX1xDMW0L5qoiMSNIHy8=; h=From:To:Cc:Subject:Date:From; b=JNt98FxfXlZSRX+3LBjG/kR73DHkD1Cl5vXwvX/bNUXosKrOJHwsyHNstH4ZojMwN GgO3UBpAYlnWAFb1lFn659tjdLfVecrALpMbQEC/F9p8YohYjW8+8+f4Ax2b4hn6CR DPaPv9NREd73SYpGl46QqjaxMGKtx/XU9rFyOCXLYTbOgSjbfncZ88f3iqkZtDpPO8 btW+vux1B1OeAEJqyXC1DogKBNJKwwK65Qul9N/zS4khI9XpO8+OJnvye3RrYMeTZ3 FYnzXhPMlX0Qi0mAF7XvbVTR1p6YnBDoWyu1JnRgb/nS60kbkZyzaonsv8zd6w5osJ Uw9CQoHzZ7zuQ== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 17 Oct 2017 21:19:40 +0900 Message-Id: <1508242783-21107-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 really 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" I thought commit d37d31849c6a ("ARM: uniphier: enable DWC3 xHCI driver") enabled CONFIG_USB_DWC3_UNIPHIER, but CONFIG_USB_XHCI_DWC3 was missing in uniphier_v7_defconfig. Re-add. Signed-off-by: Masahiro Yamada --- configs/uniphier_v7_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index 7f2347a..c352d7c 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -45,7 +45,9 @@ CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y CONFIG_USB=y 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 Tue Oct 17 12:19:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116079 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4823407qgn; Tue, 17 Oct 2017 05:21:57 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCmrFk58xX7e/KF3KkvuygAkgk1Cz0dNzAucaxgTjesv8/qYqsNLZrscamooxCjJjrLKV4g X-Received: by 10.80.149.20 with SMTP id u20mr17195432eda.137.1508242916922; Tue, 17 Oct 2017 05:21:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508242916; cv=none; d=google.com; s=arc-20160816; b=uUQ2+naafYpfh0Gv2PKDoQEEBOBm3HaJbXwKu5dlyrp/9Kdfq/gEIC4pSj1M/UtIgj SE73nQPk/+zhqDIiSD9LK0HAuW7t9Bqbxg1PIGhdvyVxVkgaAbcGaadHlMhqB9HWKFs7 OGojjk3bSrWzWjH3UDfMzXYcJX1l2gd6fUdJaTCYH53vSGHmIut4hlNbIvqE3vjSDcN4 obQR2HXQnghFCKTqxhqcvL1sUn4IYi51BhUZjbI9R9+/uMhlcChrzhwwd9FRG/2yheGh fXeDc83QTaPX62805NqVPw/Lf5zMB53j4ngwsdMoIt+6AYOmx+0dng+9KcJMUiObFRtf F7hg== 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=D+G7zI45K2eOwMTdy/ZRpQgiKunaGN4rqCf4Fwmioqs=; b=r44SBZGUlGtlRnac8EDpesUz0PmqqgFRBIsq7I9AI1GTc58OySI3Z9te9J/cfqIVvk e4sVIR8H3i4YhvQllSdQCDdqqzfFrrM5yZKCMB96yS19ZlJYzd2Gk9ZUnIdL9GVwUo1h vn+mpx51ZvVKzGzs5C2GluczC+CRQKsWXnAlHkHgIz0N5o7efPVQGXTpL/qyeIG0YPV1 qE0bmm1SBkX0HVTNbwBMRiog4pc6LLEP13VtpwrLm+nrRxdsojamaSgLzGyXnhvPPOgU 6UrRvzr9g84AEosGzzo0PEf3H6WxQhYlAx5RAJ4a++Z7EvST6FPQp/ojPV3Y6Ea/o74L X9FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=28gsxluv; 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 d31si682928edc.404.2017.10.17.05.21.56; Tue, 17 Oct 2017 05:21:56 -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=28gsxluv; 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 7D888C21D76; Tue, 17 Oct 2017 12:21:05 +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 7797DC21DA0; Tue, 17 Oct 2017 12:20:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6333BC21E0E; Tue, 17 Oct 2017 12:20:12 +0000 (UTC) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lists.denx.de (Postfix) with ESMTPS id C6D52C21DDD for ; Tue, 17 Oct 2017 12:20:08 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-11.nifty.com with ESMTP id v9HCJkdT004480; Tue, 17 Oct 2017 21:19:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v9HCJkdT004480 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508242787; bh=4E40XmlSNa+Hf0sxsvSRHPA/KUfpvuzw/UJVT3SmjAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=28gsxluvFKZ8pOJTw5LUo553V5WpKM8dMlPsINAywCsCFBs7FOCLU1IGxZrB3zZOS mlLes/jrV4Jxsp13xoRyCX6xMdvwNMsx8QGu0HQbkx9ki0XpJUCrZ+DwqV/wF9NDt0 kuWwtVCkGZow4Ps/zX5+b8IUpFM7CnkaYUq0VIdBK8ad0fowRLMWIl73YV6ffKq9tn 0jBQf09NyzHu4JasEYMGkLodDr2+1roM58osJo5Bn/8ePdWpmtK7OznF0nxI6od03M xjod5vzxHmRaGbsxq5cGk3Ua536w+a0DzGEjU/INMu8d0Zld1qBGmwPuYAGvwiNGHa 06gsLf34i2uhg== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 17 Oct 2017 21:19:41 +0900 Message-Id: <1508242783-21107-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508242783-21107-1-git-send-email-yamada.masahiro@socionext.com> References: <1508242783-21107-1-git-send-email-yamada.masahiro@socionext.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH 2/4] ARM: uniphier: remove CONFIG_UNIPHIER_ETH 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" The option is never enabled by anyone. Remove the code surrounded by its ifdef. This should be handled by the clock/reset drivers. CONFIG_UNIPHIER_ETH in scripts/config_whitelist.txt will be dropped at the next resync. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/clk/clk-ld4.c | 6 ------ arch/arm/mach-uniphier/clk/clk-pro4.c | 6 ------ arch/arm/mach-uniphier/clk/clk-pxs2.c | 6 ------ 3 files changed, 18 deletions(-) diff --git a/arch/arm/mach-uniphier/clk/clk-ld4.c b/arch/arm/mach-uniphier/clk/clk-ld4.c index def87c1..64fa12e 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld4.c +++ b/arch/arm/mach-uniphier/clk/clk-ld4.c @@ -17,9 +17,6 @@ void uniphier_ld4_clk_init(void) /* deassert reset */ tmp = readl(SC_RSTCTRL); -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_RSTCTRL_NRST_ETHER; -#endif #ifdef CONFIG_NAND_DENALI tmp |= SC_RSTCTRL_NRST_NAND; #endif @@ -28,9 +25,6 @@ void uniphier_ld4_clk_init(void) /* provide clocks */ tmp = readl(SC_CLKCTRL); -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_CLKCTRL_CEN_ETHER; -#endif #ifdef CONFIG_USB_EHCI_HCD tmp |= SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_STDMAC; #endif diff --git a/arch/arm/mach-uniphier/clk/clk-pro4.c b/arch/arm/mach-uniphier/clk/clk-pro4.c index 8a978d2..09c03cd 100644 --- a/arch/arm/mach-uniphier/clk/clk-pro4.c +++ b/arch/arm/mach-uniphier/clk/clk-pro4.c @@ -21,9 +21,6 @@ void uniphier_pro4_clk_init(void) tmp |= SC_RSTCTRL_NRST_USB3B0 | SC_RSTCTRL_NRST_USB3C0 | SC_RSTCTRL_NRST_GIO; #endif -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_RSTCTRL_NRST_ETHER; -#endif #ifdef CONFIG_NAND_DENALI tmp |= SC_RSTCTRL_NRST_NAND; #endif @@ -43,9 +40,6 @@ void uniphier_pro4_clk_init(void) tmp |= SC_CLKCTRL_CEN_USB31 | SC_CLKCTRL_CEN_USB30 | SC_CLKCTRL_CEN_GIO; #endif -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_CLKCTRL_CEN_ETHER; -#endif #ifdef CONFIG_USB_EHCI_HCD tmp |= SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_STDMAC; #endif diff --git a/arch/arm/mach-uniphier/clk/clk-pxs2.c b/arch/arm/mach-uniphier/clk/clk-pxs2.c index 9775127..27fb2f4 100644 --- a/arch/arm/mach-uniphier/clk/clk-pxs2.c +++ b/arch/arm/mach-uniphier/clk/clk-pxs2.c @@ -19,9 +19,6 @@ void uniphier_pxs2_clk_init(void) #ifdef CONFIG_USB_DWC3_UNIPHIER tmp |= SC_RSTCTRL_NRST_USB3B0 | SC_RSTCTRL_NRST_GIO; #endif -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_RSTCTRL_NRST_ETHER; -#endif #ifdef CONFIG_NAND_DENALI tmp |= SC_RSTCTRL_NRST_NAND; #endif @@ -45,9 +42,6 @@ void uniphier_pxs2_clk_init(void) tmp |= BIT(20) | BIT(19) | SC_CLKCTRL_CEN_USB31 | SC_CLKCTRL_CEN_USB30 | SC_CLKCTRL_CEN_GIO; #endif -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_CLKCTRL_CEN_ETHER; -#endif #ifdef CONFIG_NAND_DENALI tmp |= SC_CLKCTRL_CEN_NAND; #endif From patchwork Tue Oct 17 12:19:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116077 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4822109qgn; Tue, 17 Oct 2017 05:20:48 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAM+uPhN7RG12otKmU4QV+vgYUCTKmPs5TU9CjDEP8J0Eo0AH4WZCyidbyh/EaXMxkO8rsI X-Received: by 10.80.191.15 with SMTP id f15mr17190146edk.82.1508242848082; Tue, 17 Oct 2017 05:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508242848; cv=none; d=google.com; s=arc-20160816; b=hP6EO1tIoYroLdFNSrgpxAV7RmZ+SqZsZclTy4xjuO6v9I67boG5qQ5UU5fxRKblxc 8jXuOexaHAa/N5T241c7JHKotytl+a3xL05JslNFeHduCKK67QBiNsmtmehnnUvXkMGm L7+gvyuyo6mdZfDDVyXkStEFMvERl67QZ0eb+KKsWCal48I81pM6YyZRa7qOjNflKL2E Fgf61Fulh5dMDmyDGVOByYHrlnpcDt8Zoii8n1h5Nm4l1pqXtCk4A7kdDHnnr59X+fx5 +NsRZFKGnSimTV2dyiFpzV9KnzBC2ZJG5XrAdXUcylIH3RgSqc+/wylKy89yL+sLOB6W oNSQ== 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=0QCZCt7uEqfg6X/QnQ7Qxja2L+2pS1DqzL6jqyr9HRQ=; b=tVcpJaC/hI0eokcoiW1ksyvs/s+Zyip4oO/tP/n7JDbJT5fD67sMJqMODy+kCYgiLB jCv7t2tHFyCzzZaJkm81BE9JChb2mavLhsUGoIb0HKdrmLcCtZfOaiaMTfzf+DSO6AjF ZJDTktl7eyEqewFxxBf12txkJ/oDx5LkKCY5OedL3RPky04/xVFE8OamlPjlJPNevy+I gDVuXplmKXN8rXpg0UlfwUIGdp1nMtJ9bdLbBMdpuMiCIfqjgsEdVcbSALJaJ1SSCRmW 7zkYMg5zBjq+46V6pnBq4A+fSNTQ3y3298qLks1YOZvW7PuOdlgLq28YXA3GbH2Gz6Ot PVXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=whKmerSs; 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 r7si4508487edc.232.2017.10.17.05.20.47; Tue, 17 Oct 2017 05:20:48 -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=whKmerSs; 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 80607C21DCA; Tue, 17 Oct 2017 12:20:18 +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 97D60C21E1E; Tue, 17 Oct 2017 12:20:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 38A9CC21DA1; Tue, 17 Oct 2017 12:20:12 +0000 (UTC) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lists.denx.de (Postfix) with ESMTPS id 40E38C21E10 for ; Tue, 17 Oct 2017 12:20:08 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-11.nifty.com with ESMTP id v9HCJkdU004480; Tue, 17 Oct 2017 21:19:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v9HCJkdU004480 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508242787; bh=R9qErtzlm3MVy36vhc0j4jEU32Vy5FCKFpaJ7EgdB0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=whKmerSsPXn/gr0M11GWsWN1Q/ltdwYBwQ16hQhnKFaAphPANh1hkRqy4Tgt7c8+r A5EMe4rv3+KXHb62uBQ8yOJJvarF2NQ2G0AxM+yK3T6JHhqjApU6aicTYiw0fyZ+9o 7dds4dYOP9cOXYk07ubHkIdEKlosrvdYPN92+YfPOnnMk1j6RQpN3q8PrPpgPy4kqb 7l9iajVXSTHUM74UHsd075YGqa59EsIypAEscMCxxA0EJ1O6l7io9Nu1k4qjnIMBMw N3xQT5YvUkekkCgNWqh2NDQ7rKLZLYLi4mmu9yIzIBvADiXlYligT70qWMnibA/VV9 QvadX0bop4UxA== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 17 Oct 2017 21:19:42 +0900 Message-Id: <1508242783-21107-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508242783-21107-1-git-send-email-yamada.masahiro@socionext.com> References: <1508242783-21107-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 3/4] ARM: uniphier: split u-boot, dm-pre-reloc out to uniphier-v7-u-boot.dtsi 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" UniPhier 32-bit SoCs use CONFIG_SPL_OF_CONTROL. So, many nodes must be marked as dm-pre-reloc to prevent fdtgrep from stripping them off. Sprinkling U-Boot specific properties all over the place is painful because DT files are synced with Linux from time to time. Split u-boot,dm-pre-reloc out to uniphier-v7-u-boot.dtsi, which is appended to UniPhier V7 DTS before the build. Signed-off-by: Masahiro Yamada Reviewed-by: Jagan Teki --- arch/arm/dts/uniphier-ld4-ref.dts | 9 ------ arch/arm/dts/uniphier-ld4.dtsi | 3 -- arch/arm/dts/uniphier-ld6b-ref.dts | 9 ------ arch/arm/dts/uniphier-pro4-ace.dts | 9 ------ arch/arm/dts/uniphier-pro4-ref.dts | 9 ------ arch/arm/dts/uniphier-pro4-sanji.dts | 21 ------------ arch/arm/dts/uniphier-pro4.dtsi | 4 --- arch/arm/dts/uniphier-pro5-4kbox.dts | 9 ------ arch/arm/dts/uniphier-pro5.dtsi | 4 --- arch/arm/dts/uniphier-pxs2-gentil.dts | 21 ------------ arch/arm/dts/uniphier-pxs2-vodka.dts | 21 ------------ arch/arm/dts/uniphier-pxs2.dtsi | 4 --- arch/arm/dts/uniphier-sld8-ref.dts | 9 ------ arch/arm/dts/uniphier-sld8.dtsi | 3 -- arch/arm/dts/uniphier-v7-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++++ arch/arm/mach-uniphier/Kconfig | 2 ++ 16 files changed, 63 insertions(+), 135 deletions(-) create mode 100644 arch/arm/dts/uniphier-v7-u-boot.dtsi diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts index 0f50acb..0fd66e7 100644 --- a/arch/arm/dts/uniphier-ld4-ref.dts +++ b/arch/arm/dts/uniphier-ld4-ref.dts @@ -68,12 +68,3 @@ &usb1 { status = "okay"; }; - -/* for U-Boot only */ -&serial0 { - u-boot,dm-pre-reloc; -}; - -&pinctrl_uart0 { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi index b816038..158beae 100644 --- a/arch/arm/dts/uniphier-ld4.dtsi +++ b/arch/arm/dts/uniphier-ld4.dtsi @@ -50,7 +50,6 @@ #size-cells = <1>; ranges; interrupt-parent = <&intc>; - u-boot,dm-pre-reloc; l2: l2-cache@500c0000 { compatible = "socionext,uniphier-system-cache"; @@ -295,11 +294,9 @@ compatible = "socionext,uniphier-ld4-soc-glue", "simple-mfd", "syscon"; reg = <0x5f800000 0x2000>; - u-boot,dm-pre-reloc; pinctrl: pinctrl { compatible = "socionext,uniphier-ld4-pinctrl"; - u-boot,dm-pre-reloc; }; }; diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts index bdb7f50..926d37e 100644 --- a/arch/arm/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/dts/uniphier-ld6b-ref.dts @@ -70,12 +70,3 @@ &usb1 { status = "okay"; }; - -/* for U-Boot only */ -&serial0 { - u-boot,dm-pre-reloc; -}; - -&pinctrl_uart0 { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts index 8161ba8..60a8c33 100644 --- a/arch/arm/dts/uniphier-pro4-ace.dts +++ b/arch/arm/dts/uniphier-pro4-ace.dts @@ -90,12 +90,3 @@ &usb3 { status = "okay"; }; - -/* for U-Boot only */ -&serial0 { - u-boot,dm-pre-reloc; -}; - -&pinctrl_uart0 { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/uniphier-pro4-ref.dts b/arch/arm/dts/uniphier-pro4-ref.dts index 360b31d..1b22f80 100644 --- a/arch/arm/dts/uniphier-pro4-ref.dts +++ b/arch/arm/dts/uniphier-pro4-ref.dts @@ -83,12 +83,3 @@ &usb1 { status = "okay"; }; - -/* for U-Boot only */ -&serial0 { - u-boot,dm-pre-reloc; -}; - -&pinctrl_uart0 { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts index 778e2bb..950f47a 100644 --- a/arch/arm/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/dts/uniphier-pro4-sanji.dts @@ -85,24 +85,3 @@ &usb3 { status = "okay"; }; - -/* for U-Boot only */ -&serial0 { - u-boot,dm-pre-reloc; -}; - -&mio_clk { - u-boot,dm-pre-reloc; -}; - -&emmc { - u-boot,dm-pre-reloc; -}; - -&pinctrl_uart0 { - u-boot,dm-pre-reloc; -}; - -&pinctrl_emmc { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi index 5f39972..ea97e26 100644 --- a/arch/arm/dts/uniphier-pro4.dtsi +++ b/arch/arm/dts/uniphier-pro4.dtsi @@ -58,7 +58,6 @@ #size-cells = <1>; ranges; interrupt-parent = <&intc>; - u-boot,dm-pre-reloc; l2: l2-cache@500c0000 { compatible = "socionext,uniphier-system-cache"; @@ -224,7 +223,6 @@ compatible = "socionext,uniphier-pro4-mioctrl", "simple-mfd", "syscon"; reg = <0x59810000 0x800>; - u-boot,dm-pre-reloc; mio_clk: clock { compatible = "socionext,uniphier-pro4-mio-clock"; @@ -333,11 +331,9 @@ compatible = "socionext,uniphier-pro4-soc-glue", "simple-mfd", "syscon"; reg = <0x5f800000 0x2000>; - u-boot,dm-pre-reloc; pinctrl: pinctrl { compatible = "socionext,uniphier-pro4-pinctrl"; - u-boot,dm-pre-reloc; }; }; diff --git a/arch/arm/dts/uniphier-pro5-4kbox.dts b/arch/arm/dts/uniphier-pro5-4kbox.dts index 05597d3..1986a0b 100644 --- a/arch/arm/dts/uniphier-pro5-4kbox.dts +++ b/arch/arm/dts/uniphier-pro5-4kbox.dts @@ -55,12 +55,3 @@ &sd { status = "okay"; }; - -/* for U-Boot only */ -&serial1 { - u-boot,dm-pre-reloc; -}; - -&pinctrl_uart1 { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi index 950b02c..3be3acf 100644 --- a/arch/arm/dts/uniphier-pro5.dtsi +++ b/arch/arm/dts/uniphier-pro5.dtsi @@ -132,7 +132,6 @@ #size-cells = <1>; ranges; interrupt-parent = <&intc>; - u-boot,dm-pre-reloc; l2: l2-cache@500c0000 { compatible = "socionext,uniphier-system-cache"; @@ -311,7 +310,6 @@ compatible = "socionext,uniphier-pro5-sdctrl", "simple-mfd", "syscon"; reg = <0x59810000 0x400>; - u-boot,dm-pre-reloc; sd_clk: clock { compatible = "socionext,uniphier-pro5-sd-clock"; @@ -344,11 +342,9 @@ compatible = "socionext,uniphier-pro5-soc-glue", "simple-mfd", "syscon"; reg = <0x5f800000 0x2000>; - u-boot,dm-pre-reloc; pinctrl: pinctrl { compatible = "socionext,uniphier-pro5-pinctrl"; - u-boot,dm-pre-reloc; }; }; diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts index 7f0f972..4397714 100644 --- a/arch/arm/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/dts/uniphier-pxs2-gentil.dts @@ -66,24 +66,3 @@ &usb1 { status = "okay"; }; - -/* for U-Boot only */ -&serial2 { - u-boot,dm-pre-reloc; -}; - -&sd_clk { - u-boot,dm-pre-reloc; -}; - -&emmc { - u-boot,dm-pre-reloc; -}; - -&pinctrl_uart2 { - u-boot,dm-pre-reloc; -}; - -&pinctrl_emmc { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/uniphier-pxs2-vodka.dts b/arch/arm/dts/uniphier-pxs2-vodka.dts index ec9ffb7..d29096f 100644 --- a/arch/arm/dts/uniphier-pxs2-vodka.dts +++ b/arch/arm/dts/uniphier-pxs2-vodka.dts @@ -49,24 +49,3 @@ &usb0 { status = "okay"; }; - -/* for U-Boot only */ -&serial2 { - u-boot,dm-pre-reloc; -}; - -&sd_clk { - u-boot,dm-pre-reloc; -}; - -&emmc { - u-boot,dm-pre-reloc; -}; - -&pinctrl_uart2 { - u-boot,dm-pre-reloc; -}; - -&pinctrl_emmc { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi index ac84d15..dcb2515 100644 --- a/arch/arm/dts/uniphier-pxs2.dtsi +++ b/arch/arm/dts/uniphier-pxs2.dtsi @@ -120,7 +120,6 @@ #size-cells = <1>; ranges; interrupt-parent = <&intc>; - u-boot,dm-pre-reloc; l2: l2-cache@500c0000 { compatible = "socionext,uniphier-system-cache"; @@ -297,7 +296,6 @@ compatible = "socionext,uniphier-pxs2-sdctrl", "simple-mfd", "syscon"; reg = <0x59810000 0x400>; - u-boot,dm-pre-reloc; sd_clk: clock { compatible = "socionext,uniphier-pxs2-sd-clock"; @@ -365,11 +363,9 @@ compatible = "socionext,uniphier-pxs2-soc-glue", "simple-mfd", "syscon"; reg = <0x5f800000 0x2000>; - u-boot,dm-pre-reloc; pinctrl: pinctrl { compatible = "socionext,uniphier-pxs2-pinctrl"; - u-boot,dm-pre-reloc; }; }; diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts index 3557bb7..478ee0a 100644 --- a/arch/arm/dts/uniphier-sld8-ref.dts +++ b/arch/arm/dts/uniphier-sld8-ref.dts @@ -72,12 +72,3 @@ &usb2 { status = "okay"; }; - -/* for U-Boot only */ -&serial0 { - u-boot,dm-pre-reloc; -}; - -&pinctrl_uart0 { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi index 70a5ea4..a3693b0 100644 --- a/arch/arm/dts/uniphier-sld8.dtsi +++ b/arch/arm/dts/uniphier-sld8.dtsi @@ -50,7 +50,6 @@ #size-cells = <1>; ranges; interrupt-parent = <&intc>; - u-boot,dm-pre-reloc; l2: l2-cache@500c0000 { compatible = "socionext,uniphier-system-cache"; @@ -299,11 +298,9 @@ compatible = "socionext,uniphier-sld8-soc-glue", "simple-mfd", "syscon"; reg = <0x5f800000 0x2000>; - u-boot,dm-pre-reloc; pinctrl: pinctrl { compatible = "socionext,uniphier-sld8-pinctrl"; - u-boot,dm-pre-reloc; }; }; diff --git a/arch/arm/dts/uniphier-v7-u-boot.dtsi b/arch/arm/dts/uniphier-v7-u-boot.dtsi new file mode 100644 index 0000000..4a0c9c0 --- /dev/null +++ b/arch/arm/dts/uniphier-v7-u-boot.dtsi @@ -0,0 +1,61 @@ +/ { + soc { + u-boot,dm-pre-reloc; + + serial@54006800 { + u-boot,dm-pre-reloc; + }; + + serial@54006900 { + u-boot,dm-pre-reloc; + }; + + serial@54006a00 { + u-boot,dm-pre-reloc; + }; + + mioctrl@59810000 { + u-boot,dm-pre-reloc; + + clock { + u-boot,dm-pre-reloc; + }; + }; + + sdctrl@59810000 { + u-boot,dm-pre-reloc; + + clock { + u-boot,dm-pre-reloc; + }; + }; + + soc-glue@5f800000 { + u-boot,dm-pre-reloc; + + pinctrl { + u-boot,dm-pre-reloc; + + emmc_grp { + u-boot,dm-pre-reloc; + }; + + uart0_grp { + u-boot,dm-pre-reloc; + }; + + uart1_grp { + u-boot,dm-pre-reloc; + }; + + uart2_grp { + u-boot,dm-pre-reloc; + }; + }; + }; + }; +}; + +&emmc { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index de3bdc0..cc759b3 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -117,4 +117,6 @@ config CMD_DDRMPHY_DUMP The command "ddrmphy" shows the resulting parameters of DDR Multi PHY training; it is useful for the evaluation of DDR Multi PHY training. +config SYS_SOC + default "uniphier-v7" if ARCH_UNIPHIER_LD4_SLD8 || ARCH_UNIPHIER_V7_MULTI endif From patchwork Tue Oct 17 12:19:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116078 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4822992qgn; Tue, 17 Oct 2017 05:21:34 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD1b4n/vbYzItlb/+4738B0hwy4h2oRuL4JMgNGa2R5VeZNSfr2xbafqpv7gkvuOqAa5dfw X-Received: by 10.80.165.149 with SMTP id a21mr17734859edc.83.1508242894376; Tue, 17 Oct 2017 05:21:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508242894; cv=none; d=google.com; s=arc-20160816; b=IQ1327oZUO8rp05YMPpbgVRwKfcVixuPB/P5hvVTV9zaziRp6WU13sg+GgLzhD/R1u be4RkyVRPo9x87GqOY+NPJAUSjVfY8rpY/ubRcQytYxFKTRGkt3nhgbQBzzD7sr+9RPP tIgDoLv6Jl/c1ZZ3QL0V56HuUYqMJAfTct2kNoNl6O3A4zy+WTIGGRoF/1QrtlQbW/xa JmfXRE5g9rnUAmTNGubfdIqDLmO+xiBWZJSBseP0y5mvh253MddCV8kVeuZjfIKIpXtv 1PSFYnFg8ny+5aoAH3bQ4s++2zpGWZIAqnjfzTwPQtn9zHKvIOdT2E7/6MBORp36/V7T CxsQ== 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=D7fSVOIlkKN+fDPN+WQjeM5iytNkp/LbQTyfXSmGfbU=; b=X/xbSyeB/XIieSLD61s8l0yiHvGbOGrBWiUDFXYUXXSVIzn659/rdlnrpwI9rX8D3v LLE++5PQ2g0JTmy1N7u/46zo9x17HqtjoL8J32kWJMwEzrNoRNUwOy+vTWHS+xdDKVuZ OOtap+FkYSk8ccNPh9Y12V2nw7FEwoxP3d20vljOOsVbHki3UR0BWAd5eavwre5qtbBl bUszpmVrcZN7+rzQu+LRfgkj+t92Lx+5JhW0sStz6xgeq6MMw1tvxCfmYKJnxl5EeVft uikC6P9B3n+4nc4UmMz2t8Fa0ov6J4JpG9DsN0q31yaIKKt8k7zNT6k07Dhy4uaIqLW6 cPXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=zXbfRaoO; 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 z3si1037039edz.35.2017.10.17.05.21.34; Tue, 17 Oct 2017 05:21:34 -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=zXbfRaoO; 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 F3942C21DE5; Tue, 17 Oct 2017 12:20:45 +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 547E0C21DC1; Tue, 17 Oct 2017 12:20:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DC292C21DA0; Tue, 17 Oct 2017 12:20:12 +0000 (UTC) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lists.denx.de (Postfix) with ESMTPS id 8532FC21DC4 for ; Tue, 17 Oct 2017 12:20:08 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-11.nifty.com with ESMTP id v9HCJkdV004480; Tue, 17 Oct 2017 21:19:48 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v9HCJkdV004480 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508242788; bh=FeKtaLy2meXx6HD9Uyha6XEFQ/8CKatajIjLYt1iGyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zXbfRaoOPG8g8yTJQNV2oj87MaD+Tf6AqfcOF9wb0S/n1o4gMXgc2h+mRpXZwn+fL OvlO7O50lXerh8/RFudn/jo7bkrVJvIqhAxkWlhONuBJn1RY9CS18yw9qAS2NXwR3o LgCn5+ODvQTfp4uGYGrt75vv5KRd66l24C1G6t2h8Waq+6Owem5V3s33mC/CPxTymU MvuhOIfOfVCe63sk4NKrLWMl1o+iXTIowm3vkNJogW6/O2fNMWeJKYGtvT0cE7EpNf pG6PMy0lgtLrmLdVZIMO7bb+t2z+lFBJSnem9h/H3LFaYYMp1Ry2jzopJDyOodzvGT dBjltj3OMsrLA== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 17 Oct 2017 21:19:43 +0900 Message-Id: <1508242783-21107-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508242783-21107-1-git-send-email-yamada.masahiro@socionext.com> References: <1508242783-21107-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 4/4] ARM: dts: uniphier: sync DT with Linux 4.14-rc5 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" Signed-off-by: Masahiro Yamada --- arch/arm/dts/uniphier-ld11.dtsi | 13 +++++++++++++ arch/arm/dts/uniphier-ld20.dtsi | 30 ++++++++++++++++++++++++++++++ arch/arm/dts/uniphier-ld4-ref.dts | 4 ++++ arch/arm/dts/uniphier-ld6b-ref.dts | 4 ++++ arch/arm/dts/uniphier-pinctrl.dtsi | 15 +++++++++++++++ arch/arm/dts/uniphier-pxs3-ref.dts | 4 ++++ arch/arm/dts/uniphier-sld8-ref.dts | 4 ++++ 7 files changed, 74 insertions(+) diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi index 0cc6fd7..cf079b9 100644 --- a/arch/arm/dts/uniphier-ld11.dtsi +++ b/arch/arm/dts/uniphier-ld11.dtsi @@ -175,6 +175,19 @@ "gpio_range4", "gpio_range5"; ngpios = <200>; + socionext,interrupt-ranges = <0 48 16>, <16 154 5>, + <21 217 3>; + }; + + adamv@57920000 { + compatible = "socionext,uniphier-ld11-adamv", + "simple-mfd", "syscon"; + reg = <0x57920000 0x1000>; + + adamv_rst: reset { + compatible = "socionext,uniphier-ld11-adamv-reset"; + #reset-cells = <1>; + }; }; i2c0: i2c@58780000 { diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi index a7fdaa7..68f0292 100644 --- a/arch/arm/dts/uniphier-ld20.dtsi +++ b/arch/arm/dts/uniphier-ld20.dtsi @@ -223,6 +223,36 @@ clock-frequency = <58820000>; }; + gpio: gpio@55000000 { + compatible = "socionext,uniphier-gpio"; + reg = <0x55000000 0x200>; + interrupt-parent = <&aidet>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl 0 0 0>, + <&pinctrl 96 0 0>, + <&pinctrl 160 0 0>; + gpio-ranges-group-names = "gpio_range0", + "gpio_range1", + "gpio_range2"; + ngpios = <205>; + socionext,interrupt-ranges = <0 48 16>, <16 154 5>, + <21 217 3>; + }; + + adamv@57920000 { + compatible = "socionext,uniphier-ld20-adamv", + "simple-mfd", "syscon"; + reg = <0x57920000 0x1000>; + + adamv_rst: reset { + compatible = "socionext,uniphier-ld20-adamv-reset"; + #reset-cells = <1>; + }; + }; + i2c0: i2c@58780000 { compatible = "socionext,uniphier-fi2c"; status = "disabled"; diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts index 0fd66e7..fb94df4 100644 --- a/arch/arm/dts/uniphier-ld4-ref.dts +++ b/arch/arm/dts/uniphier-ld4-ref.dts @@ -68,3 +68,7 @@ &usb1 { status = "okay"; }; + +&nand { + status = "okay"; +}; diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts index 926d37e..9b136b8 100644 --- a/arch/arm/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/dts/uniphier-ld6b-ref.dts @@ -70,3 +70,7 @@ &usb1 { status = "okay"; }; + +&nand { + status = "okay"; +}; diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi index d5e8aaf..a1b9a6c 100644 --- a/arch/arm/dts/uniphier-pinctrl.dtsi +++ b/arch/arm/dts/uniphier-pinctrl.dtsi @@ -23,6 +23,21 @@ function = "emmc"; }; + pinctrl_ether_mii: ether_mii_grp { + groups = "ether_mii"; + function = "ether_mii"; + }; + + pinctrl_ether_rgmii: ether_rgmii_grp { + groups = "ether_rgmii"; + function = "ether_rgmii"; + }; + + pinctrl_ether_rmii: ether_rmii_grp { + groups = "ether_rmii"; + function = "ether_rmii"; + }; + pinctrl_i2c0: i2c0_grp { groups = "i2c0"; function = "i2c0"; diff --git a/arch/arm/dts/uniphier-pxs3-ref.dts b/arch/arm/dts/uniphier-pxs3-ref.dts index 1118dd7..27de84d 100644 --- a/arch/arm/dts/uniphier-pxs3-ref.dts +++ b/arch/arm/dts/uniphier-pxs3-ref.dts @@ -68,3 +68,7 @@ &usb1 { status = "okay"; }; + +&nand { + status = "okay"; +}; diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts index 478ee0a..c94f0af 100644 --- a/arch/arm/dts/uniphier-sld8-ref.dts +++ b/arch/arm/dts/uniphier-sld8-ref.dts @@ -72,3 +72,7 @@ &usb2 { status = "okay"; }; + +&nand { + status = "okay"; +};