* [PATCH] ARM: dts: imx6q-arm2: move NANDF_CS pins out of 'hog'
@ 2012-10-15 8:48 Shawn Guo
2012-10-15 12:45 ` Huang Shijie
0 siblings, 1 reply; 4+ messages in thread
From: Shawn Guo @ 2012-10-15 8:48 UTC (permalink / raw)
To: linux-arm-kernel
Commit 9e3c0066 (ARM: dts: imx6q-arm2: add pinctrl for uart and enet)
defines NANDF_CS pins as gpio in 'hog', assuming these two pins are
always used by usdhc3 in gpio mode as card-detection and
write-protection on ARM2 board. But it's not true. These pins are
shared by usdhc3 and gpmi-nand. We should have the pins functional
for gpmi-nand when usdhc3 is disabled.
Move the pins out of 'hog', so that pins only work in gpio mode as CD
and WP when usdhc3 is enabled, and otherwise they are available for
gpmi-nand.
Reported-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
Huang,
Please help test the patch to see if it fixes your problem, thanks.
Shawn
arch/arm/boot/dts/imx6q-arm2.dts | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index 15df4c1..5bfa02a 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -37,6 +37,13 @@
pinctrl_hog: hoggrp {
fsl,pins = <
176 0x80000000 /* MX6Q_PAD_EIM_D25__GPIO_3_25 */
+ >;
+ };
+ };
+
+ arm2 {
+ pinctrl_usdhc3_arm2: usdhc3grp-arm2 {
+ fsl,pins = <
1363 0x80000000 /* MX6Q_PAD_NANDF_CS0__GPIO_6_11 */
1369 0x80000000 /* MX6Q_PAD_NANDF_CS1__GPIO_6_14 */
>;
@@ -58,7 +65,8 @@
wp-gpios = <&gpio6 14 0>;
vmmc-supply = <®_3p3v>;
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc3_1>;
+ pinctrl-0 = <&pinctrl_usdhc3_1
+ &pinctrl_usdhc3_arm2>;
status = "okay";
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] ARM: dts: imx6q-arm2: move NANDF_CS pins out of 'hog'
2012-10-15 8:48 [PATCH] ARM: dts: imx6q-arm2: move NANDF_CS pins out of 'hog' Shawn Guo
@ 2012-10-15 12:45 ` Huang Shijie
2012-10-15 13:35 ` Shawn Guo
0 siblings, 1 reply; 4+ messages in thread
From: Huang Shijie @ 2012-10-15 12:45 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Oct 15, 2012 at 4:48 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> Commit 9e3c0066 (ARM: dts: imx6q-arm2: add pinctrl for uart and enet)
> defines NANDF_CS pins as gpio in 'hog', assuming these two pins are
> always used by usdhc3 in gpio mode as card-detection and
> write-protection on ARM2 board. But it's not true. These pins are
> shared by usdhc3 and gpmi-nand. We should have the pins functional
> for gpmi-nand when usdhc3 is disabled.
>
> Move the pins out of 'hog', so that pins only work in gpio mode as CD
> and WP when usdhc3 is enabled, and otherwise they are available for
> gpmi-nand.
>
> Reported-by: Huang Shijie <b32955@freescale.com>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> Huang,
>
> Please help test the patch to see if it fixes your problem, thanks.
yes, this patch fixes the problem.
thanks a lot.
Tested-by: Huang Shijie <shijie8@gmail.com>
Huang Shijie
>
> Shawn
>
> arch/arm/boot/dts/imx6q-arm2.dts | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
> index 15df4c1..5bfa02a 100644
> --- a/arch/arm/boot/dts/imx6q-arm2.dts
> +++ b/arch/arm/boot/dts/imx6q-arm2.dts
> @@ -37,6 +37,13 @@
> pinctrl_hog: hoggrp {
> fsl,pins = <
> 176 0x80000000 /* MX6Q_PAD_EIM_D25__GPIO_3_25 */
> + >;
> + };
> + };
> +
> + arm2 {
> + pinctrl_usdhc3_arm2: usdhc3grp-arm2 {
> + fsl,pins = <
> 1363 0x80000000 /* MX6Q_PAD_NANDF_CS0__GPIO_6_11 */
> 1369 0x80000000 /* MX6Q_PAD_NANDF_CS1__GPIO_6_14 */
> >;
> @@ -58,7 +65,8 @@
> wp-gpios = <&gpio6 14 0>;
> vmmc-supply = <®_3p3v>;
> pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_usdhc3_1>;
> + pinctrl-0 = <&pinctrl_usdhc3_1
> + &pinctrl_usdhc3_arm2>;
> status = "okay";
> };
>
> --
> 1.7.9.5
>
>
> _______________________________________________
> 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] 4+ messages in thread* [PATCH] ARM: dts: imx6q-arm2: move NANDF_CS pins out of 'hog'
2012-10-15 12:45 ` Huang Shijie
@ 2012-10-15 13:35 ` Shawn Guo
2012-10-16 17:07 ` Olof Johansson
0 siblings, 1 reply; 4+ messages in thread
From: Shawn Guo @ 2012-10-15 13:35 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Oct 15, 2012 at 08:45:48AM -0400, Huang Shijie wrote:
> On Mon, Oct 15, 2012 at 4:48 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > Commit 9e3c0066 (ARM: dts: imx6q-arm2: add pinctrl for uart and enet)
> > defines NANDF_CS pins as gpio in 'hog', assuming these two pins are
> > always used by usdhc3 in gpio mode as card-detection and
> > write-protection on ARM2 board. But it's not true. These pins are
> > shared by usdhc3 and gpmi-nand. We should have the pins functional
> > for gpmi-nand when usdhc3 is disabled.
> >
> > Move the pins out of 'hog', so that pins only work in gpio mode as CD
> > and WP when usdhc3 is enabled, and otherwise they are available for
> > gpmi-nand.
> >
> > Reported-by: Huang Shijie <b32955@freescale.com>
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > ---
> > Huang,
> >
> > Please help test the patch to see if it fixes your problem, thanks.
>
> yes, this patch fixes the problem.
> thanks a lot.
>
> Tested-by: Huang Shijie <shijie8@gmail.com>
>
Arnd, Olof,
Can you please send it for later -rc, since it fixes a regression
in -rc1?
Shawn
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: imx6q-arm2: move NANDF_CS pins out of 'hog'
2012-10-15 13:35 ` Shawn Guo
@ 2012-10-16 17:07 ` Olof Johansson
0 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2012-10-16 17:07 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Oct 15, 2012 at 09:35:20PM +0800, Shawn Guo wrote:
> On Mon, Oct 15, 2012 at 08:45:48AM -0400, Huang Shijie wrote:
> > On Mon, Oct 15, 2012 at 4:48 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > > Commit 9e3c0066 (ARM: dts: imx6q-arm2: add pinctrl for uart and enet)
> > > defines NANDF_CS pins as gpio in 'hog', assuming these two pins are
> > > always used by usdhc3 in gpio mode as card-detection and
> > > write-protection on ARM2 board. But it's not true. These pins are
> > > shared by usdhc3 and gpmi-nand. We should have the pins functional
> > > for gpmi-nand when usdhc3 is disabled.
> > >
> > > Move the pins out of 'hog', so that pins only work in gpio mode as CD
> > > and WP when usdhc3 is enabled, and otherwise they are available for
> > > gpmi-nand.
> > >
> > > Reported-by: Huang Shijie <b32955@freescale.com>
> > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > > ---
> > > Huang,
> > >
> > > Please help test the patch to see if it fixes your problem, thanks.
> >
> > yes, this patch fixes the problem.
> > thanks a lot.
> >
> > Tested-by: Huang Shijie <shijie8@gmail.com>
> >
> Arnd, Olof,
>
> Can you please send it for later -rc, since it fixes a regression
> in -rc1?
Done, applied to fixes and will be sent up with the next batch for
3.7-rc2.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-16 17:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-15 8:48 [PATCH] ARM: dts: imx6q-arm2: move NANDF_CS pins out of 'hog' Shawn Guo
2012-10-15 12:45 ` Huang Shijie
2012-10-15 13:35 ` Shawn Guo
2012-10-16 17:07 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox