From: Koen Kooi <koen@dominion.thruhere.net>
To: linux-kernel@vger.kernel.org
Cc: bcousson@baylibre.com, tony@atomide.com, rob.herring@calxeda.com,
pawel.moll@arm.com, mark.rutland@arm.com, swarren@wwwdotorg.org,
ijc+devicetree@hellion.org.uk, linux@arm.linux.org.uk,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Alexander Holler <holler@ahsoftware.de>,
Koen Kooi <koen@dominion.thruhere.net>
Subject: [PATCH 1/4] arm: bone: dts: add CD for mmc1
Date: Thu, 12 Sep 2013 17:42:09 +0200 [thread overview]
Message-ID: <1379000532-27376-2-git-send-email-koen@dominion.thruhere.net> (raw)
In-Reply-To: <1379000532-27376-1-git-send-email-koen@dominion.thruhere.net>
From: Alexander Holler <holler@ahsoftware.de>
This enables the use of MMC cards even when no card was inserted at boot.
Signed-off-by: Alexander Holler <holler@ahsoftware.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
Changes since v2:
None, again a simple repost
Changes since v1:
None, simple repost
arch/arm/boot/dts/am335x-bone-common.dtsi | 14 ++++++++++++++
arch/arm/boot/dts/am335x-bone.dts | 4 ----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 2f66ded..ced256c 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -107,6 +107,11 @@
0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
>;
};
+ mmc1_pins: pinmux_mmc1_pins {
+ pinctrl-single,pins = <
+ 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
+ >;
+ };
};
ocp {
@@ -260,3 +265,12 @@
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
};
+
+&mmc1 {
+ status = "okay";
+ vmmc-supply = <&ldo3_reg>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
+ cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+ cd-inverted;
+};
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index d5f43fe..d34469c 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -16,7 +16,3 @@
regulator-always-on;
};
-&mmc1 {
- status = "okay";
- vmmc-supply = <&ldo3_reg>;
-};
--
1.8.2.1
next prev parent reply other threads:[~2013-09-12 15:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-12 15:42 [PATCHv3 0/2] ARM: dts: Beaglebone MMC fixes Koen Kooi
2013-09-12 15:42 ` Koen Kooi [this message]
2013-09-12 16:15 ` [PATCH 1/4] arm: bone: dts: add CD for mmc1 Nishanth Menon
2013-09-12 15:42 ` [PATCH 2/4] am335x-boneblack: add eMMC DT entry Koen Kooi
2013-09-12 16:18 ` Nishanth Menon
2013-09-12 15:42 ` [PATCH 3/4] ARM: am335x-bone-common: switch mmc1 to 4-bit mode Koen Kooi
2013-09-12 16:19 ` Nishanth Menon
2013-09-12 15:42 ` [PATCH 4/4] ARM: dts: am335x-bone-common: add cpu0 and mmc1 triggers Koen Kooi
2013-09-12 16:20 ` Nishanth Menon
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=1379000532-27376-2-git-send-email-koen@dominion.thruhere.net \
--to=koen@dominion.thruhere.net \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=holler@ahsoftware.de \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=swarren@wwwdotorg.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
all inboxes | Powered by JetHome®