more i.MX patches for -rc
Sascha Hauer
maintainerThe following changes since commit 11dda987e916b743f7338ed5f9134b082d2cb541:
Merge branch 'imx-rc-pu' into imx-for-2.6.37 (2010-11-05 09:20:29 +0100)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx-rc-pu
Sascha Hauer (3):
ARM mx3_camera: check for DMA engine type
ARM i.MX27 eukrea: Fix compilation
ARM i.MX spi: fix compilation for i.MX21
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 ------ arch/arm/plat-mxc/devices/platform-spi_imx.c | 1 + drivers/media/video/mx3_camera.c | 4 ++++ 3 files changed, 5 insertions(+), 6 deletions(-)
Sascha Hauer
maintainerPATCH 1/3 ARM mx3_camera: check for DMA engine type
We have two dma engines in MX3 systems: The IPU and the SDMA engine. We have to check if we got a channel from the correct engine before proceeding with a channel.
--- drivers/media/video/mx3_camera.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/media/video/mx3_camera.c +4 -0
@@ -27,6 +27,7 @@#include <mach/ipu.h> #include <mach/mx3_camera.h> +#include <mach/dma.h> #define MX3_CAM_DRV_NAME "mx3-camera"
@@ -638,6 +639,9 @@ static bool chan_filter(struct dma_chan *chan, void *arg)struct dma_chan_request *rq = arg;struct mx3_camera_pdata *pdata; +if (!imx_dma_is_ipu (chan)) +return false; +if (!rq)return false;
Signature · 1 line
1.7.2.3
PATCH 1/3 ARM mx3_camera: check for DMA engine type
Quoted 6 lines · Sascha Hauer
We have two dma engines in MX3 systems: The IPU and the SDMA engine. We have to check if we got a channel from the correct engine before proceeding with a channel.
Signed-off-by Sascha Hauer <[email protected]>Cc Guennadi Liakhovetski <[email protected]>
Thanks, since this is a fix and the SDMA is already in the mainline, I can pull this via v4l for 37-rc2.
Thanks
Guennadi
Quoted 30 lines
--- drivers/media/video/mx3_camera.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)drivers/media/video/mx3_camera.c +4
-0@@ -27,6 +27,7 @@#include <mach/ipu.h> #include <mach/mx3_camera.h> +#include <mach/dma.h> #define MX3_CAM_DRV_NAME "mx3-camera"@@ -638,6 +639,9 @@ static bool chan_filter(struct dma_chan *chan, void *arg)struct dma_chan_request *rq = arg;struct mx3_camera_pdata *pdata; +if (!imx_dma_is_ipu (chan)) +return false; +if (!rq)return false;Signature · 1 line
1.7.2.3
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
Sascha Hauer
maintainerPATCH 1/3 ARM mx3_camera: check for DMA engine type
Quoted 11 lines · Guennadi Liakhovetski
Quoted 6 lines · Sascha Hauer
We have two dma engines in MX3 systems: The IPU and the SDMA engine. We have to check if we got a channel from the correct engine before proceeding with a channel.
Signed-off-by Sascha Hauer <[email protected]>Cc Guennadi Liakhovetski <[email protected]>Thanks, since this is a fix and the SDMA is already in the mainline, I can pull this via v4l for 37-rc2.
Ok, I'll remove it from my queue then.
Sascha
Signature · 4 lines
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 |
Sascha Hauer
maintainerPATCH 2/3 ARM i.MX27 eukrea: Fix compilation
In reply to Sascha HauerCurrently compilation breaks for the eukrea mbimx27 baseboard when CONFIG_SPI_IMX is selected and CONFIG_TOUCHSCREEN_ADS7846 is not selected. Fix this by removing the ifdefs altogether.
--- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +0 -6
@@ -250,9 +250,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, }; -#if defined(CONFIG_TOUCHSCREEN_ADS7846 ) \ - || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE ) -#define ADS7846_PENDOWN (GPIO_PORTD | 25)static void ads7846_dev_init (void )
@@ -273,9 +270,7 @@ static struct ads7846_platform_data ads7846_config __initdata = { .get_pendown_state = ads7846_get_pendown_state, .keep_vref_on = 1, }; -#endif -#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)static struct spi_board_info eukrea_mbimx27_spi_board_info[]__initdata = { [0 ] = { .modalias ="ads7846" ,
@@ -294,7 +289,6 @@ static const struct spi_imx_master eukrea_mbimx27_spi0_data __initconst = { .chipselect = eukrea_mbimx27_spi_cs, .num_chipselect = ARRAY_SIZE(eukrea_mbimx27_spi_cs), }; -#endif static struct i2c_board_info eukrea_mbimx27_i2c_devices[] = { {
Signature · 1 line
1.7.2.3
Sascha Hauer
maintainerPATCH 3/3 ARM i.MX spi: fix compilation for i.MX21
In reply to Sascha Hauer--- arch/arm/plat-mxc/devices/platform-spi_imx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/plat-mxc/devices/platform-spi_imx.c +1 -0
@@ -27,6 +27,7 @@ const struct imx_spi_imx_data imx21_cspi_data[] __initconst = { imx_spi_imx_data_entry(MX21, CSPI, "imx21-cspi", _id, _hwid, SZ_4K)imx21_cspi_data_entry (0 ,1 ), imx21_cspi_data_entry(1, 2), +};#endif #ifdef CONFIG_ARCH_MX25
Signature · 1 line
1.7.2.3
PATCH 3/3 ARM i.MX spi: fix compilation for i.MX21
Quoted 1 line · Sascha Hauer
Signed-off-by Sascha Hauer <[email protected]>
Thanks
Uwe
Quoted 25 lines
--- arch/arm/plat-mxc/devices/platform-spi_imx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)arch/arm/plat-mxc/devices/platform-spi_imx.c +1
-0@@ -27,6 +27,7 @@ const struct imx_spi_imx_data imx21_cspi_data[] __initconst = { imx_spi_imx_data_entry(MX21, CSPI, "imx21-cspi", _id, _hwid, SZ_4K)imx21_cspi_data_entry (0 ,1 ), imx21_cspi_data_entry(1, 2), +};#endif #ifdef CONFIG_ARCH_MX25 Signature · 7 lines
1.7.2.3 _______________________________________________ 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/ |