Skip to contentSkip to conversation

Some trivial ARM fixes

PATCH New Ryan Lortie 3 participants 5 messages Feb 27, 2011 – Feb 28, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Ryan Lortie

author
#0 lore raw

Hello list,

I've been spending the past couple of days working on getting the kernel working on an ARM board and I ran into a couple of trivial bugs in the mean time.

Here are some fixes.

Cheers

ps: this is my first time using git-send-email. Please point out anything I did wrong.

author
#1 lore raw

PATCH 1/2 ARM: imx35: fix ATA_DATA3 pad control address

According to the "i.MX35 (MCIMX35) Multimedia Applications Processor Reference Manual" the correct address for the pad control register IOMUXC_SW_PAD_CTL_PAD_ATA_DATA3 is 0x06ec, not 0x6e8.

Signed-off-by Ryan Lortie <[email protected]>
---
 arch/arm/plat-mxc/include/mach/iomux-mx35.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/plat-mxc/include/mach/iomux-mx35.h +7 -7
index 2a24bae..3117c18 100644
@@ -989,13 +989,13 @@
 #define MX35_PAD_ATA_DATA2__IPU_DIAGB_9				IOMUX_PAD(0x6e8, 0x284, 6, 0x0,   0, NO_PAD_CTRL)
 #define MX35_PAD_ATA_DATA2__ARM11P_TOP_TRACE_28			IOMUX_PAD(0x6e8, 0x284, 7, 0x0,   0, NO_PAD_CTRL)
 
-#define MX35_PAD_ATA_DATA3__ATA_DATA_3				IOMUX_PAD(0x6e8, 0x288, 0, 0x0,   0, NO_PAD_CTRL)
-#define MX35_PAD_ATA_DATA3__ESDHC3_CLK				IOMUX_PAD(0x6e8, 0x288, 1, 0x814, 1, NO_PAD_CTRL)
-#define MX35_PAD_ATA_DATA3__USB_TOP_USBOTG_DATA_5		IOMUX_PAD(0x6e8, 0x288, 2, 0x9b8, 1, NO_PAD_CTRL)
-#define MX35_PAD_ATA_DATA3__CSPI2_SCLK				IOMUX_PAD(0x6e8, 0x288, 4, 0x7e0, 2, NO_PAD_CTRL)
-#define MX35_PAD_ATA_DATA3__GPIO2_16				IOMUX_PAD(0x6e8, 0x288, 5, 0x884, 1, NO_PAD_CTRL)
-#define MX35_PAD_ATA_DATA3__IPU_DIAGB_10			IOMUX_PAD(0x6e8, 0x288, 6, 0x0,   0, NO_PAD_CTRL)
-#define MX35_PAD_ATA_DATA3__ARM11P_TOP_TRACE_29			IOMUX_PAD(0x6e8, 0x288, 7, 0x0,   0, NO_PAD_CTRL)
+#define MX35_PAD_ATA_DATA3__ATA_DATA_3				IOMUX_PAD(0x6ec, 0x288, 0, 0x0,   0, NO_PAD_CTRL)
+#define MX35_PAD_ATA_DATA3__ESDHC3_CLK				IOMUX_PAD(0x6ec, 0x288, 1, 0x814, 1, NO_PAD_CTRL)
+#define MX35_PAD_ATA_DATA3__USB_TOP_USBOTG_DATA_5		IOMUX_PAD(0x6ec, 0x288, 2, 0x9b8, 1, NO_PAD_CTRL)
+#define MX35_PAD_ATA_DATA3__CSPI2_SCLK				IOMUX_PAD(0x6ec, 0x288, 4, 0x7e0, 2, NO_PAD_CTRL)
+#define MX35_PAD_ATA_DATA3__GPIO2_16				IOMUX_PAD(0x6ec, 0x288, 5, 0x884, 1, NO_PAD_CTRL)
+#define MX35_PAD_ATA_DATA3__IPU_DIAGB_10			IOMUX_PAD(0x6ec, 0x288, 6, 0x0,   0, NO_PAD_CTRL)
+#define MX35_PAD_ATA_DATA3__ARM11P_TOP_TRACE_29			IOMUX_PAD(0x6ec, 0x288, 7, 0x0,   0, NO_PAD_CTRL)
 
 #define MX35_PAD_ATA_DATA4__ATA_DATA_4				IOMUX_PAD(0x6f0, 0x28c, 0, 0x0,   0, NO_PAD_CTRL)
 #define MX35_PAD_ATA_DATA4__ESDHC3_CMD				IOMUX_PAD(0x6f0, 0x28c, 1, 0x818, 1, NO_PAD_CTRL)
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 1/2 ARM: imx35: fix ATA_DATA3 pad control address

