Commit graph

10,652 commits

Author SHA1 Message Date
Tomeu Vizoso
69636a85df ARM: dts: Add clocks to DISP1 domain in exynos5250
Adds to the node of the DISP1 power domain the two clocks that need to
be reparented while the domain is powered off:
CLK_MOUT_ACLK200_DISP1_SUB and CLK_MOUT_ACLK300_DISP1_SUB.

Otherwise the state is unknown at power up and the mixer's clocks are
all messed up.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Link: http://lkml.kernel.org/g/561CDC33.7050103@collabora.com
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-10-24 04:31:47 +09:00
Laurent Pinchart
1f7ce3d1c9 ARM: dts: Fix typo in regulator enable GPIO property in s5pv210-goni
The property name should be "gpio", not "gpios". Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-10-24 04:31:35 +09:00
Laurent Pinchart
698da378a3 ARM: dts: Fix typo in regulator enable GPIO property in s5pv210-aquila
The property name should be "gpio", not "gpios". Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-10-24 04:31:29 +09:00
Marek Szyprowski
4ae9a4c66c ARM: dts: Add vbus regulator to USB2 phy nodes on exynos3250, exynos4210 and exynos4412 boards
Exynos USB2 PHY driver now supports VBUS regulator, so add it to all
boards which have it available. This also fixes commit
7eec126675 ("ARM: dts: Add Maxim 77693 PMIC to exynos4412-trats2"),
which added new regulators to Trats2 board, but without linking them to
the consumers.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: 7eec126675 ("ARM: dts: Add Maxim 77693 PMIC to exynos4412-trats2")
Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-10-24 04:31:23 +09:00
Jaehoon Chung
b29dd5fa56 ARM: dts: use exynos5420-dw-mshc compatible for exynos3250
There are some differences of mobile storage host between exynos3250
and exnos5250. For example, exynos3250 supports the HS400 mode, but
exynos5250 doesn't support it.
Since exynos3250 can perform the similar function with exynos5420
compatible, this patch changes the compatible from exynos5250 to
exynos5420 for mshc.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-10-24 03:42:02 +09:00
Olof Johansson
355d1ef1ad The i.MX device tree changes for 4.4:
- Add IOMUXC LPSR (Low Power State Retention) device for i.MX7D.
  - Add a few low power mode related devices and touch controller for
    i.MX6UL.
  - Add a number of devices for i.MX7D SDB board support, USB, Dual FEC,
    and eMMC5.0.
  - i.MX6 Boundary Devices updates: relicense under GPLv2/X11, add Okaya
    LCD, touch and wifi support, add new boards Nitrogen6_Lite and
    Nitrogen6_Max.
  - Enable touch screen and NAND Flash controller for a few Vybrid
    devices.
  - Some random and small updates on LS1021A and MXS support.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWJQUPAAoJEFBXWFqHsHzOo+cH/irx+abVdFV97q6M0VwFsQ3/
 Tf4/CsdiTjM5ZDrKZEtXzP8BZl+ZO4tQXLspP+wVceQ+PVUiVvdAHu0l68iuJRrA
 +Bj9VrLIzMDf7FVpzbZHZD3kd1NALGh/5i0TerkuZMNl1KH57HyGjLnjKH43n7uz
 mFPeZFAQMwSjEnRJj/6217Itqi+LurARJsnXQs6uhQ7feSsA88HU3EQ8QsiZqiAu
 MULAJBYaE09shlokuXIKx67t8outdb8C0Uue64nt42y8NR0m5eVVG7NJoF+23T6C
 CRX5zveYa7D2QXTkihvjdRpazhLiPnwV3RCVejLOZMk0G14hD9U39jkTp+9ws1w=
 =kPBq
 -----END PGP SIGNATURE-----

Merge tag 'imx-dt-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

The i.MX device tree changes for 4.4:
 - Add IOMUXC LPSR (Low Power State Retention) device for i.MX7D.
 - Add a few low power mode related devices and touch controller for
   i.MX6UL.
 - Add a number of devices for i.MX7D SDB board support, USB, Dual FEC,
   and eMMC5.0.
 - i.MX6 Boundary Devices updates: relicense under GPLv2/X11, add Okaya
   LCD, touch and wifi support, add new boards Nitrogen6_Lite and
   Nitrogen6_Max.
 - Enable touch screen and NAND Flash controller for a few Vybrid
   devices.
 - Some random and small updates on LS1021A and MXS support.

