* [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data
@ 2013-04-21 21:30 Marek Vasut
2013-04-21 21:30 ` [PATCH 2/8] ARM: mx5: Add CAN1 " Marek Vasut
` (7 more replies)
0 siblings, 8 replies; 15+ messages in thread
From: Marek Vasut @ 2013-04-21 21:30 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds pinctrl data for the AUDMUX4 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/boot/dts/imx53.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index c4ddf51..fb701bb 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -298,6 +298,15 @@
MX53_PAD_KEY_ROW1__AUDMUX_AUD5_RXD 0x80000000
>;
};
+
+ pinctrl_audmux_2: audmuxgrp-2 {
+ fsl,pins = <
+ MX53_PAD_SD2_DATA3__AUDMUX_AUD4_TXC 0x80000000
+ MX53_PAD_SD2_DATA2__AUDMUX_AUD4_TXD 0x80000000
+ MX53_PAD_SD2_DATA1__AUDMUX_AUD4_TXFS 0x80000000
+ MX53_PAD_SD2_DATA0__AUDMUX_AUD4_RXD 0x80000000
+ >;
+ };
};
fec {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/8] ARM: mx5: Add CAN1 pinctrl data
2013-04-21 21:30 [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Marek Vasut
@ 2013-04-21 21:30 ` Marek Vasut
2013-04-21 21:30 ` [PATCH 3/8] ARM: mx5: Add I2C1 " Marek Vasut
` (6 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Marek Vasut @ 2013-04-21 21:30 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds pinctrl data for different mux of CAN1 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/boot/dts/imx53.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index fb701bb..6a2f5a8 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -446,6 +446,13 @@
MX53_PAD_KEY_ROW2__CAN1_RXCAN 0x80000000
>;
};
+
+ pinctrl_can1_3: can1grp-3 {
+ fsl,pins = <
+ MX53_PAD_GPIO_7__CAN1_TXCAN 0x80000000
+ MX53_PAD_GPIO_8__CAN1_RXCAN 0x80000000
+ >;
+ };
};
can2 {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/8] ARM: mx5: Add I2C1 pinctrl data
2013-04-21 21:30 [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Marek Vasut
2013-04-21 21:30 ` [PATCH 2/8] ARM: mx5: Add CAN1 " Marek Vasut
@ 2013-04-21 21:30 ` Marek Vasut
2013-04-21 21:30 ` [PATCH 4/8] ARM: mx5: Add I2C2 " Marek Vasut
` (5 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Marek Vasut @ 2013-04-21 21:30 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds pinctrl data for different mux of I2C1 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/boot/dts/imx53.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 6a2f5a8..1f6868d 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -471,6 +471,13 @@
MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000
>;
};
+
+ pinctrl_i2c1_2: i2c1grp-2 {
+ fsl,pins = <
+ MX53_PAD_EIM_D21__I2C1_SCL 0xc0000000
+ MX53_PAD_EIM_D28__I2C1_SDA 0xc0000000
+ >;
+ };
};
i2c2 {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 4/8] ARM: mx5: Add I2C2 pinctrl data
2013-04-21 21:30 [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Marek Vasut
2013-04-21 21:30 ` [PATCH 2/8] ARM: mx5: Add CAN1 " Marek Vasut
2013-04-21 21:30 ` [PATCH 3/8] ARM: mx5: Add I2C1 " Marek Vasut
@ 2013-04-21 21:30 ` Marek Vasut
2013-04-21 21:30 ` [PATCH 5/8] ARM: mx5: Add NAND " Marek Vasut
` (4 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Marek Vasut @ 2013-04-21 21:30 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds pinctrl data for different mux of I2C2 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/boot/dts/imx53.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 1f6868d..09145e2 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -487,6 +487,13 @@
MX53_PAD_KEY_COL3__I2C2_SCL 0xc0000000
>;
};
+
+ pinctrl_i2c2_2: i2c2grp-2 {
+ fsl,pins = <
+ MX53_PAD_EIM_D16__I2C2_SDA 0xc0000000
+ MX53_PAD_EIM_EB2__I2C2_SCL 0xc0000000
+ >;
+ };
};
i2c3 {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 5/8] ARM: mx5: Add NAND pinctrl data
2013-04-21 21:30 [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Marek Vasut
` (2 preceding siblings ...)
2013-04-21 21:30 ` [PATCH 4/8] ARM: mx5: Add I2C2 " Marek Vasut
@ 2013-04-21 21:30 ` Marek Vasut
2013-04-22 5:02 ` Shawn Guo
2013-04-21 21:30 ` [PATCH 6/8] ARM: mx5: Add LCD IPU " Marek Vasut
` (3 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Marek Vasut @ 2013-04-21 21:30 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds pinctrl data for NAND on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/boot/dts/imx53.dtsi | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 09145e2..7574026 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -575,6 +575,27 @@
};
};
+ nand {
+ pinctrl_nand_1: nandgrp-1 {
+ fsl,pins = <
+ MX53_PAD_NANDF_WE_B__EMI_NANDF_WE_B 0x4
+ MX53_PAD_NANDF_RE_B__EMI_NANDF_RE_B 0x4
+ MX53_PAD_NANDF_CLE__EMI_NANDF_CLE 0x4
+ MX53_PAD_NANDF_ALE__EMI_NANDF_ALE 0x4
+ MX53_PAD_NANDF_WP_B__EMI_NANDF_WP_B 0xe0
+ MX53_PAD_NANDF_RB0__EMI_NANDF_RB_0 0xe0
+ MX53_PAD_NANDF_CS0__EMI_NANDF_CS_0 0x4
+ MX53_PAD_PATA_DATA0__EMI_NANDF_D_0 0xa4
+ MX53_PAD_PATA_DATA1__EMI_NANDF_D_1 0xa4
+ MX53_PAD_PATA_DATA2__EMI_NANDF_D_2 0xa4
+ MX53_PAD_PATA_DATA3__EMI_NANDF_D_3 0xa4
+ MX53_PAD_PATA_DATA4__EMI_NANDF_D_4 0xa4
+ MX53_PAD_PATA_DATA5__EMI_NANDF_D_5 0xa4
+ MX53_PAD_PATA_DATA6__EMI_NANDF_D_6 0xa4
+ MX53_PAD_PATA_DATA7__EMI_NANDF_D_7 0xa4
+ >;
+ };
+ };
};
gpr: iomuxc-gpr at 53fa8000 {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 6/8] ARM: mx5: Add LCD IPU pinctrl data
2013-04-21 21:30 [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Marek Vasut
` (3 preceding siblings ...)
2013-04-21 21:30 ` [PATCH 5/8] ARM: mx5: Add NAND " Marek Vasut
@ 2013-04-21 21:30 ` Marek Vasut
2013-04-22 5:05 ` Shawn Guo
2013-04-21 21:30 ` [PATCH 7/8] ARM: mx5: Add PWM1 " Marek Vasut
` (2 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Marek Vasut @ 2013-04-21 21:30 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds pinmux for IPU LCD 1 and IPU LVDS.
Signed-off-by: Marek Vasut <marex@denx.de>
---
arch/arm/boot/dts/imx53.dtsi | 57 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 7574026..91fc8cc 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -513,6 +513,63 @@
};
};
+ ipu_disp1 {
+ pinctrl_ipu_disp1_1: ipudisp1grp-1 {
+ fsl,pins = <
+ MX53_PAD_EIM_DA9__IPU_DISP1_DAT_0 0x5
+ MX53_PAD_EIM_DA8__IPU_DISP1_DAT_1 0x5
+ MX53_PAD_EIM_DA7__IPU_DISP1_DAT_2 0x5
+ MX53_PAD_EIM_DA6__IPU_DISP1_DAT_3 0x5
+ MX53_PAD_EIM_DA5__IPU_DISP1_DAT_4 0x5
+ MX53_PAD_EIM_DA4__IPU_DISP1_DAT_5 0x5
+ MX53_PAD_EIM_DA3__IPU_DISP1_DAT_6 0x5
+ MX53_PAD_EIM_DA2__IPU_DISP1_DAT_7 0x5
+ MX53_PAD_EIM_DA1__IPU_DISP1_DAT_8 0x5
+ MX53_PAD_EIM_DA0__IPU_DISP1_DAT_9 0x5
+ MX53_PAD_EIM_EB1__IPU_DISP1_DAT_10 0x5
+ MX53_PAD_EIM_EB0__IPU_DISP1_DAT_11 0x5
+ MX53_PAD_EIM_A17__IPU_DISP1_DAT_12 0x5
+ MX53_PAD_EIM_A18__IPU_DISP1_DAT_13 0x5
+ MX53_PAD_EIM_A19__IPU_DISP1_DAT_14 0x5
+ MX53_PAD_EIM_A20__IPU_DISP1_DAT_15 0x5
+ MX53_PAD_EIM_A21__IPU_DISP1_DAT_16 0x5
+ MX53_PAD_EIM_A22__IPU_DISP1_DAT_17 0x5
+ MX53_PAD_EIM_A23__IPU_DISP1_DAT_18 0x5
+ MX53_PAD_EIM_A24__IPU_DISP1_DAT_19 0x5
+ MX53_PAD_EIM_D31__IPU_DISP1_DAT_20 0x5
+ MX53_PAD_EIM_D30__IPU_DISP1_DAT_21 0x5
+ MX53_PAD_EIM_D26__IPU_DISP1_DAT_22 0x5
+ MX53_PAD_EIM_D27__IPU_DISP1_DAT_23 0x5
+ MX53_PAD_EIM_A16__IPU_DI1_DISP_CLK 0x5
+ MX53_PAD_EIM_DA13__IPU_DI1_D0_CS 0x5
+ MX53_PAD_EIM_DA14__IPU_DI1_D1_CS 0x5
+ MX53_PAD_EIM_DA15__IPU_DI1_PIN1 0x5
+ MX53_PAD_EIM_DA11__IPU_DI1_PIN2 0x5
+ MX53_PAD_EIM_DA12__IPU_DI1_PIN3 0x5
+ MX53_PAD_EIM_A25__IPU_DI1_PIN12 0x5
+ MX53_PAD_EIM_DA10__IPU_DI1_PIN15 0x5
+ >;
+ };
+ };
+
+ ipu_disp2 {
+ pinctrl_ipu_disp2_1: ipudisp2grp-1 {
+ fsl,pins = <
+ MX53_PAD_LVDS0_TX0_P__LDB_LVDS0_TX0 0x80000000
+ MX53_PAD_LVDS0_TX1_P__LDB_LVDS0_TX1 0x80000000
+ MX53_PAD_LVDS0_TX2_P__LDB_LVDS0_TX2 0x80000000
+ MX53_PAD_LVDS0_TX3_P__LDB_LVDS0_TX3 0x80000000
+ MX53_PAD_LVDS0_CLK_P__LDB_LVDS0_CLK 0x80000000
+
+ MX53_PAD_LVDS1_TX0_P__LDB_LVDS1_TX0 0x80000000
+ MX53_PAD_LVDS1_TX1_P__LDB_LVDS1_TX1 0x80000000
+ MX53_PAD_LVDS1_TX2_P__LDB_LVDS1_TX2 0x80000000
+ MX53_PAD_LVDS1_TX3_P__LDB_LVDS1_TX3 0x80000000
+ MX53_PAD_LVDS1_CLK_P__LDB_LVDS1_CLK 0x80000000
+ >;
+ };
+ };
+
uart1 {
pinctrl_uart1_1: uart1grp-1 {
fsl,pins = <
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 7/8] ARM: mx5: Add PWM1 pinctrl data
2013-04-21 21:30 [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Marek Vasut
` (4 preceding siblings ...)
2013-04-21 21:30 ` [PATCH 6/8] ARM: mx5: Add LCD IPU " Marek Vasut
@ 2013-04-21 21:30 ` Marek Vasut
2013-04-22 5:05 ` Shawn Guo
2013-04-21 21:30 ` [PATCH 8/8] ARM: mx5: Add support for DENX M53EVK Marek Vasut
2013-04-22 5:00 ` [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Shawn Guo
7 siblings, 1 reply; 15+ messages in thread
From: Marek Vasut @ 2013-04-21 21:30 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds pinctrl data for PWM1 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
---
arch/arm/boot/dts/imx53.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 91fc8cc..c343ba6 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -653,6 +653,14 @@
>;
};
};
+
+ pwm1 {
+ pinctrl_pwm1_1: pwm1grp-1 {
+ fsl,pins = <
+ MX53_PAD_DISP0_DAT8__PWM1_PWMO 0x5
+ >;
+ };
+ };
};
gpr: iomuxc-gpr at 53fa8000 {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 8/8] ARM: mx5: Add support for DENX M53EVK
2013-04-21 21:30 [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Marek Vasut
` (5 preceding siblings ...)
2013-04-21 21:30 ` [PATCH 7/8] ARM: mx5: Add PWM1 " Marek Vasut
@ 2013-04-21 21:30 ` Marek Vasut
2013-04-22 5:19 ` Shawn Guo
2013-04-22 6:41 ` Sascha Hauer
2013-04-22 5:00 ` [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Shawn Guo
7 siblings, 2 replies; 15+ messages in thread
From: Marek Vasut @ 2013-04-21 21:30 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds support for the DENX M53EVK board. The board currently supports
NAND, Ethernet, UART, CAN, I2C.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx53-m53evk.dts | 282 ++++++++++++++++++++++++++++++++++++
arch/arm/mach-imx/mach-imx53.c | 16 +-
3 files changed, 297 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/boot/dts/imx53-m53evk.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 4fd1f62..1fbec6b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -107,6 +107,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx51-babbage.dtb \
imx53-ard.dtb \
imx53-evk.dtb \
+ imx53-m53evk.dtb \
imx53-mba53.dtb \
imx53-qsb.dtb \
imx53-smd.dtb \
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
new file mode 100644
index 0000000..32f8ff4
--- /dev/null
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx53.dtsi"
+
+/ {
+ model = "DENX M53EVK";
+ compatible = "denx,imx53-m53evk", "fsl,imx53";
+
+ memory {
+ reg = <0x70000000 0x20000000>;
+ };
+
+ soc {
+ display at di0 {
+ compatible = "fsl,imx-parallel-display";
+ crtcs = <&ipu 0>;
+ interface-pix-fmt = "rgb24";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ipu_disp1_1>;
+
+ display-timings {
+ 800x480p60 {
+ native-mode;
+ clock-frequency = <31500000>;
+ hactive = <800>;
+ vactive = <480>;
+ hfront-porch = <40>;
+ hback-porch = <88>;
+ hsync-len = <128>;
+ vback-porch = <33>;
+ vfront-porch = <9>;
+ vsync-len = <3>;
+ vsync-active = <1>;
+ };
+ };
+ };
+
+ display at di1 {
+ compatible = "fsl,imx-parallel-display";
+ crtcs = <&ipu 1>;
+ interface-pix-fmt = "rgb24";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ipu_disp2_1>;
+
+ display-timings {
+ 800x480p60 {
+ native-mode;
+ clock-frequency = <31500000>;
+ hactive = <800>;
+ vactive = <480>;
+ hfront-porch = <40>;
+ hback-porch = <88>;
+ hsync-len = <128>;
+ vback-porch = <33>;
+ vfront-porch = <9>;
+ vsync-len = <3>;
+ vsync-active = <1>;
+ };
+ };
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <&led_pin_gpio>;
+
+ user1 {
+ label = "user1";
+ gpios = <&gpio2 8 0>;
+ linux,default-trigger = "heartbeat";
+ };
+
+ user2 {
+ label = "user2";
+ gpios = <&gpio2 9 0>;
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
+
+ reg_3p2v: 3p2v {
+ compatible = "regulator-fixed";
+ regulator-name = "3P2V";
+ regulator-min-microvolt = <3200000>;
+ regulator-max-microvolt = <3200000>;
+ regulator-always-on;
+ };
+ };
+
+ sound {
+ compatible = "fsl,imx53-m53evk-sgtl5000",
+ "fsl,imx-audio-sgtl5000";
+ model = "imx53-m53evk-sgtl5000";
+ ssi-controller = <&ssi2>;
+ audio-codec = <&sgtl5000>;
+ audio-routing =
+ "MIC_IN", "Mic Jack",
+ "Mic Jack", "Mic Bias",
+ "LINE_IN", "Line In Jack",
+ "Headphone Jack", "HP_OUT",
+ "Ext Spk", "LINE_OUT";
+ mux-int-port = <2>;
+ mux-ext-port = <4>;
+ };
+
+ backlight {
+ compatible = "pwm-backlight";
+ pwms = <&pwm1 0 3000>;
+ brightness-levels = <0 4 8 16 32 64 128 255>;
+ default-brightness-level = <6>;
+ };
+};
+
+&esdhc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_esdhc1_1>;
+ cd-gpios = <&gpio1 1 0>;
+ wp-gpios = <&gpio1 9 0>;
+ status = "okay";
+};
+
+&ssi2 {
+ fsl,mode = "i2s-slave";
+ status = "okay";
+};
+
+&uart3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart3_1>;
+ status = "okay";
+};
+
+&pwm1 {
+/* pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm1_1>;*/
+ status = "okay";
+};
+
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart1_2>;
+ status = "okay";
+};
+
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart2_1>;
+ status = "okay";
+};
+
+&iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
+
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
+ MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
+ MX53_PAD_EIM_EB3__GPIO2_31 0x80000000
+ MX53_PAD_PATA_DA_0__GPIO7_6 0x80000000
+ MX53_PAD_DISP0_DAT8__PWM1_PWMO 0x5
+
+ >;
+ };
+
+ led_pin_gpio: led_gpio at 0 {
+ fsl,pins = <
+ MX53_PAD_PATA_DATA8__GPIO2_8 0x80000000
+ MX53_PAD_PATA_DATA9__GPIO2_9 0x80000000
+ >;
+ };
+ };
+};
+
+&can1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_can1_3>;
+ status = "okay";
+};
+
+&can2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_can2_1>;
+ status = "okay";
+};
+
+&i2c1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1_2>;
+ status = "okay";
+
+ sgtl5000: codec at 0a {
+ compatible = "fsl,sgtl5000";
+ reg = <0x0a>;
+ VDDA-supply = <®_3p2v>;
+ VDDIO-supply = <®_3p2v>;
+ };
+};
+
+&i2c2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2_2>;
+ clock-frequency = <400000>;
+ status = "okay";
+
+ stmpe610 at 41 {
+ compatible = "st,stmpe610";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x41>;
+ irq-over-gpio;
+ irq-gpios = <&gpio7 6 0>;
+ id = <0>;
+ blocks = <0x5>;
+ irq-trigger = <0x1>;
+
+ stmpe_touchscreen {
+ compatible = "stmpe,ts";
+ reg = <0>;
+ ts,sample-time = <4>;
+ ts,mod-12b = <1>;
+ ts,ref-sel = <0>;
+ ts,adc-freq = <1>;
+ ts,ave-ctrl = <3>;
+ ts,touch-det-delay = <3>;
+ ts,settling = <4>;
+ ts,fraction-z = <7>;
+ ts,i-drive = <1>;
+ };
+ };
+
+ eeprom: eeprom at 50 {
+ compatible = "atmel,24c128";
+ reg = <0x50>;
+ pagesize = <32>;
+ };
+
+ rtc: rtc at 68 {
+ compatible = "stm,m41t62";
+ reg = <0x68>;
+ };
+};
+
+&i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c3_1>;
+ status = "okay";
+};
+
+&audmux {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_audmux_2>;
+ status = "okay";
+};
+
+&nfc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_nand_1>;
+ nand-bus-width = <8>;
+ nand-ecc-mode = "hw";
+ status = "okay";
+};
+
+&fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_fec_1>;
+ phy-mode = "rmii";
+ status = "okay";
+};
diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c
index f579c61..4effe59 100644
--- a/arch/arm/mach-imx/mach-imx53.c
+++ b/arch/arm/mach-imx/mach-imx53.c
@@ -23,7 +23,7 @@
#include "common.h"
#include "mx53.h"
-static void __init imx53_qsb_init(void)
+static void __init imx53_ssi_clk_init(const char *device)
{
struct clk *clk;
@@ -33,11 +33,23 @@ static void __init imx53_qsb_init(void)
return;
}
- clk_register_clkdev(clk, NULL, "0-000a");
+ clk_register_clkdev(clk, NULL, device);
+}
+
+static void __init imx53_qsb_init(void)
+{
+ imx53_ssi_clk_init("0-000a");
+}
+
+static void __init imx53_m53evk_init(void)
+{
+ imx53_ssi_clk_init("2-000a");
}
static void __init imx53_dt_init(void)
{
+ if (of_machine_is_compatible("denx,imx53-m53evk"))
+ imx53_m53evk_init();
if (of_machine_is_compatible("fsl,imx53-qsb"))
imx53_qsb_init();
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data
2013-04-21 21:30 [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Marek Vasut
` (6 preceding siblings ...)
2013-04-21 21:30 ` [PATCH 8/8] ARM: mx5: Add support for DENX M53EVK Marek Vasut
@ 2013-04-22 5:00 ` Shawn Guo
2013-04-22 8:47 ` Marek Vasut
7 siblings, 1 reply; 15+ messages in thread
From: Shawn Guo @ 2013-04-22 5:00 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 21, 2013 at 11:30:01PM +0200, Marek Vasut wrote:
> This patch adds pinctrl data for the AUDMUX4 on MX53.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
Applied 1~7, with some small fixups (see replies).
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 5/8] ARM: mx5: Add NAND pinctrl data
2013-04-21 21:30 ` [PATCH 5/8] ARM: mx5: Add NAND " Marek Vasut
@ 2013-04-22 5:02 ` Shawn Guo
0 siblings, 0 replies; 15+ messages in thread
From: Shawn Guo @ 2013-04-22 5:02 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 21, 2013 at 11:30:05PM +0200, Marek Vasut wrote:
> This patch adds pinctrl data for NAND on MX53.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> ---
> arch/arm/boot/dts/imx53.dtsi | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
> index 09145e2..7574026 100644
> --- a/arch/arm/boot/dts/imx53.dtsi
> +++ b/arch/arm/boot/dts/imx53.dtsi
> @@ -575,6 +575,27 @@
> };
> };
>
> + nand {
I put it before node "owire" to have it somehow sorted.
Shawn
> + pinctrl_nand_1: nandgrp-1 {
> + fsl,pins = <
> + MX53_PAD_NANDF_WE_B__EMI_NANDF_WE_B 0x4
> + MX53_PAD_NANDF_RE_B__EMI_NANDF_RE_B 0x4
> + MX53_PAD_NANDF_CLE__EMI_NANDF_CLE 0x4
> + MX53_PAD_NANDF_ALE__EMI_NANDF_ALE 0x4
> + MX53_PAD_NANDF_WP_B__EMI_NANDF_WP_B 0xe0
> + MX53_PAD_NANDF_RB0__EMI_NANDF_RB_0 0xe0
> + MX53_PAD_NANDF_CS0__EMI_NANDF_CS_0 0x4
> + MX53_PAD_PATA_DATA0__EMI_NANDF_D_0 0xa4
> + MX53_PAD_PATA_DATA1__EMI_NANDF_D_1 0xa4
> + MX53_PAD_PATA_DATA2__EMI_NANDF_D_2 0xa4
> + MX53_PAD_PATA_DATA3__EMI_NANDF_D_3 0xa4
> + MX53_PAD_PATA_DATA4__EMI_NANDF_D_4 0xa4
> + MX53_PAD_PATA_DATA5__EMI_NANDF_D_5 0xa4
> + MX53_PAD_PATA_DATA6__EMI_NANDF_D_6 0xa4
> + MX53_PAD_PATA_DATA7__EMI_NANDF_D_7 0xa4
> + >;
> + };
> + };
> };
>
> gpr: iomuxc-gpr at 53fa8000 {
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 6/8] ARM: mx5: Add LCD IPU pinctrl data
2013-04-21 21:30 ` [PATCH 6/8] ARM: mx5: Add LCD IPU " Marek Vasut
@ 2013-04-22 5:05 ` Shawn Guo
0 siblings, 0 replies; 15+ messages in thread
From: Shawn Guo @ 2013-04-22 5:05 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 21, 2013 at 11:30:06PM +0200, Marek Vasut wrote:
> This patch adds pinmux for IPU LCD 1 and IPU LVDS.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> ---
> arch/arm/boot/dts/imx53.dtsi | 57 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 57 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
> index 7574026..91fc8cc 100644
> --- a/arch/arm/boot/dts/imx53.dtsi
> +++ b/arch/arm/boot/dts/imx53.dtsi
> @@ -513,6 +513,63 @@
> };
> };
>
> + ipu_disp1 {
> + pinctrl_ipu_disp1_1: ipudisp1grp-1 {
> + fsl,pins = <
> + MX53_PAD_EIM_DA9__IPU_DISP1_DAT_0 0x5
> + MX53_PAD_EIM_DA8__IPU_DISP1_DAT_1 0x5
> + MX53_PAD_EIM_DA7__IPU_DISP1_DAT_2 0x5
> + MX53_PAD_EIM_DA6__IPU_DISP1_DAT_3 0x5
> + MX53_PAD_EIM_DA5__IPU_DISP1_DAT_4 0x5
> + MX53_PAD_EIM_DA4__IPU_DISP1_DAT_5 0x5
> + MX53_PAD_EIM_DA3__IPU_DISP1_DAT_6 0x5
> + MX53_PAD_EIM_DA2__IPU_DISP1_DAT_7 0x5
> + MX53_PAD_EIM_DA1__IPU_DISP1_DAT_8 0x5
> + MX53_PAD_EIM_DA0__IPU_DISP1_DAT_9 0x5
> + MX53_PAD_EIM_EB1__IPU_DISP1_DAT_10 0x5
> + MX53_PAD_EIM_EB0__IPU_DISP1_DAT_11 0x5
> + MX53_PAD_EIM_A17__IPU_DISP1_DAT_12 0x5
> + MX53_PAD_EIM_A18__IPU_DISP1_DAT_13 0x5
> + MX53_PAD_EIM_A19__IPU_DISP1_DAT_14 0x5
> + MX53_PAD_EIM_A20__IPU_DISP1_DAT_15 0x5
> + MX53_PAD_EIM_A21__IPU_DISP1_DAT_16 0x5
> + MX53_PAD_EIM_A22__IPU_DISP1_DAT_17 0x5
> + MX53_PAD_EIM_A23__IPU_DISP1_DAT_18 0x5
> + MX53_PAD_EIM_A24__IPU_DISP1_DAT_19 0x5
> + MX53_PAD_EIM_D31__IPU_DISP1_DAT_20 0x5
> + MX53_PAD_EIM_D30__IPU_DISP1_DAT_21 0x5
> + MX53_PAD_EIM_D26__IPU_DISP1_DAT_22 0x5
> + MX53_PAD_EIM_D27__IPU_DISP1_DAT_23 0x5
> + MX53_PAD_EIM_A16__IPU_DI1_DISP_CLK 0x5
> + MX53_PAD_EIM_DA13__IPU_DI1_D0_CS 0x5
> + MX53_PAD_EIM_DA14__IPU_DI1_D1_CS 0x5
> + MX53_PAD_EIM_DA15__IPU_DI1_PIN1 0x5
> + MX53_PAD_EIM_DA11__IPU_DI1_PIN2 0x5
> + MX53_PAD_EIM_DA12__IPU_DI1_PIN3 0x5
> + MX53_PAD_EIM_A25__IPU_DI1_PIN12 0x5
I fixed the indent a little bit to have 0x5 aligned with above one.
> + MX53_PAD_EIM_DA10__IPU_DI1_PIN15 0x5
> + >;
> + };
> + };
> +
> + ipu_disp2 {
> + pinctrl_ipu_disp2_1: ipudisp2grp-1 {
> + fsl,pins = <
> + MX53_PAD_LVDS0_TX0_P__LDB_LVDS0_TX0 0x80000000
> + MX53_PAD_LVDS0_TX1_P__LDB_LVDS0_TX1 0x80000000
> + MX53_PAD_LVDS0_TX2_P__LDB_LVDS0_TX2 0x80000000
> + MX53_PAD_LVDS0_TX3_P__LDB_LVDS0_TX3 0x80000000
> + MX53_PAD_LVDS0_CLK_P__LDB_LVDS0_CLK 0x80000000
> +
I removed this new line.
> + MX53_PAD_LVDS1_TX0_P__LDB_LVDS1_TX0 0x80000000
> + MX53_PAD_LVDS1_TX1_P__LDB_LVDS1_TX1 0x80000000
> + MX53_PAD_LVDS1_TX2_P__LDB_LVDS1_TX2 0x80000000
> + MX53_PAD_LVDS1_TX3_P__LDB_LVDS1_TX3 0x80000000
> + MX53_PAD_LVDS1_CLK_P__LDB_LVDS1_CLK 0x80000000
> + >;
> + };
> + };
> +
I put the nodes after i2c ones.
Shawn
> uart1 {
> pinctrl_uart1_1: uart1grp-1 {
> fsl,pins = <
> --
> 1.7.10.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] 15+ messages in thread
* [PATCH 7/8] ARM: mx5: Add PWM1 pinctrl data
2013-04-21 21:30 ` [PATCH 7/8] ARM: mx5: Add PWM1 " Marek Vasut
@ 2013-04-22 5:05 ` Shawn Guo
0 siblings, 0 replies; 15+ messages in thread
From: Shawn Guo @ 2013-04-22 5:05 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 21, 2013 at 11:30:07PM +0200, Marek Vasut wrote:
> This patch adds pinctrl data for PWM1 on MX53.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> ---
> arch/arm/boot/dts/imx53.dtsi | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
> index 91fc8cc..c343ba6 100644
> --- a/arch/arm/boot/dts/imx53.dtsi
> +++ b/arch/arm/boot/dts/imx53.dtsi
> @@ -653,6 +653,14 @@
> >;
> };
> };
> +
> + pwm1 {
I put the node after owire.
Shawn
> + pinctrl_pwm1_1: pwm1grp-1 {
> + fsl,pins = <
> + MX53_PAD_DISP0_DAT8__PWM1_PWMO 0x5
> + >;
> + };
> + };
> };
>
> gpr: iomuxc-gpr at 53fa8000 {
> --
> 1.7.10.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] 15+ messages in thread
* [PATCH 8/8] ARM: mx5: Add support for DENX M53EVK
2013-04-21 21:30 ` [PATCH 8/8] ARM: mx5: Add support for DENX M53EVK Marek Vasut
@ 2013-04-22 5:19 ` Shawn Guo
2013-04-22 6:41 ` Sascha Hauer
1 sibling, 0 replies; 15+ messages in thread
From: Shawn Guo @ 2013-04-22 5:19 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 21, 2013 at 11:30:08PM +0200, Marek Vasut wrote:
> This patch adds support for the DENX M53EVK board. The board currently supports
> NAND, Ethernet, UART, CAN, I2C.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> ---
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/imx53-m53evk.dts | 282 ++++++++++++++++++++++++++++++++++++
> arch/arm/mach-imx/mach-imx53.c | 16 +-
> 3 files changed, 297 insertions(+), 2 deletions(-)
> create mode 100644 arch/arm/boot/dts/imx53-m53evk.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 4fd1f62..1fbec6b 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -107,6 +107,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
> imx51-babbage.dtb \
> imx53-ard.dtb \
> imx53-evk.dtb \
> + imx53-m53evk.dtb \
> imx53-mba53.dtb \
> imx53-qsb.dtb \
> imx53-smd.dtb \
> diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
> new file mode 100644
> index 0000000..32f8ff4
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx53-m53evk.dts
> @@ -0,0 +1,282 @@
> +/*
> + * Copyright (C) 2013 Marek Vasut <marex@denx.de>
> + *
> + * The code contained herein is licensed under the GNU General Public
> + * License. You may obtain a copy of the GNU General Public License
> + * Version 2 or later at the following locations:
> + *
> + * http://www.opensource.org/licenses/gpl-license.html
> + * http://www.gnu.org/copyleft/gpl.html
> + */
> +
> +/dts-v1/;
> +#include "imx53.dtsi"
> +
> +/ {
> + model = "DENX M53EVK";
> + compatible = "denx,imx53-m53evk", "fsl,imx53";
> +
> + memory {
> + reg = <0x70000000 0x20000000>;
> + };
> +
> + soc {
> + display at di0 {
> + compatible = "fsl,imx-parallel-display";
> + crtcs = <&ipu 0>;
> + interface-pix-fmt = "rgb24";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_ipu_disp1_1>;
> +
> + display-timings {
> + 800x480p60 {
> + native-mode;
> + clock-frequency = <31500000>;
> + hactive = <800>;
> + vactive = <480>;
> + hfront-porch = <40>;
> + hback-porch = <88>;
> + hsync-len = <128>;
> + vback-porch = <33>;
> + vfront-porch = <9>;
> + vsync-len = <3>;
> + vsync-active = <1>;
> + };
> + };
> + };
> +
> + display at di1 {
> + compatible = "fsl,imx-parallel-display";
> + crtcs = <&ipu 1>;
> + interface-pix-fmt = "rgb24";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_ipu_disp2_1>;
> +
> + display-timings {
> + 800x480p60 {
> + native-mode;
> + clock-frequency = <31500000>;
> + hactive = <800>;
> + vactive = <480>;
> + hfront-porch = <40>;
> + hback-porch = <88>;
> + hsync-len = <128>;
> + vback-porch = <33>;
> + vfront-porch = <9>;
> + vsync-len = <3>;
> + vsync-active = <1>;
> + };
> + };
> + };
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> + pinctrl-names = "default";
> + pinctrl-0 = <&led_pin_gpio>;
> +
> + user1 {
> + label = "user1";
> + gpios = <&gpio2 8 0>;
> + linux,default-trigger = "heartbeat";
> + };
> +
> + user2 {
> + label = "user2";
> + gpios = <&gpio2 9 0>;
> + linux,default-trigger = "heartbeat";
> + };
> + };
> +
> + regulators {
> + compatible = "simple-bus";
> +
> + reg_3p2v: 3p2v {
> + compatible = "regulator-fixed";
> + regulator-name = "3P2V";
> + regulator-min-microvolt = <3200000>;
> + regulator-max-microvolt = <3200000>;
> + regulator-always-on;
> + };
> + };
> +
> + sound {
> + compatible = "fsl,imx53-m53evk-sgtl5000",
> + "fsl,imx-audio-sgtl5000";
> + model = "imx53-m53evk-sgtl5000";
> + ssi-controller = <&ssi2>;
> + audio-codec = <&sgtl5000>;
> + audio-routing =
> + "MIC_IN", "Mic Jack",
> + "Mic Jack", "Mic Bias",
> + "LINE_IN", "Line In Jack",
> + "Headphone Jack", "HP_OUT",
> + "Ext Spk", "LINE_OUT";
> + mux-int-port = <2>;
> + mux-ext-port = <4>;
> + };
> +
> + backlight {
> + compatible = "pwm-backlight";
> + pwms = <&pwm1 0 3000>;
> + brightness-levels = <0 4 8 16 32 64 128 255>;
> + default-brightness-level = <6>;
> + };
I'm going to be picky on new board dts file on the node sorting. Please
put "backlight" before "leds".
> +};
> +
> +&esdhc1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_esdhc1_1>;
> + cd-gpios = <&gpio1 1 0>;
> + wp-gpios = <&gpio1 9 0>;
> + status = "okay";
> +};
> +
Please sort all these nodes per label names.
> +&ssi2 {
> + fsl,mode = "i2s-slave";
> + status = "okay";
> +};
> +
> +&uart3 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart3_1>;
> + status = "okay";
> +};
> +
> +&pwm1 {
> +/* pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm1_1>;*/
Please remove it, either the commenting or the lines.
> + status = "okay";
> +};
> +
> +&uart1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart1_2>;
> + status = "okay";
> +};
> +
> +&uart2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart2_1>;
> + status = "okay";
> +};
> +
> +&iomuxc {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_hog>;
> +
> + hog {
> + pinctrl_hog: hoggrp {
> + fsl,pins = <
> + MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK 0x80000000
> + MX53_PAD_EIM_EB3__GPIO2_31 0x80000000
> + MX53_PAD_PATA_DA_0__GPIO7_6 0x80000000
> + MX53_PAD_DISP0_DAT8__PWM1_PWMO 0x5
> +
> + >;
> + };
> +
> + led_pin_gpio: led_gpio at 0 {
> + fsl,pins = <
> + MX53_PAD_PATA_DATA8__GPIO2_8 0x80000000
> + MX53_PAD_PATA_DATA9__GPIO2_9 0x80000000
> + >;
> + };
> + };
> +};
> +
> +&can1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_can1_3>;
> + status = "okay";
> +};
> +
> +&can2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_can2_1>;
> + status = "okay";
> +};
> +
> +&i2c1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c1_2>;
> + status = "okay";
> +
> + sgtl5000: codec at 0a {
> + compatible = "fsl,sgtl5000";
> + reg = <0x0a>;
> + VDDA-supply = <®_3p2v>;
> + VDDIO-supply = <®_3p2v>;
> + };
> +};
> +
> +&i2c2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c2_2>;
> + clock-frequency = <400000>;
> + status = "okay";
> +
> + stmpe610 at 41 {
> + compatible = "st,stmpe610";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0x41>;
> + irq-over-gpio;
> + irq-gpios = <&gpio7 6 0>;
> + id = <0>;
> + blocks = <0x5>;
> + irq-trigger = <0x1>;
> +
> + stmpe_touchscreen {
> + compatible = "stmpe,ts";
> + reg = <0>;
> + ts,sample-time = <4>;
> + ts,mod-12b = <1>;
> + ts,ref-sel = <0>;
> + ts,adc-freq = <1>;
> + ts,ave-ctrl = <3>;
> + ts,touch-det-delay = <3>;
> + ts,settling = <4>;
> + ts,fraction-z = <7>;
> + ts,i-drive = <1>;
> + };
> + };
> +
> + eeprom: eeprom at 50 {
> + compatible = "atmel,24c128";
> + reg = <0x50>;
> + pagesize = <32>;
> + };
> +
> + rtc: rtc at 68 {
> + compatible = "stm,m41t62";
> + reg = <0x68>;
> + };
> +};
> +
> +&i2c3 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c3_1>;
> + status = "okay";
> +};
> +
> +&audmux {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_audmux_2>;
> + status = "okay";
> +};
> +
> +&nfc {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_nand_1>;
> + nand-bus-width = <8>;
> + nand-ecc-mode = "hw";
> + status = "okay";
> +};
> +
> +&fec {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_fec_1>;
> + phy-mode = "rmii";
> + status = "okay";
> +};
> diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c
> index f579c61..4effe59 100644
> --- a/arch/arm/mach-imx/mach-imx53.c
> +++ b/arch/arm/mach-imx/mach-imx53.c
> @@ -23,7 +23,7 @@
> #include "common.h"
> #include "mx53.h"
>
> -static void __init imx53_qsb_init(void)
> +static void __init imx53_ssi_clk_init(const char *device)
> {
> struct clk *clk;
>
> @@ -33,11 +33,23 @@ static void __init imx53_qsb_init(void)
> return;
> }
>
> - clk_register_clkdev(clk, NULL, "0-000a");
> + clk_register_clkdev(clk, NULL, device);
I just sent a patch (you are on CC) to move the lookup into DT. With
it, you do not need to touch mach-imx53.c but just add the clk in your
board dts instead.
Shawn
> +}
> +
> +static void __init imx53_qsb_init(void)
> +{
> + imx53_ssi_clk_init("0-000a");
> +}
> +
> +static void __init imx53_m53evk_init(void)
> +{
> + imx53_ssi_clk_init("2-000a");
> }
>
> static void __init imx53_dt_init(void)
> {
> + if (of_machine_is_compatible("denx,imx53-m53evk"))
> + imx53_m53evk_init();
> if (of_machine_is_compatible("fsl,imx53-qsb"))
> imx53_qsb_init();
>
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 8/8] ARM: mx5: Add support for DENX M53EVK
2013-04-21 21:30 ` [PATCH 8/8] ARM: mx5: Add support for DENX M53EVK Marek Vasut
2013-04-22 5:19 ` Shawn Guo
@ 2013-04-22 6:41 ` Sascha Hauer
1 sibling, 0 replies; 15+ messages in thread
From: Sascha Hauer @ 2013-04-22 6:41 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 21, 2013 at 11:30:08PM +0200, Marek Vasut wrote:
> This patch adds support for the DENX M53EVK board. The board currently supports
> NAND, Ethernet, UART, CAN, I2C.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> ---
> +/ {
> + model = "DENX M53EVK";
> + compatible = "denx,imx53-m53evk", "fsl,imx53";
> +
> + memory {
> + reg = <0x70000000 0x20000000>;
> + };
> +
> + soc {
> + display at di0 {
> + compatible = "fsl,imx-parallel-display";
> + crtcs = <&ipu 0>;
> + interface-pix-fmt = "rgb24";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_ipu_disp1_1>;
> +
> + display-timings {
> + 800x480p60 {
> + native-mode;
> + clock-frequency = <31500000>;
> + hactive = <800>;
> + vactive = <480>;
> + hfront-porch = <40>;
> + hback-porch = <88>;
> + hsync-len = <128>;
> + vback-porch = <33>;
> + vfront-porch = <9>;
> + vsync-len = <3>;
> + vsync-active = <1>;
> + };
> + };
> + };
> +
> + display at di1 {
> + compatible = "fsl,imx-parallel-display";
> + crtcs = <&ipu 1>;
> + interface-pix-fmt = "rgb24";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_ipu_disp2_1>;
> +
> + display-timings {
> + 800x480p60 {
> + native-mode;
> + clock-frequency = <31500000>;
> + hactive = <800>;
> + vactive = <480>;
> + hfront-porch = <40>;
> + hback-porch = <88>;
> + hsync-len = <128>;
> + vback-porch = <33>;
> + vfront-porch = <9>;
> + vsync-len = <3>;
> + vsync-active = <1>;
> + };
> + };
> + };
This board has two identical displays?
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> + pinctrl-names = "default";
> + pinctrl-0 = <&led_pin_gpio>;
> +
> + user1 {
> + label = "user1";
> + gpios = <&gpio2 8 0>;
> + linux,default-trigger = "heartbeat";
> + };
> +
> + user2 {
> + label = "user2";
> + gpios = <&gpio2 9 0>;
> + linux,default-trigger = "heartbeat";
> + };
> + };
Two heartbeat LEDs? Why not use one for something else?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data
2013-04-22 5:00 ` [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Shawn Guo
@ 2013-04-22 8:47 ` Marek Vasut
0 siblings, 0 replies; 15+ messages in thread
From: Marek Vasut @ 2013-04-22 8:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi Shawn,
> On Sun, Apr 21, 2013 at 11:30:01PM +0200, Marek Vasut wrote:
> > This patch adds pinctrl data for the AUDMUX4 on MX53.
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
>
> Applied 1~7, with some small fixups (see replies).
Thanks, really appreciated! I'll fix 0008 and repost only that one.
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2013-04-22 8:47 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-21 21:30 [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Marek Vasut
2013-04-21 21:30 ` [PATCH 2/8] ARM: mx5: Add CAN1 " Marek Vasut
2013-04-21 21:30 ` [PATCH 3/8] ARM: mx5: Add I2C1 " Marek Vasut
2013-04-21 21:30 ` [PATCH 4/8] ARM: mx5: Add I2C2 " Marek Vasut
2013-04-21 21:30 ` [PATCH 5/8] ARM: mx5: Add NAND " Marek Vasut
2013-04-22 5:02 ` Shawn Guo
2013-04-21 21:30 ` [PATCH 6/8] ARM: mx5: Add LCD IPU " Marek Vasut
2013-04-22 5:05 ` Shawn Guo
2013-04-21 21:30 ` [PATCH 7/8] ARM: mx5: Add PWM1 " Marek Vasut
2013-04-22 5:05 ` Shawn Guo
2013-04-21 21:30 ` [PATCH 8/8] ARM: mx5: Add support for DENX M53EVK Marek Vasut
2013-04-22 5:19 ` Shawn Guo
2013-04-22 6:41 ` Sascha Hauer
2013-04-22 5:00 ` [PATCH 1/8] ARM: mx5: Add AUDMUX4 pinctrl data Shawn Guo
2013-04-22 8:47 ` Marek Vasut
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).