8566 Commits

Author SHA1 Message Date
Hans de Goede
19f5c703c5 ARM: dts: sun8i: Add dts file for the GA10H-A33 tablet
The ga10h is an 10" tablet with an A33 or A23 soc, 1G RAM, 8G or 16G nand,
sdio wifi, 2 micro usb ports, 1 otg and 1 host and 1 micro sd slot.

This commit adds a dts file for the v1.1 pcb with an a33 soc.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-02 23:36:23 +02:00
Chen-Yu Tsai
4eb0f25fa6 ARM: dts: sun8i-a33: Add dts for Sinlinx SinA33 development board.
The SinA33 is a core/SDK development board by Sinlinx. The core board
does not have any connectors or pads, other than the pads used to connect
it to the SDK board.

The core board only has the A33 SoC, 2 RAM chips, an eMMC flash chip,
the AXP223 PMIC, and supporting discrete components. eMMC is optional.

The SDK board has a USB host, USB OTG, volume control and home buttons,
audio input/output jacks, a micro-SD slot, camera and SDIO expansion
headers, an LCD connector, and a GPIO expansion header, which has
UARTs, MIPI DSI and I2C available. Only UART0 is enabled though.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-02 23:18:09 +02:00
Chen-Yu Tsai
63c6509b0d ARM: dts: sun8i-a33: Add pinmux setting for uart0 on PB pins
The A33 adds an additional pinmux option for uart0 on the PB pins.
This was not present on the A23. Nor is it available on the H3,
which does not have the PB pingroup.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-02 23:14:42 +02:00
Chen-Yu Tsai
93b129d6fa ARM: dts: sun8i: Add pinmux setting for 8bit mmc2
mmc2 is mostly used with eMMC flash chips, as an alternative to
raw NAND flash chips. 8 bit mmc is commonly used.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-02 23:14:39 +02:00
Steffen Trumtrar
e0e6f74801 ARM: socfpga: socrates: add gpio-leds
The SOCrates has three HPS LEDs that can be turned on/off via gpio.
Use the first one has heartbeat and add the other two as free LEDs.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-06-02 14:27:11 -05:00
Steffen Trumtrar
81638f1b9f ARM: socfpga: socrates: enable gpio0/1
Enable the gpio0+1 controller.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-06-02 14:20:16 -05:00
Dinh Nguyen
ebbce1bbc4 ARM: socfpga: dts: add enable-method property for cpu nodes
Add the enable-method property for the cpu node on socfpga.dtsi and
socfpga_arria10.dtsi. This is for CPU_METHOD_OF_DECLARE to use to enable
the secondary core.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-06-02 14:18:15 -05:00
Dinh Nguyen
479f8df04c ARM: socfpga: dts: add the a9-scu node for arria10
Add a dts node for the A9 SCU on the Arria10 platform.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-06-02 14:18:06 -05:00
Hans de Goede
ef3476e236 ARM: dts: sun8i: Add usb_clk node for a23/a33
Add an usb_clk node for a23/a33.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
2015-06-02 10:26:52 +02:00
Vishnu Patekar
e01d9c7551 ARM: dts: sun8i: Add ET-Q8 A33 support
ET-Q8_A33 is A33 based cheap tablet in common Q8 format.

It has 512MB RAM, 4GB Nand, 7" Display, RDA5900P wifi, GSL1680 touch, etc.

Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Chen-Yu Tsai <wens@csie.org>
2015-06-02 09:55:36 +02:00
Vishnu Patekar
35af8e4b38 ARM: dts: sun8i: Add sun8i-a33 dtsi
Add a dtsi file for use with a33 based boards based on the new
sun8i-a23-a33.dtsi file.

Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Chen-Yu Tsai <wens@csie.org>
2015-06-02 09:54:52 +02:00
Vishnu Patekar
a0e9e9be6a ARM: dts: sun8i: Add sun8i-a23-a33 dtsi
Rename sun8i-a23.dtsi to sun8i-a23-a33.dtsi as the base dtsi for the A33
is 99% the same and add a new sun8i-a23.dtsi including sun8i-a23-a33.dtsi
and setting the few things not shared with the A33 (mbus-clk, pio
compatible and interrupts).

Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Chen-Yu Tsai <wens@csie.org>
2015-06-02 09:53:49 +02:00
Arnd Bergmann
e897ee70dc Device Tree changes for Ux500 and ARM SOC:
- Document Snoop Control Unit (SCU) bindings
 - Document Ux500 board bindings
 - Define the backup RAM in the DBx500 device tree
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVbEwwAAoJEEEQszewGV1zw5IQAMgEalCaSArXm/a12eogltuE
 rGzJtP6MRwqLA4dGe+rOnUEsw2+jX1uBpUsBt7akBRbl2prRUpm89SJxZg8E5YpG
 u2c+ODrh1lp4sRpAtKiMrLVx+hIjR4YFEa2cW0/OAJKG+4h1RXeQlXW3bw9q0qov
 dO+M+NlcmWHyaJU9bNHYPZNYtG+9rVYY8kEK/LFe1xiY/VYC8KIe+gikR/R9WHI1
 PZgAi1rARLeKAC7eThUDA+XnhzpxwYyqsxHsLV92l0l/cfly6DKCmZ1Zn9jk7v4b
 L24jZ8OpHhJX5s//vsBmLxSobisuL8aLJDHCkrBmIb+geRsphOYmYTwmKdRJ2YkB
 CyuxmvjdpKNiBIb8SGEKplrRaAexRfjXxX1GdNZNzdvIDo7T1hrM3/Fzo5TXxP61
 Tgtu3I2Cwa3luDxFKaGlgldihvhUVPcAoBQUXyF57teWIh4iwTcrGZ3Li9kxTY32
 ZvunTP/z8XjWRKFHv5KFCnnpxoQLDB/aHuv36H94hol5Nf95MC0EjGvBRM582z+u
 1znExgtfSUt0BfqaxFgTieIu8RrQK0bxGcwBK6Okmv+j2BjTnE10ZuoqZSCaurOQ
 QEkO336JNyYSwSu9Bxcwcx5x/qB+X5yuZLvmzhOp8Ld0omUngOqSpBtxdQQNQBK5
 9qwI0QJ0Unc3rSgkJ6Ho
 =IRmr
 -----END PGP SIGNATURE-----