* tag 'imx-dt-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (53 commits)
  ARM: dts: ls1021a: Add quirk for Erratum A009116
  ARM: imx6sx-sdb: Fix typo in regulator enable GPIO property
  ARM: dts: imx6: phyFLEX: fix typo in "pinctrl-names"
  ARM: dts: imx6: change the core clock of spdif
  ARM: dts: vf-colibri: enable NAND flash controller
  ARM: dts: vf610twr: add NAND flash controller peripherial
  ARM: dts: imx: add Boundary Devices Nitrogen6_Lite board
  ARM: dts: imx: add Boundary Devices Nitrogen6_Max board
  ARM: dts: imx6dl-nitrogen6x: change manufacturer to Boundary Devices
  ARM: dts: imx6q-nitrogen6x: change manufacturer to Boundary Devices
  of: Add Boundary Devices Inc. vendor prefix
  ARM: dts: imx6qdl-sabrelite: relicense under GPLv2/X11
  ARM: dts: imx6qdl-nitrogen6x: relicense under GPLv2/X11
  ARM: dts: imx6qdl-nitrogen6x: add wifi wl1271 support
  ARM: dts: imx6dql-nitrogen6x: add touchscreen support
  ARM: dts: imx6qdl-sabrelite: add Okaya LCD panel
  ARM: dts: imx6qdl-nitrogen6x: add Okaya LCD panel
  ARM: dts: vf500-colibri: Add device tree node for touchscreen support
  ARM: dts: i.MX35: fix cpu compatible value
  ARM: dts: i.MX31: fix cpu compatible value
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-23 10:51:21 -07:00
Olof Johansson
de0b2a545c Delete regulator-compatible usage in mt8135-evbp1.dts.
The regualtor-compatible binding is deprecated, instead the node name
 is used.
 
 Mediatek timer driver supports as well mt8127, mt8135 and mt8173. Add
 these SOCs to the bindings list.
 
 Power domains venc and venc_lt need clocks two extra clocks to access
 their registers. We update the bindings documentation about this.
 
 Update SMP bindings documentation by adding support for mt6589 and mt81xx SOCs.
 
 Update mt8127.dtsi and mt8135.dtsi to enable SMP support.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWI4nIAAoJELQ5Ylss8dNDznQQAK9O/IgeKz069P+UT/HxnflC
 K21RbkMX5KKej8QS23yqYxZVz+c2HyZLpYF5sAl/k9p5oMsm1EvfNVfDC7acWmfM
 CY65ZgNOPixi9Yrd29qgN0IMtTzsQtMnS7dhiKloyZr9sszuRw0SHeAQOOjGFv2H
 rZ+N7fbH3RH6vDeWIurVY8bNppu3FJNeIFm6xbotiXcQvsXX8hJjoN6E8BI7Rzg+
 i/p80IEmGRFvxHebZjrRCgVFIdqIfo0M02kxNVc4erH+Z7mLOmHZuYXIg7S3825M
 E5W+mJd6fqNh62qbPZUi2/0Y9TAsOPiIpxU+QDp2cBO37nse2/MeWPhJyg6DfCO/
 RuC0Y+tJx1fxF+5+/7lkXeWqsvzo5twJTGcLu+D0pPSTVb5Gy0P9671QMJPBknf+
 6zy4qqjSYNpsIz+OqbwlZHeQJEuDjt/DEVWqFmvW3DoUr5O8hRjHpFa4lJ6F084u
 tvSkSOuiJKtO1htAZLeVmMQOYylAPxpxKTc1AqIcLIiBkgkNKhz7v43vtdwETNIv
 8qkJVNKGF8WNDdskM2/GamlC2hTabw8kMoPxeYtqzZz5BYBALeOND0TvclEMecnh
 nDzdTwlhJDdHOlT5hQ7ur9UecakFQSMzQnoJ35LbjU+lVKXOyFIphXuBAmlX7Fvi
 hgbvHY7WClquwgKJ+PUF
 =Lj7i
 -----END PGP SIGNATURE-----

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

Delete regulator-compatible usage in mt8135-evbp1.dts.
The regualtor-compatible binding is deprecated, instead the node name
is used.

Mediatek timer driver supports as well mt8127, mt8135 and mt8173. Add
these SOCs to the bindings list.

Power domains venc and venc_lt need clocks two extra clocks to access
their registers. We update the bindings documentation about this.

Update SMP bindings documentation by adding support for mt6589 and mt81xx SOCs.

Update mt8127.dtsi and mt8135.dtsi to enable SMP support.

