[PATCH] omap2+: mux: Remove the use of IDLE flag.

[PATCH] omap2+: mux: Remove the use of IDLE flag.

[sricharan]

Currently OMAP_DEVICE_PAD_IDLE flag is used to mux pins
dynamically. This can be simplified by using the enabled
state variable of each pad. This also fixes the issue of
the static pads not getting muxed after idling and
disable/enable state transitions.

Signed-off-by: sricharan <r.sricharan@ti.com>
---
 arch/arm/mach-omap2/mux.c |   19 +++++++------------
 arch/arm/mach-omap2/mux.h |    1 -
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 8717370..bb043cb 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -359,7 +359,6 @@ void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)
 			struct omap_device_pad *pad = hmux->pads_dynamic[i];
 			int val = -EINVAL;
 
-			pad->flags |= OMAP_DEVICE_PAD_IDLE;
 			val = pad->idle;
 			omap_mux_write(pad->partition, val,
 					pad->mux->reg_offset);
@@ -369,25 +368,18 @@ void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)
 	}
 
 	/* Runtime enabling of dynamic pads */
-	if ((state == _HWMOD_STATE_ENABLED) && hmux->pads_dynamic) {
-		int idled = 0;
-
+	if ((state == _HWMOD_STATE_ENABLED) && hmux->pads_dynamic
+					&& hmux->enabled) {
 		for (i = 0; i < hmux->nr_pads_dynamic; i++) {
 			struct omap_device_pad *pad = hmux->pads_dynamic[i];
 			int val = -EINVAL;
 
-			if (!(pad->flags & OMAP_DEVICE_PAD_IDLE))
-				continue;
-
-			pad->flags &= ~OMAP_DEVICE_PAD_IDLE;
 			val = pad->enable;
 			omap_mux_write(pad->partition, val,
 					pad->mux->reg_offset);
-			idled++;
 		}
 
-		if (idled)
-			return;
+		return;
 	}
 
 	/* Enabling or disabling of all pads */
@@ -404,7 +396,6 @@ void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)
 					pad->name, val);
 			break;
 		case _HWMOD_STATE_DISABLED:
-		default:
 			/* Use safe mode unless OMAP_DEVICE_PAD_REMUX */
 			if (flags & OMAP_DEVICE_PAD_REMUX)
 				val = pad->off;
@@ -412,6 +403,10 @@ void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)
 				val = OMAP_MUX_MODE7;
 			pr_debug("%s: Disabling %s %x\n", __func__,
 					pad->name, val);
+			break;
+		default:
+			/* Nothing to be done */
+			break;
 		};
 
 		if (val >= 0) {
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index 1d5bf42..8920fa4 100644
--- a/arch/arm/mach-omap2/mux.h
+++ b/arch/arm/mach-omap2/mux.h
@@ -159,7 +159,6 @@ struct omap_board_mux {
 	u16	value;
 };
 
-#define OMAP_DEVICE_PAD_IDLE		BIT(7)	/* Not needed for board-*.c */
 #define OMAP_DEVICE_PAD_REMUX		BIT(1)	/* Dynamically remux a pad,
 						   needs enable, idle and off
 						   values */
-- 
1.7.0.4

[PATCH] omap2+: mux: Remove the use of IDLE flag.

[Sricharan R]

Tony,
>-----Original Message-----
From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
>owner at vger.kernel.org] On Behalf Of Tony Lindgren
>Sent: Tuesday, March 08, 2011 10:11 PM
>To: sricharan
>Cc: linux-omap at vger.kernel.org; b-cousson at ti.com;
santosh.shilimkar at ti.com;
>paul at pswan.com
>Subject: Re: [PATCH] omap2+: mux: Remove the use of IDLE flag.
>
>* sricharan <r.sricharan@ti.com> [110306 20:33]:
>> Currently OMAP_DEVICE_PAD_IDLE flag is used to mux pins
>> dynamically. This can be simplified by using the enabled
>> state variable of each pad. This also fixes the issue of
>> the static pads not getting muxed after idling and
>> disable/enable state transitions.
>
>Looks good, can you please repost one more time with linux-arm-kernel
>mailing list also Cc'd?
>
Ok sure. I have  re posted  this to the linux-arm-kernel list.
>Thanks,
>
>Tony
>--
>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

[PATCH] omap2+: mux: Remove the use of IDLE flag.

[Sricharan R]

Tony,
>-----Original Message-----
>From: Sricharan R [mailto:r.sricharan at ti.com]
>Sent: Wednesday, March 09, 2011 1:19 PM
>To: 'Tony Lindgren'
>Cc: 'linux-omap at vger.kernel.org'; Benoit Cousson; Santosh Shilimkar;
>'paul at pswan.com'; 'linux-arm-kernel at lists.infradead.org'
>Subject: RE: [PATCH] omap2+: mux: Remove the use of IDLE flag.
>
[....]

>>* sricharan <r.sricharan@ti.com> [110306 20:33]:
>>> Currently OMAP_DEVICE_PAD_IDLE flag is used to mux pins
>>> dynamically. This can be simplified by using the enabled
>>> state variable of each pad. This also fixes the issue of
>>> the static pads not getting muxed after idling and
>>> disable/enable state transitions.
>>
>>Looks good, can you please repost one more time with linux-arm-kernel
>>mailing list also Cc'd?
>>
>Ok sure. I have  re posted  this to the linux-arm-kernel list.


Btw,I have fixed the comments on the below patches that
I sent for configuring the serial pads.

4430sdp:
http://marc.info/?l=linux-omap&m=129900334420003&w=2

omap4panda:
http://marc.info/?l=linux-omap&m=129900338520082&w=2

3430sdp:
http://marc.info/?l=linux-omap&m=129619117726479&w=2

Can you please check if they are ok?

Thanks,
 Sricharan

[PATCH] omap2+: mux: Remove the use of IDLE flag.

[Tony Lindgren]

* sricharan <r.sricharan@ti.com> [110308 23:43]:
> Currently OMAP_DEVICE_PAD_IDLE flag is used to mux pins
> dynamically. This can be simplified by using the enabled
> state variable of each pad. This also fixes the issue of
> the static pads not getting muxed after idling and
> disable/enable state transitions.

Thanks applying.

Tony