* pull-request: can-next 2015-09-17
@ 2015-09-17 21:07 Marc Kleine-Budde
2015-09-21 4:59 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2015-09-17 21:07 UTC (permalink / raw)
To: netdev; +Cc: David Miller, kernel@pengutronix.de, linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 1719 bytes --]
Hello David,
this is a pull request of two patches for net-next/master.
Gerhard Bertelsmann adds support for the CAN controller found on the
Allwinner A10/A20 SoC.
Marc
---
The following changes since commit 37d2dbcdcca88e392009d7cbe8617d5af0ebcb32:
net: fix cdc-phonet.c dependency and build error (2015-09-16 11:51:19 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-4.4-20150917
for you to fetch changes up to 0738eff14d817a02ab082c392c96a1613006f158:
can: Allwinner A10/A20 CAN Controller support - Kernel module (2015-09-17 22:39:08 +0200)
----------------------------------------------------------------
linux-can-next-for-4.4-20150917
----------------------------------------------------------------
Gerhard Bertelsmann (2):
can: Allwinner A10/A20 CAN Controller support - Devicetree bindings
can: Allwinner A10/A20 CAN Controller support - Kernel module
.../devicetree/bindings/net/can/sun4i_can.txt | 36 +
drivers/net/can/Kconfig | 10 +
drivers/net/can/Makefile | 1 +
drivers/net/can/sun4i_can.c | 857 +++++++++++++++++++++
4 files changed, 904 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/can/sun4i_can.txt
create mode 100644 drivers/net/can/sun4i_can.c
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2015-09-17
2015-09-17 21:07 Marc Kleine-Budde
@ 2015-09-21 4:59 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2015-09-21 4:59 UTC (permalink / raw)
To: mkl; +Cc: netdev, kernel, linux-can
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 17 Sep 2015 23:07:44 +0200
> this is a pull request of two patches for net-next/master.
>
> Gerhard Bertelsmann adds support for the CAN controller found on the
> Allwinner A10/A20 SoC.
Pulled, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* pull-request: can-next 2015-09-17
@ 2015-09-21 7:20 Marc Kleine-Budde
2015-09-22 0:15 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2015-09-21 7:20 UTC (permalink / raw)
To: netdev; +Cc: David Miller, kernel@pengutronix.de, linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 1912 bytes --]
Hello David,
this is a pull request of 8 patches for net-next/master.
All 8 patches are by me and cleanup the flexcan driver.
Marc
---
The following changes since commit a1ef48e1e8843e2f6be631b8cf1c21b24579b9d6:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (2015-09-20 22:26:58 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-4.4-20150921
for you to fetch changes up to 6fa7da249269a6146ce456c43098901c81c8afdf:
can: flexcan: enable interrupts atomically at the end of flexcan_chip_start() (2015-09-21 08:38:23 +0200)
----------------------------------------------------------------
linux-can-next-for-4.4-20150921
----------------------------------------------------------------
Marc Kleine-Budde (8):
can: flexcan: cleanup coding style and fix typos
can: headers: make header files self contained
can: flexcan: remove unused header files
can: flexcan: flexcan_chip_start(): cleanup writing of reg_mcr
can: flexcan: rename feature into quirks
can: flexcan: use pointer to struct regs instead of void pointer for mmio address space
can: flexcan: give member of flexcan_priv holding mailboxes a sensible name
can: flexcan: enable interrupts atomically at the end of flexcan_chip_start()
drivers/net/can/flexcan.c | 197 ++++++++++++++++++++++------------------------
include/linux/can/dev.h | 3 +-
include/linux/can/led.h | 1 +
3 files changed, 95 insertions(+), 106 deletions(-)
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2015-09-17
2015-09-21 7:20 pull-request: can-next 2015-09-17 Marc Kleine-Budde
@ 2015-09-22 0:15 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2015-09-22 0:15 UTC (permalink / raw)
To: mkl; +Cc: netdev, kernel, linux-can
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 21 Sep 2015 09:20:21 +0200
> this is a pull request of 8 patches for net-next/master.
>
> All 8 patches are by me and cleanup the flexcan driver.
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 6+ messages in thread
* pull-request: can-next 2015-09-17
@ 2015-10-13 16:08 Marc Kleine-Budde
2015-10-15 1:37 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2015-10-13 16:08 UTC (permalink / raw)
To: netdev; +Cc: David Miller, kernel@pengutronix.de, linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 1818 bytes --]
Hello David,
this is a pull request of 4 patches for net-next/master.
Two patches are by Gerhard Bertelsmann, fixing some problems in the
sun4i driver. The patch by Arnd Bergmann stops using timeval for the
CAN broadcast manager. The last patch by Alexandre Belloni removes the
otherwise unused struct at91_can_data from the driver.
Marc
---
The following changes since commit bbb300eb976b613a8e4e666d3af39f5ab1031d22:
Merge branch 'bridge-vlan' (2015-10-13 04:58:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-4.4-20151013
for you to fetch changes up to 42160a041db89807691b2a3fbf42e36a98b6019e:
can: at91: remove at91_can_data (2015-10-13 17:42:35 +0200)
----------------------------------------------------------------
linux-can-next-for-4.4-20151013
----------------------------------------------------------------
Alexandre Belloni (1):
can: at91: remove at91_can_data
Arnd Bergmann (1):
can: avoid using timeval for uapi
Gerhard Bertelsmann (2):
can: sun4i: fix arbitration lost error reporting
can: sun4i: fix MODULE_DESCRIPTION
drivers/net/can/at91_can.c | 21 ---------------------
drivers/net/can/sun4i_can.c | 4 ++--
include/linux/platform_data/atmel.h | 5 -----
include/uapi/linux/can/bcm.h | 7 ++++++-
net/can/bcm.c | 15 ++++++++++-----
5 files changed, 18 insertions(+), 34 deletions(-)
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2015-09-17
2015-10-13 16:08 Marc Kleine-Budde
@ 2015-10-15 1:37 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2015-10-15 1:37 UTC (permalink / raw)
To: mkl; +Cc: netdev, kernel, linux-can
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 13 Oct 2015 18:08:01 +0200
> this is a pull request of 4 patches for net-next/master.
>
> Two patches are by Gerhard Bertelsmann, fixing some problems in the
> sun4i driver. The patch by Arnd Bergmann stops using timeval for the
> CAN broadcast manager. The last patch by Alexandre Belloni removes the
> otherwise unused struct at91_can_data from the driver.
Pulled, thank you.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-15 1:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-21 7:20 pull-request: can-next 2015-09-17 Marc Kleine-Budde
2015-09-22 0:15 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2015-10-13 16:08 Marc Kleine-Budde
2015-10-15 1:37 ` David Miller
2015-09-17 21:07 Marc Kleine-Budde
2015-09-21 4:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).