* tag 'v4.3-next-dts' of https://github.com/mbgg/linux-mediatek:
  ARM: dts: mt8127: enable basic SMP bringup for mt8127
  ARM: dts: mt8135: enable basic SMP bringup for mt8135
  devicetree: bindings: add new SMP enable method Mediatek SoC
  dt-bindings: soc: Add clocks for Mediatek SCPSYS unit
  dt-bindings: add more MediaTek SoC to mtk-timer binding
  ARM: dts: mt8135-evbp1: remove regulator-compatible usage

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-23 10:24:44 -07:00
Olof Johansson
4751424117 SPDIF device nodes for the newly added driver.
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJWIlmfAAoJEPOmecmc0R2BQGIH/16YsYkAoxTnZBQ3dgRu5dpf
 2vFkFZz11eQzdxIbaaMCNoDw6MeMZr3JsBg3vT3UkDbPnQD0US0dCETotXhs78An
 M07EyrUAVgIaJ4eyZtlGuC315uebSpj0uS9+oaiV0XaTP/WT2n+JNYci238Z96MZ
 +8+Kp3hfGHcTal2bWoJJLDwuJZRXdv5W/zXpSR5pi0eMM1z5A4RDokLwdOZt2Yup
 TxL1dhlIguOloXoT4zjMuv4nRqdiz/DnxyJtetT3mIhVE7/zVLm+wdziejipMrYN
 qISuUF3EYDikpaBv8fFdfRJs0kJMqIOeoGB0LmbuGSM9BnG0xCw0X5O6/jDuy7U=
 =4bh1
 -----END PGP SIGNATURE-----

Merge tag 'v4.4-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

SPDIF device nodes for the newly added driver.

* tag 'v4.4-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add SPDIF optical out on Radxa Rock2 Square
  ARM: dts: rockchip: Add SPDIF transceiver for RK3288
  ARM: dts: rockchip: Add SPDIF optical out on Radxa Rock
  ARM: dts: rockchip: Add SPDIF transceiver for RK3188

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-23 10:19:04 -07:00
Olof Johansson
d8f440b6aa Allwinner DT changes for 4.4, round 2
More DT patches for 4.4, mostly with new boards coming in (CHIP, BananaPi
 M2, pcduino2), further consolidation for the q8-based designs and a bunch
 of random patches enhancing support for existing boards
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWInnmAAoJEBx+YmzsjxAg6u8P/AvVaiwT4/XrwD1G4ms47+kq
 gRFLJ5xqWWnY0285Uaf4A33fU60dIJwYz4qbAiHdCOWZ+/bQy1lVNiB1o+RdKjIh
 zJHYbpKKREArwoanw9JogwpeSBVU5QnsoHeEHxPfYWHBnluU8cfKeS6Xgd1CQz1G
 oV00i4H0HjBNbEJCbZnyGPbZoeFbzkpFJ8Pb26W2Xv6bG4dwH7uI/Kzq672G+Uop
 uPa908Gwvid/HFNI4pQKgg1JGk6F08zM1pO9HwHdF3bxUs6Jl7IDnxhv7Q1BpbYo
 u6vNs7YP8SzUoTAlaEDwdCLUtH0S/PZs+ZkAMo43JAztFXHmf72HDId+XTznqQkZ
 nEk5p6yUAykSAGlXf3nj2ET6jlitjUqkhk909YpcowAlTloEjbdbijabixZgDfql
 jqF8WNSc3ilYrqTl+3TGsP+GupTQdl0S7XFyBgCTAQFhOTFPf6UognWJfWEmnHuR
 /lTRjPTt84DZ0o1zCHLfzpHFCE/jP+lGDmLc7aOQLxVZuUK4KsIjyilNGIcJgLKv
 dQNNHQKAi15KMLuLzhnxfmcCBTr0FxIgvlZEW/BeQ5O+LIbAYw0wPRyxiPuYdHTf
 Ro3z6Osex0YFSmjyGiKH3NaqbEAHfmPJB/SoGsbcmWcRSX+yPLYs/6wB3P3vgfmO
 Jd2TnpNnEGGaX6oUuPoG
 =vcTX
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-4.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Allwinner DT changes for 4.4, round 2

More DT patches for 4.4, mostly with new boards coming in (CHIP, BananaPi
M2, pcduino2), further consolidation for the q8-based designs and a bunch
of random patches enhancing support for existing boards

