| Message ID | 1253180254-11910-3-git-send-email-mkl@pengutronix.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Marc Kleine-Budde wrote: > This patch activates the at91 CAN controller for the at91sam9263ek > development board. > > Signed-off-by: Hans J. Koch <hjk@linutronix.de> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > --- > arch/arm/mach-at91/board-sam9263ek.c | 19 +++++++++++++++++++ > 1 files changed, 19 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c > index 57d5252..e6268b3 100644 > --- a/arch/arm/mach-at91/board-sam9263ek.c > +++ b/arch/arm/mach-at91/board-sam9263ek.c > @@ -400,6 +400,23 @@ static struct gpio_led ek_pwm_led[] = { > } > }; > > +/* > + * CAN > + */ > +static void sam9263ek_transceiver_switch(int on) > +{ > + if (on) { > + at91_set_gpio_output(AT91_PIN_PA18, 1); /* CANRXEN */ > + at91_set_gpio_output(AT91_PIN_PA19, 0); /* CANRS */ > + } else { > + at91_set_gpio_output(AT91_PIN_PA18, 0); /* CANRXEN */ > + at91_set_gpio_output(AT91_PIN_PA19, 1); /* CANRS */ > + } > +} > + > +static struct at91_can_data ek_can_data = { > + .transceiver_switch = sam9263ek_transceiver_switch, > +}; > > static void __init ek_board_init(void) > { > @@ -431,6 +448,8 @@ static void __init ek_board_init(void) > /* LEDs */ > at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); > at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led)); > + /* CAN */ > + at91_add_device_can(&ek_can_data); > } > > MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK") Acked-by: Wolfgang Grandegger <wg@grandegger.com> -- 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
hi Marc, > This patch activates the at91 CAN controller for the at91sam9263ek > development board. > > Signed-off-by: Hans J. Koch <hjk@linutronix.de> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Acked-by: Andrew Victor <linux@maxim.org.za> -- 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: Wolfgang Grandegger <wg@grandegger.com> Date: Thu, 17 Sep 2009 15:14:55 +0200 > Marc Kleine-Budde wrote: >> This patch activates the at91 CAN controller for the at91sam9263ek >> development board. >> >> Signed-off-by: Hans J. Koch <hjk@linutronix.de> >> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ... > Acked-by: Wolfgang Grandegger <wg@grandegger.com> Applied. -- 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/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c index 57d5252..e6268b3 100644 --- a/arch/arm/mach-at91/board-sam9263ek.c +++ b/arch/arm/mach-at91/board-sam9263ek.c @@ -400,6 +400,23 @@ static struct gpio_led ek_pwm_led[] = { } }; +/* + * CAN + */ +static void sam9263ek_transceiver_switch(int on) +{ + if (on) { + at91_set_gpio_output(AT91_PIN_PA18, 1); /* CANRXEN */ + at91_set_gpio_output(AT91_PIN_PA19, 0); /* CANRS */ + } else { + at91_set_gpio_output(AT91_PIN_PA18, 0); /* CANRXEN */ + at91_set_gpio_output(AT91_PIN_PA19, 1); /* CANRS */ + } +} + +static struct at91_can_data ek_can_data = { + .transceiver_switch = sam9263ek_transceiver_switch, +}; static void __init ek_board_init(void) { @@ -431,6 +448,8 @@ static void __init ek_board_init(void) /* LEDs */ at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led)); + /* CAN */ + at91_add_device_can(&ek_can_data); } MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")