Merge tag 'dt-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

Merge "Device Tree changes for Ux500 and ARM SOC" from Linus Walleij:

- Document Snoop Control Unit (SCU) bindings
- Document Ux500 board bindings
- Define the backup RAM in the DBx500 device tree

* tag 'dt-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: define the backupram in the device tree
  ARM: ux500: add board documentation
  ARM: scu: document Snoop Control Unit DT bindings
2015-06-01 18:02:44 +02:00
Arnd Bergmann
63cb275e6e Merge tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux into next/dt
Merge "This pull request contains a single change" from Florian Fainelli:

- fix the NAND controller node on bcm63138, the original change was a mis-merge that
  did not properly parent it to the "ubus" node

* tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux:
  ARM: dts: BCM63xx: re-parent NAND controller node
2015-06-01 17:41:46 +02:00
Arnd Bergmann
e59bff9af4 mvebu dt changes for v4.2 (part #2)
Add 2 new set boards:
 - Armada 385 based Linksys boards
 - DLink DNS-327L
 
 Update the spi-nor flash compatible strings
 
 Use improved armada spi device tree compatible name for each mvebu SoC
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlVo3bwACgkQCwYYjhRyO9UxNgCgn5KoYMnx0qzbbmc7rfoyd9g3
 IF8An0yb+2EFpP7SBPu41s8rXOATCCTb
 =APjz
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-4.2-2' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu dt changes for v4.2 (part #2)" from Gregory CLEMENT:

Add 2 new set boards:
- Armada 385 based Linksys boards
- DLink DNS-327L

Update the spi-nor flash compatible strings

Use improved armada spi device tree compatible name for each mvebu SoC

* tag 'mvebu-dt-4.2-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: use improved armada spi device tree compatible name for each SoC
  ARM: mvebu: dts: Add dts file for DLink DNS-327L
  ARM: mvebu: add "jedec,spi-nor" flash compatible binding
  ARM: kirkwood: add "jedec,spi-nor" flash compatible binding
  ARM: mvebu: add support for the new Armada 385 based Linksys boards
2015-06-01 17:38:07 +02:00
Maxime Ripard
0eb14a8dad ARM: dts: sun7i: Add A20 SRAM and SRAM controller
The A20 has a few SRAM that can be mapped either to a device or to the CPU,
with the mapping being controlled by a SRAM controller.

Add the SRAM controller, the SRAM that it drives and the section that can
be used by the various devices.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
2015-06-01 11:13:27 +02:00
Maxime Ripard
00f69ba94d ARM: dts: sun5i: Add A10s and A13 SRAM and SRAM controller
The A10s and A13 have a few SRAM that can be mapped either to a device or
to the CPU, with the mapping being controlled by a SRAM controller.

Add the SRAM controller, the SRAM that it drives and the section that can
be used by the various devices.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
2015-06-01 11:13:26 +02:00
Maxime Ripard
1fbc15175d ARM: dts: sun4i: Add A10 SRAM and SRAM controller
The A10 has a few SRAM that can be mapped either to a device or to the CPU,
with the mapping being controlled by a SRAM controller.

Add the SRAM controller, the SRAM that it drives and the section that can
be used by the various devices.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
2015-06-01 11:13:26 +02:00
Maxime Ripard
860c186c7d ARM: dts: sunxi: Revert SRAM controller drivers patches
This patch reverts commit ccb4ada2f193 ("ARM: dts: sun7i: Add A20 SRAM and
SRAM controller"), commit e6f51e4bd2a5 ("ARM: dts: sun5i: Add A13 and A10s
SRAM and SRAM controller") and commit 6d92b80f356f ("ARM: dts: sun4i: Add
A10 SRAM and SRAM controller").

The bindings have been changed in the SRAM driver, and we need to
change the DT accordingly.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01 11:13:22 +02:00
Chen-Yu Tsai
6d6693c8a7 ARM: dts: sun9i: Add device node for watchdog
On A80 there are 2 watchdogs, one in the main block, and one in the
R (special) block. We do not have information on the R block watchdog,
other than the register layout is the same, and the interrupt number.
Both are able to reset the whole system.

Add the main watchdog, in case the R block is used for special purposes
like running an RTOS.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01 11:08:43 +02:00
Michael Ring
4528f5314b ARM: dts: sun7i: Add uart4 support for BananaPro, disable uart2
The BananaPro uses uart4 for the default rx/tx pins on the 40 pins connector,
so enable uart4.

Uart2 is also available at the bananapro io-pins, but like on the bananapi
the primary function of the pins is to act as gpios, see:
http://forum.lemaker.org/forum.php?mod=viewthread&tid=10852

Remove the uart2 node, people who want to use uart2 can do so with a
devicetree-overlay.

Signed-off-by: Michael Ring <mail@michael-ring.org>
[hdegoede@redhat.com: Remove uart2 node]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01 11:08:29 +02:00
Michael Ring
869afa7f17 ARM: dts: sun7i: Add uart4_pins_b definition
Some boards (e.g. the BananaPro) use alternative pins for uart4, add a pinmux
entry for these.

Signed-off-by: Michael Ring <mail@michael-ring.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01 11:08:29 +02:00
Maxime Ripard
5f6883898c ARM: sun8i: Introduce A23 Evaluation Board Support
The A23 Evaluation Board has an MMC slot, two UARTs, NAND, a few display
connectors (RGB, MIPI, LVDS), a mini-PCIE slot, USB host and OTG and a
bunch of embedded sensors.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01 11:08:24 +02:00
Linus Torvalds
2a64517186 ARM: SoC fixes for 4.1-rc5
Two weeks worth of small bug fixes this time, nothing sticking out
 this time:
 
 - one defconfig change to adapt to a modified Kconfig symbol
 - two fixes for i.MX for backwards compatibility with older DT
   files that was accidentally broken
 - one regression fix for irq handling on pxa
 - three small dt files on omap, and one each for imx and exynos
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIVAwUAVWjV6WCrR//JCVInAQKwABAA4ZCvaRoP5Yc9aIGVZx5/FRSaXQ7pMi39
 ORggazaHWZ3NpMDMfVqhBzyeZya3Ad6pjaIsPL83GdcqJgu5O+bNF86f5r4Q5rWK
 bvLPQd77ge4SCvqgQw8CgR/05aiLGhMlujKQeIR+P4z21p5OFoPqRjQnAzjWbRde
 lm6sO8I3xQybagyjp4y1/uxW4Ukc0fRNM+sMnQbVwRlCM6L+CGGWuyCuAseM8MrH
 eGqlHutZTt3/3TB/Y+gerohchxgq2+YVAUFhMoaVl+UUwW0Qk7Ee9roKfruiWuMk
 9fvPMeaw/CkwpUSZreGjBPsGINWWRQPleWzWHEvjiOyALooM1h/LRL6JJH/nodnV
 w2F4ECjdGxfdEXn4ShMYg8ZfdXMswpB8CaAOFH3dTQyXo4Yy0bfXB3EakiOjmoZW
 Nst3vCI0IYq6kLnOOLzNfVZy6VQQtA3oNShCILvHKwyqVkSfX998a365otW5xAXJ
 2D2GAjGxNNp+Rg5QJ++OEwQrpha6DtyvuGffIB/DQMLpqkizvMQyK7x+nAvUaKQ7
 OdxEs8Npm7i78wd84mNqXKosbq9yHUlbOU7PVlOfjL/JjXi1jDhPBTtKvnSZHTyr
 Np0/FI1iJqUf9//L1z8Dz0CE8G/DLQe7NG847HsBkLbqudtNY2Hcr7IOSs9eJdp3
 DEG/377/2mM=
 =2HQg
 -----END PGP SIGNATURE-----

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
 "Two weeks worth of small bug fixes this time, nothing sticking out
  this time:

   - one defconfig change to adapt to a modified Kconfig symbol

   - two fixes for i.MX for backwards compatibility with older DT files
     that was accidentally broken

   - one regression fix for irq handling on pxa

   - three small dt files on omap, and one each for imx and exynos"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: multi_v7_defconfig: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760
  ARM: imx6: gpc: don't register power domain if DT data is missing
  ARM: imx6: allow booting with old DT
  ARM: dts: set display clock correctly for exynos4412-trats2
  ARM: pxa: pxa_cplds: signedness bug in probe
  ARM: dts: Fix WLAN interrupt line for AM335x EVM-SK
  ARM: dts: omap3-devkit8000: Fix NAND DT node
  ARM: dts: am335x-boneblack: disable RTC-only sleep
  ARM: dts: fix imx27 dtb build rule
  ARM: dts: imx27: only map 4 Kbyte for fec registers
2015-05-29 14:48:58 -07:00
Arnd Bergmann
4eaf9ed74c Samsung fix for v4.1
- Set display clock correctly for exynos4412-trats2
   : fix the following error
 
     exynos-drm: No connectors reported connected with modes
     [drm] Cannot find any crtc or sizes - going 1024x768
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIbBAABAgAGBQJVX+5NAAoJEA0Cl+kVi2xqpMIP8wfc3SQ50eR+6rHmsxoSmxFE
 QxAq8g/yQYTXOy3xtm4IF0UQthkeqzpYRwsgROG0Jvg8lbh66LfQrOC9k8H2GMv5
 gnFZBeby1DkPU6LA4NEe20VaK0uh84h/OxwoHJTaXUacsUJ4yQvgObGWuazz0kAN
 4y2bW0N0MPBWQT2xdm17DOAmECsbR3SievUPPph+s3oRXH3wyQPDB8r/qV1F8LyD
 9DjM7z4J1zepVtOno9xgdlP10OCGrLXorJM6rp9b86DLa+RiSQ+BEu42OrhNlMSj
 rKScbjldxx11dF8lE0TGo7uo5c6kdgiJgPUhDwanMllpmdGKSnauek4vHHhLrtHJ
 oYZTRLRAsRxqzaNzd1FqSqJs45BMkR+VLnXFNNxMNXNn4fx7655Ji0W+CR34b9ko
 lo7p7O6bEWzapI57xIt6OR/O+pXaDfRKxAWbejQ1/nLKs29iGDfG+qLVe92a6NKq
 5gtO4GVQam+z59ivFqZBjWFjx1OeYBdyDYa5sFSzqtZ+o7tM2JCP65PrfIA5foUm
 1OftnwMPVDkpT3haWICDx0mVeHSPvE2d55R6iAnPeAlxEeVTk5/BLlYtsn9wP5eB
 o4tfrWTYgVKPNg3KIvE/XkMyGmX7T/asKK6RB8JuVAKPOSJ1ATP0z9cPGScj63Va
 2yaKIKGIuOcFyg5KqUI=
 =U0hO
 -----END PGP SIGNATURE-----

Merge tag 'samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

Merge "Samsung fix for v4.1" from Kukjin Kim:

- Set display clock correctly for exynos4412-trats2
  : fix the following error

    exynos-drm: No connectors reported connected with modes
    [drm] Cannot find any crtc or sizes - going 1024x768

* tag 'samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: set display clock correctly for exynos4412-trats2
2015-05-29 14:29:37 +02:00
Arnd Bergmann
ff28ea6342 Second Round of Renesas ARM Based SoC DT Updates for v4.2
* Describe DMA for the serial ports of R-Car Gen2 SoCs
 * Add MMCIF max-frequency to R-Car Gen2 SoCs
 * Use "nor-jedec" instead of "jedec,spi-nor"
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVZ7e4AAoJENfPZGlqN0++Qq4P/1B2R/WUB0TF8AFiG1dDVglV
 WjtnyMTWPJvojZNgKZ7+AgK+lJyeAsAJ+2ask+3ucxak4EyOfS3BusoodWD7PRDT
 R7Ud0Lqm6hbdWcj5NasYBRPN5vaz56p7KG5OCmDsKbr3LzxGHA8YJsDOMnptRfkI
 BU/fwlOztNajrZgQyQ7REdQV12UBAxIzvzq0/oHjIBtJ/JQeCw6A9/130yPnkdbT
 BrOBK7N/xHfZRD5sK1ANg4seaGQFQq4tnx3FPxWl/FrmdUNT+/yvzrfIuuyT3BbF
 I35sZ1JPZnYD9m9g+YKeK38Vcir8lcVU9U+HRc4V6IdI/f73lJndrPGTr80NjVRn
 TqClGktX+qJ9iZyP186WyS1bL+qnf527uQHnpYLcU4XEbSobQfBSZcafynsXGFZN
 zViDeHIW6WDperLeUV30G1MT4H8qpbfX/rVysrS1tgjDQ2G1DR9IXMAQjBhieYTK
 GMyO5aeeG3GugQxmHKPeuQJBO+MpJDn6LGluiIwE2E77+Kv+eYhtvqvugb/p6UyQ
 fueapUSSK8rKQJtapx6JvkA1nQjIhw7x/1+JdzThzSsvfnUYVHtTvihtlq2mknbj
 lPIiGxVHk0CJ4H7Qq/YLc/ojwo65GE1tbiWqPW399jARbwiNpCdFJB/UDsTS2A9U
 C5a13k+WthJMcEwsOz0Q
 =OIk0
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.2" from Simon Horman:

* Describe DMA for the serial ports of R-Car Gen2 SoCs
* Add MMCIF max-frequency to R-Car Gen2 SoCs
* Use "nor-jedec" instead of "jedec,spi-nor"

* tag 'renesas-dt2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790 dtsi: Describe DMA for the serial ports
  ARM: shmobile: r8a7791 dtsi: Describe DMA for the serial ports
  ARM: shmobile: r8a7794 dtsi: Describe DMA for the serial ports
  ARM: shmobile: r8a7791: add MMCIF max-frequency
  ARM: shmobile: r8a7790: add MMCIF max-frequency
  ARM: shmobile: bockw dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: bockw-reference dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: koelsch dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: lager dts: Replace "nor-jedec" by "jedec,spi-nor"
2015-05-29 13:59:55 +02:00
Arnd Bergmann
047d378a00 arm: Xilinx Zynq dt patches for v4.2
- Fix aliases and stdout properties
 - Document current TTC binding
 - Add Ceva to prefixes
 - Use new compatible string for MACB
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iEYEABECAAYFAlVmuqQACgkQykllyylKDCEKxgCgl/50lxDs3V9bRw5JUiN0ClM/
 lCoAn2OfNpK5w/HmOw57erYuIA0rPQc8
 =ulOE
 -----END PGP SIGNATURE-----

Merge tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/dt

Merge "arm: Xilinx Zynq dt patches for v4.2" from Michal Simek:

- Fix aliases and stdout properties
- Document current TTC binding
- Add Ceva to prefixes
- Use new compatible string for MACB

* tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: DT: Use the zynq binding with macb
  of: Add vendor prefix for Ceva
  PCI: xilinx: Trivial fix in DT example
  devicetree: cadence_ttc: Document binding for timer width
  ARM: dts: zynq: Fix stdout-path and bootargs
  ARM: dts: zynq: Add missing alias node for zybo and parallella
2015-05-29 13:58:41 +02:00
Arnd Bergmann
db695b5ecf - dts: add pinctrl/GPIO/EINT to mt8135
- dts: fix uart address for mt8127
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVZdqhAAoJELQ5Ylss8dNDArgQAJmMgIDUIW4u1/j8T0xX6WWf
 dWkdYfrNcV7lU8Y1xUtqucx/hI7waJlw6fRXyGj/8ZNG+NnAnOhC3NdWPy+9lRpA
 idjYihlFVtb4+AtWSXaPxpt4ea4Eq/87lXhgY02CwXw17naa5rimtHG8zppuM/v8
 Cvu27A3ID8RuGYNOvaYBJ9ngKfJH4QdgtzwHVk1KmDc91ROQqk+Gfey3olN7rsJZ
 M0Yf4tCaoNBLusF5nNb0PGnKHbQFvexAjDD4X3B+mCSBW4pyeZDBIvtXBJogBqmr
 B1XBfgeWmwFlLgF++DHEoakjQAVparqyMoB6GX9OkNpxpC1OrVz7S6zBX+wsp/WA
 9fKvmzTtF3FJQURv4v45u8/6iVn/V2OOgMDFiqF53JAfbWtlq7PqE8NJNwryRG+p
 5rSCT212qieAt3cz1iGKXjqlqzo+tXODBdmg+mQOQjHUhHDZfNraPGMFMO/Lq9kv
 dMJ6uUno4Y4NDaWT/TGBwblPSBR08JT7BwQKhgbTsnZuk4xJxZtSLCDwTWWkjtYe
 MGkWyP0PFWVbyzXtx6EXrBZm6XxcEZ4ymTXk4JHl49/9rodZ6zj+rd9zEgxARw+z
 03lS8r7nRmvgVW9TJgOwQgIR6avG3KvxPX/VzGdvGysar3/YYhFGQ36bhLm7AMG8
 laHAeKzwDr7ogHN2LGRo
 =zN/l
 -----END PGP SIGNATURE-----

Merge tag 'v4.1-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt

Merge "ARM: mediatek: dts updates for v4.2" from Matthias Brugger:
- dts: add pinctrl/GPIO/EINT to mt8135
- dts: fix uart address for mt8127

* tag 'v4.1-next-dts' of https://github.com/mbgg/linux-mediatek:
  ARM: dts: mt8127: correct uart instance address
  ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135.
2015-05-29 13:56:58 +02:00
Arnd Bergmann
0258b15d39 Qualcomm ARM Based Device Tree Updates for v4.2
* Added support for regulators, USB Host & OTG, SATA, and i2c
   controllers on APQ8064 based platforms
 * Added PM8841/PM8941/PMA8084 device nodes
 * Added PMU support on MSM8660
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 Comment: GPGTools - https://gpgtools.org
 
 iQIcBAABCgAGBQJVZMX4AAoJEF9hYXeAcXzB01EP/3r+hxHSEPhQr/3lh/C7+Edj
 iOZWjVBZga2iVMeOuDURa0d67fVaS/sEYZ70HasPkkVWENo1Ka/1ZBWUR+U/6Bu+
 3ET/eWbNbKfRDM2Cyy4r+g35EvEIPK37K9DoYcv8G5NtTSuHjO8ypVW9rIzmh3a/
 JPl1UR5uOftQiws92qz51DnDmaZgJSJ+CL7LyazRkYeBi9v1u5cQpyajtLipXwkA
 gdWMyZgix24DCo0S5AsZzltPwzzlP8YK10A1PtAWpPePeOes7jKbhHAnROl6b51y
 Pfvz+L4IRxoRHPZsTVQEEQJzGbi19Evf4MdEAErI6IxO17omRK0XrGm42WLUqoe1
 ziRkH4NzgG7tQi3nBMkbVNDqSRanxJMBC8KusxzHbLCVggKFmb1SIbve1tyjGpdD
 qRv1xQm2pSS96y/sUtJEGlytE7XtMsJ7FrFPUG0uk5i5GE+QFt1Q0v1knKoGEfOe
 Tn8PZZTz1jx03Sb/W2ahHaTKaD/jQ0XWCqoamc99dXQXsS443D1TZBPZ9YDp9xBY
 bAUrx/U86DS+iKNJNfaEeePHQj816ZLuPs4HeJN3KIENzkJMQeRAWSncgvbEh7O/
 nmZnItMKJ7AjY+mkYxq+SJntwpisNMxYqlcRzteDcbO+zXHartUO4o5shQwqKOG8
 wPXLY0wxfLO4/FPJTRXD
 =9suB
 -----END PGP SIGNATURE-----

Merge tag 'qcom-dt-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dt

Merge "Qualcomm ARM Based Device Tree Updates for v4.2" from Kumar Gala:

* Added support for regulators, USB Host & OTG, SATA, and i2c
  controllers on APQ8064 based platforms
* Added PM8841/PM8941/PMA8084 device nodes
* Added PMU support on MSM8660

* tag 'qcom-dt-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: dts: qcom: Add msm8660 PMU node
  ARM: dts: qcom: Add PMA8084 functions device nodes
  ARM: dts: qcom: Add PM8941 functions device nodes
  ARM: dts: qcom: Add PM8841 functions device nodes
  ARM: dts: qcom: apq8064 - add i2c3 node for panel.
  ARM: dts: qcom: apq8064 - Move i2c1 pinctrl to apq8064.dtsi
  ARM: dts: qcom: apq8064-ifc6410 - Add DT alias for serial port
  ARM: dts: qcom: apq8064 - Add USB OTG support for CM QS-600
  ARM: dts: qcom: apq8064 - Add usb host support to CM QS-600
  ARM: dts: qcom: apq8064-cm-qs600 - Add basic regulators
  ARM: dts: qcom: apq8064 - Add SATA controller support
  ARM: dts: qcom: apq8064 - Add USB OTG support
  ARM: dts: qcom: apq8064 - Add usb host support.
  ARM: dts: qcom: apq8064-ifc6410 - Add basic regulators
  ARM: dts: qcom: apq8064 - add RPM regulators support
2015-05-29 13:55:50 +02:00
Arnd Bergmann
542459e7ff Device tree related changes for omaps:
- Configure MMC data lines 4..8 for 1.8V IO on boards that
   are using them as GPIOs instead of MMC data lines
 
 - Add support for Baltos IR5221
 
 - Add device tree support for LogicPD Torpedo devkit
 
 - Add 3717 core pinctrl region
 
 - Add gta04 1w and GSM audio support
 
 - Add wilink and ov2659 support for am437x-gp-evm
 
 - Add am335x-evm bluetooth and mmc3 support
 
 - Enable omap5-uevm uart wakeup interrupt
 
 - Enable I2C2 on BeagleBone as it's used for the capes
 
 - Use defines for LDP GPIO keys
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVX46XAAoJEBvUPslcq6Vzd+cQALB8fPAEVrTedwf+7M02SWEl
 0z+lrG+VFusfHjqVj7Me26CjQLJet0Ntq+MGSyiInOpO8XhQI6z77EZHD6AOxfGV
 KDcDHoU4vs6UudyzkECkQ+v47cVCoNIV7lj3VnXvxbykSRSDUpg/xvw5Fj6TQpxW
 EYY7yOGx096kmtQi1dED1g8cawtsJeb0uRPNm38FzRRPWj5/0+Av5NTAvh7jkd/X
 hPSOeWST0cvtrXn3xpX9ZM2g+2O5ZMDOyxn6GDZup4WwgQD3pU/HnySckcKnUjPg
 /UWK7Qw/u/eup2cU2TYJLS5SKIm4EPcWb/qht721Yd2kTT0Yn1/RubWvLxbYHcKr
 ZFwQ5T5zU0PpoScij4MJuagiEq4sedxkfKbTfckjJgHFubDMiEHV4C7EGkYGDP0i
 MLS9YdAGWeb/zQ3gedYbup/9gvD5qjMh8q9EHoWovG8ZInqBmzg7xA0QYkY3Tks1
 hClQpv+0KGm8PI9Gz/AYf4wxEFgAUzI7Cqh9m+6LW1z/VmOecCcHg3XKO7JVimtk
 baqLo6/dJCtLqlpI4UHNujmfPdCzH1VjITTpfz2FxFdO9MseL2POJ++POwJvgghH
 tU1heRVNlSOeYDgWnRChLPyx0Cx/3n5qpfPvumF9W0kpNoOA5dAXkAY979Cm/l46
 nSIBsJDsCQJOqBZpqnMF
 =MmxV
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.2/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "Device tree related changes for omaps" from Tony Lindgren:

- Configure MMC data lines 4..8 for 1.8V IO on boards that
  are using them as GPIOs instead of MMC data lines

- Add support for Baltos IR5221

- Add device tree support for LogicPD Torpedo devkit

- Add 3717 core pinctrl region

- Add gta04 1w and GSM audio support

- Add wilink and ov2659 support for am437x-gp-evm

- Add am335x-evm bluetooth and mmc3 support

- Enable omap5-uevm uart wakeup interrupt

- Enable I2C2 on BeagleBone as it's used for the capes

- Use defines for LDP GPIO keys

* tag 'omap-for-v4.2/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-evm: add mmc3 and wlan definitions to dts
  ARM: dts: Enable SDIO card interrupt for 37xx-evm
  ARM: dts: Fix ldp gpio keys to use defines
  ARM: dts: Beaglebone i2c definitions
  ARM: dts: am437x-gp-evm: add DT nodes for ov2659 sensor
  ARM: dts: add DTS for Baltos IR5221
  ARM: dts: omap5-uevm: Add Uart wakeup interrupt
  ARM: dts: omap3-gta04: Add GSM audio support
  ARM: dts: am335x-evm: add bluetooth support
  ARM: dts: am437x-gp-evm: add wilink8 support
  ARM: dts: omap3-gta04: Add hdqw1 support
  ARM: dts: add core2 padconf region for am3517
  ARM: dts: Add minimal support for LogicPD Torpedo DM3730 devkit
  ARM: OMAP3: Add support for configuring MMC pins as GPIO pins
2015-05-28 22:41:13 +02:00
Enric Balletbo i Serra
8584d4fcab ARM: dts: am335x-sl50: Add Toby-Churchill SL50 board support.
Add support for Lightwriter SL50 series board, a small, robust and portable
Voice Output Communication Aids (VOCA) designed to meet the particular and
changing needs of people with speech loss resulting from a wide range of
acquired, progressive and congenital conditions.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: Andy Simpkins <andy.simpkins@toby-churchill.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-05-28 09:49:50 -07:00
Anthoine Bourgeois
e04beeb7b6 ARM: dts: omap3-devkit8000: Add dm9000 support
Support dm9000 network interface in the device tree of devkit8000 board.

Signed-off-by: Anthoine Bourgeois <anthoine.bourgeois@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-05-28 09:49:49 -07:00
Nathan Sullivan
4481b18b7c ARM: zynq: DT: Use the zynq binding with macb
Use the new zynq binding for macb ethernet, since it will disable half
duplex gigabit like the Zynq TRM says to do. Also allow the compatible
cadence gem binding that won't disable half duplex but works otherwise.

Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-05-28 08:47:28 +02:00
Michal Simek
2221043b75 ARM: dts: zynq: Fix stdout-path and bootargs
parallella - Remove linux,stdout-path.
Use stdout-path to identify kernel console

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
2015-05-28 08:44:56 +02:00
Michal Simek
1b654bc9d4 ARM: dts: zynq: Add missing alias node for zybo and parallella
Add missing alias node.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
2015-05-28 08:13:35 +02:00
Florian Fainelli
9d7ef1b76c ARM: dts: BCM63xx: re-parent NAND controller node
The NAND controller is a child node of the UBUS (legacy) bus, not the
AXI (new) bus, re-parent the NAND controller node accordingly. This was
a mistake introduced by a failed merge of this NAND node with other
changes (PMB).

Fixes: b5762cacc411 ("ARM: bcm63138: add NAND DT support")
Reported-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-05-27 09:57:34 -07:00
Gregory CLEMENT
2d29592860 ARM: mvebu: use improved armada spi device tree compatible name for each SoC
Use the new compatible introduced in order to benefit of a wider and
more accurate range of baud rates to be used.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-05-27 12:04:45 +02:00
Andrew Andrianov
16b79921e3 ARM: mvebu: dts: Add dts file for DLink DNS-327L
DNS-327L is a 2-bay NAS with the following specs:
     - 512MiB RAM
     - 128MiB NAND Flash
     - 1 GbE interface (Marvell PHY)
     - 1 rear USB 3.0 port (via PCIe USB 3.0 controller)
     - 2 internal SATA ports handled by the Armada 370:
       	 uses 2 gpios for power control
     - two front 2-color leds (amber + white) for both discs,
        controlled by the SoC
     - One white LED handled by SoC (USB)
     - 3 buttons. Power handled by weltrend, USB and
       RESET (on the bottom) are wired via GPIOs
     - Unidentified i2c device at address 0x13 (via i2cdetect)
     - UART0 providing serial console
     - Weltrend MCU serving for RTC, temperature, fan control,
       and power button handling interfaced via UART1
       (Handled via userspace dns320l-daemon)

Signed-off-by: Andrew Andrianov <andrew@ncrmnt.org>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-05-27 12:00:34 +02:00
Geert Uytterhoeven
acea43fcb0 ARM: shmobile: r8a7790 dtsi: Describe DMA for the serial ports
Add DMA properties to all SCIF, SCIFA, SCIFB, and HSCIF device nodes.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-05-26 10:02:43 +09:00
Geert Uytterhoeven
558d656513 ARM: shmobile: r8a7791 dtsi: Describe DMA for the serial ports
Add DMA properties to all SCIF, SCIFA, SCIFB, and HSCIF device nodes.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-05-26 10:02:43 +09:00
Geert Uytterhoeven
8233a0dee9 ARM: shmobile: r8a7794 dtsi: Describe DMA for the serial ports
Add DMA properties to all SCIF, SCIFA, SCIFB, and HSCIF device nodes.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-05-26 10:02:43 +09:00
Rafał Miłecki
e9f3ed4ac4 ARM: mvebu: add "jedec,spi-nor" flash compatible binding
Starting with commit 8947e396a829 ("Documentation: dt: mtd: replace
"nor-jedec" binding with "jedec, spi-nor"") we have "jedec,spi-nor"
binding indicating support for JEDEC identification.

Use it for all flashes that are supposed to support READ ID op according
to the datasheets.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-05-25 16:53:40 +02:00
Rafał Miłecki
943d45aafd ARM: kirkwood: add "jedec,spi-nor" flash compatible binding
Starting with commit 8947e396a829 ("Documentation: dt: mtd: replace
"nor-jedec" binding with "jedec, spi-nor"") we have "jedec,spi-nor"
binding indicating support for JEDEC identification.

Use it for all flashes that are supposed to support READ ID op according
to the datasheets.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-05-25 16:53:25 +02:00
Imre Kaloz
3abdd58331 ARM: mvebu: add support for the new Armada 385 based Linksys boards
This patch adds support for the Linksys WRT1200AC (Caiman) and
the Linksys WRT1900AC v2 (Cobra).

Both boards have:

- 2 Marvell 88W8864 radios
- 1 USB 3.0 port
- 1 USB 2.0/eSATAp port
- 2 Ethernet interfaces connected to a 88E6176 switch (1x WAN + 4x LAN)
- 128MB NAND flash
- 512MB RAM

gregory.clement@free-electrons.com: use serial0:115200n8 in
stdout-path and remove the bootargs part in the chosen node

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-05-25 16:42:03 +02:00
Kuninori Morimoto
d957ab8dbd ARM: shmobile: r8a7791: add MMCIF max-frequency
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-05-25 09:49:10 +09:00
Kuninori Morimoto
96370057bd ARM: shmobile: r8a7790: add MMCIF max-frequency
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-05-25 09:49:05 +09:00
Inki Dae
242ddf0429 ARM: dts: set display clock correctly for exynos4412-trats2
This patch sets display clock correctly. If Display clock isn't set
correctly then you would find below messages and Display controller
doesn't work correctly.

 exynos-drm: No connectors reported connected with modes
 [drm] Cannot find any crtc or sizes - going 1024x768

Fixes: abc0b1447d49 ("drm: Perform basic sanity checks on probed modes")
Cc: <stable@vger.kernel.org>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-05-23 11:46:55 +09:00
Linus Torvalds
0b6280c620 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:

 1) Don't leak ipvs->sysctl_tbl, from Tommi Rentala.

 2) Fix neighbour table entry leak in rocker driver, from Ying Xue.

 3) Do not emit bonding notifications for unregistered interfaces, from
    Nicolas Dichtel.

 4) Set ipv6 flow label properly when in TIME_WAIT state, from Florent
    Fourcot.

 5) Fix regression in ipv6 multicast filter test, from Henning Rogge.

 6) do_replace() in various footables netfilter modules is missing a
    check for 0 counters in the datastructure provided by the user.  Fix
    from Dave Jones, and found with trinity.

 7) Fix RCU bug in packet scheduler classifier module unloads, from
    Daniel Borkmann.

 8) Avoid deadlock in tcp_get_info() by using u64_sync.  From Eric
    Dumzaet.

 9) Input packet processing can race with inetdev_destroy() teardown,
    fix potential OOPS in ip_error() by explicitly testing whether the
    inetdev is still attached.  From Eric W Biederman.