* tag 'sunxi-dt-for-4.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (27 commits)
  ARM: dts: sun6i: Add a dts file for the Sinovoip BPI-M2 board
  ARM: dts: sun6i: Add mmc2_pins_a pinmux setting to sun6i-a31.dtsi
  ARM: dts: sunxi: Fix interrupt-cells for [r]pio on A23/A31/A33/A80
  ARM: dts: sun8i: Add NMI interrupt controller node
  ARM: dts: sun6i: hummingbird: Enable AXP221 DC5LDO regulator as "vdd-cpus"
  ARM: dts: sun6i: hummingbird: Use axp22x.dtsi for AXP221 regulators
  ARM: dts: sun6i: hummingbird: Fix VDD-CPU and VDD-GPU regulator names
  ARM: dts: sun7i: Add regulator configuration for pcDuino v3 Nano
  ARM: dts: sun6i: Turn on gmac on Colombus
  ARM: dts: sun8i: Make et-q8-v1.6.dts a symlink to q8-tablet.dts
  ARM: dts: sun8i: Make ippo-q8h-v*.dts a symlink to q8-tablet.dts
  ARM: dts: sun8i: Add sun8i-a23-q8-tablet.dts file
  ARM: dts: sun5i: Add backlight node to sun5i-q8-common.dtsi
  ARM: dts: sunxi: Enable PWM controller on Q8 format tablets
  ARM: dts: sun5i: Add PWM channel 0 pinmux setting for A13/A10s
  ARM: dts: sun5i: Add PWM controller node for A13 / A10s
  ARM: sun5i: Add C.H.I.P DTS
  ARM: dts: sunxi: Add dtsi for AXP22x PMIC
  ARM: dts: sun7i: Correct USB regulators on pcDuino v3 Nano
  ARM: sun5i: dt: Add UART3 CTS and RTS pins
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-23 10:17:27 -07:00
Eric Anholt
121432c7a0 ARM: bcm2835: Add the DDC I2C controller to the device tree.
We need to use it for getting video modes over HDMI.

Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
2015-10-23 10:04:02 +01:00
Eric Anholt
94cb7f76ca ARM: bcm2835: Switch to using the new clock driver support.
This will give us the ability to set the pixel and HDMI state machine
clocks for the VC4 KMS driver, change the CPU frequency, and
potentially gate clocks in the future (once we also write a power
domain driver).  It also gives the uart an explicit clock reference,
so that we don't need to change the physical addresses of the old
fixed clk_bcm2835.c clocks for Raspberry Pi 2 port.

Two clocks get their frequencies updated as a result of this.  One is
uart's apb_pclk, which was previously accidentally grabbing the fixed
uart0_pclk due to the apb_pclk not having clk_register_clkdev()
called.  The uart doesn't seem to do anything with apb_pclk other than
make sure it's on, so that appears safe (also, as far as I can see,
the apb clock is actually the same as the VPU clock).  The other is
EMMC, which according to the docs was supposed to be in the 50-100Mhz
range, but it turns out the firmware needed to change to running it at
the 250Mhz core clock speed to avoid a bug in clock domain crossing.

Additionally, anything using BCM2835_CLOCK_VPU will now have a correct
clock rate if the user configures the boot-time core clock speed using
config.txt.

Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
2015-10-23 10:03:55 +01:00
Karsten Merker
a5ea06d0bc ARM: dts: sun6i: Add dts file for MSI Primo81 tablet
The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
768x1024 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
rear camera, 3500 mAh battery, gt911 touchscreen, mma8452 accelerometer
and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
(both volume buttons are also connected to the UBOOT_SEL pin). The
external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
OTG and 3.5mm headphone jack.

USB OTG is enabled in host only mode. AXP221 USB power supply and
GPIO support are required for full USB OTG support.

Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Signed-off-by: Karsten Merker <merker@debian.org>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-10-23 08:05:17 +02:00
Chen-Yu Tsai
c0949308dd ARM: dts: sun6i: Add simplefb node labels to reference at board level
Some boards, such as tablets, have regulators providing power to parts
of the display pipeline, like signal converters and LCD panels.

Add labels to the simplefb device nodes so that we can reference them
in the board dts files to add regulator supply properties.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-10-23 08:04:49 +02:00
Magnus Damm
098cb3a601 ARM: shmobile: r8a7793: Add IPMMU nodes
Add IPMMU nodes for the r8a7793 SoC. The IPMMU configuration for r8a7793
is identical to r8a7791 and includes SY0, SY1, DS, MP, MX, RT and GP.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-10-23 09:23:55 +09:00
Magnus Damm
832d3e4c82 ARM: shmobile: r8a7794: Disable all IPMMU nodes by default
The r8a7794 IPMMU nodes for MX and DS are currently lacking
a line containing 'status = "disabled"', fix this by
making sure they are disabled like all other IPMMU nodes.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-10-23 09:23:39 +09:00
Sergei Shtylyov
1329f6d0f6 ARM: shmobile: r8a7791: fix "gpio-ranges" props
On R8A7791, GPIO banks 1 and 7  are missing  pins 26 to 31.  Correct the
"gpio-ranges" properties of the GPIO1 node (GPIO7 is already correct).

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-10-23 09:19:56 +09:00
Sergei Shtylyov
56a2182f6a ARM: shmobile: r8a7790: fix "gpio-ranges" props
On R8A7790, GPIO banks 1 and 2 are missing  pins 30 and 31.  Correct the
"gpio-ranges" properties of the corresponding device nodes.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-10-23 09:19:25 +09:00
Sudeep Holla
0cc16889e7 ARM: dts: shmobile/r8a7xxx: replace gpio-key, wakeup with wakeup-source property
Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
check for/support the legacy "gpio-key,wakeup" boolean property to
enable gpio buttons as wakeup source, "wakeup-source" is the new
standard binding.

