public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: dts: imx28: add pinmuxing for mmc1
@ 2014-08-08  9:24 Uwe Kleine-König
  2014-08-08  9:24 ` [PATCH 2/2] ARM: dts: imx28: add alternative pinmuxing for i2c1 Uwe Kleine-König
  2014-08-18  6:11 ` [PATCH 1/2] ARM: dts: imx28: add pinmuxing for mmc1 Shawn Guo
  0 siblings, 2 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2014-08-08  9:24 UTC (permalink / raw)
  To: linux-arm-kernel

From: Marc Kleine-Budde <mkl@pengutronix.de>

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
[ukl: rebase from ancient kernel version]
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/boot/dts/imx28.dtsi | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index a95cc5358ff4..defb98a5b045 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -489,6 +489,38 @@
 					fsl,pull-up = <MXS_PULL_DISABLE>;
 				};
 
+				mmc1_4bit_pins_a: mmc1-4bit at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						MX28_PAD_GPMI_D00__SSP1_D0
+						MX28_PAD_GPMI_D01__SSP1_D1
+						MX28_PAD_GPMI_D02__SSP1_D2
+						MX28_PAD_GPMI_D03__SSP1_D3
+						MX28_PAD_GPMI_RDY1__SSP1_CMD
+						MX28_PAD_GPMI_RDY0__SSP1_CARD_DETECT
+						MX28_PAD_GPMI_WRN__SSP1_SCK
+					>;
+					fsl,drive-strength = <MXS_DRIVE_8mA>;
+					fsl,voltage = <MXS_VOLTAGE_HIGH>;
+					fsl,pull-up = <MXS_PULL_ENABLE>;
+				};
+
+				mmc1_cd_cfg: mmc1-cd-cfg {
+					fsl,pinmux-ids = <
+						MX28_PAD_GPMI_RDY0__SSP1_CARD_DETECT
+					>;
+					fsl,pull-up = <MXS_PULL_DISABLE>;
+				};
+
+				mmc1_sck_cfg: mmc1-sck-cfg {
+					fsl,pinmux-ids = <
+						MX28_PAD_GPMI_WRN__SSP1_SCK
+					>;
+					fsl,drive-strength = <MXS_DRIVE_12mA>;
+					fsl,pull-up = <MXS_PULL_DISABLE>;
+				};
+
+
 				mmc2_4bit_pins_a: mmc2-4bit at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
-- 
2.0.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/2] ARM: dts: imx28: add alternative pinmuxing for i2c1
  2014-08-08  9:24 [PATCH 1/2] ARM: dts: imx28: add pinmuxing for mmc1 Uwe Kleine-König
@ 2014-08-08  9:24 ` Uwe Kleine-König
  2014-08-18  6:11 ` [PATCH 1/2] ARM: dts: imx28: add pinmuxing for mmc1 Shawn Guo
  1 sibling, 0 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2014-08-08  9:24 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/boot/dts/imx28.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index defb98a5b045..47f68ac868d4 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -585,6 +585,17 @@
 					fsl,pull-up = <MXS_PULL_ENABLE>;
 				};
 
+				i2c1_pins_b: i2c1 at 1 {
+					reg = <1>;
+					fsl,pinmux-ids = <
+						MX28_PAD_AUART2_CTS__I2C1_SCL
+						MX28_PAD_AUART2_RTS__I2C1_SDA
+					>;
+					fsl,drive-strength = <MXS_DRIVE_8mA>;
+					fsl,voltage = <MXS_VOLTAGE_HIGH>;
+					fsl,pull-up = <MXS_PULL_ENABLE>;
+				};
+
 				saif0_pins_a: saif0 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
-- 
2.0.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 1/2] ARM: dts: imx28: add pinmuxing for mmc1
  2014-08-08  9:24 [PATCH 1/2] ARM: dts: imx28: add pinmuxing for mmc1 Uwe Kleine-König
  2014-08-08  9:24 ` [PATCH 2/2] ARM: dts: imx28: add alternative pinmuxing for i2c1 Uwe Kleine-König
@ 2014-08-18  6:11 ` Shawn Guo
  1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2014-08-18  6:11 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Aug 08, 2014 at 11:24:21AM +0200, Uwe Kleine-K?nig wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> [ukl: rebase from ancient kernel version]
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> ---
>  arch/arm/boot/dts/imx28.dtsi | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)

Applied both, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-08-18  6:11 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-08  9:24 [PATCH 1/2] ARM: dts: imx28: add pinmuxing for mmc1 Uwe Kleine-König
2014-08-08  9:24 ` [PATCH 2/2] ARM: dts: imx28: add alternative pinmuxing for i2c1 Uwe Kleine-König
2014-08-18  6:11 ` [PATCH 1/2] ARM: dts: imx28: add pinmuxing for mmc1 Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox