* Some trivial ARM fixes @ 2011-02-27 0:41 Ryan Lortie 2011-02-27 0:41 ` [PATCH 1/2] ARM: imx35: fix ATA_DATA3 pad control address Ryan Lortie 2011-02-27 0:41 ` [PATCH 2/2] ARM: imx35: fix trivial copy/paste error Ryan Lortie 0 siblings, 2 replies; 5+ messages in thread From: Ryan Lortie @ 2011-02-27 0:41 UTC (permalink / raw) To: linux-arm-kernel 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. ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: imx35: fix ATA_DATA3 pad control address 2011-02-27 0:41 Some trivial ARM fixes Ryan Lortie @ 2011-02-27 0:41 ` Ryan Lortie 2011-02-27 5:18 ` Marc Reilly 2011-02-27 0:41 ` [PATCH 2/2] ARM: imx35: fix trivial copy/paste error Ryan Lortie 1 sibling, 1 reply; 5+ messages in thread From: Ryan Lortie @ 2011-02-27 0:41 UTC (permalink / raw) To: linux-arm-kernel 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 <desrt@desrt.ca> --- arch/arm/plat-mxc/include/mach/iomux-mx35.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx35.h b/arch/arm/plat-mxc/include/mach/iomux-mx35.h index 2a24bae..3117c18 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx35.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx35.h @@ -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) -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: imx35: fix ATA_DATA3 pad control address 2011-02-27 0:41 ` [PATCH 1/2] ARM: imx35: fix ATA_DATA3 pad control address Ryan Lortie @ 2011-02-27 5:18 ` Marc Reilly 0 siblings, 0 replies; 5+ messages in thread From: Marc Reilly @ 2011-02-27 5:18 UTC (permalink / raw) To: linux-arm-kernel Hi Ryan, Good find! > 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 <desrt@desrt.ca> Acked-by: Marc Reilly <marc@cpdesign.com.au> Cheers Marc > --- > arch/arm/plat-mxc/include/mach/iomux-mx35.h | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx35.h > b/arch/arm/plat-mxc/include/mach/iomux-mx35.h index 2a24bae..3117c18 > 100644 > --- a/arch/arm/plat-mxc/include/mach/iomux-mx35.h > +++ b/arch/arm/plat-mxc/include/mach/iomux-mx35.h > @@ -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) ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: imx35: fix trivial copy/paste error 2011-02-27 0:41 Some trivial ARM fixes Ryan Lortie 2011-02-27 0:41 ` [PATCH 1/2] ARM: imx35: fix ATA_DATA3 pad control address Ryan Lortie @ 2011-02-27 0:41 ` Ryan Lortie 2011-02-28 8:13 ` Uwe Kleine-König 1 sibling, 1 reply; 5+ messages in thread From: Ryan Lortie @ 2011-02-27 0:41 UTC (permalink / raw) To: linux-arm-kernel Change imx31_add_imx_keypad() to imx35_add_imx_keypad() in mach-mx3/devices-imx35.h. Signed-off-by: Ryan Lortie <desrt@desrt.ca> --- arch/arm/mach-mx3/devices-imx35.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-mx3/devices-imx35.h b/arch/arm/mach-mx3/devices-imx35.h index 677b18a..d545d86 100644 --- a/arch/arm/mach-mx3/devices-imx35.h +++ b/arch/arm/mach-mx3/devices-imx35.h @@ -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; -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: imx35: fix trivial copy/paste error 2011-02-27 0:41 ` [PATCH 2/2] ARM: imx35: fix trivial copy/paste error Ryan Lortie @ 2011-02-28 8:13 ` Uwe Kleine-König 0 siblings, 0 replies; 5+ messages in thread From: Uwe Kleine-König @ 2011-02-28 8:13 UTC (permalink / raw) To: linux-arm-kernel Hi Ryan, On Sat, Feb 26, 2011 at 07:41:53PM -0500, Ryan Lortie wrote: > Change imx31_add_imx_keypad() to imx35_add_imx_keypad() in > mach-mx3/devices-imx35.h. > > Signed-off-by: Ryan Lortie <desrt@desrt.ca> Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> To increase your chances to get imx related patches in, you'd better Cc: kernel at pengutronix.de Best regards Uwe > --- > arch/arm/mach-mx3/devices-imx35.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-mx3/devices-imx35.h b/arch/arm/mach-mx3/devices-imx35.h > index 677b18a..d545d86 100644 > --- a/arch/arm/mach-mx3/devices-imx35.h > +++ b/arch/arm/mach-mx3/devices-imx35.h > @@ -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; > -- > 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 > -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ | ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-28 8:13 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-02-27 0:41 Some trivial ARM fixes Ryan Lortie 2011-02-27 0:41 ` [PATCH 1/2] ARM: imx35: fix ATA_DATA3 pad control address Ryan Lortie 2011-02-27 5:18 ` Marc Reilly 2011-02-27 0:41 ` [PATCH 2/2] ARM: imx35: fix trivial copy/paste error Ryan Lortie 2011-02-28 8:13 ` Uwe Kleine-König
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).