10) MLDv2 parser in bridge multicast code breaks too early while
    parsing.  Fix from Thadeu Lima de Souza Cascardo.

11) Asking for settings on non-zero PHYID doesn't work because we do not
    import the command structure from the user and use the PHYID
    provided there.  Fix from Arun Parameswaran.

12) Fix UDP checksums with IPV6 RAW sockets, from Vlad Yasevich.

13) Missing NF_TABLES depends for TPROXY etc can cause build failures,
    fix from Florian Westphal.

14) Fix netfilter conntrack to handle RFC5961 challenge ACKs properly,
    from Jesper Dangaard Brouer.

15) If netlink autobind retry fails, we have to reset the sockets portid
    back to zero.  From Herbert Xu.

16) VXLAN netns exit code unregisters using wrong device, from John W
    Linville.

17) Add some USB device IDs to ath3k and btusb bluetooth drivers, from
    Dmitry Tunin and Wen-chien Jesse Sung.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
  bridge: fix lockdep splat
  net: core: 'ethtool' issue with querying phy settings
  bridge: fix parsing of MLDv2 reports
  ARM: zynq: DT: Use the zynq binding with macb
  net: macb: Disable half duplex gigabit on Zynq
  net: macb: Document zynq gem dt binding
  ipv4: fill in table id when replacing a route
  cdc_ncm: Fix tx_bytes statistics
  ipv4: Avoid crashing in ip_error
  tcp: fix a potential deadlock in tcp_get_info()
  net: sched: fix call_rcu() race on classifier module unloads
  net: phy: Make sure phy_start() always re-enables the phy interrupts
  ipv6: fix ECMP route replacement
  ipv6: do not delete previously existing ECMP routes if add fails
  Revert "netfilter: bridge: query conntrack about skb dnat"
  netfilter: ensure number of counters is >0 in do_replace()
  netfilter: nfnetlink_{log,queue}: Register pernet in first place
  tcp: don't over-send F-RTO probes
  tcp: only undo on partial ACKs in CA_Loss
  net/ipv6/udp: Fix ipv6 multicast socket filter regression
  ...
