* [PATCH 1/2] mx25: fix spi device registration typo
@ 2010-11-09 6:47 Baruch Siach
2010-11-09 6:47 ` [PATCH 2/2] imx: fix USB build when USB gadget is selected Baruch Siach
2010-11-09 9:34 ` [PATCH 1/2] mx25: fix spi device registration typo Uwe Kleine-König
0 siblings, 2 replies; 4+ messages in thread
From: Baruch Siach @ 2010-11-09 6:47 UTC (permalink / raw)
To: linux-arm-kernel
Commit 35bab0589b9a71533b37280eefa430c21dc102fe (ARM: imx: change the way
spi-imx devices are registered) contained a typo in mx25, leading to link time
failure.
Cc: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix•de>
Signed-off-by: Baruch Siach <baruch@tkos•co.il>
---
arch/arm/mach-mx25/devices-imx25.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mx25/devices-imx25.h b/arch/arm/mach-mx25/devices-imx25.h
index 93afa10..d94d282 100644
--- a/arch/arm/mach-mx25/devices-imx25.h
+++ b/arch/arm/mach-mx25/devices-imx25.h
@@ -42,9 +42,9 @@ extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst;
#define imx25_add_mxc_nand(pdata) \
imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)
-extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;
+extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst;
#define imx25_add_spi_imx(id, pdata) \
- imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)
+ imx_add_spi_imx(&imx25_cspi_data[id], pdata)
#define imx25_add_spi_imx0(pdata) imx25_add_spi_imx(0, pdata)
#define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata)
#define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] imx: fix USB build when USB gadget is selected
2010-11-09 6:47 [PATCH 1/2] mx25: fix spi device registration typo Baruch Siach
@ 2010-11-09 6:47 ` Baruch Siach
2010-11-09 8:48 ` Anatolij Gustschin
2010-11-09 9:34 ` [PATCH 1/2] mx25: fix spi device registration typo Uwe Kleine-König
1 sibling, 1 reply; 4+ messages in thread
From: Baruch Siach @ 2010-11-09 6:47 UTC (permalink / raw)
To: linux-arm-kernel
Commit 126512e3f274802ca65ebeca8660237f0361ad48 (USB: add platform glue driver
for FSL USB DR controller) broke i.MX build by selecting USB_FSL_MPH_DR_OF.
Cc: Anatolij Gustschin <agust@denx•de>
Signed-off-by: Baruch Siach <baruch@tkos•co.il>
---
drivers/usb/gadget/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index b739ca8..5a858aa 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -158,7 +158,7 @@ config USB_GADGET_FSL_USB2
boolean "Freescale Highspeed USB DR Peripheral Controller"
depends on FSL_SOC || ARCH_MXC
select USB_GADGET_DUALSPEED
- select USB_FSL_MPH_DR_OF
+ select USB_FSL_MPH_DR_OF if FSL_SOC
help
Some of Freescale PowerPC processors have a High Speed
Dual-Role(DR) USB controller, which supports device mode.
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/2] mx25: fix spi device registration typo
2010-11-09 6:47 [PATCH 1/2] mx25: fix spi device registration typo Baruch Siach
2010-11-09 6:47 ` [PATCH 2/2] imx: fix USB build when USB gadget is selected Baruch Siach
@ 2010-11-09 9:34 ` Uwe Kleine-König
1 sibling, 0 replies; 4+ messages in thread
From: Uwe Kleine-König @ 2010-11-09 9:34 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 09, 2010 at 08:47:54AM +0200, Baruch Siach wrote:
> Commit 35bab0589b9a71533b37280eefa430c21dc102fe (ARM: imx: change the way
> spi-imx devices are registered) contained a typo in mx25, leading to link time
> failure.
>
> Cc: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix•de>
s/Cc/Acked-by/
hm, and I thought my testing strategy was good (enough). :-/
Thanks
Uwe
> Signed-off-by: Baruch Siach <baruch@tkos•co.il>
> ---
> arch/arm/mach-mx25/devices-imx25.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mx25/devices-imx25.h b/arch/arm/mach-mx25/devices-imx25.h
> index 93afa10..d94d282 100644
> --- a/arch/arm/mach-mx25/devices-imx25.h
> +++ b/arch/arm/mach-mx25/devices-imx25.h
> @@ -42,9 +42,9 @@ extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst;
> #define imx25_add_mxc_nand(pdata) \
> imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)
>
> -extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;
> +extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst;
> #define imx25_add_spi_imx(id, pdata) \
> - imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)
> + imx_add_spi_imx(&imx25_cspi_data[id], pdata)
> #define imx25_add_spi_imx0(pdata) imx25_add_spi_imx(0, pdata)
> #define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata)
> #define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata)
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-11-09 9:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-09 6:47 [PATCH 1/2] mx25: fix spi device registration typo Baruch Siach
2010-11-09 6:47 ` [PATCH 2/2] imx: fix USB build when USB gadget is selected Baruch Siach
2010-11-09 8:48 ` Anatolij Gustschin
2010-11-09 9:34 ` [PATCH 1/2] mx25: fix spi device registration typo 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