From patchwork Thu Jan 17 04:09:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 155780 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1478136jaa; Wed, 16 Jan 2019 20:10:55 -0800 (PST) X-Google-Smtp-Source: ALg8bN7BUyIOXbNdnybl6flqB9Qzqe1Js7DxWTOlktxPsHasWELI68ZkOaRQT+4tFASN+awj/+nS X-Received: by 2002:a50:ef18:: with SMTP id m24mr9928403eds.136.1547698254991; Wed, 16 Jan 2019 20:10:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547698254; cv=none; d=google.com; s=arc-20160816; b=PZv3KYlDkMXomOyhmJq/hW4dBsxSIUoIad+yxpf8KX1ShEVcBW3wK8OTnAZ6Xknvx7 vAn/mX+23EUAGO9WiqiCXK6S8/5RCZ09pMRKKxxziX+DflmAUwvDFlPTrXVQhUjnXi6P hCTn+ERE8zCdlWBq01rfc8mX8TQa0k5yD7TpiZCxMzkm1cp3llyd14g+Y53yq8hfSkoc wmUW8AlOXfz/Ep3sKYNDDrOZgTetyFNWl7uIBoFCBj0LWZ4Q/e8w3gg0lx0toXb8Mnp4 ZEAn6f3OzSvLWoM+KbUGlqoqqfu1cOIX2ckSd/e3iMNlLdEI4AVL6jRFpCLuhWJyL/pn XmmA== 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; bh=vBmwict5JYjW7+onuI72kp/utFucjwOP70opHxQmHcE=; b=w+cs3jBoJKh3Cjy4sLnFdsgbcz85k+dmZzFQ5PadK+d5bb9G2jSXSFcTpVIzEW67eF 7T6tQpt8RJ7keDS/kFrGk7Z7JauH1gbcNo0mdT9bye1zf+kJClUu77/cbsj/nMPYWfkW EIFO3eWuywEC9erPxQjTp1sLt2pFfXecRwBo5P1q0yfJOwPn9B6unyw7Z3/wZLmnQTfw t5B66d/Icn41ac11AG+HGVZQ8B1XPNdxsc9xLXIutA2PzJjxonOq9C/PczpgL8aZgEEy 89jQ7vBjPoSUnDPb4EHpZdnRhYAxJwbYdk+dBttTQDVWI67P7nsTv1gAL9uGO+8gD44d 99Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dI4bEdU6; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id p10si1431388eds.243.2019.01.16.20.10.54; Wed, 16 Jan 2019 20:10:54 -0800 (PST) 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=@linaro.org header.s=google header.b=dI4bEdU6; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 8B6CBC220CC; Thu, 17 Jan 2019 04:10: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=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 9D505C220D7; Thu, 17 Jan 2019 04:10:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B40E6C22045; Thu, 17 Jan 2019 04:10:32 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id 6F0EEC22042 for ; Thu, 17 Jan 2019 04:10:28 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id s198so3833327pgs.2 for ; Wed, 16 Jan 2019 20:10:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0Vs5hFdl3uLyYNTBgu6LlZnTxMc7HKjihrq84Hb0lOI=; b=dI4bEdU6U5X2SEAMX/Rs92b1ijgyP4DW2lP6EmZCjWRKMyCdv3cXkJWGvV8Pl+HXTj VV9cyCgTaxOcMU4EUVy7Tk/fkIJ0QKdYYaLl4Tp79K3tm2W3hbQQNaqEcakUAI6Gq4iN LXvhNUu6ra7GEOfl0rvUZETiqPH+s8te3FYBc= 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=0Vs5hFdl3uLyYNTBgu6LlZnTxMc7HKjihrq84Hb0lOI=; b=Dj8vAd9UoTecUa6HYsedW2NgQ/oLYu9xc6muVzdW+Q+BsBzcegb1oE/I/HoaIv3f+j HfHT2keocn36kln4Xs/oUaiNaXPZQxLDULjVTb7odZg5GBAzvLeswUqZvewyzscqkjkA F2vfpW4LZRwYFvOba77LQgazli12hVJO5rLwVTAUH+PI9rwvvUQcpDzq+XUpWLV4mjjb dd6vHN2Y22iqVkb63icBijByyHrkYS66uyF6usoq62GPpVpJRkuZIVz3mRqYInbVYjsO fh5S9hlXEoxPHz/YWBDC0CGLKQOvxC6dY3O/QAJ2E1knrF09xnATOm2FSe3IGkVp01pR iVdA== X-Gm-Message-State: AJcUukf9sXsNB/YwEzKBqXlIIHTgNDULrRoj/yLe8P1hEv2q+JPSgw9y mppZ4oFBdf7as6/8LN4Le+CPZg== X-Received: by 2002:a63:de46:: with SMTP id y6mr12005327pgi.198.1547698226759; Wed, 16 Jan 2019 20:10:26 -0800 (PST) Received: from localhost.localdomain (61-216-91-114.HINET-IP.hinet.net. [61.216.91.114]) by smtp.gmail.com with ESMTPSA id 202sm377257pfy.87.2019.01.16.20.10.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 20:10:25 -0800 (PST) From: Shawn Guo To: Tom Rini Date: Thu, 17 Jan 2019 12:09:50 +0800 Message-Id: <20190117040952.4024-2-shawn.guo@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190117040952.4024-1-shawn.guo@linaro.org> References: <20190117040952.4024-1-shawn.guo@linaro.org> Cc: u-boot@lists.denx.de, Manivannan Sadhasivam Subject: [U-Boot] [PATCH 1/3] poplar: sync up device tree with kernel 4.20 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" It adds missing pinctrl headers, updates clock header and sync up Poplar device tree with kernel 4.20 release. Signed-off-by: Shawn Guo --- arch/arm/dts/hi3798cv200-poplar.dts | 68 ++++++-- arch/arm/dts/hi3798cv200.dtsi | 221 +++++++++++++++++++++++- arch/arm/dts/poplar-pinctrl.dtsi | 98 +++++++++++ include/dt-bindings/clock/histb-clock.h | 56 +++--- include/dt-bindings/pinctrl/hisi.h | 74 ++++++++ 5 files changed, 482 insertions(+), 35 deletions(-) create mode 100644 arch/arm/dts/poplar-pinctrl.dtsi create mode 100644 include/dt-bindings/pinctrl/hisi.h diff --git a/arch/arm/dts/hi3798cv200-poplar.dts b/arch/arm/dts/hi3798cv200-poplar.dts index 964326eae89b..d30f6eb8a5ee 100644 --- a/arch/arm/dts/hi3798cv200-poplar.dts +++ b/arch/arm/dts/hi3798cv200-poplar.dts @@ -1,14 +1,17 @@ -// SPDX-License-Identifier: GPL-2.0 /* * DTS File for HiSilicon Poplar Development Board * * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd. + * + * Released under the GPLv2 only. + * SPDX-License-Identifier: GPL-2.0 */ /dts-v1/; #include #include "hi3798cv200.dtsi" +#include "poplar-pinctrl.dtsi" / { model = "HiSilicon Poplar Development Board"; @@ -59,6 +62,33 @@ default-state = "off"; }; }; + + reg_pcie: regulator-pcie { + compatible = "regulator-fixed"; + regulator-name = "3V3_PCIE0"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio6 7 0>; + enable-active-high; + }; +}; + +&ehci { + status = "okay"; +}; + +&emmc { + pinctrl-names = "default"; + pinctrl-0 = <&emmc_pins_1 &emmc_pins_2 + &emmc_pins_3 &emmc_pins_4>; + fifo-depth = <256>; + clock-frequency = <200000000>; + cap-mmc-highspeed; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + non-removable; + bus-width = <8>; + status = "okay"; }; &gmac1 { @@ -76,17 +106,17 @@ &gpio1 { status = "okay"; - gpio-line-names = "LS-GPIO-E", "", + gpio-line-names = "GPIO-E", "", "", "", - "", "LS-GPIO-F", - "", "LS-GPIO-J"; + "", "GPIO-F", + "", "GPIO-J"; }; &gpio2 { status = "okay"; - gpio-line-names = "LS-GPIO-H", "LS-GPIO-I", - "LS-GPIO-L", "LS-GPIO-G", - "LS-GPIO-K", "", + gpio-line-names = "GPIO-H", "GPIO-I", + "GPIO-L", "GPIO-G", + "GPIO-K", "", "", ""; }; @@ -94,15 +124,15 @@ status = "okay"; gpio-line-names = "", "", "", "", - "LS-GPIO-C", "", - "", "LS-GPIO-B"; + "GPIO-C", "", + "", "GPIO-B"; }; &gpio4 { status = "okay"; gpio-line-names = "", "", "", "", - "", "LS-GPIO-D", + "", "GPIO-D", "", ""; }; @@ -110,7 +140,7 @@ status = "okay"; gpio-line-names = "", "USER-LED-1", "USER-LED-2", "", - "", "LS-GPIO-A", + "", "GPIO-A", "", ""; }; @@ -144,6 +174,22 @@ status = "okay"; }; +&ohci { + status = "okay"; +}; + +&pcie { + reset-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>; + vpcie-supply = <®_pcie>; + status = "okay"; +}; + +&sd0 { + bus-width = <4>; + cap-sd-highspeed; + status = "okay"; +}; + &spi0 { status = "okay"; label = "LS-SPI0"; diff --git a/arch/arm/dts/hi3798cv200.dtsi b/arch/arm/dts/hi3798cv200.dtsi index 8b9c5ad05a19..7c0fddd7c8cf 100644 --- a/arch/arm/dts/hi3798cv200.dtsi +++ b/arch/arm/dts/hi3798cv200.dtsi @@ -1,12 +1,16 @@ -// SPDX-License-Identifier: GPL-2.0 /* * DTS File for HiSilicon Hi3798cv200 SoC. * * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd. + * + * Released under the GPLv2 only. + * SPDX-License-Identifier: GPL-2.0 */ #include +#include #include +#include #include / { @@ -104,6 +108,113 @@ #reset-cells = <2>; }; + perictrl: peripheral-controller@8a20000 { + compatible = "hisilicon,hi3798cv200-perictrl", "syscon", + "simple-mfd"; + reg = <0x8a20000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x8a20000 0x1000>; + + usb2_phy1: usb2-phy@120 { + compatible = "hisilicon,hi3798cv200-usb2-phy"; + reg = <0x120 0x4>; + clocks = <&crg HISTB_USB2_PHY1_REF_CLK>; + resets = <&crg 0xbc 4>; + #address-cells = <1>; + #size-cells = <0>; + + usb2_phy1_port0: phy@0 { + reg = <0>; + #phy-cells = <0>; + resets = <&crg 0xbc 8>; + }; + + usb2_phy1_port1: phy@1 { + reg = <1>; + #phy-cells = <0>; + resets = <&crg 0xbc 9>; + }; + }; + + usb2_phy2: usb2-phy@124 { + compatible = "hisilicon,hi3798cv200-usb2-phy"; + reg = <0x124 0x4>; + clocks = <&crg HISTB_USB2_PHY2_REF_CLK>; + resets = <&crg 0xbc 6>; + #address-cells = <1>; + #size-cells = <0>; + + usb2_phy2_port0: phy@0 { + reg = <0>; + #phy-cells = <0>; + resets = <&crg 0xbc 10>; + }; + }; + + combphy0: phy@850 { + compatible = "hisilicon,hi3798cv200-combphy"; + reg = <0x850 0x8>; + #phy-cells = <1>; + clocks = <&crg HISTB_COMBPHY0_CLK>; + resets = <&crg 0x188 4>; + assigned-clocks = <&crg HISTB_COMBPHY0_CLK>; + assigned-clock-rates = <100000000>; + hisilicon,fixed-mode = ; + }; + + combphy1: phy@858 { + compatible = "hisilicon,hi3798cv200-combphy"; + reg = <0x858 0x8>; + #phy-cells = <1>; + clocks = <&crg HISTB_COMBPHY1_CLK>; + resets = <&crg 0x188 12>; + assigned-clocks = <&crg HISTB_COMBPHY1_CLK>; + assigned-clock-rates = <100000000>; + hisilicon,mode-select-bits = <0x0008 11 (0x3 << 11)>; + }; + }; + + pmx0: pinconf@8a21000 { + compatible = "pinconf-single"; + reg = <0x8a21000 0x180>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <7>; + pinctrl-single,gpio-range = < + &range 0 8 2 /* GPIO 0 */ + &range 8 1 0 /* GPIO 1 */ + &range 9 4 2 + &range 13 1 0 + &range 14 1 1 + &range 15 1 0 + &range 16 5 0 /* GPIO 2 */ + &range 21 3 1 + &range 24 4 1 /* GPIO 3 */ + &range 28 2 2 + &range 86 1 1 + &range 87 1 0 + &range 30 4 2 /* GPIO 4 */ + &range 34 3 0 + &range 37 1 2 + &range 38 3 2 /* GPIO 6 */ + &range 41 5 0 + &range 46 8 1 /* GPIO 7 */ + &range 54 8 1 /* GPIO 8 */ + &range 64 7 1 /* GPIO 9 */ + &range 71 1 0 + &range 72 6 1 /* GPIO 10 */ + &range 78 1 0 + &range 79 1 1 + &range 80 6 1 /* GPIO 11 */ + &range 70 2 1 + &range 88 8 0 /* GPIO 12 */ + >; + + range: gpio-range { + #pinctrl-single,gpio-range-cells = <3>; + }; + }; + uart0: serial@8b00000 { compatible = "arm,pl011", "arm,primecell"; reg = <0x8b00000 0x1000>; @@ -190,13 +301,30 @@ status = "disabled"; }; - emmc: mmc@9830000 { + sd0: mmc@9820000 { compatible = "snps,dw-mshc"; + reg = <0x9820000 0x10000>; + interrupts = ; + clocks = <&crg HISTB_SDIO0_CIU_CLK>, + <&crg HISTB_SDIO0_BIU_CLK>; + clock-names = "ciu", "biu"; + resets = <&crg 0x9c 4>; + reset-names = "reset"; + status = "disabled"; + }; + + emmc: mmc@9830000 { + compatible = "hisilicon,hi3798cv200-dw-mshc"; reg = <0x9830000 0x10000>; interrupts = ; clocks = <&crg HISTB_MMC_CIU_CLK>, - <&crg HISTB_MMC_BIU_CLK>; - clock-names = "ciu", "biu"; + <&crg HISTB_MMC_BIU_CLK>, + <&crg HISTB_MMC_SAMPLE_CLK>, + <&crg HISTB_MMC_DRV_CLK>; + clock-names = "ciu", "biu", "ciu-sample", "ciu-drive"; + resets = <&crg 0xa0 4>; + reset-names = "reset"; + status = "disabled"; }; gpio0: gpio@8b20000 { @@ -207,6 +335,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 0 8>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -220,6 +349,13 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = < + &pmx0 0 8 1 + &pmx0 1 9 4 + &pmx0 5 13 1 + &pmx0 6 14 1 + &pmx0 7 15 1 + >; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -233,6 +369,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 16 5 &pmx0 5 21 3>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -246,6 +383,12 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = < + &pmx0 0 24 4 + &pmx0 4 28 2 + &pmx0 6 86 1 + &pmx0 7 87 1 + >; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -259,6 +402,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 30 4 &pmx0 4 34 3 &pmx0 7 37 1>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -285,6 +429,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 38 3 &pmx0 0 41 5>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -298,6 +443,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 46 8>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -311,6 +457,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 54 8>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -324,6 +471,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 64 7 &pmx0 71 1>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -337,6 +485,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 72 6 &pmx0 6 78 1 &pmx0 7 79 1>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -350,6 +499,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 80 6 &pmx0 6 70 2>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -363,6 +513,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + gpio-ranges = <&pmx0 0 88 8>; clocks = <&crg HISTB_APB_CLK>; clock-names = "apb_pclk"; status = "disabled"; @@ -405,5 +556,67 @@ clocks = <&sysctrl HISTB_IR_CLK>; status = "disabled"; }; + + pcie: pcie@9860000 { + compatible = "hisilicon,hi3798cv200-pcie"; + reg = <0x9860000 0x1000>, + <0x0 0x2000>, + <0x2000000 0x01000000>; + reg-names = "control", "rc-dbi", "config"; + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + bus-range = <0 15>; + num-lanes = <1>; + ranges = <0x81000000 0x0 0x00000000 0x4f00000 0x0 0x100000 + 0x82000000 0x0 0x3000000 0x3000000 0x0 0x01f00000>; + interrupts = ; + interrupt-names = "msi"; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &gic 0 131 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&crg HISTB_PCIE_AUX_CLK>, + <&crg HISTB_PCIE_PIPE_CLK>, + <&crg HISTB_PCIE_SYS_CLK>, + <&crg HISTB_PCIE_BUS_CLK>; + clock-names = "aux", "pipe", "sys", "bus"; + resets = <&crg 0x18c 6>, <&crg 0x18c 5>, <&crg 0x18c 4>; + reset-names = "soft", "sys", "bus"; + phys = <&combphy1 PHY_TYPE_PCIE>; + phy-names = "phy"; + status = "disabled"; + }; + + ohci: ohci@9880000 { + compatible = "generic-ohci"; + reg = <0x9880000 0x10000>; + interrupts = ; + clocks = <&crg HISTB_USB2_BUS_CLK>, + <&crg HISTB_USB2_12M_CLK>, + <&crg HISTB_USB2_48M_CLK>; + clock-names = "bus", "clk12", "clk48"; + resets = <&crg 0xb8 12>; + reset-names = "bus"; + phys = <&usb2_phy1_port0>; + phy-names = "usb"; + status = "disabled"; + }; + + ehci: ehci@9890000 { + compatible = "generic-ehci"; + reg = <0x9890000 0x10000>; + interrupts = ; + clocks = <&crg HISTB_USB2_BUS_CLK>, + <&crg HISTB_USB2_PHY_CLK>, + <&crg HISTB_USB2_UTMI_CLK>; + clock-names = "bus", "phy", "utmi"; + resets = <&crg 0xb8 12>, + <&crg 0xb8 16>, + <&crg 0xb8 13>; + reset-names = "bus", "phy", "utmi"; + phys = <&usb2_phy1_port0>; + phy-names = "usb"; + status = "disabled"; + }; }; }; diff --git a/arch/arm/dts/poplar-pinctrl.dtsi b/arch/arm/dts/poplar-pinctrl.dtsi new file mode 100644 index 000000000000..7bb19e4b084a --- /dev/null +++ b/arch/arm/dts/poplar-pinctrl.dtsi @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Pinctrl dts file for HiSilicon Poplar board + * + * Copyright (c) 2016-2018 HiSilicon Technologies Co., Ltd. + */ + +#include + +/* value, enable bits, disable bits, mask */ +#define PINCTRL_PULLDOWN(value, enable, disable, mask) \ + (value << 13) (enable << 13) (disable << 13) (mask << 13) +#define PINCTRL_PULLUP(value, enable, disable, mask) \ + (value << 12) (enable << 12) (disable << 12) (mask << 12) +#define PINCTRL_SLEW_RATE(value, mask) (value << 8) (mask << 8) +#define PINCTRL_DRV_STRENGTH(value, mask) (value << 4) (mask << 4) + +&pmx0 { + emmc_pins_1: emmc-pins-1 { + pinctrl-single,pins = < + 0x000 MUX_M2 + 0x004 MUX_M2 + 0x008 MUX_M2 + 0x00c MUX_M2 + 0x010 MUX_M2 + 0x014 MUX_M2 + 0x018 MUX_M2 + 0x01c MUX_M2 + 0x024 MUX_M2 + >; + pinctrl-single,bias-pulldown = < + PINCTRL_PULLDOWN(0, 1, 0, 1) + >; + pinctrl-single,bias-pullup = < + PINCTRL_PULLUP(0, 1, 0, 1) + >; + pinctrl-single,slew-rate = < + PINCTRL_SLEW_RATE(1, 1) + >; + pinctrl-single,drive-strength = < + PINCTRL_DRV_STRENGTH(0xb, 0xf) + >; + }; + + emmc_pins_2: emmc-pins-2 { + pinctrl-single,pins = < + 0x028 MUX_M2 + >; + pinctrl-single,bias-pulldown = < + PINCTRL_PULLDOWN(0, 1, 0, 1) + >; + pinctrl-single,bias-pullup = < + PINCTRL_PULLUP(0, 1, 0, 1) + >; + pinctrl-single,slew-rate = < + PINCTRL_SLEW_RATE(1, 1) + >; + pinctrl-single,drive-strength = < + PINCTRL_DRV_STRENGTH(0x9, 0xf) + >; + }; + + emmc_pins_3: emmc-pins-3 { + pinctrl-single,pins = < + 0x02c MUX_M2 + >; + pinctrl-single,bias-pulldown = < + PINCTRL_PULLDOWN(0, 1, 0, 1) + >; + pinctrl-single,bias-pullup = < + PINCTRL_PULLUP(0, 1, 0, 1) + >; + pinctrl-single,slew-rate = < + PINCTRL_SLEW_RATE(1, 1) + >; + pinctrl-single,drive-strength = < + PINCTRL_DRV_STRENGTH(3, 3) + >; + }; + + emmc_pins_4: emmc-pins-4 { + pinctrl-single,pins = < + 0x030 MUX_M2 + >; + pinctrl-single,bias-pulldown = < + PINCTRL_PULLDOWN(1, 1, 0, 1) + >; + pinctrl-single,bias-pullup = < + PINCTRL_PULLUP(0, 1, 0, 1) + >; + pinctrl-single,slew-rate = < + PINCTRL_SLEW_RATE(1, 1) + >; + pinctrl-single,drive-strength = < + PINCTRL_DRV_STRENGTH(3, 3) + >; + }; +}; diff --git a/include/dt-bindings/clock/histb-clock.h b/include/dt-bindings/clock/histb-clock.h index 181c0f070f7c..136de24733be 100644 --- a/include/dt-bindings/clock/histb-clock.h +++ b/include/dt-bindings/clock/histb-clock.h @@ -22,18 +22,18 @@ #define HISTB_OSC_CLK 0 #define HISTB_APB_CLK 1 #define HISTB_AHB_CLK 2 -#define HISTB_UART1_CLK 3 -#define HISTB_UART2_CLK 4 -#define HISTB_UART3_CLK 5 -#define HISTB_I2C0_CLK 6 -#define HISTB_I2C1_CLK 7 -#define HISTB_I2C2_CLK 8 -#define HISTB_I2C3_CLK 9 -#define HISTB_I2C4_CLK 10 -#define HISTB_I2C5_CLK 11 -#define HISTB_SPI0_CLK 12 -#define HISTB_SPI1_CLK 13 -#define HISTB_SPI2_CLK 14 +#define HISTB_UART1_CLK 3 +#define HISTB_UART2_CLK 4 +#define HISTB_UART3_CLK 5 +#define HISTB_I2C0_CLK 6 +#define HISTB_I2C1_CLK 7 +#define HISTB_I2C2_CLK 8 +#define HISTB_I2C3_CLK 9 +#define HISTB_I2C4_CLK 10 +#define HISTB_I2C5_CLK 11 +#define HISTB_SPI0_CLK 12 +#define HISTB_SPI1_CLK 13 +#define HISTB_SPI2_CLK 14 #define HISTB_SCI_CLK 15 #define HISTB_FMC_CLK 16 #define HISTB_MMC_BIU_CLK 17 @@ -43,7 +43,7 @@ #define HISTB_SDIO0_BIU_CLK 21 #define HISTB_SDIO0_CIU_CLK 22 #define HISTB_SDIO0_DRV_CLK 23 -#define HISTB_SDIO0_SAMPLE_CLK 24 +#define HISTB_SDIO0_SAMPLE_CLK 24 #define HISTB_PCIE_AUX_CLK 25 #define HISTB_PCIE_PIPE_CLK 26 #define HISTB_PCIE_SYS_CLK 27 @@ -53,14 +53,30 @@ #define HISTB_ETH1_MAC_CLK 31 #define HISTB_ETH1_MACIF_CLK 32 #define HISTB_COMBPHY1_CLK 33 - +#define HISTB_USB2_BUS_CLK 34 +#define HISTB_USB2_PHY_CLK 35 +#define HISTB_USB2_UTMI_CLK 36 +#define HISTB_USB2_12M_CLK 37 +#define HISTB_USB2_48M_CLK 38 +#define HISTB_USB2_OTG_UTMI_CLK 39 +#define HISTB_USB2_PHY1_REF_CLK 40 +#define HISTB_USB2_PHY2_REF_CLK 41 +#define HISTB_COMBPHY0_CLK 42 +#define HISTB_USB3_BUS_CLK 43 +#define HISTB_USB3_UTMI_CLK 44 +#define HISTB_USB3_PIPE_CLK 45 +#define HISTB_USB3_SUSPEND_CLK 46 +#define HISTB_USB3_BUS_CLK1 47 +#define HISTB_USB3_UTMI_CLK1 48 +#define HISTB_USB3_PIPE_CLK1 49 +#define HISTB_USB3_SUSPEND_CLK1 50 /* clocks provided by mcu CRG */ -#define HISTB_MCE_CLK 1 -#define HISTB_IR_CLK 2 -#define HISTB_TIMER01_CLK 3 -#define HISTB_LEDC_CLK 4 -#define HISTB_UART0_CLK 5 -#define HISTB_LSADC_CLK 6 +#define HISTB_MCE_CLK 1 +#define HISTB_IR_CLK 2 +#define HISTB_TIMER01_CLK 3 +#define HISTB_LEDC_CLK 4 +#define HISTB_UART0_CLK 5 +#define HISTB_LSADC_CLK 6 #endif /* __DTS_HISTB_CLOCK_H */ diff --git a/include/dt-bindings/pinctrl/hisi.h b/include/dt-bindings/pinctrl/hisi.h new file mode 100644 index 000000000000..0359bfdc9119 --- /dev/null +++ b/include/dt-bindings/pinctrl/hisi.h @@ -0,0 +1,74 @@ +/* + * This header provides constants for hisilicon pinctrl bindings. + * + * Copyright (c) 2015 Hisilicon Limited. + * Copyright (c) 2015 Linaro Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _DT_BINDINGS_PINCTRL_HISI_H +#define _DT_BINDINGS_PINCTRL_HISI_H + +/* iomg bit definition */ +#define MUX_M0 0 +#define MUX_M1 1 +#define MUX_M2 2 +#define MUX_M3 3 +#define MUX_M4 4 +#define MUX_M5 5 +#define MUX_M6 6 +#define MUX_M7 7 + +/* iocg bit definition */ +#define PULL_MASK (3) +#define PULL_DIS (0) +#define PULL_UP (1 << 0) +#define PULL_DOWN (1 << 1) + +/* drive strength definition */ +#define DRIVE_MASK (7 << 4) +#define DRIVE1_02MA (0 << 4) +#define DRIVE1_04MA (1 << 4) +#define DRIVE1_08MA (2 << 4) +#define DRIVE1_10MA (3 << 4) +#define DRIVE2_02MA (0 << 4) +#define DRIVE2_04MA (1 << 4) +#define DRIVE2_08MA (2 << 4) +#define DRIVE2_10MA (3 << 4) +#define DRIVE3_04MA (0 << 4) +#define DRIVE3_08MA (1 << 4) +#define DRIVE3_12MA (2 << 4) +#define DRIVE3_16MA (3 << 4) +#define DRIVE3_20MA (4 << 4) +#define DRIVE3_24MA (5 << 4) +#define DRIVE3_32MA (6 << 4) +#define DRIVE3_40MA (7 << 4) +#define DRIVE4_02MA (0 << 4) +#define DRIVE4_04MA (2 << 4) +#define DRIVE4_08MA (4 << 4) +#define DRIVE4_10MA (6 << 4) + +/* drive strength definition for hi3660 */ +#define DRIVE6_MASK (15 << 4) +#define DRIVE6_04MA (0 << 4) +#define DRIVE6_12MA (4 << 4) +#define DRIVE6_19MA (8 << 4) +#define DRIVE6_27MA (10 << 4) +#define DRIVE6_32MA (15 << 4) +#define DRIVE7_02MA (0 << 4) +#define DRIVE7_04MA (1 << 4) +#define DRIVE7_06MA (2 << 4) +#define DRIVE7_08MA (3 << 4) +#define DRIVE7_10MA (4 << 4) +#define DRIVE7_12MA (5 << 4) +#define DRIVE7_14MA (6 << 4) +#define DRIVE7_16MA (7 << 4) +#endif From patchwork Thu Jan 17 04:09:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 155783 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1478615jaa; Wed, 16 Jan 2019 20:11:31 -0800 (PST) X-Google-Smtp-Source: ALg8bN6eDKjjGwSgEF3HJUCcS4pab4cIqEF7QDxuupsBH12jK3qIkJpx7m5Y8a5CvdCK9DCZuJjQ X-Received: by 2002:a50:b68a:: with SMTP id d10mr10176721ede.16.1547698291526; Wed, 16 Jan 2019 20:11:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547698291; cv=none; d=google.com; s=arc-20160816; b=aeg1GvRdzx/YI1JVgHVJHGEiGbvQCt1/51tMpfZeZFoUv0ps01wCe52zNyYWske6wI GpaPZJes/n8mgzqODOixkYZh4OPC+gBoga/aWT7GhuyGF4AzAnzZYVX0aA2BFxr6ihoC AzZdPFtoPHvrNu9ayi4ukdNzqmLydi8dmR8/Uk4cSTtKp8ODCfutrs4yWe7yjIWXJGU1 cWSHslxI0MgcIjr+1hgHAKSa3yT43PKDU+mV2WxXMUp4pAZrxd6uvu2quVg0wLS4Uyga QFLBwfbQcmCD+9rHQEX7roRdFqlElTQDHqOVOh+5B4kjhni53mWWRbwj6qQwnVnH8ZNF Jf5Q== 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; bh=7i+uqJY59bfJ2RTdsVWvWADZf7jbU3tVLxoFhiBBn+8=; b=ky7kn4m+294CqbTshgm/uKjA+DNol66/NmejSXQDqMwIgbIYw8zY1gO9drS9SNuwev XHAVQa5OcBKxXLN+aizKeqD9YSelIp6cLe3SSjJdzX3092OWUp42QbLUsy4z5gmImJPv /Jm0F/UPq1Qw41d4G9yPYuSBRI00guNJYTei3o1xtT3fq1EHxcSdn+SbeMKii7vPZPuS Hgeue9W82KCHwQoRmOVobxc6Fybr58g9IKKFNOIox8RoiwqQaAmmEBpbLP/C4hKeo9FY X9ph7OZhccIGKADJ7JPi49jT9rKLJXtVnZp/kGm/cnnrHAF8EwK+X0BkK5QZKHF/qHk/ TtrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dCBRUhMX; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id l19-v6si2401972ejp.77.2019.01.16.20.11.31; Wed, 16 Jan 2019 20:11:31 -0800 (PST) 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=@linaro.org header.s=google header.b=dCBRUhMX; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 0D8F5C21D4A; Thu, 17 Jan 2019 04:11:27 +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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 6D7B4C220A5; Thu, 17 Jan 2019 04:10:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 13CEAC2207C; Thu, 17 Jan 2019 04:10:36 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 78B8BC220A6 for ; Thu, 17 Jan 2019 04:10:32 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id z10so3821103pgp.7 for ; Wed, 16 Jan 2019 20:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/X4Ps6Jw2eze0FrwpH1tQN2KfEfoEgldnFbGa+L11fg=; b=dCBRUhMXP2XW2aWQxOU9D0F5T9nunEDyQI4eZYcqWxkkG76tMyW1C+DNSAlGzeeh0y 3CQBrKiYIdf1vzsZq+v3tPjdd4zX6nrDtYKNoIDOVwO2HQkWY02HDGMcRboFDP6JvLSb eahbRhOuzSl2sj3RO+hY/zALYrphMQG3x3LHI= 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=/X4Ps6Jw2eze0FrwpH1tQN2KfEfoEgldnFbGa+L11fg=; b=czbDy0PSc5tlHv+8OrvwQDkNE5y5oHiy0PqlgrH79rTshjUFnWT0YOy4D66S6UtFvm I0CljN7I3I/4feZccgBcOotur1EIlo4miPD03gK+A7lmcRh1uKFZ54UVtRMygaRHQS0M 7B0ikUD+FoPZmnaxd+cmawFMB5rhTzfuWOm5kcHFtYqHOIrUOd/cKCeL7/hdjDR55T12 TxIukkMFp/0p+RCVPyTDhw1YRZWAyPwl7YDHtrqitCLWgQ8ZP1jYIYLKm8Hwe2PRuZOn FCUazX/ZR9sfMcZoBaJPn9nh0YJ737EsljTcXDjl+WLVwA3R7s5WSyuuLmn/0Hhk3tsE HxAQ== X-Gm-Message-State: AJcUukdY0bmRCFpcFHgnzODzgX86FBjcBQ24nXe5mi1EB7kP8GALKKwo 1l/MDsFXYjVBLt18Zp82H/vCyvNVxhb24A== X-Received: by 2002:a63:ce08:: with SMTP id y8mr11920079pgf.388.1547698231120; Wed, 16 Jan 2019 20:10:31 -0800 (PST) Received: from localhost.localdomain (61-216-91-114.HINET-IP.hinet.net. [61.216.91.114]) by smtp.gmail.com with ESMTPSA id 202sm377257pfy.87.2019.01.16.20.10.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 20:10:29 -0800 (PST) From: Shawn Guo To: Tom Rini Date: Thu, 17 Jan 2019 12:09:51 +0800 Message-Id: <20190117040952.4024-3-shawn.guo@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190117040952.4024-1-shawn.guo@linaro.org> References: <20190117040952.4024-1-shawn.guo@linaro.org> Cc: u-boot@lists.denx.de, Manivannan Sadhasivam Subject: [U-Boot] [PATCH 2/3] mmc: hi6220_dw_mmc: add compatible for Poplar 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" It adds compatible "hisilicon,hi3798cv200-dw-mshc" for Poplar SoC Hi3798CV200 to probe this mmc driver. Signed-off-by: Shawn Guo Acked-by: Manivannan Sadhasivam --- drivers/mmc/hi6220_dw_mmc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c index cc58aff38cc4..effd1e4c7c84 100644 --- a/drivers/mmc/hi6220_dw_mmc.c +++ b/drivers/mmc/hi6220_dw_mmc.c @@ -77,6 +77,7 @@ static int hi6220_dwmmc_bind(struct udevice *dev) static const struct udevice_id hi6220_dwmmc_ids[] = { { .compatible = "hisilicon,hi6220-dw-mshc" }, + { .compatible = "hisilicon,hi3798cv200-dw-mshc" }, { } }; From patchwork Thu Jan 17 04:09:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 155784 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1479348jaa; Wed, 16 Jan 2019 20:12:31 -0800 (PST) X-Google-Smtp-Source: ALg8bN66H/zYvMOwAaPpLlrK8QfD/6ulnFkqtvCUfpfR23of4GYLYqNvsvn1p3DeqasECF5fnuaU X-Received: by 2002:a50:d797:: with SMTP id w23mr10367586edi.19.1547698351524; Wed, 16 Jan 2019 20:12:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547698351; cv=none; d=google.com; s=arc-20160816; b=apWCk7EuRJRFw+RctkMWiNPFS4WdSj3riVu2I0UW+f1/2E4jXU1kLNLYdZ7srQCInA q5eyztukEFNA3zjof0TBAouzC0S3S+MXPFbwq8eI/217qfus0n6kAg7nkV/nEB2MxkuP fcWZtW7O3O2sKxSZIi+iAMxckrJrojBp9TASJbRX6I5dVmRb3ATpssqoOvv3EYQgdgMa yh4mISP681qjeSFHDCZjmpWuirgGYfvj9ktbNz01zUB5B2br7X+7kh9kTXY4m7cbwOS6 X1K1olXkKjQalhtv30B8nmLMukJvdrUcCugubd76sQkZsRN9YD94/8kKKpNq/h0ona+C HUKQ== 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; bh=OKIy87266CTShKshumys0JX4HnnpYZmXC/a5OI5P4bM=; b=FZCkGFJVYzM3rkgiaNzoOJgtwD+zrg2DuKIXSxk4abKKLO3eyVkVlmATMw9BxOldsQ g4Owbf3X8vnvhos3VRmxxiu28n8cQSmEuYypbrmNZlOg5A2qRvZGSUsWs4mhRmKWzPzs iX4xTryhYfrLumi4VYwTqODdCBK5r594QmcHqp6R6Welmz0lJirKZ9EB5uKzfQNmtF5Q DGjcQmy9jwZ1Ve6v5ZeBv+VaaPKcdDMcHA9knQNDkD9RHhcVGJw0UR4E0eL+dL7n8Ey1 6OuzjGKeqkgJxeYB9GD1P2espHceym/77x9zPPqucVRf1UpouiihYi8/8VjcUfK8rw1T 9BHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NdWunlGe; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id m1-v6si2375177ejd.3.2019.01.16.20.12.31; Wed, 16 Jan 2019 20:12:31 -0800 (PST) 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=@linaro.org header.s=google header.b=NdWunlGe; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 28A78C2207C; Thu, 17 Jan 2019 04:11:43 +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=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 61D49C22102; Thu, 17 Jan 2019 04:10:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2B949C21F9C; Thu, 17 Jan 2019 04:10:40 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id DA200C220D8 for ; Thu, 17 Jan 2019 04:10:35 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id y4so3805199pgc.12 for ; Wed, 16 Jan 2019 20:10:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YXcbu2IqQW5Eg/khddBgIHDdXFR6SYK1h8w/m4YhzQk=; b=NdWunlGeGvkgTgF5Q7ChRAuamudC7mk3IT0RY9Mn+1TADhWAwKOff2p9ovgysrL6AD 8ZdPfVHg14cidSibHLqI+OFBKCuvt+R8hREXFbKzjQrG8whKJ9jTWOhAsjwBOHC1Edim gpXun1caNhoOAr4QUEus3BrqYPjDouEYRN8pU= 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=YXcbu2IqQW5Eg/khddBgIHDdXFR6SYK1h8w/m4YhzQk=; b=QZ5bwjMFBVZE0+xeFXxMknoe9xh41gTnNMD+ETd8zo/TH7hbNhlzQf5NdOmNzxVPSy 4Da3kgZPqPlhRc8BWTQ5jT6A//XHK1XCtshs9LU2IvjsjFIc4d9YnGmck1+EWYBUSquC /Fg8sC26UuyGzMcrjcMUKTtLEgqYECulZVhWnmqMeaVsCChvNriJKip2P56/7pkjOw7A 9OlJ2Fj0DnQzGXYwSui4Eq/KLDcfaUqoq87l95Wu70E1wvRCDroZK41UVP+RnIpMu2OM O8q8MFBOfQHTE2s6l6S1cRgn/dEdkzfRiCsbfaqKsLMS9ISbGk53aaipuyU1jzyvF5k7 DFdA== X-Gm-Message-State: AJcUukdANM2Tom9CL0L8wqVzlPPpzayUoZLP2gfwd+humFTI7xIvBQGu BPyMT2inl5mqUFRnQhXxkR44jopxKcsh+g== X-Received: by 2002:a63:2784:: with SMTP id n126mr12274707pgn.48.1547698234513; Wed, 16 Jan 2019 20:10:34 -0800 (PST) Received: from localhost.localdomain (61-216-91-114.HINET-IP.hinet.net. [61.216.91.114]) by smtp.gmail.com with ESMTPSA id 202sm377257pfy.87.2019.01.16.20.10.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 20:10:33 -0800 (PST) From: Shawn Guo To: Tom Rini Date: Thu, 17 Jan 2019 12:09:52 +0800 Message-Id: <20190117040952.4024-4-shawn.guo@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190117040952.4024-1-shawn.guo@linaro.org> References: <20190117040952.4024-1-shawn.guo@linaro.org> Cc: u-boot@lists.denx.de, Manivannan Sadhasivam Subject: [U-Boot] [PATCH 3/3] poplar: clean up board level mmc initialization code 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" We have converted mmc to driver model on Poplar. So let's clean up board level mmc initialization code. Signed-off-by: Shawn Guo Acked-by: Manivannan Sadhasivam --- arch/arm/include/asm/arch-hi3798cv200/dwmmc.h | 12 ------------ arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h | 1 - board/hisilicon/poplar/poplar.c | 12 ------------ 3 files changed, 25 deletions(-) delete mode 100644 arch/arm/include/asm/arch-hi3798cv200/dwmmc.h diff --git a/arch/arm/include/asm/arch-hi3798cv200/dwmmc.h b/arch/arm/include/asm/arch-hi3798cv200/dwmmc.h deleted file mode 100644 index d08c20b36d31..000000000000 --- a/arch/arm/include/asm/arch-hi3798cv200/dwmmc.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2017 Linaro - * Jorge Ramirez-Ortiz - */ - -#ifndef _HI3798cv200_DWMMC_H_ -#define _HI3798cv200_DWMMC_H_ - -int hi6220_dwmci_add_port(int index, u32 regbase, int bus_width); - -#endif /* _HI3798cv200_DWMMC_H_ */ diff --git a/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h b/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h index bb221e17e0ed..b98b45cc817b 100644 --- a/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h +++ b/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h @@ -11,7 +11,6 @@ #define REG_BASE_CRG 0xF8A22000 /* DEVICES */ -#define REG_BASE_MCI 0xF9830000 #define REG_BASE_UART0 0xF8B00000 #define HIOTG_BASE_ADDR 0xF98C0000 diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index 155dfbb401f1..77948445e261 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -9,7 +9,6 @@ #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; @@ -155,17 +154,6 @@ static void usb2_phy_init(void) udelay(200); } -int board_mmc_init(bd_t *bis) -{ - int ret; - - ret = hi6220_dwmci_add_port(0, REG_BASE_MCI, 8); - if (ret) - printf("mmc init error (%d)\n", ret); - - return ret; -} - #if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) #include #include