2015-05-22 15:44:50 -07:00
Nathan Sullivan
9eeb516139 ARM: zynq: DT: Use the zynq binding with macb
Use the new zynq binding for macb ethernet, since it will disable half
duplex gigabit like the Zynq TRM says to do.

Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-22 15:04:33 -04:00
Arnd Bergmann
898a7f36c6 Third batch of DT changes for 4.2:
- USB host clock refine following changes in drivers
 - one little fix for usart pinctrl
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJVXvpAAAoJEAf03oE53VmQxx0IAMegPIH5rS0NIC+XmwpFnmre
 L0bP0dRdKHS5uRxsZfD7F0WF61JiOuLzgX/rIIclnllvvKMPVW+CEs1KnfWVP33u
 9FfFIErkGnYeJjs7Lj1j1lb9ESkJfqapMwTfl74mod8QFOT3cgXOiUu8pgHIp2cF
 OTR6W5vkv1KoR8E0B4nGv9wZmRBeujtxW+2nIZZVcAglxfOHkJfqlfQ5wCQtdsnU
 7K45r4WTbM632hIW5XA3OlzCuuIWs2Hr591aW8PY4KLMPB39HcCV/eTxJMGRbg1Q
 4baSQ0xN+DhPfJary0Nc6Y2QXxZWb9y2ElGrqVMlbanCV7xaUGUGYrZ14heRvRs=
 =ubIG
 -----END PGP SIGNATURE-----

Merge tag 'at91-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt

Merge "Third batch of DT changes for 4.2" from Nicolas Ferre:

- USB host clock refine following changes in drivers
- one little fix for usart pinctrl

* tag 'at91-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: remove useless usb clock
  ARM: at91/dt: remove useless uhpck clock references from ehci defintions
  USB: atmel: update DT bindings documentation
  ARM: at91/dt: at91sam9x5: fix usart1 sck pin definition
2015-05-22 17:17:17 +02:00