Skip to contentSkip to conversation

mx25: fix spi device registration typo

PATCH New Baruch Siach 3 participants 4 messages Nov 9, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mx25: fix spi device registration typo

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 <[email protected]>
---
 arch/arm/mach-mx25/devices-imx25.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mx25/devices-imx25.h +2 -2
index 93afa10..d94d282 100644
@@ -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)
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 2/2 imx: fix USB build when USB gadget is selected

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 <[email protected]>
---
 drivers/usb/gadget/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/gadget/Kconfig +1 -1
index b739ca8..5a858aa 100644
@@ -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.
Signature · 1 line
1.7.2.3
#2 lore raw

PATCH 2/2 imx: fix USB build when USB gadget is selected

Quoted 8 lines · On Tue, 9 Nov 2010 08:47:55 +0200 Baruch Siach <[email protected]> wrote:

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 <[email protected]>
---
 drivers/usb/gadget/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Thanks. But another patch fixing this has already been posted to the linux usb devel list:

http://thread.gmane.org/gmane.linux.kernel/1052648/focus=38156

Anatolij

#3 lore raw

PATCH 1/2 mx25: fix spi device registration typo

In reply to Baruch Siach
Quoted 5 lines · Baruch Siach

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 <[email protected]>

s/Cc/Acked-by/

hm, and I thought my testing strategy was good (enough). :-/

Thanks
Uwe

Quoted 21 lines
---
 arch/arm/mach-mx25/devices-imx25.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mx25/devices-imx25.h +2 -2
index 93afa10..d94d282 100644
@@ -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)
Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |