From patchwork Tue Feb 2 13:29:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12061623 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0910C4332D for ; Tue, 2 Feb 2021 13:31:16 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FA8260232 for ; Tue, 2 Feb 2021 13:31:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FA8260232 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wHKs0qJWA3o2vJ00DRc2ZQsmRC5ftDlhW3B529C85h4=; b=ghUGzKzMfEITVNBX6Xxsza40z p+o+B3LX4+kYwRibGO9dQzh62DblZcubEzQzfMXbVOdIZEHocwef8KBRP7KPhV3HYJ7hzinTdltYN /xFbQGhoLsx3Hz9kqSpXukoTIw62ERp8qBseCHTZb5ffG97KBbnI7mEd5ji4hbdzeyUxeuvTk+kP0 3zQ66bBX1T9YqH7ynKKv9YDLADzSYKsh+t3qwMX1K9YHIBYZETlfdzVvGwNEROw3ngbgqPPpFhRGV i2t46UaswOCjWqvnFdSQLSORNMhAkrKPWRIpEhRAVW80WGpuLJ0mDp1X7iwIJqs+OLC2u8MrXgTTn /k7ICCuzw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6vkx-0000Y2-5A; Tue, 02 Feb 2021 13:30:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6vkp-0000Sg-46 for linux-arm-kernel@lists.infradead.org; Tue, 02 Feb 2021 13:30:06 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D88DF64F61; Tue, 2 Feb 2021 13:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612272602; bh=Tmpg5G8Q5WWZwkwEzV2K4ehCcH+3UNaSq0kO2M0KaCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YUkXaIK68CSCM4Vaqzz+PupuMY7Sx73apJkS8Xl4sbkCGrzk8MrdEzhZE6j+RdKe9 +izykXTBqxMbvIJiuJZFJ4bk6rsKfrIqVE3mINm2G5XA2BdaD5xENhF2Pw66Zz+iKe eWG7PDVyR51IWYcV9BWvGOqM4e++q49pG3jQFfCPOmxT8wf2MgHQt6LHKk/Yhzt6cc p/eXYzxcfCN4Qeas+X4jSHM69+9Tn9cnrjHeg+oled73uFHHa+9K6k4kv010HteMkq mrbZJSUNjLc+IMrNjNivP3karOUuCWU26EnB4r0G8V1Ib6B9Bs5BhWiv782OSctKVU 1LjICCl9cFN1g== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1l6vkl-0011zH-Tr; Tue, 02 Feb 2021 14:29:59 +0100 From: Mauro Carvalho Chehab To: Subject: [PATCH 13/13] arm64: dts: hisilicon: cleanup Hikey 970 PCI schema Date: Tue, 2 Feb 2021 14:29:58 +0100 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210202_083003_441162_05AA26ED X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Wei Xu , Rob Herring , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The original schema was not generic enough and not properly documented. Those got updated via some driver changes. Apply those changes also to Hikey 970 schema. Signed-off-by: Mauro Carvalho Chehab --- arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 18 +++++++++--------- .../boot/dts/hisilicon/hikey970-pmic.dtsi | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi index c0a0336a8ea4..7e96d5eda13a 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi @@ -673,11 +673,12 @@ its_pcie: interrupt-controller@f4000000 { }; pcie@f4000000 { - compatible = "hisilicon,kirin970-pcie", "hisilicon,kirin960-pcie"; + compatible = "hisilicon,kirin970-pcie"; reg = <0x0 0xf4000000 0x0 0x1000000>, <0x0 0xfc180000 0x0 0x1000>, <0x0 0xfc000000 0x0 0x80000>, <0x0 0xf5000000 0x0 0x2000>; + pci-supply = <&ldo33>; reg-names = "dbi", "apb", "phy", "config"; bus-range = <0x0 0x1>; msi-parent = <&its_pcie>; @@ -705,19 +706,18 @@ &gic GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>, <&crg_ctrl HI3670_PCLK_GATE_PCIE_PHY>, <&crg_ctrl HI3670_PCLK_GATE_PCIE_SYS>, <&crg_ctrl HI3670_ACLK_GATE_PCIE>; + clock-names = "pcie_phy_ref", "pcie_aux", "pcie_apb_phy", "pcie_apb_sys", "pcie_aclk"; - switch,reset-gpios = <&gpio7 0 0 >; - eth,reset-gpios = <&gpio25 2 0 >; - m_2,reset-gpios = <&gpio3 1 0 >; - mini1,reset-gpios = <&gpio27 4 0 >; - eth,clkreq-gpios = <&gpio20 6 0 >; - m_2,clkreq-gpios = <&gpio27 3 0 >; - mini1,clkreq-gpios = <&gpio17 0 0 >; + reset-gpios = <&gpio7 0 0 >, <&gpio25 2 0 >, + <&gpio3 1 0 >, <&gpio27 4 0 >; - /*vboost iboost pre post main*/ + clkreq-gpios = <&gpio20 6 0 >, <&gpio27 3 0 >, + <&gpio17 0 0 >; + + /* vboost iboost pre post main */ eye_param = <0xFFFFFFFF 0xFFFFFFFF 0xFFFFFFFF 0xFFFFFFFF 0xFFFFFFFF>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi index 8cf45b962fea..49afcd7c00ce 100644 --- a/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi @@ -73,7 +73,6 @@ ldo33: LDO33 { /* PEX8606 */ regulator-name = "ldo33"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <3300000>; - regulator-boot-on; }; ldo34: LDO34 { /* GPS AUX IN VDD */