* SAM5D3 Xplained MMC device tree updates
@ 2015-03-26 17:38 Ben Dooks
2015-03-26 17:38 ` [PATCH 1/3] ARM: at91/dt: sama5d3 fill in mmc1 and default disabled Ben Dooks
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Ben Dooks @ 2015-03-26 17:38 UTC (permalink / raw)
To: linux-arm-kernel
A small set to fix warnings from the kernel.
Note, the atmel_defconfig will require CONFIG_REGULATOR_GPIO
to be set.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] ARM: at91/dt: sama5d3 fill in mmc1 and default disabled
2015-03-26 17:38 SAM5D3 Xplained MMC device tree updates Ben Dooks
@ 2015-03-26 17:38 ` Ben Dooks
2015-04-21 15:09 ` Ludovic Desroches
2015-03-26 17:38 ` [PATCH 2/3] ARM: at91/dt: sama5d3 add mmc0 vmmcq entry Ben Dooks
2015-03-26 17:38 ` [PATCH 3/3] ARM: at91/dt: sama5d3 add gpio regulator for vmmc0 Ben Dooks
2 siblings, 1 reply; 7+ messages in thread
From: Ben Dooks @ 2015-03-26 17:38 UTC (permalink / raw)
To: linux-arm-kernel
The mmc1 channel is not populated on the SAM5D3 Xplained board, however
it is enabled and therefore the driver is attaching to it.
The node configuration for mmc1 is missing, so add an mmc1 node in the
device tree so add the basic node, set it to default it to disabled. Also
add the vmmc and also the necessary slot configuration if this node
where to be enabled to avoid the following warnings from the driver.
atmel_mci f8000000.mmc: No vmmc regulator found
atmel_mci f8000000.mmc: No vqmmc regulator found
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
--
CC: linux-arm-kernel at lists.infradead.org
CC: Andrew Victor <linux@maxim.org.za>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
CC: Rob Herring <robh+dt@kernel.org>
CC: Pawel Moll <pawel.moll@arm.com>
CC: Mark Rutland <mark.rutland@arm.com>
CC: Ian Campbell <ijc+devicetree@hellion.org.uk>
CC: Kumar Gala <galak@codeaurora.org>
CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel at lists.infradead.org
CC: devicetree at vger.kernel.org
---
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index fec1fca..652c4dd 100644
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -43,6 +43,17 @@
};
};
+ mmc1: mmc at f8000000 {
+ vmmc-supply = <&vcc_3v3_reg>;
+ vqmmc-supply = <&vcc_3v3_reg>;
+ status = "disabled";
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>;
+ };
+ };
+
spi0: spi at f0004000 {
cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;
status = "okay";
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] ARM: at91/dt: sama5d3 add mmc0 vmmcq entry
2015-03-26 17:38 SAM5D3 Xplained MMC device tree updates Ben Dooks
2015-03-26 17:38 ` [PATCH 1/3] ARM: at91/dt: sama5d3 fill in mmc1 and default disabled Ben Dooks
@ 2015-03-26 17:38 ` Ben Dooks
2015-04-21 15:13 ` Ludovic Desroches
2015-03-26 17:38 ` [PATCH 3/3] ARM: at91/dt: sama5d3 add gpio regulator for vmmc0 Ben Dooks
2 siblings, 1 reply; 7+ messages in thread
From: Ben Dooks @ 2015-03-26 17:38 UTC (permalink / raw)
To: linux-arm-kernel
The SAM5D3 Xplained device tree is missing hte vqmmc node which is
tied to 3.3V on the board. Add this to avoid the kernel warning that
there is no vqmmc node.
atmel_mci f0000000.mmc: No vqmmc regulator found
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
--
CC: linux-arm-kernel at lists.infradead.org
CC: Andrew Victor <linux@maxim.org.za>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
CC: Rob Herring <robh+dt@kernel.org>
CC: Pawel Moll <pawel.moll@arm.com>
CC: Mark Rutland <mark.rutland@arm.com>
CC: Ian Campbell <ijc+devicetree@hellion.org.uk>
CC: Kumar Gala <galak@codeaurora.org>
CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel at lists.infradead.org
CC: devicetree at vger.kernel.org
---
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 652c4dd..1eb150d 100644
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -36,6 +36,7 @@
mmc0: mmc at f0000000 {
pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7 &pinctrl_mmc0_cd>;
status = "okay";
+ vqmmc-supply = <&vcc_3v3_reg>;
slot at 0 {
reg = <0>;
bus-width = <8>;
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] ARM: at91/dt: sama5d3 add gpio regulator for vmmc0
2015-03-26 17:38 SAM5D3 Xplained MMC device tree updates Ben Dooks
2015-03-26 17:38 ` [PATCH 1/3] ARM: at91/dt: sama5d3 fill in mmc1 and default disabled Ben Dooks
2015-03-26 17:38 ` [PATCH 2/3] ARM: at91/dt: sama5d3 add mmc0 vmmcq entry Ben Dooks
@ 2015-03-26 17:38 ` Ben Dooks
2015-04-21 15:14 ` Ludovic Desroches
2 siblings, 1 reply; 7+ messages in thread
From: Ben Dooks @ 2015-03-26 17:38 UTC (permalink / raw)
To: linux-arm-kernel
Add gpio regulator for vmmc0 and attach the vmmc for it to the mmc0
node on the SAM5D3 Xplained board. This will remove the following
warning from the kernel:
atmel_mci f0000000.mmc: No vmmc regulator found
Note, atmel_defconfig will need gpio regulator support enabled if this
is to be used properly.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
--
CC: Andrew Victor <linux@maxim.org.za>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
CC: Rob Herring <robh+dt@kernel.org>
CC: Pawel Moll <pawel.moll@arm.com>
CC: Mark Rutland <mark.rutland@arm.com>
CC: Ian Campbell <ijc+devicetree@hellion.org.uk>
CC: Kumar Gala <galak@codeaurora.org>
CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel at lists.infradead.org
CC: devicetree at vger.kernel.org
---
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 1eb150d..6b6ad5c 100644
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -36,6 +36,7 @@
mmc0: mmc at f0000000 {
pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7 &pinctrl_mmc0_cd>;
status = "okay";
+ vmmc-supply = <&vcc_mmc0_reg>;
vqmmc-supply = <&vcc_3v3_reg>;
slot at 0 {
reg = <0>;
@@ -285,6 +286,14 @@
};
};
+ vcc_mmc0_reg: regulator at 1 {
+ compatible = "regualtor-gpio";
+ gpio = <&pioE 2 GPIO_ACTIVE_LOW>;
+ regulator-name = "mmc0-card-supply";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+
gpio_keys {
compatible = "gpio-keys";
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 1/3] ARM: at91/dt: sama5d3 fill in mmc1 and default disabled
2015-03-26 17:38 ` [PATCH 1/3] ARM: at91/dt: sama5d3 fill in mmc1 and default disabled Ben Dooks
@ 2015-04-21 15:09 ` Ludovic Desroches
0 siblings, 0 replies; 7+ messages in thread
From: Ludovic Desroches @ 2015-04-21 15:09 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 26, 2015 at 05:38:23PM +0000, Ben Dooks wrote:
> The mmc1 channel is not populated on the SAM5D3 Xplained board, however
> it is enabled and therefore the driver is attaching to it.
>
> The node configuration for mmc1 is missing, so add an mmc1 node in the
> device tree so add the basic node, set it to default it to disabled. Also
> add the vmmc and also the necessary slot configuration if this node
> where to be enabled to avoid the following warnings from the driver.
>
> atmel_mci f8000000.mmc: No vmmc regulator found
> atmel_mci f8000000.mmc: No vqmmc regulator found
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> --
> CC: linux-arm-kernel at lists.infradead.org
> CC: Andrew Victor <linux@maxim.org.za>
> CC: Nicolas Ferre <nicolas.ferre@atmel.com>
> CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> CC: Rob Herring <robh+dt@kernel.org>
> CC: Pawel Moll <pawel.moll@arm.com>
> CC: Mark Rutland <mark.rutland@arm.com>
> CC: Ian Campbell <ijc+devicetree@hellion.org.uk>
> CC: Kumar Gala <galak@codeaurora.org>
> CC: Russell King <linux@arm.linux.org.uk>
> CC: linux-arm-kernel at lists.infradead.org
> CC: devicetree at vger.kernel.org
> ---
> arch/arm/boot/dts/at91-sama5d3_xplained.dts | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> index fec1fca..652c4dd 100644
> --- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> +++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> @@ -43,6 +43,17 @@
> };
> };
>
> + mmc1: mmc at f8000000 {
> + vmmc-supply = <&vcc_3v3_reg>;
> + vqmmc-supply = <&vcc_3v3_reg>;
> + status = "disabled";
> + slot at 0 {
> + reg = <0>;
> + bus-width = <4>;
> + cd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>;
> + };
> + };
> +
> spi0: spi at f0004000 {
> cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;
> status = "okay";
> --
> 2.1.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] ARM: at91/dt: sama5d3 add mmc0 vmmcq entry
2015-03-26 17:38 ` [PATCH 2/3] ARM: at91/dt: sama5d3 add mmc0 vmmcq entry Ben Dooks
@ 2015-04-21 15:13 ` Ludovic Desroches
0 siblings, 0 replies; 7+ messages in thread
From: Ludovic Desroches @ 2015-04-21 15:13 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 26, 2015 at 05:38:24PM +0000, Ben Dooks wrote:
> The SAM5D3 Xplained device tree is missing hte vqmmc node which is
> tied to 3.3V on the board. Add this to avoid the kernel warning that
> there is no vqmmc node.
>
> atmel_mci f0000000.mmc: No vqmmc regulator found
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> --
> CC: linux-arm-kernel at lists.infradead.org
> CC: Andrew Victor <linux@maxim.org.za>
> CC: Nicolas Ferre <nicolas.ferre@atmel.com>
> CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> CC: Rob Herring <robh+dt@kernel.org>
> CC: Pawel Moll <pawel.moll@arm.com>
> CC: Mark Rutland <mark.rutland@arm.com>
> CC: Ian Campbell <ijc+devicetree@hellion.org.uk>
> CC: Kumar Gala <galak@codeaurora.org>
> CC: Russell King <linux@arm.linux.org.uk>
> CC: linux-arm-kernel at lists.infradead.org
> CC: devicetree at vger.kernel.org
> ---
> arch/arm/boot/dts/at91-sama5d3_xplained.dts | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> index 652c4dd..1eb150d 100644
> --- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> +++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> @@ -36,6 +36,7 @@
> mmc0: mmc at f0000000 {
> pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7 &pinctrl_mmc0_cd>;
> status = "okay";
> + vqmmc-supply = <&vcc_3v3_reg>;
above status would be better, usually we keep status at the latest
property even if in this cas we have slot after... Otherwise
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> slot at 0 {
> reg = <0>;
> bus-width = <8>;
> --
> 2.1.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] ARM: at91/dt: sama5d3 add gpio regulator for vmmc0
2015-03-26 17:38 ` [PATCH 3/3] ARM: at91/dt: sama5d3 add gpio regulator for vmmc0 Ben Dooks
@ 2015-04-21 15:14 ` Ludovic Desroches
0 siblings, 0 replies; 7+ messages in thread
From: Ludovic Desroches @ 2015-04-21 15:14 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 26, 2015 at 05:38:25PM +0000, Ben Dooks wrote:
> Add gpio regulator for vmmc0 and attach the vmmc for it to the mmc0
> node on the SAM5D3 Xplained board. This will remove the following
> warning from the kernel:
>
> atmel_mci f0000000.mmc: No vmmc regulator found
>
> Note, atmel_defconfig will need gpio regulator support enabled if this
> is to be used properly.
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> --
> CC: Andrew Victor <linux@maxim.org.za>
> CC: Nicolas Ferre <nicolas.ferre@atmel.com>
> CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> CC: Rob Herring <robh+dt@kernel.org>
> CC: Pawel Moll <pawel.moll@arm.com>
> CC: Mark Rutland <mark.rutland@arm.com>
> CC: Ian Campbell <ijc+devicetree@hellion.org.uk>
> CC: Kumar Gala <galak@codeaurora.org>
> CC: Russell King <linux@arm.linux.org.uk>
> CC: linux-arm-kernel at lists.infradead.org
> CC: devicetree at vger.kernel.org
> ---
> arch/arm/boot/dts/at91-sama5d3_xplained.dts | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> index 1eb150d..6b6ad5c 100644
> --- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> +++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> @@ -36,6 +36,7 @@
> mmc0: mmc at f0000000 {
> pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7 &pinctrl_mmc0_cd>;
> status = "okay";
> + vmmc-supply = <&vcc_mmc0_reg>;
> vqmmc-supply = <&vcc_3v3_reg>;
> slot at 0 {
> reg = <0>;
> @@ -285,6 +286,14 @@
> };
> };
>
> + vcc_mmc0_reg: regulator at 1 {
> + compatible = "regualtor-gpio";
typo here and I think it is a fixed regulator and not a gpio one since
we can't configure voltage.
> + gpio = <&pioE 2 GPIO_ACTIVE_LOW>;
> + regulator-name = "mmc0-card-supply";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + };
> +
> gpio_keys {
> compatible = "gpio-keys";
>
> --
> 2.1.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-04-21 15:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-26 17:38 SAM5D3 Xplained MMC device tree updates Ben Dooks
2015-03-26 17:38 ` [PATCH 1/3] ARM: at91/dt: sama5d3 fill in mmc1 and default disabled Ben Dooks
2015-04-21 15:09 ` Ludovic Desroches
2015-03-26 17:38 ` [PATCH 2/3] ARM: at91/dt: sama5d3 add mmc0 vmmcq entry Ben Dooks
2015-04-21 15:13 ` Ludovic Desroches
2015-03-26 17:38 ` [PATCH 3/3] ARM: at91/dt: sama5d3 add gpio regulator for vmmc0 Ben Dooks
2015-04-21 15:14 ` Ludovic Desroches
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).