netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* pull-request: can-next 2014-08-20
@ 2014-08-20 14:49 Marc Kleine-Budde
  2014-08-23  2:43 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Marc Kleine-Budde @ 2014-08-20 14:49 UTC (permalink / raw)
  To: netdev; +Cc: David Miller, linux-can@vger.kernel.org, kernel@pengutronix.de

[-- Attachment #1: Type: text/plain, Size: 3816 bytes --]

Hello David,

this is a pull request of 10 patches for net-next/master.

There is one patch by Wolfram Sang to clean up the build system.
Two patches by Stefan Agner that add vf610 support to the flexcan
driver. Dong Aisheng add support for bosch's m_can core, which is found
in the new freescale ARM SoCs. Sergei Shtylyov improves the rcar_can
driver by supporting all input clocks and adding device tree support.
The next patch is a small cleanup for the bit rate calculation function
by Lad, Prabhakar. And finally a patch by Himangi Saraogi, which
converts the mcp251x driver to use dmam_alloc_coherent.

Marc

---
The following changes since commit c9d26423e56ce1ab4d786f92aebecf859d419293:

  Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (2014-08-14 18:13:46 -0600)

are available in the git repository at:

  git://gitorious.org/linux-can/linux-can-next.git tags/linux-can-next-for-3.18-20140820

for you to fetch changes up to 3a73aeff37c2e425b11d19c19e42e8269d58d417:

  can: mcp251x: Use dmam_alloc_coherent (2014-08-18 01:03:43 +0200)

----------------------------------------------------------------
linux-can-next-for-3.18-20140820

----------------------------------------------------------------
Dong Aisheng (2):
      can: m_can: add device tree binding documentation
      can: m_can: add Bosch M_CAN controller support

Himangi Saraogi (1):
      can: mcp251x: Use dmam_alloc_coherent

Lad, Prabhakar (1):
      can: dev: remove unused variable from can_calc_bittiming() function

Sergei Shtylyov (3):
      can: rcar_can: support all input clocks
      can: rcar_can: document device tree bindings
      can: rcar_can: add device tree support

Stefan Agner (2):
      can: flexcan: flexcan_get_berr_counter(): switch on clocks before accessing ecr register
      can: flexcan: add vf610 support for FlexCAN

Wolfram Sang (1):
      net: can: use kbuild magic to inherit debug settings

 .../devicetree/bindings/net/can/m_can.txt          |   67 ++
 .../devicetree/bindings/net/can/rcar_can.txt       |   43 +
 drivers/net/can/Kconfig                            |    2 +
 drivers/net/can/Makefile                           |    3 +-
 drivers/net/can/c_can/Makefile                     |    2 -
 drivers/net/can/cc770/Makefile                     |    2 -
 drivers/net/can/dev.c                              |    3 +-
 drivers/net/can/flexcan.c                          |  111 +-
 drivers/net/can/m_can/Kconfig                      |    4 +
 drivers/net/can/m_can/Makefile                     |    5 +
 drivers/net/can/m_can/m_can.c                      | 1202 ++++++++++++++++++++
 drivers/net/can/mscan/Makefile                     |    2 -
 drivers/net/can/rcar_can.c                         |   66 +-
 drivers/net/can/sja1000/Makefile                   |    2 -
 drivers/net/can/softing/Makefile                   |    2 -
 drivers/net/can/spi/Makefile                       |    2 -
 drivers/net/can/spi/mcp251x.c                      |   16 +-
 drivers/net/can/usb/Makefile                       |    2 -
 18 files changed, 1484 insertions(+), 52 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/can/m_can.txt
 create mode 100644 Documentation/devicetree/bindings/net/can/rcar_can.txt
 create mode 100644 drivers/net/can/m_can/Kconfig
 create mode 100644 drivers/net/can/m_can/Makefile
 create mode 100644 drivers/net/can/m_can/m_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: 181 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: pull-request: can-next 2014-08-20
  2014-08-20 14:49 pull-request: can-next 2014-08-20 Marc Kleine-Budde
@ 2014-08-23  2:43 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-08-23  2:43 UTC (permalink / raw)
  To: mkl; +Cc: netdev, linux-can, kernel

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 20 Aug 2014 16:49:36 +0200

> There is one patch by Wolfram Sang to clean up the build system.
> Two patches by Stefan Agner that add vf610 support to the flexcan
> driver. Dong Aisheng add support for bosch's m_can core, which is found
> in the new freescale ARM SoCs. Sergei Shtylyov improves the rcar_can
> driver by supporting all input clocks and adding device tree support.
> The next patch is a small cleanup for the bit rate calculation function
> by Lad, Prabhakar. And finally a patch by Himangi Saraogi, which
> converts the mcp251x driver to use dmam_alloc_coherent.

Pulled, thanks Marc.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-08-23  2:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-20 14:49 pull-request: can-next 2014-08-20 Marc Kleine-Budde
2014-08-23  2:43 ` 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).