pull-request: can-next 2016-02-20

2 messages, 2 authors, 2016-02-22 · open the first message on its own page

pull-request: can-next 2016-02-20

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2016-02-20 14:09:57

Hello David,

this is a pull request of 9 patch for net-next/master.

The first 3 patches are from Damien Riegel, they add support for
Technologic Systems IP core to tje sja100 driver. The next patches 6 by
Marek Vasut (including one my me) first clean sort the CAN driver's
Kconfig and Makefiles and then add support for the IFI CANFD IP core.

Marc

---

The following changes since commit 80c804bfc487c6df783c258b9034b9d81c34f7a0:

  Merge branch 'bpf-get-stackid' (2016-02-20 00:21:44 -0500)

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.6-20160220

for you to fetch changes up to 0c4d9c94a1303008b32079991360cea7ab849ef3:

  can: ifi: Add IFI CANFD IP support (2016-02-20 14:56:15 +0100)

----------------------------------------------------------------
linux-can-next-for-4.6-20160220

----------------------------------------------------------------
Damien Riegel (3):
      can: sja1000: of: add per-compatible init hook
      can: sja1000: add documentation for Technologic Systems version
      can: sja1000: of: add compatibility with Technologic Systems version

Marc Kleine-Budde (1):
      can: Kconfig: sort drivers alphabetically

Marek Vasut (5):
      can: Kconfig: Sort the Kconfig includes
      can: Makefile: Sort the Makefile
      of: Add vendor prefix for I/F/I
      can: ifi: Add DT bindings for ifi,canfd
      can: ifi: Add IFI CANFD IP support

 .../devicetree/bindings/net/can/ifi_canfd.txt      |  15 +
 .../devicetree/bindings/net/can/sja1000.txt        |   3 +-
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 drivers/net/can/Kconfig                            |  64 +-
 drivers/net/can/Makefile                           |  17 +-
 drivers/net/can/ifi_canfd/Kconfig                  |   8 +
 drivers/net/can/ifi_canfd/Makefile                 |   5 +
 drivers/net/can/ifi_canfd/ifi_canfd.c              | 917 +++++++++++++++++++++
 drivers/net/can/sja1000/sja1000_platform.c         |  87 +-
 9 files changed, 1064 insertions(+), 53 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/can/ifi_canfd.txt
 create mode 100644 drivers/net/can/ifi_canfd/Kconfig
 create mode 100644 drivers/net/can/ifi_canfd/Makefile
 create mode 100644 drivers/net/can/ifi_canfd/ifi_canfd.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   |

Re: pull-request: can-next 2016-02-20

From: David Miller <davem@davemloft.net>
Date: 2016-02-22 03:39:59

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Sat, 20 Feb 2016 15:09:42 +0100
this is a pull request of 9 patch for net-next/master.

The first 3 patches are from Damien Riegel, they add support for
Technologic Systems IP core to tje sja100 driver. The next patches 6 by
Marek Vasut (including one my me) first clean sort the CAN driver's
Kconfig and Makefiles and then add support for the IFI CANFD IP core.
Pulled, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help