| Message ID | 1267816354.30393.4.camel@c-dwalke-linux.qualcomm.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 5 Mar 2010, Daniel Walker wrote: > From: David Brown <davidb@quicinc.com> > > Signed-off-by: David Brown <davidb@quicinc.com> > Signed-off-by: Daniel Walker <dwalker@codeaurora.org> Acked-by: Nicolas Pitre <nico@fluxnic.net> > --- > drivers/net/smc91x.h | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h > index 5479954..a6ee883 100644 > --- a/drivers/net/smc91x.h > +++ b/drivers/net/smc91x.h > @@ -330,6 +330,20 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, > > #include <unit/smc91111.h> > > +#elif defined(CONFIG_ARCH_MSM) > + > +#define SMC_CAN_USE_8BIT 0 > +#define SMC_CAN_USE_16BIT 1 > +#define SMC_CAN_USE_32BIT 0 > +#define SMC_NOWAIT 1 > + > +#define SMC_inw(a, r) readw((a) + (r)) > +#define SMC_outw(v, a, r) writew(v, (a) + (r)) > +#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) > +#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) > + > +#define SMC_IRQ_FLAGS IRQF_TRIGGER_HIGH > + > #else > > /* > -- > 1.6.3.3 > > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2010-03-05 at 14:49 -0500, Nicolas Pitre wrote: > On Fri, 5 Mar 2010, Daniel Walker wrote: > > > From: David Brown <davidb@quicinc.com> > > > > Signed-off-by: David Brown <davidb@quicinc.com> > > Signed-off-by: Daniel Walker <dwalker@codeaurora.org> > > Acked-by: Nicolas Pitre <nico@fluxnic.net> > > Are you going to send it up stream, or should I? Daniel -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Daniel Walker <dwalker@codeaurora.org> Date: Fri, 05 Mar 2010 12:05:07 -0800 > On Fri, 2010-03-05 at 14:49 -0500, Nicolas Pitre wrote: >> On Fri, 5 Mar 2010, Daniel Walker wrote: >> >> > From: David Brown <davidb@quicinc.com> >> > >> > Signed-off-by: David Brown <davidb@quicinc.com> >> > Signed-off-by: Daniel Walker <dwalker@codeaurora.org> >> >> Acked-by: Nicolas Pitre <nico@fluxnic.net> >> >> > > Are you going to send it up stream, or should I? By virtue of having been properly posted to netdev it's in patchwork and therefore I'll integrate it. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2010-03-05 at 12:09 -0800, David Miller wrote: > From: Daniel Walker <dwalker@codeaurora.org> > Date: Fri, 05 Mar 2010 12:05:07 -0800 > > > On Fri, 2010-03-05 at 14:49 -0500, Nicolas Pitre wrote: > >> On Fri, 5 Mar 2010, Daniel Walker wrote: > >> > >> > From: David Brown <davidb@quicinc.com> > >> > > >> > Signed-off-by: David Brown <davidb@quicinc.com> > >> > Signed-off-by: Daniel Walker <dwalker@codeaurora.org> > >> > >> Acked-by: Nicolas Pitre <nico@fluxnic.net> > >> > >> > > > > Are you going to send it up stream, or should I? > > By virtue of having been properly posted to netdev it's in patchwork > and therefore I'll integrate it. Well I didn't add [PATCH] to the subject , but I guess that doesn't matter.. Ok.. Thanks. Daniel -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 5 Mar 2010, Daniel Walker wrote: > On Fri, 2010-03-05 at 14:49 -0500, Nicolas Pitre wrote: > > On Fri, 5 Mar 2010, Daniel Walker wrote: > > > > > From: David Brown <davidb@quicinc.com> > > > > > > Signed-off-by: David Brown <davidb@quicinc.com> > > > Signed-off-by: Daniel Walker <dwalker@codeaurora.org> > > > > Acked-by: Nicolas Pitre <nico@fluxnic.net> > > > > > > Are you going to send it up stream, or should I? Please do it. Nicolas -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 5 Mar 2010, David Miller wrote: > From: Daniel Walker <dwalker@codeaurora.org> > Date: Fri, 05 Mar 2010 12:05:07 -0800 > > > On Fri, 2010-03-05 at 14:49 -0500, Nicolas Pitre wrote: > >> On Fri, 5 Mar 2010, Daniel Walker wrote: > >> > >> > From: David Brown <davidb@quicinc.com> > >> > > >> > Signed-off-by: David Brown <davidb@quicinc.com> > >> > Signed-off-by: Daniel Walker <dwalker@codeaurora.org> > >> > >> Acked-by: Nicolas Pitre <nico@fluxnic.net> > >> > >> > > > > Are you going to send it up stream, or should I? > > By virtue of having been properly posted to netdev it's in patchwork > and therefore I'll integrate it. Good. Nicolas -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 5479954..a6ee883 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -330,6 +330,20 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, #include <unit/smc91111.h> +#elif defined(CONFIG_ARCH_MSM) + +#define SMC_CAN_USE_8BIT 0 +#define SMC_CAN_USE_16BIT 1 +#define SMC_CAN_USE_32BIT 0 +#define SMC_NOWAIT 1 + +#define SMC_inw(a, r) readw((a) + (r)) +#define SMC_outw(v, a, r) writew(v, (a) + (r)) +#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) +#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) + +#define SMC_IRQ_FLAGS IRQF_TRIGGER_HIGH + #else /*