This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-10-23 09:16:46 +09:00
Aleksei Mamlin
6536d910ef ARM: dts: sun4i: Enable audio codec on Marsboard A10.
Enable on-chip audio codec on the Marsboard A10.

Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-10-22 20:58:12 +02:00
Olof Johansson
2995f0a1b6 mvebu dt for 4.4 (part 2)
- Add support for severals Armada-370-based Seagate NAS
 - Fix Ready NAS device tree
 - Modify SDHCI binding for A388-GP allowing using it on old and new
   version of the board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYhOjIACgkQCwYYjhRyO9VTWACeJDBHZ1+ojF5irnZzNe/9PKaF
 zJQAnjBmJxI1auTY+SQHVkZN3w2HOhwU
 =Dvfj
 -----END PGP SIGNATURE-----

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

mvebu dt for 4.4 (part 2)

- Add support for severals Armada-370-based Seagate NAS
- Fix Ready NAS device tree
- Modify SDHCI binding for A388-GP allowing using it on old and new
  version of the board

* tag 'mvebu-dt-4.4-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: set SW polling as SDHCI card detection on A388-GP
  arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file
  arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120
  ARM: mvebu: add DT support for Seagate Personal Cloud
  ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 10:43:03 -07:00
Olof Johansson
64aa1fe183 SoCFPGA dts cleanup for v4.4
- Re-order DTS nodes into correct alphabetical order
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWIQUIAAoJEBmUBAuBoyj0/4EQAJ/qm7dW4n7Ma+rfjKUiXvYl
 KvK7ZOV7Tpou/uEv15LJxSmElGweVdx8que8o7MPOsa6fBj52TSP1YymoeLeblN2
 Ho3TVwSn2GKfUsvREr65UbEIG5MQcwKuC0aR5ReFvcw6YFwr0te6ZmO2xeaDzSau
 +qUmA1YCKGRPWP/vgUZ/bvW0QoR6AM6wlhMzosbDwHFiU5z2+FrV7gb95dyIIC2I
 eSTHWHRMAxFlNKDqy3CDnSV5r9n/5DzNvuuaqe1wmQ+M15KjLb03q+Ro7M3Rd0Vb
 NK8v+ECJH7bhgXRz4SXJqCBOE24mMmQPaG5G8Wu9ugbw0rX9TCyEFBpMDEm4jbnR
 TpAaQCrgMreXd4t44KRLG1uBm6MC9hrKRt4ShnYoMeaP+MuMQShIsbLTpMEpKCJw
 tpH9hC3eWmGHuVQ0KjwazopVRTDNq0Rnbt0C0z7WrYz+0XPpmRJvlOVa1e7BeRdM
 v/N0kzc//NOhrrXhFGUzfgAzlGnTBCTqfgnDmsyo68D+2iTq3yp3JPpM6owZNxQY
 MROlx9v3qv5ZbhqpSHcpjLnG1pB14ZmYGn55clsCUhCp38uciUuw1nJVFXYOBGHz
 L1AtwrjZ+lsNzgNkmsYLcTuuQWRvaakvcz2ri1Vjf+dEmx+Pi1vxcEqwfIGWDJZU
 KiA9aGVItcy4IVZ9uo5i
 =r89u
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_for_v4.4_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA dts cleanup for v4.4
- Re-order DTS nodes into correct alphabetical order

* tag 'socfpga_for_v4.4_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: sort nodes alphabetically

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 10:08:46 -07:00
Olof Johansson
9174455472 SoCFPGA DTS update for v4.4, part 2
- Add the FPGA manager node
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWIHDcAAoJEBmUBAuBoyj08BoP/ReJ+kYRuyxpfCWzsWxA2Oun
 FJ8vSR6iZf45xyk59yQuJyO7ZKL04FFEGoZvJ6HJVcFCLYIZ2tWZSd3vMUVosy2X
 +rPwD1qj9iK/8mDlniYagnjfIwIkNDQHhtGb9e3alMWh1wQ+IBHbmms2+YhvVpZI
 2rITOKE+lZW+sSpCEv8NahOAT8TydhvO889M1d6Ot5S62Oy3ZRhCGcyTri+2ggg9
 9wyGleCzAZogZYjseSCEYad8SOBZlXXOtV/afmVy0Afkv2GjIAA7MqxdySxLe+9q
 3hsG6jOF5zIk97auzYR6oGjAoqLE+7Hi9sIh2NijKecVCz2w7JQC0hYyBQq3fzjz
 xoN4MivX9TbX12qlviS8HHRhu4ZuTzR40FqV7Kb1qSXEmykxilRaG2P1He5Wxf0d
 vnmr7YKkIzRzrhrPdimLwQ2/MqHjc2zUPQImKFdF4jQHJFGkFpo8TG2PK9j90UKC
 1pQ7qr/LiZxafBu5m5L8RRe4I058hCe9VQD84HnSrxpZpawX/23F4v/K/G1g9C7p
 k8mDTIK00BWScmeRJrluturge5c43b28oNP704EZruZFXX7BYJ/0Z9ui5a1+c5AU
 4NuRGAQVjEK07XxKpp5pgbiEU3MJprrXQ5ovkXr4PS4o7KSJHLrv6WctXyCb/gmS
 CbJamjZqeZZN2etlbf6D
 =nm0g
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_dts_for_v4.4_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA DTS update for v4.4, part 2
- Add the FPGA manager node

