From: <kostap@marvell.com>
To: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Cc: <linux@armlinux.org.uk>, <robh+dt@kernel.org>,
<sebastian.hesselbarth@gmail.com>, <gregory.clement@bootlin.com>,
<andrew@lunn.ch>, <mw@semihalf.com>, <jaz@semihalf.com>,
<nadavh@marvell.com>, <stefanc@marvell.com>, <bpeled@marvell.com>,
"Konstantin Porotchkin" <kostap@marvell.com>
Subject: [PATCH 04/11] fix: dts: a8k: Add CP eMMC regulator and update device parameters
Date: Wed, 3 Feb 2021 15:31:31 +0200 [thread overview]
Message-ID: <20210203133138.10754-5-kostap@marvell.com> (raw)
In-Reply-To: <20210203133138.10754-1-kostap@marvell.com>
From: Konstantin Porotchkin <kostap@marvell.com>
Add GPIO regulator for controlling CP0 eMMC voltage (3.3V/1.8V)
Update CP0 SDHCI parameters in A7K/A8K boards DTS files.
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
---
arch/arm64/boot/dts/marvell/armada-7040-db.dts | 17 ++++++++++++++++-
arch/arm64/boot/dts/marvell/armada-8040-db.dts | 18 +++++++++++++++++-
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index a7eb4e7697a2..f8179cadc610 100644
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -28,6 +28,19 @@
ethernet2 = &cp0_eth2;
};
+ cp0_vccq_sd0_reg: cp0_vccq_sd0 {
+ compatible = "regulator-gpio";
+ regulator-name = "cp0-vccq-sd0";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ gpios = <&expander0 15 GPIO_ACTIVE_HIGH>;
+ gpios-states = <0>;
+ states = <1800000 0x1
+ 3300000 0x0>;
+ enable-active-high;
+ };
+
cp0_exp_usb3_0_current_regulator: gpio-regulator {
compatible = "regulator-gpio";
regulator-name = "cp0-usb3-0-current-regulator";
@@ -253,8 +266,10 @@
&cp0_sdhci0 {
status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdhci_pins>;
bus-width = <4>;
- no-1-8-v;
+ vqmmc-supply = <&cp0_vccq_sd0_reg>;
cd-gpios = <&expander0 12 GPIO_ACTIVE_LOW>;
};
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 6362e654a823..d96aa9e9e61c 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -31,6 +31,19 @@
i2c2 = &cp1_i2c0;
};
+ cp0_vccq_sd0_reg: cp0_vccq_sd0 {
+ compatible = "regulator-gpio";
+ regulator-name = "cp0-vccq-sd0";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ gpios = <&expander0 15 GPIO_ACTIVE_HIGH>;
+ gpios-states = <0>;
+ states = <1800000 0x1
+ 3300000 0x0>;
+ enable-active-high;
+ };
+
cp0_reg_usb3_0_vbus: cp0-usb3-0-vbus {
compatible = "regulator-fixed";
regulator-name = "cp0-usb3h0-vbus";
@@ -362,6 +375,9 @@
&cp0_sdhci0 {
status = "okay";
- bus-width = <8>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdhci_pins>;
+ bus-width = <4>;
+ vqmmc-supply = <&cp0_vccq_sd0_reg>;
non-removable;
};
--
2.17.1
next prev parent reply other threads:[~2021-02-03 13:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 13:31 [PATCH 00/11] Device tree fixes for Armada family kostap
2021-02-03 13:31 ` [PATCH 01/11] fix: arm64: dts: replace wrong regulator on ap emmc kostap
2021-02-03 13:31 ` [PATCH 02/11] dts: mvebu: Update A8K AP806 SDHCI settings kostap
2021-02-03 13:58 ` Baruch Siach
2021-02-03 14:37 ` [EXT] " Kostya Porotchkin
2021-02-03 14:38 ` Russell King - ARM Linux admin
2021-02-03 14:50 ` Kostya Porotchkin
2021-02-03 15:03 ` Kostya Porotchkin
2021-02-03 16:11 ` Russell King - ARM Linux admin
2021-02-03 16:57 ` Kostya Porotchkin
2021-02-05 9:33 ` Marcin Wojtas
2021-02-03 13:31 ` [PATCH 03/11] dts: mvebu: Add pin control definitions for SDIO interafce kostap
2021-02-03 14:00 ` Baruch Siach
2021-02-03 14:39 ` [EXT] " Kostya Porotchkin
2021-02-03 14:28 ` Russell King - ARM Linux admin
2021-02-03 14:41 ` [EXT] " Kostya Porotchkin
2021-02-03 15:41 ` Andrew Lunn
2021-02-03 15:49 ` Kostya Porotchkin
2021-02-03 13:31 ` kostap [this message]
2021-02-03 13:31 ` [PATCH 05/11] arm64: dts: marvell: armada-3720-db: add comphy references kostap
2021-02-03 13:31 ` [PATCH 06/11] arm64: dts: marvell: armada-3270-espressobin: " kostap
2021-02-03 13:31 ` [PATCH 07/11] fix: ARM64: dts: cp110: Switch to 8-bit ECC NAND setting kostap
2021-02-03 13:31 ` [PATCH 08/11] arm64: dts: marvell: armada-3720-db: add eeprom description kostap
2021-02-03 13:31 ` [PATCH 09/11] dts: a3700: enable dma coherence for PCIE interface kostap
2021-02-05 9:45 ` Marcin Wojtas
2021-02-03 13:31 ` [PATCH 10/11] dts: marvell: add 2 eeprom properties to A8K DB device tree kostap
2021-02-03 13:31 ` [PATCH 11/11] dts: marvell: add 2 eeprom properties to A7K " kostap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210203133138.10754-5-kostap@marvell.com \
--to=kostap@marvell.com \
--cc=andrew@lunn.ch \
--cc=bpeled@marvell.com \
--cc=devicetree@vger.kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=jaz@semihalf.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mw@semihalf.com \
--cc=nadavh@marvell.com \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=stefanc@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).