From: Kishon Vijay Abraham I <kishon@ti.com>
To: "Benoît Cousson" <bcousson@baylibre.com>,
"Tony Lindgren" <tony@atomide.com>,
"Rob Herring" <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
Russell King <linux@armlinux.org.uk>,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Kishon Vijay Abraham I <kishon@ti.com>
Subject: [PATCH v2 14/15] ARM: dts: dra7: Use sdhci-omap programming model
Date: Tue, 6 Feb 2018 18:28:05 +0530 [thread overview]
Message-ID: <20180206125806.19350-15-kishon@ti.com> (raw)
In-Reply-To: <20180206125806.19350-1-kishon@ti.com>
Use sdhci-omap programming model based on the generic sdhci
library for programming the first 2 instances of eMMC/SD/SDIO
controller.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 3 +--
arch/arm/boot/dts/am57xx-idk-common.dtsi | 2 +-
arch/arm/boot/dts/dra7-evm.dts | 1 +
arch/arm/boot/dts/dra7.dtsi | 15 ++++++---------
arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +-
arch/arm/boot/dts/dra76-evm.dts | 3 ++-
6 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index 7539096fe4d8..1827b1e9a9f2 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -444,8 +444,7 @@
vmmc-supply = <&vdd_3v3>;
vqmmc-supply = <&vdd_3v3>;
bus-width = <8>;
- ti,non-removable;
- cap-mmc-dual-data-rate;
+ non-removable;
};
&sata {
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index 43cdf523a8a0..855c130afc69 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -423,7 +423,7 @@
vmmc-supply = <&v3_3d>;
vqmmc-supply = <&v3_3d>;
bus-width = <8>;
- ti,non-removable;
+ non-removable;
max-frequency = <96000000>;
};
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index f1425b0f3a54..e9a1aa17cca5 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -325,6 +325,7 @@
vmmc-supply = <&evm_1v8_sw>;
vqmmc-supply = <&evm_1v8_sw>;
bus-width = <8>;
+ non-removable;
pinctrl-names = "default", "hs", "ddr_1_8v-rev11", "ddr_1_8v", "hs200_1_8v-rev11", "hs200_1_8v";
pinctrl-0 = <&mmc2_pins_default>;
pinctrl-1 = <&mmc2_pins_hs>;
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index b4ef814c556c..7bf33d522b14 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1066,17 +1066,15 @@
};
mmc1: mmc@4809c000 {
- compatible = "ti,omap4-hsmmc";
+ compatible = "ti,dra7-sdhci";
reg = <0x4809c000 0x400>;
interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
ti,hwmods = "mmc1";
- ti,dual-volt;
- ti,needs-special-reset;
- dmas = <&sdma_xbar 61>, <&sdma_xbar 62>;
- dma-names = "tx", "rx";
status = "disabled";
pbias-supply = <&pbias_mmc_reg>;
max-frequency = <192000000>;
+ cap-sd-highspeed;
+ cap-mmc-highspeed;
};
hdqw1w: 1w@480b2000 {
@@ -1087,15 +1085,14 @@
};
mmc2: mmc@480b4000 {
- compatible = "ti,omap4-hsmmc";
+ compatible = "ti,dra7-sdhci";
reg = <0x480b4000 0x400>;
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
ti,hwmods = "mmc2";
- ti,needs-special-reset;
- dmas = <&sdma_xbar 47>, <&sdma_xbar 48>;
- dma-names = "tx", "rx";
status = "disabled";
max-frequency = <192000000>;
+ cap-sd-highspeed;
+ cap-mmc-highspeed;
};
mmc3: mmc@480ad000 {
diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
index 2e485a13dfd7..4f48f97c9c47 100644
--- a/arch/arm/boot/dts/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
@@ -421,7 +421,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_default>;
bus-width = <8>;
- ti,non-removable;
+ non-removable;
max-frequency = <192000000>;
};
diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
index 2deb96405d06..f8c0c6b068fd 100644
--- a/arch/arm/boot/dts/dra76-evm.dts
+++ b/arch/arm/boot/dts/dra76-evm.dts
@@ -307,7 +307,7 @@
&mmc1 {
status = "okay";
vmmc-supply = <&vio_3v3_sd>;
- vmmc_aux-supply = <&ldo4_reg>;
+ vqmmc-supply = <&ldo4_reg>;
bus-width = <4>;
/*
* SDCD signal is not being used here - using the fact that GPIO mode
@@ -324,6 +324,7 @@
vmmc-supply = <&vio_1v8>;
vqmmc-supply = <&vio_1v8>;
bus-width = <8>;
+ non-removable;
pinctrl-names = "default", "hs", "ddr_1_8v", "hs200_1_8v";
pinctrl-0 = <&mmc2_pins_default>;
pinctrl-1 = <&mmc2_pins_default>;
--
2.11.0
next prev parent reply other threads:[~2018-02-06 12:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 12:57 [PATCH v2 00/15] dra7: mmc: Update mmc dt node Kishon Vijay Abraham I
2018-02-06 12:57 ` [PATCH v2 01/15] ARM: multi_v7_defconfig: Enable CONFIG_MMC_SDHCI_OMAP Kishon Vijay Abraham I
2018-02-06 12:57 ` [PATCH v2 02/15] ARM: omap2plus_defconfig: " Kishon Vijay Abraham I
2018-02-06 12:57 ` [PATCH v2 03/15] ARM: dts: dra76x: Create a common file with MMC/SD IOdelay data Kishon Vijay Abraham I
2018-02-06 12:57 ` [PATCH v2 04/15] ARM: dts: dra76-evm: Shift to using common " Kishon Vijay Abraham I
2018-02-06 12:57 ` [PATCH v2 05/15] ARM: dts: dra76-evm: Add pinctrl data for higher speed MMC/SD modes Kishon Vijay Abraham I
2018-02-06 12:57 ` [PATCH v2 06/15] ARM: dts: am57xx-beagle-x15: Add "vqmmc-supply" property for mmc2 Kishon Vijay Abraham I
2018-02-06 12:57 ` [PATCH v2 07/15] ARM: dts: dra7-evm: Remove mmc specific pinmux Kishon Vijay Abraham I
2018-02-06 12:58 ` [PATCH v2 09/15] ARM: dts: am57xx-idk: Add "vqmmc-supply" property for mmc2 Kishon Vijay Abraham I
2018-02-06 12:58 ` [PATCH v2 10/15] ARM: dts: dra76-evm: " Kishon Vijay Abraham I
[not found] ` <20180206125806.19350-1-kishon-l0cyMroinI0@public.gmane.org>
2018-02-06 12:57 ` [PATCH v2 08/15] ARM: dts: dra7-evm: " Kishon Vijay Abraham I
2018-02-06 12:58 ` [PATCH v2 11/15] ARM: dts: dra71-evm: Correct evm_sd regulator max voltage Kishon Vijay Abraham I
2018-02-06 12:58 ` [PATCH v2 12/15] ARM: dts: dra71-evm: Select pull down for mmc1_clk line in default mode Kishon Vijay Abraham I
2018-02-06 12:58 ` [PATCH v2 13/15] ARM: dts: am57xx-idk: " Kishon Vijay Abraham I
2018-02-06 12:58 ` Kishon Vijay Abraham I [this message]
2018-02-06 12:58 ` [PATCH v2 15/15] ARM: dts: dra7: Add high speed modes capability to MMC1/MMC2 dt node Kishon Vijay Abraham I
[not found] ` <20180206125806.19350-16-kishon-l0cyMroinI0@public.gmane.org>
2018-02-07 9:11 ` Sekhar Nori
2018-02-07 9:21 ` Kishon Vijay Abraham I
[not found] ` <b411cf11-61e9-e688-6f04-e624fe52ac66-l0cyMroinI0@public.gmane.org>
2018-02-07 9:27 ` Sekhar Nori
2018-02-13 11:10 ` Sekhar Nori
2018-02-28 22:34 ` Tony Lindgren
2018-03-01 5:18 ` Kishon Vijay Abraham I
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=20180206125806.19350-15-kishon@ti.com \
--to=kishon@ti.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.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).