* tag 'socfpga_dts_for_v4.4_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: add fpga manager

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 10:07:04 -07:00
Sudeep Holla
4db7062c9a ARM: dts: fix gpio-keys wakeup-source property
The keyboard driver for GPIO buttons(gpio-keys) checks for one of the
two boolean properties to enable gpio buttons as wakeup source:
1. "wakeup-source" or
2. the legacy "gpio-key,wakeup"

However juno, ste-snowball and emev2-kzm9d dts file have a undetected
"wakeup" property to indictate the wakeup source.

This patch fixes it by making use of "wakeup-source" property.

Cc: Magnus Damm <magnus.damm@gmail.com>
Acked-by: Simon Horman <horms@verge.net.au>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 09:53:57 -07:00
Hans de Goede
336263770f ARM: dts: sun4i: Add dts file for the pov protab2-ips9 tablet
The Point of View protab2-ips9 is a tablet with a 9" ips 1024x768 lcd screen,
microsd slot, headphones, mini hdmi, mini usb b and power barrel connectors.

It uses a rtl8188cus usb wifi chip and a RDA 5875Y bluetooth chip attached
to uart2. It has a bma250 accelerometer attached to i2c1 addr 0x18, this
only works when ldo3 is set to 2.8 volt, otherwise i2c1 gets stuck, so
for now we mark i2c1 as failed.

It has a pixcir,pixcir_tangoc compatible touchscreen attached to i2c2 addr
0x5c. This is not enabled in this dts, because this variant of the
pixcir_tangoc has separate wakeup and enable pins both of which need
to be driven low before the touchscreen will work. Before we can enable
this the pixcir driver and devicetree-bindings need to be extended to
support these pins.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-10-22 10:58:12 +02:00
Chen-Yu Tsai
39efe82a02 ARM: sun4i: Enable cubieboard audio codec
The cubieboard uses the internal codec to output sound to its mini-jack.
Enable it.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-10-22 10:57:19 +02:00
Maxime Ripard
e54693ed82 ARM: sun5i: chip: Enable the audio codec
The CHIP v0.2 has a composite output on a mini-jack connector, the audio
part being provided by the on-SoC codec. Enable it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-22 10:55:53 +02:00
Marcus Cooper
bc8362e6ec ARM: sun4i: Enable audio-codec on Mele A1000
Enable the audio-codec on the Mele A1000 top-set box.

Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-22 10:55:52 +02:00
Maxime Ripard
4d6b0f8e86 ARM: sun7i: Enable cubieboard2 audio codec
The cubieboard2 uses the internal codec to output sound to its mini-jack.
Enable it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-22 10:55:47 +02:00
Emilio López
faef4af445 ARM: sun7i: dt: enable audio codec on Cubietruck
This commit enables the on-chip audio codec present on the A20 SoC
for the Cubietruck.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-22 10:55:33 +02:00
Emilio López
d5ce107a2f ARM: sun7i: Add sunxi codec device node
The A20 SoC includes the Allwinner audio codec, capable of both 24-bit
playback and capture. This commit adds a device node for it.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:28 +02:00
Maxime Ripard
44cdcfc2d9 ARM: sun5i: Add the Audio codec DT node
The A13 and A10s also have the audio codec present. List it in the device
tree.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:27 +02:00
Marcus Cooper
bcf884504b ARM: sun4i: Add sunxi codec device node
The A10 SoC includes the Allwinner audio codec, capable of both 24-bit
playback and capture. This commit adds a device node for it.

Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:27 +02:00
Maxime Ripard
dbe4dd1e61 ARM: sun7i: Add audio codec clock
The audio codec functional clock is a child of PLL2 and is used to control
the audio rate, enable it in the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:26 +02:00
Maxime Ripard
ca72f02237 ARM: sun5i: Add audio codec clock
The audio codec functional clock is a child of PLL2 and is used to control
the audio rate, enable it in the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:26 +02:00
Maxime Ripard
b516fa5def ARM: sun4i: Add audio codec clock
The audio codec functional clock is a child of PLL2 and is used to control
the audio rate, enable it in the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:25 +02:00
Maxime Ripard
88a86aaa61 ARM: sun7i: Add audio PLL
The A20 uses the PLL2 as the audio PLL, which is the parent of all the
other audio clocks in the system (i2s, codec, etc.). Add it to the DTSI.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:25 +02:00
Maxime Ripard
6f87abb8cd ARM: sun5i: Add audio PLL
The A13 uses the PLL2 as the audio PLL, which is the parent of all the
other audio clocks in the system (i2s, codec, etc.). However, it has a
different divider configuration than the A10, hence the difference
compatible.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:24 +02:00
Maxime Ripard
6ee93e127f ARM: sun4i: Add audio PLL
The A10 uses the PLL2 as the audio PLL, which is the parent of all the
other audio clocks in the system (i2s, codec, etc.). Add it to the DTSI.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:24 +02:00
Arnd Bergmann
55f4129757 mvebu fixes for 4.3 (part 2)
Fix wrong compatible for A385 DB AP preventing using suspend
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYhNEwACgkQCwYYjhRyO9XX9gCgnabcvdHrfFqAD3IFICLCgkOM
 U1AAnReiDUjcUhz6oTl6I2+e3PLHY7RO
 =BkFw
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-fixes-4.3-2' of git://git.infradead.org/linux-mvebu into fixes

Merge "mvebu fixes for 4.3 (part 2)" from Gregory CLEMENT:

Fix wrong compatible for A385 DB AP preventing using suspend

* tag 'mvebu-fixes-4.3-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: correct a385-db-ap compatible string
2015-10-21 17:03:37 +02:00
Arnd Bergmann
0690f4f2ef Samsung 2nd fixes for v4.3
- fix SOC detection of exynos thermal on exynos5260
 - fix audio card detection on Peach boards
 - fix double of_node_put() when parsing child power domains
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWIYd6AAoJEA0Cl+kVi2xqgzAQAIoCxYnhMr8I1kiJwFaZ3AKT
 r28RFw1rAhD+u344/5uuMwkJdl15+ubXf/g0uCLSmXwSKeQgJdXfidYEhTpd4OUw
 iVT+F+J8U7z3SaIymEdHp3ACUiU3eb1cW3AfrCU5FPwdVfnvyE7Fp7XPdE9w7GX4
 fMs+qi5BbJP02jO+rHAc2HHHdylSQu5JH0HPIOgBCQVVLQzhs79E5LcrvF0DXc2d
 WmZ+14S/Hc+/heiqc6wGQ75fDdPOGMj8ISo5sx+G0TyCz0r2FXR+yDRrXwCESTtn
 DD7CeQ8GdHT5fUiylU7y0+75h8/i3mNav9+fqF33BcpnGe8LAcB9Q/rDemw9irWp
 baGArheUjeWsql8qVbb7SeOZdzxAHT8QUs+AAxcrxBmv+4yWGhBdvVQfMKVhVcoP
 glnYpxRs1FsODVSfQ4Wp25U4PY49iOB+oND86HkmOZdQI5VrnzxPH1i5nKKRbXB7
 ZjidX3IVuiJtXFcB2ybd5VLzD7Xe6mJE0jYG264u0oXm5IFXXh+dHnDy2fqCJ9OY
 Y0HZX/EOwbDh93H/E3xqItPnWKFW5pp17wG1kIV7pm07d1TQPDjT0D8SLcF37+TW
 X622hnU5D16+qa8mNq+CyG0DZQUteNAi4yf9WiKIswbmW2n581dlmRJpVjlfY90z
 l8AwHcVTybMV1/v8fAmb
 =J4IA
 -----END PGP SIGNATURE-----

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

Merge "Samsung 2nd fixes for v4.3" from Kukjin Kim:

- fix SOC detection of exynos thermal on exynos5260
- fix audio card detection on Peach boards
- fix double of_node_put() when parsing child power domains

* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  thermal: exynos: Fix register read in TMU
  ARM: dts: Fix audio card detection on Peach boards
  ARM: EXYNOS: Fix double of_node_put() when parsing child power domains
2015-10-21 17:02:13 +02:00
Arnd Bergmann
6701ef0318 Fixes for omaps for v4.3-rc cycle:
- Fix oops with LPAE and moew than 2GB of memory by enabling
   ZONE_DMA for LPAE. Probably no need for stable on this one as we
   only recently ran into this with the mainline kernel
 
 - Fix imprecise external abort caused by bogus SRAM init. This affects
   dm814x recently merged, so no need for stable on this one AFAIK
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWJnm9AAoJEBvUPslcq6VzJHMP/i8DVa6R3OwssmGS3Cp/XKPV
 m1GCXReauql0oUfFR0baiVnBKL6x8jEHW91iQeV3b3cUz+8l3jL7Q4yc+voPyjHz
 ud890cId4wP54PWtDo4lpzDKi3lQkGBI+zJVAyWLfNPt97xcTh1yXW2HdDQ2Hlf4
 nyksDKI1CE42h22l5odB9i0yf7Y/XXl8CYl0ZggHV1XReKSZGveTf8+Qcd1uME2s
 ovLoxEOHDsmxwERXxeSw7Vw4MwefCBdXhKZf1a6l++/pyD/HqWNpJqpS+VEX4yaw
 9ZGT5wmTZQXzzAx60bfO9kokFaKzKiae1UYZusR1aoEKKvFwh8+7ziTTv5q8Do+s
 PRaeczB0tJA9OniwZaZEHNyckMgLlReH3PH5mwYV9DNNnG4LWRDjsx8LWDZ7lcjL
 HxvDjbB6Ir51jGCxa4GVH0NZy0NZ+UHFTMv6bgiEc3uO4PMu35syDXfLws4VJWXZ
 jC4bR2ShUbrAaGQj8R4aYQFus2MzXu58eqwceDGqeuf9M+wn10IO0/OaAXg5oPhk
 TfqB/6+yC8GjyWyRaKV7PrgJKsqcm4S9P2WCuZL+lU5GgnfSrFTb1+OBQl4BQFXD
 89Mj/oYOoKQd3qQFmsk2ZKwRqT9kLixKvih0bvkos4saOJipW2aNpLBTwNpQEpRk
 N9J0CUyn/p1tQEBVCJj5
 =EP6s
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.3/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "Fixes for omaps for v4.3-rc cycle" from Tony Lindgren:

- Fix oops with LPAE and moew than 2GB of memory by enabling
  ZONE_DMA for LPAE. Probably no need for stable on this one as we
  only recently ran into this with the mainline kernel

- Fix imprecise external abort caused by bogus SRAM init. This affects
  dm814x recently merged, so no need for stable on this one AFAIK

* tag 'omap-for-v4.3/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init
  ARM: OMAP2+: Fix oops with LPAE and more than 2GB of memory
2015-10-21 17:01:14 +02:00
Sergei Shtylyov
761b11e141 ARM: shmobile: silk: add SDHI1 DT support
Define the SILK board dependent part of the SDHI1 (connected to micro-SD
slot) device nodes along with the necessary voltage regulators.

Based on the original patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-10-21 09:25:06 +09:00
Javier Martinez Canillas
e9a267702d ARM: dts: am335x-base0033: Use IOPAD pinmux macro
Use the AM33XX pinmux IOPAD macro to define the physical address instead
of the offset from the padconf address. It makes the DTS easier to read
since matches the addresses listed in the Technical Reference Manual.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Javier Martinez Canillas
8a3ecb217f ARM: dts: am335x-igep0033: Use IOPAD pinmux macro
Use the AM33xx pinmux IOPAD macro to define the physical address instead
of the offset from the padconf address. It makes the DTS easier to read
since matches the addresses listed in the Technical Reference Manual.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Javier Martinez Canillas
fd20719443 ARM: dts: omap3-igep0020: Use IOPAD pinmux macro
Use the OMAP3 pinmux IOPAD macro to define the physical address instead
of the offset from the padconf address. It makes the DTS easier to read
since matches the addresses listed in the Technical Reference Manual.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Vignesh R
f513d22c9c ARM: dts: am437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_ts
On am437x-gp-evm, pixcir_i2c_ts can wakeup the system from low power
state via pinctrl and IO daisy chain using generic wakeirq framework.
With commit 3fffd12839 ("i2c: allow specifying separate wakeup
interrupt in device tree") i2c core allows optional wakeirq to be
specified via device tree. Add wakeup irq entry to enable pixcir_i2c_ts
to wake the system from low power state.

Signed-off-by: Vignesh R <vigneshr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Javier Martinez Canillas
56a31e549e ARM: dts: Update Javier Martinez Canillas's email
I see that people are still sending emails to my old address (that no
longer exists) since is the one mentioned in the IGEP DTS. Replace it
with my current email address to avoid this.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Mugunthan V N
36958598b7 ARM: dts: dra72-evm: remove cpsw gpio hogging and add mode-gpios
With the current implementation of GPIO hogging and with
gpio-pcf857x is built as module, ethernet doesn't work on boot
and doesn't throw any error/warning to user. Ethernet becomes
operational when inserting gpio-pcf857x module, even this time
there is no error/warning logs to user that ethernet is
operational.

When using with NFS rootfs and gpio-pcf857x as module, board
doesn't boot as it doesn't get any ip address and doesn't throw
any error/warning. To over come this, now cpsw driver tries to
get mode-gpios. When gpio-pcf857x is built as module it will
throw error, so that user can decide either to built in
gpio-pcf857x to continue with nfs boot or choose alternate rootfs
filesystem like sd/ramdisk.

When using mmc/ramdisk as root fs, cpsw will probe defer and
re-probes again when gpio-pcf857x module is inserted and ethernet
becomes operational.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:16:21 -07:00
David S. Miller
26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
Thierry Reding
481b4f1a3f ARM: tegra: Use consistent indentation for SATA node
The indentation for properties in the SATA device tree node on Tegra124
deviates from the rest of the device tree file. Restore consistency and
get rid of a couple of gratuitous blank lines while at it.

Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-10-20 13:51:52 +02:00