Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35eeacf1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents bed45f79 1ee18329

MAINTAINERS

+18 −18
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ F: arch/arm/boot/dts/aspeed-* 
F:	drivers/*/*aspeed*



ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>

M:	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1773,7 +1773,7 @@ F: drivers/soc/renesas/ 
F:	include/linux/soc/renesas/



ARM/SOCFPGA ARCHITECTURE

M:	Dinh Nguyen <dinguyen@opensource.altera.com>

M:	Dinh Nguyen <dinguyen@kernel.org>

S:	Maintained

F:	arch/arm/mach-socfpga/

F:	arch/arm/boot/dts/socfpga*
@@ -1783,7 +1783,7 @@ W: http://www.rocketboards.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git



ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT

M:	Dinh Nguyen <dinguyen@opensource.altera.com>

M:	Dinh Nguyen <dinguyen@kernel.org>

S:	Maintained

F:	drivers/clk/socfpga/
@@ -2175,56 +2175,56 @@ F: include/linux/atm* 
F:	include/uapi/linux/atm*



ATMEL AT91 / AT32 MCI DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

S:	Maintained

F:	drivers/mmc/host/atmel-mci.c



ATMEL AT91 SAMA5D2-Compatible Shutdown Controller

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

S:	Supported

F:	drivers/power/reset/at91-sama5d2_shdwc.c



ATMEL SAMA5D2 ADC DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-iio@vger.kernel.org

S:	Supported

F:	drivers/iio/adc/at91-sama5d2_adc.c



ATMEL Audio ALSA driver

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/atmel



ATMEL XDMA DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-arm-kernel@lists.infradead.org

L:	dmaengine@vger.kernel.org

S:	Supported

F:	drivers/dma/at_xdmac.c



ATMEL I2C DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-i2c@vger.kernel.org

S:	Supported

F:	drivers/i2c/busses/i2c-at91.c



ATMEL ISI DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-media@vger.kernel.org

S:	Supported

F:	drivers/media/platform/soc_camera/atmel-isi.c

F:	include/media/atmel-isi.h



ATMEL LCDFB DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/fbdev/atmel_lcdfb.c

F:	include/video/atmel_lcdc.h



ATMEL MACB ETHERNET DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

S:	Supported

F:	drivers/net/ethernet/cadence/
@@ -2236,32 +2236,32 @@ S: Supported 
F:	drivers/mtd/nand/atmel_nand*



ATMEL SDMMC DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-mmc@vger.kernel.org

S:	Supported

F:	drivers/mmc/host/sdhci-of-at91.c



ATMEL SPI DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

S:	Supported

F:	drivers/spi/spi-atmel.*



ATMEL SSC DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	drivers/misc/atmel-ssc.c

F:	include/linux/atmel-ssc.h



ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	drivers/misc/atmel_tclib.c

F:	drivers/clocksource/tcb_clksrc.c



ATMEL USBA UDC DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	drivers/usb/gadget/udc/atmel_usba_udc.*
@@ -9765,7 +9765,7 @@ S: Maintained 
F:	drivers/pinctrl/pinctrl-at91.*



PIN CONTROLLER - ATMEL AT91 PIO4

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-gpio@vger.kernel.org

S:	Supported

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ 
	orion5x-lacie-ethernet-disk-mini-v2.dtb \

	orion5x-linkstation-lsgl.dtb \

	orion5x-linkstation-lswtgl.dtb \

	orion5x-lschl.dtb \

	orion5x-linkstation-lschl.dtb \

	orion5x-lswsgl.dtb \

	orion5x-maxtor-shared-storage-2.dtb \

	orion5x-netgear-wnr854t.dtb \

arch/arm/boot/dts/imx1.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,14 @@ 
/ {

	#address-cells = <1>;

	#size-cells = <1>;

	/*

	 * The decompressor and also some bootloaders rely on a

	 * pre-existing /chosen node to be available to insert the

	 * command line and merge other ATAGS info.

	 * Also for U-Boot there must be a pre-existing /memory node.

	 */

	chosen {};

	memory { device_type = "memory"; reg = <0 0>; };



	aliases {

		gpio0 = &gpio1;

arch/arm/boot/dts/imx23.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ 
	#size-cells = <1>;



	interrupt-parent = <&icoll>;

	/*

	 * The decompressor and also some bootloaders rely on a

	 * pre-existing /chosen node to be available to insert the

	 * command line and merge other ATAGS info.

	 * Also for U-Boot there must be a pre-existing /memory node.

	 */

	chosen {};

	memory { device_type = "memory"; reg = <0 0>; };



	aliases {

		gpio0 = &gpio0;

arch/arm/boot/dts/imx25.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,14 @@ 
/ {

	#address-cells = <1>;

	#size-cells = <1>;

	/*

	 * The decompressor and also some bootloaders rely on a

	 * pre-existing /chosen node to be available to insert the

	 * command line and merge other ATAGS info.

	 * Also for U-Boot there must be a pre-existing /memory node.

	 */

	chosen {};

	memory { device_type = "memory"; reg = <0 0>; };



	aliases {

		ethernet0 = &fec;