* [PATCH 1/2] ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio
@ 2014-05-07 18:09 Lucas Stach
2014-05-07 18:09 ` [PATCH 2/2] ARM: dts: imx6: edmqmx6: add SPI bus and flash Lucas Stach
2014-05-08 3:43 ` [PATCH 1/2] ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio Shawn Guo
0 siblings, 2 replies; 3+ messages in thread
From: Lucas Stach @ 2014-05-07 18:09 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
index e4ae38fd0269..be5de70fe86a 100644
--- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@@ -105,7 +105,8 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2
&pinctrl_stmpe1
- &pinctrl_stmpe2>;
+ &pinctrl_stmpe2
+ &pinctrl_pfuze>;
status = "okay";
pmic: pfuze100 at 08 {
@@ -291,6 +292,12 @@
>;
};
+ pinctrl_pfuze: pfuze100grp1 {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x80000000
+ >;
+ };
+
pinctrl_stmpe1: stmpe1grp {
fsl,pins = <MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000>;
};
--
2.0.0.rc0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: dts: imx6: edmqmx6: add SPI bus and flash
2014-05-07 18:09 [PATCH 1/2] ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio Lucas Stach
@ 2014-05-07 18:09 ` Lucas Stach
2014-05-08 3:43 ` [PATCH 1/2] ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Lucas Stach @ 2014-05-07 18:09 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
index be5de70fe86a..58791d0eaaf8 100644
--- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@@ -91,6 +91,20 @@
};
};
+&ecspi5 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi5>;
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio1 12 0>;
+ status = "okay";
+
+ flash: m25p80 at 0 {
+ compatible = "m25p80";
+ spi-max-frequency = <40000000>;
+ reg = <0>;
+ };
+};
+
&fec {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
@@ -264,6 +278,15 @@
>;
};
+ pinctrl_ecspi5: ecspi5rp-1 {
+ fsl,pins = <
+ MX6QDL_PAD_SD1_DAT0__ECSPI5_MISO 0x80000000
+ MX6QDL_PAD_SD1_CMD__ECSPI5_MOSI 0x80000000
+ MX6QDL_PAD_SD1_CLK__ECSPI5_SCLK 0x80000000
+ MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x80000000
+ >;
+ };
+
pinctrl_enet: enetgrp {
fsl,pins = <
MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
--
2.0.0.rc0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio
2014-05-07 18:09 [PATCH 1/2] ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio Lucas Stach
2014-05-07 18:09 ` [PATCH 2/2] ARM: dts: imx6: edmqmx6: add SPI bus and flash Lucas Stach
@ 2014-05-08 3:43 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2014-05-08 3:43 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, May 07, 2014 at 08:09:04PM +0200, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
Applied both.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-08 3:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-07 18:09 [PATCH 1/2] ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio Lucas Stach
2014-05-07 18:09 ` [PATCH 2/2] ARM: dts: imx6: edmqmx6: add SPI bus and flash Lucas Stach
2014-05-08 3:43 ` [PATCH 1/2] ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox