Skip to contentSkip to conversation

omap patches for review for v2.6.37 merge window

PATCH New Tony Lindgren 7 participants 29 messages Sep 24, 2010 – Oct 11, 2010

Subsystems (7)
lore
Share & tools
lore

Tony Lindgren

author maintainer
#0 lore raw

cover omap patches for review for v2.6.37 merge window

Hi all,

Here are some omap patches that have not yet been posted to linux-arm-kernel for review.

Regards,

Tony

---

Anand Gadiyar (1):
omap: usb: fix build warning

Dmitry Kasatkin (1):
omap: crypto: updates to enable omap aes

Jarkko Nikula (4):
omap: n8x0: Cleanup i2c1 and menelaus registration
omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810
omap: n8x0: Mux i2s codec port pins for McBSP block
omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and docleanups

Peter Ujfalusi (1):
omap: McBSP: Do not enable SRG in slave mode

Sanjeev Premi (1):
omap2: fix assorted compiler warnings

Subramaniam C.A (1):
omap: i2c: Avoid compilation error in case the header is included multiple times

Sukumar Ghorai (1):
omap: mmc: extended to pass host capabilities from board file

Yogesh Marathe (1):
omap3: Remove non-existent config option

 arch/arm/mach-omap2/board-2430sdp.c          |    3 +
 arch/arm/mach-omap2/board-3430sdp.c          |    5 +
 arch/arm/mach-omap2/board-4430sdp.c          |    4 +
 arch/arm/mach-omap2/board-cm-t35.c           |    5 +
 arch/arm/mach-omap2/board-devkit8000.c       |    3 +
 arch/arm/mach-omap2/board-igep0020.c         |    5 +
 arch/arm/mach-omap2/board-ldp.c              |    3 +
 arch/arm/mach-omap2/board-n8x0.c             |   51 ++++++++++-----
 arch/arm/mach-omap2/board-omap3beagle.c      |    3 +
 arch/arm/mach-omap2/board-omap3evm.c         |    3 +
 arch/arm/mach-omap2/board-omap3pandora.c     |    7 +-
 arch/arm/mach-omap2/board-omap3stalker.c     |    3 +
 arch/arm/mach-omap2/board-omap3touchbook.c   |    3 +
 arch/arm/mach-omap2/board-omap4panda.c       |    4 -
 arch/arm/mach-omap2/board-overo.c            |    5 +
 arch/arm/mach-omap2/board-rx51-peripherals.c |    5 +
 arch/arm/mach-omap2/board-zoom-peripherals.c |    5 +
 arch/arm/mach-omap2/clock2420_data.c         |    2 -
 arch/arm/mach-omap2/clock2430_data.c         |    2 -
 arch/arm/mach-omap2/clock3xxx_data.c         |    2 -
 arch/arm/mach-omap2/devices.c                |   87 ++++++++++++++++++++++++--
 arch/arm/mach-omap2/hsmmc.c                  |   16 +++--
 arch/arm/mach-omap2/hsmmc.h                  |    3 +
 arch/arm/mach-omap2/mcbsp.c                  |   39 ------------
 arch/arm/mach-omap2/mux.c                    |    2 -
 arch/arm/mach-omap2/omap-iommu.c             |    2 -
 arch/arm/plat-omap/gpio.c                    |    4 +
 arch/arm/plat-omap/include/plat/i2c.h        |    4 +
 arch/arm/plat-omap/include/plat/mmc.h        |    7 +-
 arch/arm/plat-omap/include/plat/usb.h        |    2 -
 arch/arm/plat-omap/mcbsp.c                   |   13 ++--
 drivers/mmc/host/omap.c                      |    2 -
 drivers/mmc/host/omap_hsmmc.c                |   18 +----
 33 files changed, 190 insertions(+), 132 deletions(-)
Signature · 1 line
Signature
author maintainer
#1 lore raw

PATCH 1/11 omap2: fix assorted compiler warnings

From: Sanjeev Premi <[email protected]>

This patch fixes these compiler warnings:

CC arch/arm/mach-omap2/mux.o
arch/arm/mach-omap2/mux.c: In function 'omap_mux_init_gpio':
arch/arm/mach-omap2/mux.c:90: warning: 'gpio_mux' may be used uninitial ized in this function

CC arch/arm/plat-omap/gpio.o
arch/arm/plat-omap/gpio.c: In function 'omap2_gpio_resume_after_idle':
arch/arm/plat-omap/gpio.c:2152: warning: 'l' may be used uninitialized in this function
arch/arm/plat-omap/gpio.c: In function 'omap2_gpio_prepare_for_idle':
arch/arm/plat-omap/gpio.c:2085: warning: 'l2' may be used uninitialized in this function
arch/arm/plat-omap/gpio.c:2085: warning: 'l1' may be used uninitialized in this function

CC arch/arm/mach-omap2/board-omap4panda.o
arch/arm/mach-omap2/board-omap4panda.c: In function 'omap4_panda_init':
arch/arm/mach-omap2/board-omap4panda.c:277: warning: unused variable 's tatus'

---
 arch/arm/mach-omap2/board-omap4panda.c |    2 --
 arch/arm/mach-omap2/mux.c              |    2 +-
 arch/arm/plat-omap/gpio.c              |    4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/board-omap4panda.c +0 -2
index c03d1d5..96f5bbb 100644
@@ -274,8 +274,6 @@ static int __init omap4_panda_i2c_init(void)
 }
 static void __init omap4_panda_init(void)
 {
-	int status;
-
 	omap4_panda_i2c_init();
 	omap_serial_init();
 	omap4_twl6030_hsmmc_init(mmc);
arch/arm/mach-omap2/mux.c +1 -1
index ab403b2..6c2f8f0 100644
@@ -87,7 +87,7 @@ static char *omap_mux_options;
 int __init omap_mux_init_gpio(int gpio, int val)
 {
 	struct omap_mux_entry *e;
-	struct omap_mux *gpio_mux;
+	struct omap_mux *gpio_mux = NULL;
 	u16 old_mode;
 	u16 mux_mode;
 	int found = 0;
arch/arm/plat-omap/gpio.c +2 -2
index 11c5b0e..c05c653 100644
@@ -2084,7 +2084,7 @@ void omap2_gpio_prepare_for_idle(int power_state)
 
 	for (i = min; i < gpio_bank_count; i++) {
 		struct gpio_bank *bank = &gpio_bank[i];
-		u32 l1, l2;
+		u32 l1 = 0, l2 = 0;
 		int j;
 
 		for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)
@@ -2152,7 +2152,7 @@ void omap2_gpio_resume_after_idle(void)
 		min = 1;
 	for (i = min; i < gpio_bank_count; i++) {
 		struct gpio_bank *bank = &gpio_bank[i];
-		u32 l, gen, gen0, gen1;
+		u32 l = 0, gen, gen0, gen1;
 		int j;
 
 		for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)
author maintainer
#2 lore raw

PATCH 2/11 omap: n8x0: Cleanup i2c1 and menelaus registration

In reply to Tony Lindgren

From: Jarkko Nikula <[email protected]>

- Move n8x0_i2c_board_info_1 out from #ifdef CONFIG_MENELAUS block, register i2c1 in n8x0_init_machine and do a few clean-ups around these. Code looks better if board infos are grouped together
- Mark n8x0_i2c_board_info_1 and n8x0_menelaus_platform_data with __initdata

---
 arch/arm/mach-omap2/board-n8x0.c |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)
arch/arm/mach-omap2/board-n8x0.c +15 -19
index a3e2b49..313ce5e 100644
@@ -614,30 +614,25 @@ static int n8x0_menelaus_late_init(struct device *dev)
 	return 0;
 }
 
-static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] = {
+#else
+static int n8x0_menelaus_late_init(struct device *dev)
+{
+	return 0;
+}
+#endif
+
+static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
+	.late_init = n8x0_menelaus_late_init,
+};
+
+static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] __initdata = {
 	{
 		I2C_BOARD_INFO("menelaus", 0x72),
 		.irq = INT_24XX_SYS_NIRQ,
+		.platform_data = &n8x0_menelaus_platform_data,
 	},
 };
 
-static struct menelaus_platform_data n8x0_menelaus_platform_data = {
-	.late_init = n8x0_menelaus_late_init,
-};
-
-static void __init n8x0_menelaus_init(void)
-{
-	n8x0_i2c_board_info_1[0].platform_data = &n8x0_menelaus_platform_data;
-	omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,
-			      ARRAY_SIZE(n8x0_i2c_board_info_1));
-}
-
-#else
-static inline void __init n8x0_menelaus_init(void)
-{
-}
-#endif
-
 static void __init n8x0_map_io(void)
 {
 	omap2_set_globals_242x();
@@ -665,9 +660,10 @@ static void __init n8x0_init_machine(void)
 	/* FIXME: add n810 spi devices */
 	spi_register_board_info(n800_spi_board_info,
 				ARRAY_SIZE(n800_spi_board_info));
+	omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,
+			      ARRAY_SIZE(n8x0_i2c_board_info_1));
 
 	omap_serial_init();
-	n8x0_menelaus_init();
 	n8x0_onenand_init();
 	n8x0_mmc_init();
 	n8x0_usb_init();
author maintainer
#3 lore raw

PATCH 3/11 omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810

In reply to Tony Lindgren

From: Jarkko Nikula <[email protected]>

Second i2c bus on Nokia N800 and N810 shares both common and hw specific peripherals. Register now this bus and add board info with tlv320aic3x for N810. Common peripherals may be added as an additional board info to omap_register_i2c_bus(2, ...);

---
 arch/arm/mach-omap2/board-n8x0.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-n8x0.c +16 -0
index 313ce5e..7863633 100644
@@ -20,6 +20,7 @@
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/usb/musb.h>
+#include <sound/tlv320aic3x.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
@@ -633,6 +634,17 @@ static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] __initdata = {
 	},
 };
 
+static struct aic3x_pdata n810_aic33_data __initdata = {
+	.gpio_reset = 118,
+};
+
+static struct i2c_board_info n810_i2c_board_info_2[] __initdata = {
+	{
+		I2C_BOARD_INFO("tlv320aic3x", 0x18),
+		.platform_data = &n810_aic33_data,
+	},
+};
+
 static void __init n8x0_map_io(void)
 {
 	omap2_set_globals_242x();
@@ -662,6 +674,10 @@ static void __init n8x0_init_machine(void)
 				ARRAY_SIZE(n800_spi_board_info));
 	omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,
 			      ARRAY_SIZE(n8x0_i2c_board_info_1));
+	omap_register_i2c_bus(2, 400, NULL, 0);
+	if (machine_is_nokia_n810())
+		i2c_register_board_info(2, n810_i2c_board_info_2,
+					ARRAY_SIZE(n810_i2c_board_info_2));
 
 	omap_serial_init();
 	n8x0_onenand_init();
author maintainer
#4 lore raw

PATCH 4/11 omap: n8x0: Mux i2s codec port pins for McBSP block

In reply to Tony Lindgren

From: Jarkko Nikula <[email protected]>

Bootloader on Nokia N800 and N810 muxes I2C codec port pins for EAC block. As there is no driver and use for EAC, mux those pins for McBSP instead since N810 ASoC drivers can use it.

---
 arch/arm/mach-omap2/board-n8x0.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-n8x0.c +5 -0
index 7863633..8fd2269 100644
@@ -660,6 +660,11 @@ static void __init n8x0_init_irq(void)
 
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
+	/* I2S codec port pins for McBSP block */
+	OMAP2420_MUX(EAC_AC_SCLK, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
+	OMAP2420_MUX(EAC_AC_FS, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
+	OMAP2420_MUX(EAC_AC_DIN, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
+	OMAP2420_MUX(EAC_AC_DOUT, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
 	{ .reg_offset = OMAP_MUX_TERMINATOR },
 };
 #else
author maintainer
#5 lore raw

PATCH 5/11 omap3: Remove non-existent config option

In reply to Tony Lindgren

From: Yogesh Marathe <[email protected]>

The definition of "iva2" device in iommu_device is wrapped inside CONFIG_MPU_BRIDGE_IOMMU, but this option is not defined in KConfig.

This patch removes the wrapper and makes "iva2" available as another iommu_device.

---
 arch/arm/mach-omap2/omap-iommu.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/omap-iommu.c +0 -2
index f5a1aad..bb8c01d 100644
@@ -35,7 +35,6 @@ static struct iommu_device omap3_devices[] = {
 			.clk_name = "cam_ick",
 		},
 	},
-#if defined(CONFIG_MPU_BRIDGE_IOMMU)
 	{
 		.base = 0x5d000000,
 		.irq = 28,
@@ -45,7 +44,6 @@ static struct iommu_device omap3_devices[] = {
 			.clk_name = "iva2_ck",
 		},
 	},
-#endif
 };
 #define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
 static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
#6 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 8 lines · Tony Lindgren

From: Yogesh Marathe <[email protected]>

The definition of "iva2" device in iommu_device is wrapped inside CONFIG_MPU_BRIDGE_IOMMU, but this option is not defined in KConfig.

This patch removes the wrapper and makes "iva2" available as another iommu_device.

NAK.

This would break tidspbridge's MMU. This was discussed before:
http://thread.gmane.org/gmane.linux.ports.arm.kernel/58302/focus=58305

When tidspbridge has migrated to iommu, then it should define CONFIG_MPU_BRIDGE_IOMMU.

Signature · 1 line
Felipe Contreras
#7 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 19 lines

-----Original Message-----
From: Felipe Contreras [mailto:felipe.contreras at gmail.com]
Sent: Friday, September 24, 2010 3:31 PM
To: Tony Lindgren
Cc: linux-arm-kernel at lists.infradead.org;
linux-omap at vger.kernel.org; Premi, Sanjeev; Marathe, Yogesh
Subject: Re: [PATCH 05/11] omap3: Remove non-existent config option

Quoted 8 lines · Tony Lindgren

From: Yogesh Marathe <[email protected]>

The definition of "iva2" device in iommu_device is wrapped inside CONFIG_MPU_BRIDGE_IOMMU, but this option is not defined in KConfig.

This patch removes the wrapper and makes "iva2" available as another iommu_device.

Quoted 7 lines

NAK.

This would break tidspbridge's MMU. This was discussed before:
http://thread.gmane.org/gmane.linux.ports.arm.kernel/58302/focus=58305

When tidspbridge has migrated to iommu, then it should define CONFIG_MPU_BRIDGE_IOMMU.

Felipe,

Can you go through earlier discussion on this patch
http://marc.info/?l=linux-omap&m=127979007623260&w=2

I believe these concerns were discussed. I am unable to open the gmane thread (getting 504) - so can't be sure if Hiroshi had referred to same discussion.

~sanjeev

Quoted 4 lines
Signature · 2 lines
-- 
Felipe Contreras
#8 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 19 lines · Sanjeev
Quoted 11 lines
Quoted 8 lines · Tony Lindgren

From: Yogesh Marathe <[email protected]>

The definition of "iva2" device in iommu_device is wrapped inside CONFIG_MPU_BRIDGE_IOMMU, but this option is not defined in KConfig.

This patch removes the wrapper and makes "iva2" available as another iommu_device.

Quoted 7 lines

NAK.

This would break tidspbridge's MMU. This was discussed before:
http://thread.gmane.org/gmane.linux.ports.arm.kernel/58302/focus=58305

When tidspbridge has migrated to iommu, then it should define CONFIG_MPU_BRIDGE_IOMMU.

Quoted 6 lines

?Can you go through earlier discussion on this patch ?http://marc.info/?l=linux-omap&m=127979007623260&w=2

?I believe these concerns were discussed. I am unable to ?open the gmane thread (getting 504) - so can't be sure ?if Hiroshi had referred to same discussion.

When you merge iommu support, then either you enable CONFIG_MPU_BRIDGE_IOMMU unconditionally, or you apply this patch, but this patch alone will only break things.

Signature · 1 line
Felipe Contreras
#9 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 35 lines

-----Original Message-----
From: Felipe Contreras [mailto:felipe.contreras at gmail.com]
Sent: Saturday, September 25, 2010 9:13 PM
To: Premi, Sanjeev
Cc: Tony Lindgren; linux-arm-kernel at lists.infradead.org; linux- omap at vger.kernel.org; Marathe, Yogesh
Subject: Re: [PATCH 05/11] omap3: Remove non-existent config option

Quoted 19 lines · Sanjeev
Quoted 11 lines
Quoted 8 lines · Tony Lindgren

From: Yogesh Marathe <[email protected]>

The definition of "iva2" device in iommu_device is wrapped inside CONFIG_MPU_BRIDGE_IOMMU, but this option is not defined in KConfig.

This patch removes the wrapper and makes "iva2" available as another iommu_device.

Quoted 7 lines

NAK.

This would break tidspbridge's MMU. This was discussed before:
http://thread.gmane.org/gmane.linux.ports.arm.kernel/58302/focus=58305

When tidspbridge has migrated to iommu, then it should define CONFIG_MPU_BRIDGE_IOMMU.

Quoted 6 lines

?Can you go through earlier discussion on this patch ?http://marc.info/?l=linux-omap&m=127979007623260&w=2

?I believe these concerns were discussed. I am unable to ?open the gmane thread (getting 504) - so can't be sure ?if Hiroshi had referred to same discussion.

Quoted 6 lines

When you merge iommu support, then either you enable CONFIG_MPU_BRIDGE_IOMMU unconditionally, or you apply this patch, but this patch alone will only break things.

--
Felipe Contreras

Felipe,

Any other driver which does not depend on bridge and interested in using iommu should get the handle when iommu_get("iva2") is called. It is not happening in original case. I think there should not be restrictions on other drivers to define un-related compile time define if they just want to use iommu driver. I feel the implementation that is breaking due to removal of this define should be fixed.

Regards,
Yogesh.

#10 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 5 lines · Yogesh
Quoted 3 lines

When you merge iommu support, then either you enable CONFIG_MPU_BRIDGE_IOMMU unconditionally, or you apply this patch, but this patch alone will only break things.

Any other driver which does not depend on bridge and interested in using iommu should get the handle when iommu_get("iva2") is called.

That's a hypothetical driver, right? The only driver that would ever be interested in the "iva2" iommu is tidspbridge, and this patch would brake it.

Quoted 1 line

It is not happening in original case. I think there should not be restrictions on other drivers to define un-related compile time define if they just want to use iommu driver. I feel the implementation that is breaking due to removal of this define should be fixed.

I couldn't parse that correctly. However, what's wrong with the proposal? Let's think about CONFIG_MPU_BRIDGE_IOMMU when the iommu patches come.

Signature · 1 line
Felipe Contreras
author maintainer
#11 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 11 lines · Felipe Contreras
Quoted 5 lines · Yogesh
Quoted 3 lines

When you merge iommu support, then either you enable CONFIG_MPU_BRIDGE_IOMMU unconditionally, or you apply this patch, but this patch alone will only break things.

Any other driver which does not depend on bridge and interested in using iommu should get the handle when iommu_get("iva2") is called.

That's a hypothetical driver, right? The only driver that would ever be interested in the "iva2" iommu is tidspbridge, and this patch would brake it.

Quoted 5 lines
Quoted 1 line

It is not happening in original case. I think there should not be restrictions on other drivers to define un-related compile time define if they just want to use iommu driver. I feel the implementation that is breaking due to removal of this define should be fixed.

I couldn't parse that correctly. However, what's wrong with the proposal? Let's think about CONFIG_MPU_BRIDGE_IOMMU when the iommu patches come.

Let's not break the existing code. Dropping this patch for now.

Tony

#12 lore raw

PATCH 5/11 omap3: Remove non-existent config option

In reply to Felipe Contreras

Felipe,

Quoted 22 lines

-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of Felipe Contreras
Sent: Monday, September 27, 2010 10:56 AM
To: Marathe, Yogesh
Cc: Premi, Sanjeev; Tony Lindgren; linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: Re: [PATCH 05/11] omap3: Remove non-existent config option

Quoted 5 lines · Yogesh
Quoted 3 lines

When you merge iommu support, then either you enable CONFIG_MPU_BRIDGE_IOMMU unconditionally, or you apply this patch, but this patch alone will only break things.

Any other driver which does not depend on bridge and interested in using

iommu should get the handle when iommu_get("iva2") is called.

That's a hypothetical driver, right? The only driver that would ever be interested in the "iva2" iommu is tidspbridge, and this patch would brake it.

Quoted 9 lines
Quoted 1 line

It is not happening in original case. I think there should not be

restrictions on other drivers to define un-related compile time define if they just want to use iommu driver. I feel the implementation that is breaking due to removal of this define should be fixed.

I couldn't parse that correctly. However, what's wrong with the proposal? Let's think about CONFIG_MPU_BRIDGE_IOMMU when the iommu patches come.

Yogesh is coming from dsplink requirement to use iommu. I see his comment as why Bridge requirement should be imposed on other IPCs that need iommu.

Thank you,
Best regards,
Hari

#13 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Hi Hari,

Quoted 1 line · Hari

Yogesh is coming from dsplink requirement to use iommu. I see his comment as why Bridge requirement should be imposed on other IPCs that need iommu.

Ahh, that explains a lot. However, dsp-link can just enable CONFIG_MPU_BRIDGE_IOMMU, and that's it, right? Perhaps it would make sense to rename to CONFIG_OMAP_IOMMU_IVA2, or something like that. But not remove it and break tidspbridge, which is already in staging.

Once both are working happily with CONFIG_OMAP_IOMMU_IVA2 on, _then_ it can be removed.

Signature · 1 line
Felipe Contreras
#14 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 26 lines

-----Original Message-----
From: Felipe Contreras [mailto:felipe.contreras at gmail.com]
Sent: Wednesday, September 29, 2010 5:05 PM
To: Kanigeri, Hari
Cc: Marathe, Yogesh; Premi, Sanjeev; Tony Lindgren; linux-arm- kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: Re: [PATCH 05/11] omap3: Remove non-existent config option

Hi Hari,

Quoted 1 line · Hari

Yogesh is coming from dsplink requirement to use iommu. I see his

comment as why Bridge requirement should be imposed on other IPCs that need iommu.

Ahh, that explains a lot. However, dsp-link can just enable CONFIG_MPU_BRIDGE_IOMMU, and that's it, right? Perhaps it would make
sense to rename to CONFIG_OMAP_IOMMU_IVA2, or something like that. But
not remove it and break tidspbridge, which is already in staging.

Quoted 6 lines

Once both are working happily with CONFIG_OMAP_IOMMU_IVA2 on, _then_
it can be removed.

--
Felipe Contreras

Felipe,

dsplink and syslink (two drivers who use iommu) should not enable CONFIG_MPU_BRIDGE_IOMMU as dspbridge and dsplink /syslink can not co-exist as they are using same resources. Not applying patch breaks dsplink/sylink any one which is being used. Defining this config makes them co-exist.

I'm ok with changing name to CONFIG_OMAP_IOMMU_IVA2 but ideally then that will also break the dspbridge.

One more way would be to soure revert the patch and apply on dspbridge branch if it breaks the builds on that branch rather than breaking others in master.

Regards,
Yogesh.

#15 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 5 lines · Yogesh

dsplink and syslink (two drivers who use iommu) should not enable CONFIG_MPU_BRIDGE_IOMMU as dspbridge and dsplink /syslink can not co-exist as they are using same resources. Not applying patch breaks dsplink/sylink any one which is being used. Defining this config makes them co-exist.

No, for dsp-link you would have:
CONFIG_TIDSPBRIDGE=n
CONFIG_OMAP_IOMMU_IVA2=y

It would be exactly the same as applying your patch.

And tidspbridge is not using iommu right now.

And AFAIK syslink is not for omap3, so omap3_devices is not relevant.

Quoted 2 lines

I'm ok with changing name to CONFIG_OMAP_IOMMU_IVA2 but ideally then that will also break the dspbridge.

No, grep for MPU_BRIDGE_IOMMU on the current tidspbridge in mainline; it's not defined anywhere, so CONFIG_OMAP_IOMMU_IVA2, or CONFIG_FOOBAR, it doesn't matter for tidspbridge right now. And MPU_BRIDGE_IOMMU doesn't depend on tidspbridge on any way.

Quoted 2 lines

One more way would be to soure revert the patch and apply on dspbridge branch if it breaks the builds on that branch rather than breaking others in master.

There is no tidspbrige branch; it's in mainline:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=tree;f=drivers/staging/tidspbridge

But that doesn't matter, even if it was in a branch, iommu should not break either tidspbridge, or dsp-link, and driver branches should not modify anything outside their domain (ideally).

All you need to do is 'select OMAP_IOMMU_IVA2', although the attached patch would be needed.

Signature · 8 lines
Felipe Contreras
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-omap-iommu-make-iva2-iommu-selectable.patch
Type: text/x-patch
Size: 1354 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100929/78b784ae/attachment.bin>
#16 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 19 lines

-----Original Message-----
From: Felipe Contreras [mailto:[email protected]]
Sent: Thursday, September 30, 2010 12:42 AM
To: Marathe, Yogesh
Cc: Kanigeri, Hari; Premi, Sanjeev; Tony Lindgren; linux-arm- [email protected]; [email protected]
Subject: Re: [PATCH 05/11] omap3: Remove non-existent config option

Quoted 3 lines · Yogesh

dsplink and syslink (two drivers who use iommu) should not enable CONFIG_MPU_BRIDGE_IOMMU as dspbridge and dsplink /syslink can not co-exist as they are using same resources. Not applying

patch

Quoted 1 line

breaks dsplink/sylink any one which is being used. Defining this

config

Quoted 1 line

makes them co-exist.

Quoted 7 lines

No, for dsp-link you would have:
CONFIG_TIDSPBRIDGE=n
CONFIG_OMAP_IOMMU_IVA2=y

It would be exactly the same as applying your patch.

And tidspbridge is not using iommu right now.

I noticed that you have added OMAP_IOMMU_IVA2 to Kconfig. In this case I need CONFIG_OMAP_IOMMU_IVA2=y by default on master so that iommu is open to use for all other drivers by default.

Quoted 11 lines

And AFAIK syslink is not for omap3, so omap3_devices is not relevant.

Quoted 1 line

I'm ok with changing name to CONFIG_OMAP_IOMMU_IVA2 but

ideally

Quoted 1 line

then that will also break the dspbridge.

No, grep for MPU_BRIDGE_IOMMU on the current tidspbridge in mainline;
it's not defined anywhere, so CONFIG_OMAP_IOMMU_IVA2, or CONFIG_FOOBAR, it doesn't matter for tidspbridge right now. And MPU_BRIDGE_IOMMU doesn't depend on tidspbridge on any way.

Please explain, how removing CONFIG_MPU_BRIDGE_IOMMU Or any other the config name in place, breaks tidspbridge? My patch is removing the 'if defined'.

Quoted 19 lines
Quoted 2 lines

One more way would be to soure revert the patch and apply on

dspbridge branch if it breaks the builds on that branch rather than

Quoted 1 line

breaking others in master.

There is no tidspbrige branch; it's in mainline:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-
2.6.git;a=tree;f=drivers/staging/tidspbridge

But that doesn't matter, even if it was in a branch, iommu should not break either tidspbridge, or dsp-link, and driver branches should not modify anything outside their domain (ideally).

All you need to do is 'select OMAP_IOMMU_IVA2', although the attached
patch would be needed.

--
Felipe Contreras

#17 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 49 lines

-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Marathe, Yogesh
Sent: Friday, October 01, 2010 6:29 AM
To: Felipe Contreras
Cc: Kanigeri, Hari; Premi, Sanjeev; Tony Lindgren; linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: RE: [PATCH 05/11] omap3: Remove non-existent config option

Quoted 18 lines

-----Original Message-----
From: Felipe Contreras [mailto:felipe.contreras at gmail.com]
Sent: Thursday, September 30, 2010 12:42 AM
To: Marathe, Yogesh
Cc: Kanigeri, Hari; Premi, Sanjeev; Tony Lindgren; linux-arm- kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: Re: [PATCH 05/11] omap3: Remove non-existent config option

Quoted 3 lines · Yogesh

dsplink and syslink (two drivers who use iommu) should not enable CONFIG_MPU_BRIDGE_IOMMU as dspbridge and dsplink /syslink can not co-exist as they are using same resources. Not applying

patch

Quoted 1 line

breaks dsplink/sylink any one which is being used. Defining this

config

Quoted 1 line

makes them co-exist.

Quoted 7 lines

No, for dsp-link you would have:
CONFIG_TIDSPBRIDGE=n
CONFIG_OMAP_IOMMU_IVA2=y

It would be exactly the same as applying your patch.

And tidspbridge is not using iommu right now.

I noticed that you have added OMAP_IOMMU_IVA2 to Kconfig. In this case I need CONFIG_OMAP_IOMMU_IVA2=y by default on master so that iommu is open to use for all other drivers by default.

Quoted 1 line

And AFAIK syslink is not for omap3, so omap3_devices is not

relevant.

Quoted 6 lines
Quoted 2 lines

I'm ok with changing name to CONFIG_OMAP_IOMMU_IVA2 but

ideally

Quoted 1 line

then that will also break the dspbridge.

No, grep for MPU_BRIDGE_IOMMU on the current tidspbridge in

Quoted 8 lines

mainline;

Quoted 3 lines

it's not defined anywhere, so CONFIG_OMAP_IOMMU_IVA2, or CONFIG_FOOBAR, it doesn't matter for tidspbridge right now. And MPU_BRIDGE_IOMMU doesn't depend on tidspbridge on any way.

Please explain, how removing CONFIG_MPU_BRIDGE_IOMMU Or any other the config name in place, breaks tidspbridge? My patch is removing the 'if defined'.

Can I know the status of this patch?

This patch is needed now that tidspbridge has migrated to use Iommu moudle.

Will this patch be merged?

Regards,
Fernando.

Quoted 28 lines
Quoted 11 lines
Quoted 3 lines

One more way would be to soure revert the patch and apply on

dspbridge branch if it breaks the builds on that branch rather than

Quoted 1 line

breaking others in master.

There is no tidspbrige branch; it's in mainline:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-
2.6.git;a=tree;f=drivers/staging/tidspbridge

But that doesn't matter, even if it was in a branch, iommu

should not

Quoted 1 line

break either tidspbridge, or dsp-link, and driver branches

should not

Quoted 3 lines

modify anything outside their domain (ideally).

All you need to do is 'select OMAP_IOMMU_IVA2', although

the attached

Quoted 4 lines

patch would be needed.

--
Felipe Contreras

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org More majordomo info at
http://vger.kernel.org/majordomo-info.html

#18 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 71 lines

-----Original Message-----
From: Guzman Lugo, Fernando
Sent: Wednesday, October 06, 2010 5:44 AM
To: Marathe, Yogesh; Felipe Contreras
Cc: Kanigeri, Hari; Premi, Sanjeev; Tony Lindgren; linux-arm- kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: RE: [PATCH 05/11] omap3: Remove non-existent config option

Quoted 3 lines

-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Marathe,

Yogesh

Quoted 5 lines

Sent: Friday, October 01, 2010 6:29 AM
To: Felipe Contreras
Cc: Kanigeri, Hari; Premi, Sanjeev; Tony Lindgren; linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: RE: [PATCH 05/11] omap3: Remove non-existent config

option

Quoted 8 lines
Quoted 8 lines

-----Original Message-----
From: Felipe Contreras [mailto:felipe.contreras at gmail.com]
Sent: Thursday, September 30, 2010 12:42 AM
To: Marathe, Yogesh
Cc: Kanigeri, Hari; Premi, Sanjeev; Tony Lindgren; linux-arm- kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: Re: [PATCH 05/11] omap3: Remove non-existent config

option

Quoted 4 lines
Quoted 4 lines
Quoted 1 line · Yogesh

dsplink and syslink (two drivers who use iommu) should not

enable

Quoted 1 line
Quoted 1 line
Quoted 1 line

CONFIG_MPU_BRIDGE_IOMMU as dspbridge and dsplink

/syslink can not

Quoted 12 lines
Quoted 12 lines
Quoted 1 line

co-exist as they are using same resources. Not applying

patch

Quoted 1 line

breaks dsplink/sylink any one which is being used. Defining this

config

Quoted 1 line

makes them co-exist.

No, for dsp-link you would have:
CONFIG_TIDSPBRIDGE=n
CONFIG_OMAP_IOMMU_IVA2=y

It would be exactly the same as applying your patch.

Quoted 10 lines
Quoted 1 line

And tidspbridge is not using iommu right now.

I noticed that you have added OMAP_IOMMU_IVA2 to Kconfig. In this case I need CONFIG_OMAP_IOMMU_IVA2=y by default on master so that iommu is open to use for all other drivers by default.

Quoted 1 line

And AFAIK syslink is not for omap3, so omap3_devices is not

relevant.

Quoted 2 lines
Quoted 2 lines

I'm ok with changing name to CONFIG_OMAP_IOMMU_IVA2

but

Quoted 9 lines
Quoted 4 lines

ideally

Quoted 1 line

then that will also break the dspbridge.

No, grep for MPU_BRIDGE_IOMMU on the current tidspbridge in

mainline;

Quoted 3 lines

it's not defined anywhere, so CONFIG_OMAP_IOMMU_IVA2, or CONFIG_FOOBAR, it doesn't matter for tidspbridge right now. And MPU_BRIDGE_IOMMU doesn't depend on tidspbridge on any way.

Quoted 6 lines
Quoted 1 line

Please explain, how removing CONFIG_MPU_BRIDGE_IOMMU Or

any

Quoted 2 lines

other the config name in place, breaks tidspbridge? My patch is removing the 'if defined'.

Can I know the status of this patch?

I have been discussing this with Fernando. In his opinion we should have a Kconfig option and iommu user should explicitly set it to 'y' if they wish to use it. I'm saying removal of this 'if defined' solves the problem which is what you also want.

Quoted 5 lines

This patch is needed now that tidspbridge has migrated to use Iommu moudle.

Will this patch be merged?

I'm also waiting on this patch to get accepted.

Quoted 32 lines

Regards,
Fernando.

Quoted 28 lines
Quoted 11 lines
Quoted 3 lines

One more way would be to soure revert the patch and apply on

dspbridge branch if it breaks the builds on that branch rather than

Quoted 1 line

breaking others in master.

There is no tidspbrige branch; it's in mainline:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-
2.6.git;a=tree;f=drivers/staging/tidspbridge

But that doesn't matter, even if it was in a branch, iommu

should not

Quoted 1 line

break either tidspbridge, or dsp-link, and driver branches

should not

Quoted 3 lines

modify anything outside their domain (ideally).

All you need to do is 'select OMAP_IOMMU_IVA2', although

the attached

Quoted 4 lines

patch would be needed.

--
Felipe Contreras

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org More majordomo info at
http://vger.kernel.org/majordomo-info.html

Regards,
Yogesh.

#19 lore raw

PATCH 5/11 omap3: Remove non-existent config option

In reply to Guzman Lugo, Fernando
Quoted 6 lines · Fernando

Can I know the status of this patch?

This patch is needed now that tidspbridge has migrated to use Iommu moudle.

Will this patch be merged?

This patch hasn't even been sent yet. I expected somebody else to try it and do so.

Anyway, I'm now trying iommu myself and will send this patch when I get the dsp working.

Signature · 1 line
Felipe Contreras
#20 lore raw

PATCH 5/11 omap3: Remove non-existent config option

Quoted 14 lines

-----Original Message-----
From: Felipe Contreras [mailto:felipe.contreras at gmail.com]
Sent: Sunday, October 10, 2010 7:38 PM
To: Guzman Lugo, Fernando
Cc: Marathe, Yogesh; Kanigeri, Hari; Premi, Sanjeev; Tony Lindgren; linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: Re: [PATCH 05/11] omap3: Remove non-existent config option

Quoted 2 lines · Fernando

Can I know the status of this patch?

Quoted 7 lines
Quoted 4 lines

This patch is needed now that tidspbridge has migrated to use Iommu moudle.

Will this patch be merged?

This patch hasn't even been sent yet. I expected somebody else to try it and do so.

Felipe,

I think Fernando is talking about the patch that I had sent at the beginning. I had replied Fernando saying it is under discussion as you were looking at other iommu patches.

If we have agreed upon having CONFIG_OMAP_IOMMU_IVA2 available "by default" I have no problem to try your patch else the original patch that I had sent should be reconsidered.

Regards,
Yogesh.

Quoted 5 lines

Anyway, I'm now trying iommu myself and will send this patch when I get the dsp working.

--
Felipe Contreras

author maintainer
#21 lore raw

PATCH 6/11 omap: usb: fix build warning

In reply to Tony Lindgren

From: Anand Gadiyar <[email protected]>

Fix this and similar build warnings when building with omap_4430sdp_defconfig.

CC arch/arm/mach-omap2/board-4430sdp.o
In file included from arch/arm/mach-omap2/board-4430sdp.c:36:
arch/arm/plat-omap/include/plat/usb.h:109: warning: return type defaults to 'int'

---
 arch/arm/plat-omap/include/plat/usb.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-omap/include/plat/usb.h +1 -1
index 2a9427c..6674562 100644
@@ -105,7 +105,7 @@ static inline void omap1_usb_init(struct omap_usb_config *pdata)
 #if defined(CONFIG_ARCH_OMAP_OTG) || defined(CONFIG_ARCH_OMAP_OTG_MODULE)
 void omap2_usbfs_init(struct omap_usb_config *pdata);
 #else
-static inline omap2_usbfs_init(struct omap_usb_config *pdata)
+static inline void omap2_usbfs_init(struct omap_usb_config *pdata)
 {
 }
 #endif
author maintainer
#22 lore raw

PATCH 7/11 omap: crypto: updates to enable omap aes

In reply to Tony Lindgren

From: Dmitry Kasatkin <[email protected]>

Updates to enable omap aes

[tony at atomide.com: updated to use CONFIG_ARCH_OMAP2/3 instead of old 24XX/34XX]
---
 arch/arm/mach-omap2/clock2420_data.c |    2 -
 arch/arm/mach-omap2/clock2430_data.c |    2 -
 arch/arm/mach-omap2/clock3xxx_data.c |    2 -
 arch/arm/mach-omap2/devices.c        |   71 ++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/clock2420_data.c +1 -1
index 37d65d6..5f2066a 100644
@@ -1838,7 +1838,7 @@ static struct omap_clk omap2420_clks[] = {
 	CLK(NULL,	"des_ick",	&des_ick,	CK_242X),
 	CLK("omap-sham",	"ick",	&sha_ick,	CK_242X),
 	CLK("omap_rng",	"ick",		&rng_ick,	CK_242X),
-	CLK(NULL,	"aes_ick",	&aes_ick,	CK_242X),
+	CLK("omap-aes",	"ick",	&aes_ick,	CK_242X),
 	CLK(NULL,	"pka_ick",	&pka_ick,	CK_242X),
 	CLK(NULL,	"usb_fck",	&usb_fck,	CK_242X),
 	CLK("musb_hdrc",	"fck",	&osc_ck,	CK_242X),
arch/arm/mach-omap2/clock2430_data.c +1 -1
index b33118f..701a171 100644
@@ -1926,7 +1926,7 @@ static struct omap_clk omap2430_clks[] = {
 	CLK(NULL,	"des_ick",	&des_ick,	CK_243X),
 	CLK("omap-sham",	"ick",	&sha_ick,	CK_243X),
 	CLK("omap_rng",	"ick",		&rng_ick,	CK_243X),
-	CLK(NULL,	"aes_ick",	&aes_ick,	CK_243X),
+	CLK("omap-aes",	"ick",	&aes_ick,	CK_243X),
 	CLK(NULL,	"pka_ick",	&pka_ick,	CK_243X),
 	CLK(NULL,	"usb_fck",	&usb_fck,	CK_243X),
 	CLK("musb_hdrc",	"ick",	&usbhs_ick,	CK_243X),
arch/arm/mach-omap2/clock3xxx_data.c +1 -1
index dfdce2d..c73906d 100644
@@ -3288,7 +3288,7 @@ static struct omap_clk omap3xxx_clks[] = {
 	CLK(NULL,	"usbtll_ick",	&usbtll_ick,	CK_3430ES2 | CK_AM35XX),
 	CLK("mmci-omap-hs.2",	"ick",	&mmchs3_ick,	CK_3430ES2 | CK_AM35XX),
 	CLK(NULL,	"icr_ick",	&icr_ick,	CK_343X),
-	CLK(NULL,	"aes2_ick",	&aes2_ick,	CK_343X),
+	CLK("omap-aes",	"ick",	&aes2_ick,	CK_343X),
 	CLK("omap-sham",	"ick",	&sha12_ick,	CK_343X),
 	CLK(NULL,	"des2_ick",	&des2_ick,	CK_343X),
 	CLK("mmci-omap-hs.1",	"ick",	&mmchs2_ick,	CK_3XXX),
arch/arm/mach-omap2/devices.c +71 -0

83 lines not on this page · raw message

author maintainer
#23 lore raw

PATCH 8/11 omap: i2c: Avoid compilation error in case the header is included multiple times

In reply to Tony Lindgren

From: Subramaniam C.A <[email protected]>

Added defines to avoid compilation error.

---
 arch/arm/plat-omap/include/plat/i2c.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
arch/arm/plat-omap/include/plat/i2c.h +4 -0
index 87f6bf2..36a0bef 100644
@@ -18,6 +18,8 @@
  * 02110-1301 USA
  *
  */
+#ifndef __ASM__ARCH_OMAP_I2C_H
+#define __ASM__ARCH_OMAP_I2C_H
 
 #include <linux/i2c.h>
 
@@ -36,3 +38,5 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
 
 void __init omap1_i2c_mux_pins(int bus_id);
 void __init omap2_i2c_mux_pins(int bus_id);
+
+#endif /* __ASM__ARCH_OMAP_I2C_H */
author maintainer
#24 lore raw

PATCH 9/11 omap: McBSP: Do not enable SRG in slave mode

In reply to Tony Lindgren

From: Peter Ujfalusi <[email protected]>

McBSP SRG (Sample Rate Generator) and FSG (Frame Sync Generator) is only needed to be enabled, when McBSP is master.
In McBSP slave mode, the SRG, and FSG can be kept disabled, which might save some power at the end in this configuration.

---
 arch/arm/plat-omap/mcbsp.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
arch/arm/plat-omap/mcbsp.c +8 -5
index e31496e..ecbfe39 100644
@@ -878,7 +878,7 @@ EXPORT_SYMBOL(omap_mcbsp_free);
 void omap_mcbsp_start(unsigned int id, int tx, int rx)
 {
 	struct omap_mcbsp *mcbsp;
-	int idle;
+	int enable_srg = 0;
 	u16 w;
 
 	if (!omap_mcbsp_check_valid_id(id)) {
@@ -893,10 +893,13 @@ void omap_mcbsp_start(unsigned int id, int tx, int rx)
 	mcbsp->rx_word_length = (MCBSP_READ_CACHE(mcbsp, RCR1) >> 5) & 0x7;
 	mcbsp->tx_word_length = (MCBSP_READ_CACHE(mcbsp, XCR1) >> 5) & 0x7;
 
-	idle = !((MCBSP_READ_CACHE(mcbsp, SPCR2) |
-			MCBSP_READ_CACHE(mcbsp, SPCR1)) & 1);
+	/* Only enable SRG, if McBSP is master */
+	w = MCBSP_READ_CACHE(mcbsp, PCR0);
+	if (w & (FSXM | FSRM | CLKXM | CLKRM))
+		enable_srg = !((MCBSP_READ_CACHE(mcbsp, SPCR2) |
+				MCBSP_READ_CACHE(mcbsp, SPCR1)) & 1);
 
-	if (idle) {
+	if (enable_srg) {
 		/* Start the sample generator */
 		w = MCBSP_READ_CACHE(mcbsp, SPCR2);
 		MCBSP_WRITE(mcbsp, SPCR2, w | (1 << 6));
@@ -919,7 +922,7 @@ void omap_mcbsp_start(unsigned int id, int tx, int rx)
 	 */
 	udelay(500);
 
-	if (idle) {
+	if (enable_srg) {
 		/* Start frame sync */
 		w = MCBSP_READ_CACHE(mcbsp, SPCR2);
 		MCBSP_WRITE(mcbsp, SPCR2, w | (1 << 7));
author maintainer
#25 lore raw

PATCH 10/11 omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and docleanups

In reply to Tony Lindgren

From: Jarkko Nikula <[email protected]>

This 'legacy' OMAP2420 McBSP2 muxing code is currently broken after recent conversion to new mux code. The omap_mcbsp_request calling this code is usually called after booting whereas the omap_mux_init_signal is __init marked so null pointer dereference would occur.

Fix this by removing the muxing code and let the bootloader or board file to do it if necessary. Remove also omap2_mcbsp_ops as there is no use for it.

---
 arch/arm/mach-omap2/mcbsp.c |   39 ---------------------------------------
 1 files changed, 0 insertions(+), 39 deletions(-)
arch/arm/mach-omap2/mcbsp.c +0 -39
index 467aae2..88b8790 100644
@@ -23,29 +23,6 @@
 #include <plat/cpu.h>
 #include <plat/mcbsp.h>
 
-#include "mux.h"
-
-static void omap2_mcbsp2_mux_setup(void)
-{
-	omap_mux_init_signal("eac_ac_sclk.mcbsp2_clkx", OMAP_PULL_ENA);
-	omap_mux_init_signal("eac_ac_fs.mcbsp2_fsx", OMAP_PULL_ENA);
-	omap_mux_init_signal("eac_ac_din.mcbsp2_dr", OMAP_PULL_ENA);
-	omap_mux_init_signal("eac_ac_dout.mcbsp2_dx", OMAP_PULL_ENA);
-	omap_mux_init_gpio(117, OMAP_PULL_ENA);
-	/*
-	 * TODO: Need to add MUX settings for OMAP 2430 SDP
-	 */
-}
-
-static void omap2_mcbsp_request(unsigned int id)
-{
-	if (cpu_is_omap2420() && (id == OMAP_MCBSP2))
-		omap2_mcbsp2_mux_setup();
-}
-
-static struct omap_mcbsp_ops omap2_mcbsp_ops = {
-	.request	= omap2_mcbsp_request,
-};
 
 #ifdef CONFIG_ARCH_OMAP2420
 static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
@@ -55,7 +32,6 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,
 		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP24XX_MCBSP2_BASE,
@@ -63,7 +39,6 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,
 		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 };
 #define OMAP2420_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2420_mcbsp_pdata)
@@ -82,7 +57,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,
 		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP24XX_MCBSP2_BASE,
@@ -90,7 +64,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,
 		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP2430_MCBSP3_BASE,
@@ -98,7 +71,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP3_TX,
 		.rx_irq		= INT_24XX_MCBSP3_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP3_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP2430_MCBSP4_BASE,
@@ -106,7 +78,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP4_TX,
 		.rx_irq		= INT_24XX_MCBSP4_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP4_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP2430_MCBSP5_BASE,
@@ -114,7 +85,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP5_TX,
 		.rx_irq		= INT_24XX_MCBSP5_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP5_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 };
 #define OMAP2430_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2430_mcbsp_pdata)
@@ -133,7 +103,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,
 		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x80, /* The FIFO has 128 locations */
 	},
 	{
@@ -143,7 +112,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,
 		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x500, /* The FIFO has 1024 + 256 locations */
 	},
 	{
@@ -153,7 +121,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP3_TX,
 		.rx_irq		= INT_24XX_MCBSP3_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP3_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x80, /* The FIFO has 128 locations */
 	},
 	{
@@ -162,7 +129,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP4_TX,
 		.rx_irq		= INT_24XX_MCBSP4_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP4_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x80, /* The FIFO has 128 locations */
 	},
 	{
@@ -171,7 +137,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP5_TX,
 		.rx_irq		= INT_24XX_MCBSP5_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP5_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x80, /* The FIFO has 128 locations */
 	},
 };
@@ -189,28 +154,24 @@ static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP1_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP1_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP1,
-		.ops            = &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP2_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP2_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP2_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP2,
-		.ops            = &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP3_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP3_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP3_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP3,
-		.ops            = &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP4_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP4_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP4_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP4,
-		.ops            = &omap2_mcbsp_ops,
 	},
 };
 #define OMAP44XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap44xx_mcbsp_pdata)
author maintainer
#26 lore raw

PATCH 11/11 omap: mmc: extended to pass host capabilities from board file

In reply to Tony Lindgren

From: Sukumar Ghorai <[email protected]>

wires variable is renamed, extended and this single variable to be used to pass the platform capabilities, e.g DDR mode. Also removed the hardcoded value was using as bus-width.

---
 arch/arm/mach-omap2/board-2430sdp.c          |    3 ++-
 arch/arm/mach-omap2/board-3430sdp.c          |    5 +++--
 arch/arm/mach-omap2/board-4430sdp.c          |    4 ++--
 arch/arm/mach-omap2/board-cm-t35.c           |    5 +++--
 arch/arm/mach-omap2/board-devkit8000.c       |    3 ++-
 arch/arm/mach-omap2/board-igep0020.c         |    5 +++--
 arch/arm/mach-omap2/board-ldp.c              |    3 ++-
 arch/arm/mach-omap2/board-n8x0.c             |    2 +-
 arch/arm/mach-omap2/board-omap3beagle.c      |    3 ++-
 arch/arm/mach-omap2/board-omap3evm.c         |    3 ++-
 arch/arm/mach-omap2/board-omap3pandora.c     |    7 ++++---
 arch/arm/mach-omap2/board-omap3stalker.c     |    3 ++-
 arch/arm/mach-omap2/board-omap3touchbook.c   |    3 ++-
 arch/arm/mach-omap2/board-omap4panda.c       |    2 +-
 arch/arm/mach-omap2/board-overo.c            |    5 +++--
 arch/arm/mach-omap2/board-rx51-peripherals.c |    5 +++--
 arch/arm/mach-omap2/board-zoom-peripherals.c |    5 +++--
 arch/arm/mach-omap2/devices.c                |   16 +++++++++-------
 arch/arm/mach-omap2/hsmmc.c                  |   16 ++++++++++------
 arch/arm/mach-omap2/hsmmc.h                  |    3 ++-
 arch/arm/plat-omap/include/plat/mmc.h        |    7 +++----
 drivers/mmc/host/omap.c                      |    2 +-
 drivers/mmc/host/omap_hsmmc.c                |   18 ++----------------
 23 files changed, 67 insertions(+), 61 deletions(-)
arch/arm/mach-omap2/board-2430sdp.c +2 -1
index 8538e41..fc178a0 100644
@@ -19,6 +19,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
+#include <linux/mmc/host.h>
 #include <linux/delay.h>
 #include <linux/i2c/twl.h>
 #include <linux/err.h>
@@ -190,7 +191,7 @@ static int __init omap2430_i2c_init(void)
 static struct omap2_hsmmc_info mmc[] __initdata = {
 	{
 		.mmc		= 1,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 		.ext_clock	= 1,
arch/arm/mach-omap2/board-3430sdp.c +3 -2
index 67b95b5..3eb9839 100644
@@ -24,6 +24,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
+#include <linux/mmc/host.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -353,12 +354,12 @@ static struct omap2_hsmmc_info mmc[] = {
 		/* 8 bits (default) requires S6.3 == ON,
 		 * so the SIM card isn't used; else 4 bits.
 		 */
-		.wires		= 8,
+		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 		.gpio_wp	= 4,
 	},
 	{
 		.mmc		= 2,
-		.wires		= 8,
+		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 		.gpio_wp	= 7,
 	},
 	{}	/* Terminator */
arch/arm/mach-omap2/board-4430sdp.c +2 -2
index 9447644..e379bef 100644
@@ -193,12 +193,12 @@ static struct omap_musb_board_data musb_board_data = {
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 8,
+		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 		.gpio_wp	= -EINVAL,
 	},
 	{
 		.mmc		= 2,
-		.wires		= 8,
+		.caps		=  MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 		.nonremovable   = true,
arch/arm/mach-omap2/board-cm-t35.c +3 -2
index e10bc10..b72009a 100644
@@ -31,6 +31,7 @@
 #include <linux/i2c/at24.h>
 #include <linux/i2c/twl.h>
 #include <linux/regulator/machine.h>
+#include <linux/mmc/host.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/tdo24m.h>
@@ -579,14 +580,14 @@ static struct twl4030_keypad_data cm_t35_kp_data = {
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 
 	},
 	{
 		.mmc		= 2,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.transceiver	= 1,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
arch/arm/mach-omap2/board-devkit8000.c +2 -1
index a07086d..de5e2c2 100644
@@ -28,6 +28,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
+#include <linux/mmc/host.h>
 
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
@@ -105,7 +106,7 @@ static struct omap_nand_platform_data devkit8000_nand_data = {
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 8,
+		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 		.gpio_wp	= 29,
 	},
 	{}	/* Terminator */
arch/arm/mach-omap2/board-igep0020.c +3 -2
index 175f043..f3f0280 100644
@@ -20,6 +20,7 @@
 
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
+#include <linux/mmc/host.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -248,13 +249,13 @@ static struct regulator_init_data igep2_vmmc2 = {
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 	},
 	{
 		.mmc		= 2,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 	},
arch/arm/mach-omap2/board-ldp.c +2 -1
index 00d9b13..58698e3 100644
@@ -27,6 +27,7 @@
 #include <linux/i2c/twl.h>
 #include <linux/io.h>
 #include <linux/smsc911x.h>
+#include <linux/mmc/host.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -362,7 +363,7 @@ static int __init omap_i2c_init(void)
 static struct omap2_hsmmc_info mmc[] __initdata = {
 	{
 		.mmc		= 1,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 	},
arch/arm/mach-omap2/board-n8x0.c +1 -1
index 8fd2269..7a93bd5 100644
@@ -488,7 +488,7 @@ static struct omap_mmc_platform_data mmc1_data = {
 	.max_freq			= 24000000,
 	.dma_mask			= 0xffffffff,
 	.slots[0] = {
-		.wires			= 4,
+		.caps			= MMC_CAP_4_BIT_DATA,
 		.set_power		= n8x0_mmc_set_power,
 		.set_bus_mode		= n8x0_mmc_set_bus_mode,
 		.get_cover_state	= n8x0_mmc_get_cover_state,
arch/arm/mach-omap2/board-omap3beagle.c +2 -1
index 87969c7..51493f5 100644
@@ -27,6 +27,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
+#include <linux/mmc/host.h>
 
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
@@ -166,7 +167,7 @@ static void __init beagle_display_init(void)
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 8,
+		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 		.gpio_wp	= 29,
 	},
 	{}	/* Terminator */
arch/arm/mach-omap2/board-omap3evm.c +2 -1
index f76d9c0..523ba55 100644
@@ -31,6 +31,7 @@
 #include <linux/smsc911x.h>
 
 #include <linux/regulator/machine.h>
+#include <linux/mmc/host.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -370,7 +371,7 @@ static struct regulator_init_data omap3evm_vsim = {
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= 63,
 	},
arch/arm/mach-omap2/board-omap3pandora.c +4 -3
index dd3af2b..2d2e6fc 100644
@@ -32,6 +32,7 @@
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/gpio_keys.h>
+#include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
 
 #include <asm/mach-types.h>
@@ -276,14 +277,14 @@ static void pandora_wl1251_init_card(struct mmc_card *card)
 static struct omap2_hsmmc_info omap3pandora_mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= 126,
 		.ext_clock	= 0,
 	},
 	{
 		.mmc		= 2,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= 127,
 		.ext_clock	= 1,
@@ -291,7 +292,7 @@ static struct omap2_hsmmc_info omap3pandora_mmc[] = {
 	},
 	{
 		.mmc		= 3,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 		.init_card	= pandora_wl1251_init_card,
arch/arm/mach-omap2/board-omap3stalker.c +2 -1
index bcd01d2..c1b881d 100644
@@ -26,6 +26,7 @@
 
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
+#include <linux/mmc/host.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -275,7 +276,7 @@ static struct regulator_init_data omap3stalker_vsim = {
 static struct omap2_hsmmc_info mmc[] = {
 	{
 	 .mmc		= 1,
-	 .wires		= 4,
+	 .caps		= MMC_CAP_4_BIT_DATA,
 	 .gpio_cd	= -EINVAL,
 	 .gpio_wp	= 23,
 	 },
arch/arm/mach-omap2/board-omap3touchbook.c +2 -1
index 663c62d..9ab18fd 100644
@@ -27,6 +27,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
+#include <linux/mmc/host.h>
 
 #include <plat/mcspi.h>
 #include <linux/spi/spi.h>
@@ -108,7 +109,7 @@ static struct omap_nand_platform_data omap3touchbook_nand_data = {
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 8,
+		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 		.gpio_wp	= 29,
 	},
 	{}	/* Terminator */
arch/arm/mach-omap2/board-omap4panda.c +1 -1
index 96f5bbb..0bb2353 100644
@@ -56,7 +56,7 @@ static struct omap_musb_board_data musb_board_data = {
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 8,
+		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 		.gpio_wp	= -EINVAL,
 	},
 	{}	/* Terminator */
arch/arm/mach-omap2/board-overo.c +3 -2
index 4c48436..93441e5 100644
@@ -32,6 +32,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/mmc/host.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -303,13 +304,13 @@ static void __init overo_flash_init(void)
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 	},
 	{
 		.mmc		= 2,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 		.transceiver	= true,
arch/arm/mach-omap2/board-rx51-peripherals.c +3 -2
index 9a5eb87..a3dbaa7 100644
@@ -302,7 +302,7 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
 	{
 		.name		= "external",
 		.mmc		= 1,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.cover_only	= true,
 		.gpio_cd	= 160,
 		.gpio_wp	= -EINVAL,
@@ -311,7 +311,8 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
 	{
 		.name		= "internal",
 		.mmc		= 2,
-		.wires		= 8, /* See also rx51_mmc2_remux */
+		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
+						/* See also rx51_mmc2_remux */
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 		.nonremovable	= true,
arch/arm/mach-omap2/board-zoom-peripherals.c +3 -2
index 6b39849..e5eac46 100644
@@ -16,6 +16,7 @@
 #include <linux/gpio.h>
 #include <linux/i2c/twl.h>
 #include <linux/regulator/machine.h>
+#include <linux/mmc/host.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -155,14 +156,14 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
 	{
 		.name		= "external",
 		.mmc		= 1,
-		.wires		= 4,
+		.caps		= MMC_CAP_4_BIT_DATA,
 		.gpio_wp	= -EINVAL,
 		.power_saving	= true,
 	},
 	{
 		.name		= "internal",
 		.mmc		= 2,
-		.wires		= 8,
+		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
 		.nonremovable	= true,
arch/arm/mach-omap2/devices.c +9 -7
index dc49c07..9e5d51b 100644
@@ -694,7 +694,7 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
 		omap_mux_init_signal("sdmmc_dat0", 0);
 		omap_mux_init_signal("sdmmc_dat_dir0", 0);
 		omap_mux_init_signal("sdmmc_cmd_dir", 0);
-		if (mmc_controller->slots[0].wires == 4) {
+		if (mmc_controller->slots[0].caps & MMC_CAP_4_BIT_DATA) {
 			omap_mux_init_signal("sdmmc_dat1", 0);
 			omap_mux_init_signal("sdmmc_dat2", 0);
 			omap_mux_init_signal("sdmmc_dat3", 0);
@@ -722,8 +722,8 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
 				OMAP_PIN_INPUT_PULLUP);
 			omap_mux_init_signal("sdmmc1_dat0",
 				OMAP_PIN_INPUT_PULLUP);
-			if (mmc_controller->slots[0].wires == 4 ||
-				mmc_controller->slots[0].wires == 8) {
+			if (mmc_controller->slots[0].caps &
+				(MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA)) {
 				omap_mux_init_signal("sdmmc1_dat1",
 					OMAP_PIN_INPUT_PULLUP);
 				omap_mux_init_signal("sdmmc1_dat2",
@@ -731,7 +731,8 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
 				omap_mux_init_signal("sdmmc1_dat3",
 					OMAP_PIN_INPUT_PULLUP);
 			}
-			if (mmc_controller->slots[0].wires == 8) {
+			if (mmc_controller->slots[0].caps &
+						MMC_CAP_8_BIT_DATA) {
 				omap_mux_init_signal("sdmmc1_dat4",
 					OMAP_PIN_INPUT_PULLUP);
 				omap_mux_init_signal("sdmmc1_dat5",
@@ -755,8 +756,8 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
 			 * For 8 wire configurations, Lines DAT4, 5, 6 and 7 need to be muxed
 			 * in the board-*.c files
 			 */
-			if (mmc_controller->slots[0].wires == 4 ||
-				mmc_controller->slots[0].wires == 8) {
+			if (mmc_controller->slots[0].caps &
+				(MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA)) {
 				omap_mux_init_signal("sdmmc2_dat1",
 					OMAP_PIN_INPUT_PULLUP);
 				omap_mux_init_signal("sdmmc2_dat2",
@@ -764,7 +765,8 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
 				omap_mux_init_signal("sdmmc2_dat3",
 					OMAP_PIN_INPUT_PULLUP);
 			}
-			if (mmc_controller->slots[0].wires == 8) {
+			if (mmc_controller->slots[0].caps &
+							MMC_CAP_8_BIT_DATA) {
 				omap_mux_init_signal("sdmmc2_dat4.sdmmc2_dat4",
 					OMAP_PIN_INPUT_PULLUP);
 				omap_mux_init_signal("sdmmc2_dat5.sdmmc2_dat5",
arch/arm/mach-omap2/hsmmc.c +10 -6
index c8f647b..87ce6ff 100644
@@ -258,7 +258,7 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
 				"mmc%islot%i", c->mmc, 1);
 		mmc->slots[0].name = hc->name;
 		mmc->nr_slots = 1;
-		mmc->slots[0].wires = c->wires;
+		mmc->slots[0].caps = c->caps;
 		mmc->slots[0].internal_clock = !c->ext_clock;
 		mmc->dma_mask = 0xffffffff;
 
@@ -316,16 +316,20 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
 			}
 
 			/* Omap3630 HSMMC1 supports only 4-bit */
-			if (cpu_is_omap3630() && c->wires > 4) {
-				c->wires = 4;
-				mmc->slots[0].wires = c->wires;
+			if (cpu_is_omap3630() &&
+					(c->caps & MMC_CAP_8_BIT_DATA)) {
+				c->caps &= ~MMC_CAP_8_BIT_DATA;
+				c->caps |= MMC_CAP_4_BIT_DATA;
+				mmc->slots[0].caps = c->caps;
 			}
 			break;
 		case 2:
 			if (c->ext_clock)
 				c->transceiver = 1;
-			if (c->transceiver && c->wires > 4)
-				c->wires = 4;
+			if (c->transceiver && (c->caps & MMC_CAP_8_BIT_DATA)) {
+				c->caps &= ~MMC_CAP_8_BIT_DATA;
+				c->caps |= MMC_CAP_4_BIT_DATA;
+			}
 			/* FALLTHROUGH */
 		case 3:
 			if (mmc->slots[0].features & HSMMC_HAS_PBIAS) {
arch/arm/mach-omap2/hsmmc.h +2 -1
index 1fe6f01..281e972 100644
@@ -10,7 +10,8 @@ struct mmc_card;
 
 struct omap2_hsmmc_info {
 	u8	mmc;		/* controller 1/2/3 */
-	u8	wires;		/* 1/4/8 wires */
+	u32	caps;		/* 4/8 wires and any additional host
+				 * capabilities OR'd (ref. linux/mmc/host.h) */
 	bool	transceiver;	/* MMC-2 option */
 	bool	ext_clock;	/* use external pin for input clock */
 	bool	cover_only;	/* No card detect - just cover switch */
arch/arm/plat-omap/include/plat/mmc.h +3 -4
index 9b89ec6..4f819fc 100644
@@ -73,10 +73,9 @@ struct omap_mmc_platform_data {
 
 	struct omap_mmc_slot_data {
 
-		/* 4 wire signaling is optional, and is used for SD/SDIO/HSMMC;
-		 * 8 wire signaling is also optional, and is used with HSMMC
-		 */
-		u8 wires;
+		/* 4/8 wires and any additional host capabilities
+		 * need to OR'd all capabilities (ref. linux/mmc/host.h) */
+		u32 caps;
 
 		/*
 		 * nomux means "standard" muxing is wrong on this board, and
drivers/mmc/host/omap.c +1 -1
index d98ddcf..a9d62cf 100644
@@ -1317,7 +1317,7 @@ static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id)
 	host->slots[id] = slot;
 
 	mmc->caps = 0;
-	if (host->pdata->slots[id].wires >= 4)
+	if (host->pdata->slots[id].caps & MMC_CAP_8_BIT_DATA)
 		mmc->caps |= MMC_CAP_4_BIT_DATA;
 
 	mmc->ops = &mmc_omap_ops;
drivers/mmc/host/omap_hsmmc.c +2 -16
index 4526d27..53f8fa5 100644
@@ -2116,23 +2116,9 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
 	mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
 		     MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_ERASE;
 
-	switch (mmc_slot(host).wires) {
-	case 8:
-		mmc->caps |= MMC_CAP_8_BIT_DATA;
-		/* Fall through */
-	case 4:
+	mmc->caps |= mmc_slot(host).caps;
+	if (mmc->caps & MMC_CAP_8_BIT_DATA)
 		mmc->caps |= MMC_CAP_4_BIT_DATA;
-		break;
-	case 1:
-		/* Nothing to crib here */
-	case 0:
-		/* Assuming nothing was given by board, Core use's 1-Bit */
-		break;
-	default:
-		/* Completely unexpected.. Core goes with 1-Bit Width */
-		dev_crit(mmc_dev(host->mmc), "Invalid width %d\n used!"
-			"using 1 instead\n", mmc_slot(host).wires);
-	}
 
 	if (mmc_slot(host).nonremovable)
 		mmc->caps |= MMC_CAP_NONREMOVABLE;
#27 lore raw

cover omap patches for review for v2.6.37 merge window

In reply to Tony Lindgren
Quoted 11 lines · On Thu, 23 Sep 2010 18:50:38 -0700 Tony Lindgren <[email protected]> wrote:

Hi all,

Here are some omap patches that have not yet been posted to linux-arm-kernel for review.

Jarkko Nikula (4):
omap: n8x0: Cleanup i2c1 and menelaus registration
omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810
omap: n8x0: Mux i2s codec port pins for McBSP block
omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and docleanups

...

Quoted 3 lines

Subramaniam C.A (1):
omap: i2c: Avoid compilation error in case the header is included multiple times

Hmm... I wonder do I have something wrong or in patchwork but it looks like somehow a line feed gets introduced to subject line of some of my patches. And it seems to do with my patches only.

Original patch in my mailbox or archive doesn't show it but it is in patchwork.

http://marc.info/?l=linux-omap&m=128324955316265&w=2
https://patchwork.kernel.org/patch/144841/mbox

Signature · 1 line
Jarkko
author maintainer
#28 lore raw

cover omap patches for review for v2.6.37 merge window

Quoted 22 lines · Jarkko Nikula
Quoted 11 lines · On Thu, 23 Sep 2010 18:50:38 -0700 Tony Lindgren <[email protected]> wrote:

Hi all,

Here are some omap patches that have not yet been posted to linux-arm-kernel for review.

Jarkko Nikula (4):
omap: n8x0: Cleanup i2c1 and menelaus registration
omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810
omap: n8x0: Mux i2s codec port pins for McBSP block
omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and docleanups

...

Quoted 3 lines

Subramaniam C.A (1):
omap: i2c: Avoid compilation error in case the header is included multiple times

Hmm... I wonder do I have something wrong or in patchwork but it looks like somehow a line feed gets introduced to subject line of some of my patches. And it seems to do with my patches only.

Quoted 5 lines

Original patch in my mailbox or archive doesn't show it but it is in patchwork.

http://marc.info/?l=linux-omap&m=128324955316265&w=2
https://patchwork.kernel.org/patch/144841/mbox

Hmm yeah looks like patchwork wraps the subject line.. Need to look to see where the bug is later on.

Here's the patch with fixed subject.

Tony

From: Jarkko Nikula <[email protected]>
Date: Tue, 31 Aug 2010 10:12:56 +0000
Subject: [PATCH] omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and do cleanups

This 'legacy' OMAP2420 McBSP2 muxing code is currently broken after recent conversion to new mux code. The omap_mcbsp_request calling this code is usually called after booting whereas the omap_mux_init_signal is __init marked so null pointer dereference would occur.

Fix this by removing the muxing code and let the bootloader or board file to do it if necessary. Remove also omap2_mcbsp_ops as there is no use for it.

arch/arm/mach-omap2/mcbsp.c +0 -39
index 467aae2..88b8790 100644
@@ -23,29 +23,6 @@
 #include <plat/cpu.h>
 #include <plat/mcbsp.h>
 
-#include "mux.h"
-
-static void omap2_mcbsp2_mux_setup(void)
-{
-	omap_mux_init_signal("eac_ac_sclk.mcbsp2_clkx", OMAP_PULL_ENA);
-	omap_mux_init_signal("eac_ac_fs.mcbsp2_fsx", OMAP_PULL_ENA);
-	omap_mux_init_signal("eac_ac_din.mcbsp2_dr", OMAP_PULL_ENA);
-	omap_mux_init_signal("eac_ac_dout.mcbsp2_dx", OMAP_PULL_ENA);
-	omap_mux_init_gpio(117, OMAP_PULL_ENA);
-	/*
-	 * TODO: Need to add MUX settings for OMAP 2430 SDP
-	 */
-}
-
-static void omap2_mcbsp_request(unsigned int id)
-{
-	if (cpu_is_omap2420() && (id == OMAP_MCBSP2))
-		omap2_mcbsp2_mux_setup();
-}
-
-static struct omap_mcbsp_ops omap2_mcbsp_ops = {
-	.request	= omap2_mcbsp_request,
-};
 
 #ifdef CONFIG_ARCH_OMAP2420
 static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
@@ -55,7 +32,6 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,
 		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP24XX_MCBSP2_BASE,
@@ -63,7 +39,6 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,
 		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 };
 #define OMAP2420_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2420_mcbsp_pdata)
@@ -82,7 +57,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,
 		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP24XX_MCBSP2_BASE,
@@ -90,7 +64,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,
 		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP2430_MCBSP3_BASE,
@@ -98,7 +71,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP3_TX,
 		.rx_irq		= INT_24XX_MCBSP3_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP3_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP2430_MCBSP4_BASE,
@@ -106,7 +78,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP4_TX,
 		.rx_irq		= INT_24XX_MCBSP4_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP4_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base	= OMAP2430_MCBSP5_BASE,
@@ -114,7 +85,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP5_TX,
 		.rx_irq		= INT_24XX_MCBSP5_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP5_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 	},
 };
 #define OMAP2430_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2430_mcbsp_pdata)
@@ -133,7 +103,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,
 		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x80, /* The FIFO has 128 locations */
 	},
 	{
@@ -143,7 +112,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,
 		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x500, /* The FIFO has 1024 + 256 locations */
 	},
 	{
@@ -153,7 +121,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP3_TX,
 		.rx_irq		= INT_24XX_MCBSP3_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP3_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x80, /* The FIFO has 128 locations */
 	},
 	{
@@ -162,7 +129,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP4_TX,
 		.rx_irq		= INT_24XX_MCBSP4_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP4_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x80, /* The FIFO has 128 locations */
 	},
 	{
@@ -171,7 +137,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 		.dma_tx_sync	= OMAP24XX_DMA_MCBSP5_TX,
 		.rx_irq		= INT_24XX_MCBSP5_IRQ_RX,
 		.tx_irq		= INT_24XX_MCBSP5_IRQ_TX,
-		.ops		= &omap2_mcbsp_ops,
 		.buffer_size	= 0x80, /* The FIFO has 128 locations */
 	},
 };
@@ -189,28 +154,24 @@ static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP1_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP1_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP1,
-		.ops            = &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP2_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP2_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP2_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP2,
-		.ops            = &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP3_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP3_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP3_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP3,
-		.ops            = &omap2_mcbsp_ops,
 	},
 	{
 		.phys_base      = OMAP44XX_MCBSP4_BASE,
 		.dma_rx_sync    = OMAP44XX_DMA_MCBSP4_RX,
 		.dma_tx_sync    = OMAP44XX_DMA_MCBSP4_TX,
 		.tx_irq         = OMAP44XX_IRQ_MCBSP4,
-		.ops            = &omap2_mcbsp_ops,
 	},
 };
 #define OMAP44XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap44xx_mcbsp_pdata)