Hi Samuel,
Would you please take a look at this patch?
Since without this patch, regression test for blackfin will fail:
http://kisskb.ellerman.id.au/kisskb/matrix/
Thank you!
On Mon, Jul 30, 2012 at 2:44 PM, Bob Liu <[email protected]> wrote:
> From: Sonic Zhang <[email protected]>
>
> Bit IREN is replaced by UMOD_IRDA and UMOD_MASK since blackfin 60x added, but
> this driver didn't update which will cause bfin_sir build error:
>
> drivers/net/irda/bfin_sir.c:161:9: error: 'IREN' undeclared (first use in this
> function)
> drivers/net/irda/bfin_sir.c:435:18: error: 'IREN' undeclared (first use in
> this function)
> drivers/net/irda/bfin_sir.c:521:11: error: 'IREN' undeclared (first use in
> this function)
>
> This patch fix it.
>
> Signed-off-by: Sonic Zhang <[email protected]>
> Signed-off-by: Bob Liu <[email protected]>
> ---
> drivers/net/irda/bfin_sir.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c
> index a561ae4..c6a0299 100644
> --- a/drivers/net/irda/bfin_sir.c
> +++ b/drivers/net/irda/bfin_sir.c
> @@ -158,7 +158,7 @@ static int bfin_sir_set_speed(struct bfin_sir_port *port, int speed)
> /* If not add the 'RPOLC', we can't catch the receive interrupt.
> * It's related with the HW layout and the IR transiver.
> */
> - val |= IREN | RPOLC;
> + val |= UMOD_IRDA | RPOLC;
> UART_PUT_GCTL(port, val);
> return ret;
> }
> @@ -432,7 +432,7 @@ static void bfin_sir_shutdown(struct bfin_sir_port *port, struct net_device *dev
> bfin_sir_stop_rx(port);
>
> val = UART_GET_GCTL(port);
> - val &= ~(UCEN | IREN | RPOLC);
> + val &= ~(UCEN | UMOD_MASK | RPOLC);
> UART_PUT_GCTL(port, val);
>
> #ifdef CONFIG_SIR_BFIN_DMA
> @@ -518,10 +518,10 @@ static void bfin_sir_send_work(struct work_struct *work)
> * reset all the UART.
> */
> val = UART_GET_GCTL(port);
> - val &= ~(IREN | RPOLC);
> + val &= ~(UMOD_MASK | RPOLC);
> UART_PUT_GCTL(port, val);
> SSYNC();
> - val |= IREN | RPOLC;
> + val |= UMOD_IRDA | RPOLC;
> UART_PUT_GCTL(port, val);
> SSYNC();
> /* bfin_sir_set_speed(port, self->speed); */
> --
> 1.7.9.5
>
>
--
Regards,
--Bob
Hi Bob,
On Mon, 2012-08-06 at 17:29 +0800, Bob Liu wrote:
> Hi Samuel,
>
> Would you please take a look at this patch?
> Since without this patch, regression test for blackfin will fail:
> http://kisskb.ellerman.id.au/kisskb/matrix/
>
> Thank you!
The patch looks fine to me:
Acked-by: Samuel Ortiz <[email protected]>
Dave, do you want me to carry it and eventually get a pull request from
me, or would you prefer to apply it directly ? This is a fix for 3.6.
Cheers,
Samuel.
Networking patches not sent to netdev will not be properly queued up
and tracked, and therefore will not be applied.
On Tue, Aug 7, 2012 at 4:48 AM, David Miller <[email protected]> wrote:
>
> Networking patches not sent to netdev will not be properly queued up
> and tracked, and therefore will not be applied.
Sorry, i've resend one.
--
Regards,
--Bob