From patchwork Sat Feb 3 11:23:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 10198491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 53FA860247 for ; Sat, 3 Feb 2018 11:25:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31A2428FBC for ; Sat, 3 Feb 2018 11:25:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2606728FC1; Sat, 3 Feb 2018 11:25:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AA26E28FBC for ; Sat, 3 Feb 2018 11:25:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To: References:List-Owner; bh=YeepTy8apQzADvGoexrJ1Gg0LkJ9OKA6wQ2p6kPEjPA=; b=WNR XXsfKuFQnHxPf5m2U8G/QjVdYjMFKU13+UjJVp+utAQfvBrtCpSLb2ZoaS44yDtRSEBqJmlFGERcP 2uwRDBMoE/X9ls8ufCT9pYsW1hMGX4UAa1CrHdg1EPISh+gk/dBS00iuw8uuC96qpvc5xtmB2v6Zl 3gX9qXwgOx1bWieknoiPzuB50NFMoKX7NKWV4lY+Kp1lFtm7v5IgmNHyw7Q/7qK7hSkTgJJd9RmKb hPYN+Rk9ioDPaYSk4Ryp9cZeSxD78215nY7XIO0OCtsI1/9aMlBq5CG0u/F4xc/quF4OkNj8VQFH3 chygnO6tRsDa1iyw8RJWt5n4K/1h+eg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ehvwR-0000QJ-EQ; Sat, 03 Feb 2018 11:25:07 +0000 Received: from caracal.maple.relay.mailchannels.net ([23.83.214.30]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ehvwN-0007ze-94 for linux-arm-kernel@lists.infradead.org; Sat, 03 Feb 2018 11:25:05 +0000 X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id E6A205C1520; Sat, 3 Feb 2018 11:24:47 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.25.39]) (Authenticated sender: lmn-TZDUIOWCRQMW) by relay.mailchannels.net (Postfix) with ESMTPA id 891F75C14FC; Sat, 3 Feb 2018 11:24:46 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [172.18.52.126]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.13.1); Sat, 03 Feb 2018 11:24:47 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Arithmetic-Daffy: 740f7b244a24a654_1517657087537_315817211 X-MC-Loop-Signature: 1517657087537:3623575517 X-MC-Ingress-Time: 1517657087536 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id 641A856CFA; Sat, 3 Feb 2018 11:24:41 +0000 (UTC) From: Icenowy Zheng To: Maxime Ripard , Chen-Yu Tsai Subject: [PATCH] Revert "ARM: dts: sunxi: Add regulators for Sinovoip BPI-M2" Date: Sat, 3 Feb 2018 19:23:53 +0800 Message-Id: <20180203112353.13497-1-icenowy@aosc.io> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 7daa213700758b5b08fc0daab09bb139dd334165. The original commit has several problems: - vdd-cpus and aldo3 (AVCC of the SoC) are not set to always-on, which leads to system hang when disabling unused regulators. - GMAC (which uses dldo1 and aldo2) and Wi-Fi (which uses aldo1) are not considered, and will fail to work after adding this commit. This indicates that this patch should be not tested at all. Signed-off-by: Icenowy Zheng --- arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 57 ------------------------ 1 file changed, 57 deletions(-) diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts index 51e6f1d21c32..a565316eb340 100644 --- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts +++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts @@ -86,10 +86,6 @@ }; }; -&cpu0 { - cpu-supply = <®_dcdc3>; -}; - &ehci0 { status = "okay"; }; @@ -155,17 +151,6 @@ status = "okay"; }; -&p2wi { - status = "okay"; - - axp22x: pmic@68 { - compatible = "x-powers,axp221"; - reg = <0x68>; - interrupt-parent = <&nmi_intc>; - interrupts = <0 IRQ_TYPE_LEVEL_LOW>; - }; -}; - &pio { gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 { pins = "PA21"; @@ -191,48 +176,6 @@ }; }; -#include "axp22x.dtsi" - -®_dc5ldo { - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1320000>; - regulator-name = "vdd-cpus"; -}; - -®_dcdc1 { - regulator-always-on; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-name = "vdd-3v0"; -}; - -®_dcdc2 { - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1320000>; - regulator-name = "vdd-gpu"; -}; - -®_dcdc3 { - regulator-always-on; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1320000>; - regulator-name = "vdd-cpu"; -}; - -®_dcdc4 { - regulator-always-on; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1320000>; - regulator-name = "vdd-sys-dll"; -}; - -®_dcdc5 { - regulator-always-on; - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; - regulator-name = "vcc-dram"; -}; - &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>;