From patchwork Wed Feb 14 14:10:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Rossak X-Patchwork-Id: 10219035 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 DB153602CB for ; Wed, 14 Feb 2018 14:18:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9C4E288FC for ; Wed, 14 Feb 2018 14:18:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE7BD28FEE; Wed, 14 Feb 2018 14:18:49 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 33053288FC for ; Wed, 14 Feb 2018 14:18:49 +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: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=Qudaqu8vluNE/gvfDX+hyL2G3pzIDbtuehzRedpyhuA=; b=Ds4vXMw9RCDSwKE6QHwkTgx6ff IVSUKS5ahqb7MLfXVKWXTpeEy+e3T1v+ixbElXuvuSS+pRdmOFfjVq1RlmLKjH5a20MixlGPrBENV eY6PUCU4jNuwYSEPM8R/kDWg0q5r5jP3ih8ZVe3HcLtCRMM+zMWkFl5ApK/HP2bvWsm1718OU0+IE U53ZyQgfFroGHUM7rJLgnRNOH5xhZAcK46PVZvh0lDGJeBC1I2k6akHY09calmFtcikBTyQ1WjPLZ sG2+bGw4qqND5srKo+F8kyA5ecFYKTPo5hvQe0QMG68EXahd90ZOyivXpV+H5cvQ0Xkax6NFIX2tF gGw62OgQ==; 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 1elxtU-0003N5-Uh; Wed, 14 Feb 2018 14:18:44 +0000 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elxlh-0004Q6-He for linux-arm-kernel@lists.infradead.org; Wed, 14 Feb 2018 14:11:02 +0000 Received: by mail-wr0-x243.google.com with SMTP id m5so88756wrg.1 for ; Wed, 14 Feb 2018 06:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kw0Wmpd75U998hDqFNZjTRtCX7DXiqMeuEUQdfxihW4=; b=ZKgy2yka4YclleatyrFAaWzdZG77CNVdiodfMUyu6tIm3zozNZnJoVCM2+LOPTeoYA Y+H6ephz6W7bbp0CWZaDQCX5RSdc9LuV9aYO48t3yyAGjA6k+CGhxkYKlySad+p6aI7I FaRehlv2E2Lq37wawUSEQOuk+VlrVEp0ERWwkNCKDdv00a9TqSqDNIMYxtAPsrgWx2KR fL15dfyZB463ui35AetuwD53BdOY0oum4ahvRgaE+6E9hgMhR5DVx3zBT+S0nPy05Zdh f+0sdEfv+k/rJ3HD1a2Jp6RHk1IcOhNOk2cLAcJf/DCEzGZ6iSRl9Ey8q53WzCYN177e N9YA== 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=kw0Wmpd75U998hDqFNZjTRtCX7DXiqMeuEUQdfxihW4=; b=Q3OJuvVG+pg0s1QlxIbcMnJyQgT2lT5jmwn1LmiIgk+D2ojhtT6K1dDAy+ktW+Xj8v f/UKmmwjoknW1I5Tmuj4TnVP9tOu5VQjDgjiJmlM8++uOP3iNw7Sgmf13MlKxkNeoR+Y 3tI2gqxV7A9tcPjukYdPOEZE7JiKjJGDe1xuXNjBmgswCTzawCR4dX6L5GelgkELq3hT I+fGGs13ztDt2Th87XhK3J2t7L89s3dgaf38W/cCsK9sJTWzIU6gyswoybrCQR3/6j4H PQoCoZSvb4J1l+Fl0iektAukMOaJaMN9KtkF2cSES3dleeaGlzU5RhKB0io+cK4RWfMh mCoA== X-Gm-Message-State: APf1xPAa4FRWm1/xwbtshYWiz4taY5Hr1MvB14nhMAgxCrKVOOif/zmL 3PTR/2YzAM+qkVLC5tJlKCw= X-Google-Smtp-Source: AH8x225nwscDEGYxokX37bgCWJIPwGzcqPStxgBqUoeH4LWw2kEhhdCgvh/vPiRMPH3LkTKwQl0Mmg== X-Received: by 10.223.158.207 with SMTP id b15mr4410507wrf.192.1518617431419; Wed, 14 Feb 2018 06:10:31 -0800 (PST) Received: from debian-laptop.fritz.box (p578F04D2.dip0.t-ipconnect.de. [87.143.4.210]) by smtp.gmail.com with ESMTPSA id m86sm13001982wmi.40.2018.02.14.06.10.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 06:10:30 -0800 (PST) From: Philipp Rossak To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, wens@csie.org Subject: [PATCH v2 2/2] arm: dts: sun6i: a31s: fix: bpi-m2: add missing regulators Date: Wed, 14 Feb 2018 15:10:25 +0100 Message-Id: <20180214141025.22171-3-embed3d@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180214141025.22171-1-embed3d@gmail.com> References: <20180214141025.22171-1-embed3d@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180214_061041_876442_E1988816 X-CRM114-Status: GOOD ( 15.98 ) 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 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 patch fixes a bootproblem with the Bananapi M2 board. Since there are some regulators missing we add them right now. Those values come from the schematic, below you can find a small overview: * reg_aldo1: 3,3V, powers the wifi * reg_aldo2: 2,5V, powers the IO of the RTL8211E * reg_aldo3: 3,3V, powers the audio * reg_dldo1: 3,0V, powers the RTL8211E * reg_dldo2: 2,8V, powers the analog part of the csi * reg_dldo3: 3,3V, powers misc * reg_eldo1: 1,8V, powers the csi * reg_ldo_io1:1,8V, powers the gpio * reg_dc5ldo: needs to be always on This patch updates also the vmmc-supply properties on the mmc0 and mmc2 node to use the allready existent regulators. We can now remove the sunxi-common-regulators.dtsi include since we don't need it anymore. Fixes: 7daa21370075 ("ARM: dts: sunxi: Add regulators for Sinovoip BPI-M2") Signed-off-by: Philipp Rossak --- arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 61 ++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 3 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 fb34f32502cf..b2758dd8ce43 100644 --- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts +++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts @@ -42,7 +42,6 @@ /dts-v1/; #include "sun6i-a31s.dtsi" -#include "sunxi-common-regulators.dtsi" #include / { @@ -99,6 +98,7 @@ pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_bpi_m2>; phy = <&phy1>; phy-mode = "rgmii"; + phy-supply = <®_dldo1>; snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>; /* PA21 */ snps,reset-active-low; snps,reset-delays-us = <0 10000 30000>; @@ -118,7 +118,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>; - vmmc-supply = <®_vcc3v0>; + vmmc-supply = <®_dcdc1>; bus-width = <4>; cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */ cd-inverted; @@ -132,7 +132,7 @@ &mmc2 { pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins_a>; - vmmc-supply = <®_vcc3v0>; + vmmc-supply = <®_aldo1>; mmc-pwrseq = <&mmc2_pwrseq>; bus-width = <4>; non-removable; @@ -195,7 +195,28 @@ #include "axp22x.dtsi" +®_aldo1 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi"; +}; + +®_aldo2 { + regulator-always-on; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-name = "vcc-gmac"; +}; + +®_aldo3 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "avcc"; +}; + ®_dc5ldo { + regulator-always-on; regulator-min-microvolt = <700000>; regulator-max-microvolt = <1320000>; regulator-name = "vdd-cpus"; @@ -235,6 +256,40 @@ regulator-name = "vcc-dram"; }; +®_dldo1 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc-mac"; +}; + +®_dldo2 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-name = "avdd-csi"; +}; + +®_dldo3 { + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-pb"; +}; + +®_eldo1 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vdd-csi"; + status = "okay"; +}; + +®_ldo_io1 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc-pm-cpus"; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>;