Hi Ryan,

Good find!

Quoted 5 lines

According to the "i.MX35 (MCIMX35) Multimedia Applications Processor Reference Manual" the correct address for the pad control register IOMUXC_SW_PAD_CTL_PAD_ATA_DATA3 is 0x06ec, not 0x6e8.

Signed-off-by Ryan Lortie <[email protected]>
Acked-by Marc Reilly <[email protected]>

Cheers
Marc

arch/arm/plat-mxc/include/mach/iomux-mx35.h line 989

Quoted 11 lines
---
 arch/arm/plat-mxc/include/mach/iomux-mx35.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
(quoted diff) +0 -0

b/arch/arm/plat-mxc/include/mach/iomux-mx35.h index 2a24bae..3117c18 100644

arch/arm/plat-mxc/include/mach/iomux-mx35.h +0 -0
@@ -989,13 +989,13 @@
 #define MX35_PAD_ATA_DATA2__IPU_DIAGB_9				IOMUX_PAD(0x6e8,

0x284, 6, 0x0,

arch/arm/plat-mxc/include/mach/iomux-mx35.h line 991

Quoted 2 lines
arch/arm/plat-mxc/include/mach/iomux-mx35.h +0 -0
  0, NO_PAD_CTRL) #define
 MX35_PAD_ATA_DATA2__ARM11P_TOP_TRACE_28			IOMUX_PAD(0x6e8, 0x284, 7,

0x0,

arch/arm/plat-mxc/include/mach/iomux-mx35.h line 994

Quoted 3 lines
arch/arm/plat-mxc/include/mach/iomux-mx35.h +0 -1
 0, NO_PAD_CTRL)
 
-#define MX35_PAD_ATA_DATA3__ATA_DATA_3				IOMUX_PAD(0x6e8, 0x288,

0, 0x0,

arch/arm/plat-mxc/include/mach/iomux-mx35.h line 995

Quoted 2 lines
arch/arm/plat-mxc/include/mach/iomux-mx35.h +0 -0
 0, NO_PAD_CTRL) -#define
 MX35_PAD_ATA_DATA3__ESDHC3_CLK				IOMUX_PAD(0x6e8, 0x288, 1,

0x814, 1,

Quoted 4 lines

NO_PAD_CTRL) -#define
MX35_PAD_ATA_DATA3__USB_TOP_USBOTG_DATA_5 IOMUX_PAD(0x6e8, 0x288, 2,
0x9b8, 1, NO_PAD_CTRL) -#define
MX35_PAD_ATA_DATA3__CSPI2_SCLK IOMUX_PAD(0x6e8, 0x288, 4,

0x7e0, 2,

Quoted 1 line

NO_PAD_CTRL) -#define MX35_PAD_ATA_DATA3__GPIO2_16

IOMUX_PAD(0x6e8,

Quoted 4 lines

0x288, 5, 0x884, 1, NO_PAD_CTRL) -#define
MX35_PAD_ATA_DATA3__IPU_DIAGB_10 IOMUX_PAD(0x6e8, 0x288, 6, 0x0, 0,
NO_PAD_CTRL) -#define
MX35_PAD_ATA_DATA3__ARM11P_TOP_TRACE_29 IOMUX_PAD(0x6e8, 0x288, 7,

0x0,

Quoted 2 lines

0, NO_PAD_CTRL) +#define
MX35_PAD_ATA_DATA3__ATA_DATA_3 IOMUX_PAD(0x6ec, 0x288, 0, 0x0,

0,

Quoted 1 line

NO_PAD_CTRL) +#define MX35_PAD_ATA_DATA3__ESDHC3_CLK

IOMUX_PAD(0x6ec,

Quoted 4 lines

0x288, 1, 0x814, 1, NO_PAD_CTRL) +#define
MX35_PAD_ATA_DATA3__USB_TOP_USBOTG_DATA_5 IOMUX_PAD(0x6ec, 0x288, 2,
0x9b8, 1, NO_PAD_CTRL) +#define
MX35_PAD_ATA_DATA3__CSPI2_SCLK IOMUX_PAD(0x6ec, 0x288, 4,

0x7e0, 2,

Quoted 1 line

NO_PAD_CTRL) +#define MX35_PAD_ATA_DATA3__GPIO2_16

IOMUX_PAD(0x6ec,

Quoted 4 lines

0x288, 5, 0x884, 1, NO_PAD_CTRL) +#define
MX35_PAD_ATA_DATA3__IPU_DIAGB_10 IOMUX_PAD(0x6ec, 0x288, 6, 0x0, 0,
NO_PAD_CTRL) +#define
MX35_PAD_ATA_DATA3__ARM11P_TOP_TRACE_29 IOMUX_PAD(0x6ec, 0x288, 7,

0x0,

Quoted 3 lines

0, NO_PAD_CTRL)

#define MX35_PAD_ATA_DATA4__ATA_DATA_4 IOMUX_PAD(0x6f0, 0x28c,

0, 0x0,

Quoted 2 lines

0, NO_PAD_CTRL) #define
MX35_PAD_ATA_DATA4__ESDHC3_CMD IOMUX_PAD(0x6f0, 0x28c, 1,

0x818, 1,

Quoted 1 line

NO_PAD_CTRL)

author
#3 lore raw

PATCH 2/2 ARM: imx35: fix trivial copy/paste error

In reply to Ryan Lortie

Change imx31_add_imx_keypad() to imx35_add_imx_keypad() in mach-mx3/devices-imx35.h.

Signed-off-by Ryan Lortie <[email protected]>
---
 arch/arm/mach-mx3/devices-imx35.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-mx3/devices-imx35.h +1 -1
index 677b18a..d545d86 100644
@@ -35,7 +35,7 @@ extern const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst;
 #define imx35_add_imx_i2c2(pdata)	imx35_add_imx_i2c(2, pdata)
 
 extern const struct imx_imx_keypad_data imx35_imx_keypad_data __initconst;
-#define imx31_add_imx_keypad(pdata)	\
+#define imx35_add_imx_keypad(pdata)	\
 	imx_add_imx_keypad(&imx35_imx_keypad_data, pdata)
 
 extern const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst;
Signature · 1 line
1.7.4.1
#4 lore raw

PATCH 2/2 ARM: imx35: fix trivial copy/paste error

Hi Ryan,

Quoted 4 lines · Ryan Lortie

Change imx31_add_imx_keypad() to imx35_add_imx_keypad() in mach-mx3/devices-imx35.h.

Signed-off-by Ryan Lortie <[email protected]>
Acked-by Uwe Kleine-K?nig <[email protected]>

To increase your chances to get imx related patches in, you'd better Cc:
kernel at pengutronix.de

Best regards
Uwe

Quoted 26 lines
---
 arch/arm/mach-mx3/devices-imx35.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-mx3/devices-imx35.h +1 -1
index 677b18a..d545d86 100644
@@ -35,7 +35,7 @@ extern const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst;
 #define imx35_add_imx_i2c2(pdata)	imx35_add_imx_i2c(2, pdata)
 
 extern const struct imx_imx_keypad_data imx35_imx_keypad_data __initconst;
-#define imx31_add_imx_keypad(pdata)	\
+#define imx35_add_imx_keypad(pdata)	\
 	imx_add_imx_keypad(&imx35_imx_keypad_data, pdata)
 
 extern const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst;
Signature · 7 lines
1.7.4.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |