Commit Graph

46676 Commits

Author SHA1 Message Date
Sebastian Andrzej Siewior 7fbbaebf8c ARM/mvebu: Convert to hotplug state machine
Install the callbacks via the state machine.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160713153333.503198935@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-14 09:34:30 +02:00
Arnaldo Carvalho de Melo f2d3adf46d kvm arm/arm64: Remove trailing whitespace from headers
Noticed while making a copy of these files to tools/ where those kernel
files were being directly accessed, which we're not allowing anymore to
avoid that changes in the kernel side break tooling.

Cc: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Eric Auger <eric.auger@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-82thftcdhj2j5wt6ir4vuyhk@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-07-12 15:20:36 -03:00
Lee Jones f221d8100e ARM: sti: stih410-clocks: Identify critical clocks
Lots of platforms contain clocks which if turned off would prove fatal.
The only way to recover is to restart the board(s).  This driver takes
references to clocks which are required to be always-on.  The Common
Clk Framework will then take references to them.  This way they will
not be turned off during the clk_disabled_unused() procedure.

In this patch we are identifying clocks, which if gated would render
the STiH410 development board unserviceable.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
2016-07-12 13:22:51 +02:00
Arnd Bergmann a16729ea82 ARM: ux500: consolidate base platform files
The cpu.c and cache-l2x0.c files hold only two or three simple
functions each, and they are all called from the machine
descriptors, so we can just move them all into the same file
for simplicity and consistency.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:24:09 +02:00
Arnd Bergmann 18a9927878 ARM: ux500: move soc_id driver to drivers/soc
As the ux500 id code is basically a standalone driver, we can move it
out of the arch code into drivers/soc/ux500.

This is a user-visible change, as it moves all the devices in sysfs
from /sys/devices/soc0/ to /sys/devices/ and leaves the soc0 node as a
separate device.

Originally the idea was to put all on-chip devices under the soc node,
and ux500 was the first platform to have this device, but later platforms
almost all didn't follow that pattern, so this makes the platform do
the same thing as everyone else.

Since the platform is really obsolete now, I am optimistic that nothing
will break after moving the devices around.

As the SoC driver no longer has access to the private header files,
I'm changing the code to instead look up the address of the backupram
from devicetree, which is a good idea anyway.

Finally, having a separate Kconfig symbol means the driver is now
optional and could even be a loadable module rather than always being
built-in if we allowed that for soc_device.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[Fixup mising Makefile, fixup BB_UID_BASE to fc0]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:24:09 +02:00
Arnd Bergmann f15601d62b ARM: ux500: call ux500_setup_id later
ux500_setup_id is currently called from u8500_map_io(), which is
really early, but nothing relies on the ID any more, other than
a printk message that is not really all that important to
have early during boot.

If we move the call to ux500_setup_id() into ux500_soc_device_init(),
that file becomes usuable almost entirely standalone, and we can kill
off the u8500_map_io() callback as it just does the default
debug_ll_io_init() now.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:24:08 +02:00
Arnd Bergmann cd1dc431d0 ARM: ux500: consolidate soc_device code in id.c
Nothing else uses the global dbx500_asic_id structure, so
we can merge the two small files that reference it into one.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:24:08 +02:00
Arnd Bergmann 4cf124f9a9 ARM: ux500: remove cpu_is_u* helpers
These functions are all unused now and can be removed.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:24:07 +02:00
Arnd Bergmann 269f1aac14 ARM: ux500: use CLK_OF_DECLARE()
The ux500 DT support predates the CLK_OF_DECLARE macro and calls
directly into the clk driver from platform code.

Converting this to CLK_OF_DECLARE makes the code much nicer and
similar to how modern platforms do it today. It also removes the
last user of cpu_is_u8500_family() etc.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:24:07 +02:00
Arnd Bergmann 1e6cbc0691 ARM: ux500: move l2x0 init to .init_irq
The generic IRQ init function also enables the l2 cache
implicitly when the machine descriptor sets an .l2c_aux_mask.

Let's use that on ux500 and remove the ux500_l2x0_init()
along with the cpu_is_u8500_family checks.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:24:06 +02:00
Arnd Bergmann 4e657946cb mfd: db8500 stop passing around platform data
Except for the constant DB8500_PRCMU_FW_VERSION_OFFSET number, nothing
is ever passed through the platform data and used in a driver, so we
can simply stop passing it around.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:23:58 +02:00
Arnd Bergmann 79886be097 ARM: ux500: move ab8500_regulator_plat_data into driver
There is only one instance of ab8500_regulator_platform_data, and it's
safe to assume we won't ever merge another one, so it's rather pointless
to pass it through multiple levels of platform data pointers.

This moves the structure and everything referenced by it into the
driver that uses it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:23:50 +02:00
Arnd Bergmann 37dc78d9b1 ARM: ux500: remove unused regulator data
Most of the board-mop500-regulators.c file is never referenced and
can simply be removed.

Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-07-12 11:23:42 +02:00
Michael Turquette 3c67d1162a Merge branch 'clk-sunxi-ng' into clk-next 2016-07-11 14:39:47 -07:00
Maxime Ripard f38f519923 ARM: dt: sun8i: switch the H3 to the new CCU driver
Now that we have a different clock representation, switch to it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/20160629190535.11855-15-maxime.ripard@free-electrons.com
2016-07-11 14:38:01 -07:00
Russell King d261861ab5 ARM: dts: armada-388-clearfog: remove duplicate mdio entry
The clearfog DTS should not be defining the on-board phy, this device
is located on the microsom.  Remove the duplicated definition.

Reported-by: Jon Nettleton <jon@solid-run.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2016-07-11 18:05:48 +02:00
Thierry Reding 3981b11fda ARM: s3c64xx: smartq: Avoid sparse warnings
The smartq_map_io() and smartq_machine_init() functions are used by both
SmartQ 5 and SmartQ 7 machines and exported via the mach-smartq.h header
file. However that header file is not included by the mach-smartq.c file
that implements them, causing sparse warnings.

Include mach-smartq.h from mach-smartq.c to fix these warnings.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
2016-07-11 17:44:11 +02:00
Marcel Ziswiler 85afd20e4b ARM: tegra: Initial support for Apalis TK1
This patch adds the device tree to support Toradex Apalis TK1 a
computer on module which can be used on different carrier boards.

The module consists of a Tegra TK1 SoC, a PMIC solution, 2 GB of DDR3L
RAM, a bunch of level shifters, an eMMC, a TMP451 temperature sensor
chip, an I210 gigabit Ethernet controller and a SGTL5000 audio codec.
Furthermore, there is a Kinetis MK20DN512 companion micro controller for
analogue, CAN and resistive touch functionality which is not yet
supported. Anything that is not self contained on the module is disabled
by default.

The device tree for the Evaluation Board includes the module's device
tree and enables the supported peripherals of the carrier board (the
Evaluation Board supports almost all of them).

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2016-07-11 16:48:10 +02:00
Marcel Ziswiler b5896f67ab ARM: tegra: Remove commas from unit addresses on Tegra124
Remove commas from unit addresses as suggested by Rob Herring upon me
posting initial Apalis TK1 support:

	http://article.gmane.org/gmane.linux.ports.tegra/26608

Please keep the remaining 0, notation on the GPU node in place as a
former mainline U-Boot version was looking for that particular notation
in order to perform required fix-ups on it.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2016-07-11 16:48:09 +02:00
Stephen Warren aee7a747af ARM: tegra: Import latest Jetson TK1 spreadsheet
This imports v11 of "Jetson TK1 Development Platform Pin Mux" from
https://developer.nvidia.com/embedded/downloads.

The new version defines the mux option for the MIPI pad ctrl selection.
The OWR pin no longer has an entry in the configuration table because
the only mux option it support is OWR, that feature isn't supported, and
hence can't conflict with any other pin. This pin can only usefully be
used as a GPIO.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2016-07-11 16:48:09 +02:00
Arnd Bergmann da35cbcafa ARM: tegra: Remove board_init_funcs array
In a configuration that enables CONFIG_UBSAN_SANITIZE_ALL, I am getting
a section mismatch warning for tegra20:

WARNING: arch/arm/mach-tegra/built-in.o(.data+0x6e0): Section mismatch in reference from the variable board_init_funcs to the function .init.text:paz00_init()

The array is no longer useful here since there is only one entry,
so we can simply call the function directly after checking
of_machine_is_compatible(). This fixes the section mismatch
and is easier to read.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2016-07-11 16:47:53 +02:00
Thierry Reding 4ec2e60186 ARM: tegra: Add spaces around = in properties
This seems to have been copied and pasted since the beginning of time,
though only until Tegra124, likely because that DT was written from
scratch or it was fixed along the way.

Signed-off-by: Thierry Reding <treding@nvidia.com>
2016-07-11 16:46:26 +02:00
Thierry Reding ca3226d389 ARM: tegra: Fix a couple of DTC warnings
Add unit-addresses to nodes that have a reg property to avoid warnings
on newer versions of DTC.

Signed-off-by: Thierry Reding <treding@nvidia.com>
2016-07-11 16:46:26 +02:00
Patrice Chotard afd9dc4562 ARM: multi_v7_defconfig: enable STMicroelectronics DRM Support
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
2016-07-11 09:42:59 +02:00
Patrice Chotard 24f9172011 ARM: multi_v7_defconfig: enable STMicroelectronics BDISP 2D blitter driver
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
2016-07-11 09:42:59 +02:00
Tony Lindgren 0992b2f16b ARM: omap2plus_defconfig: Fix USB selection to keep Ethernet working
With the recent Kconfig changes we need to now enable
the PHYs to keep USB working.

Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-07-11 00:24:27 -07:00
Patrice Chotard 7b8e0188fa ARM: sti: Implement dummy L2 cache's write_sec
This patch implements the write_sec callback that handle PL310
secure registers writes.
This callback is just a stub for now, to avoid system crash.
Later, it could handle SMC calls so that TZ handles the needed writes.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
2016-07-11 09:15:44 +02:00
Peter Griffin 50fdda702f ARM: STi: Update machine _namestr to be more generic.
This string is used by dump_stack and as we now support
more SoC's than just STiH415/6 it is misleading to have
the current string in the stack trace.

This patch updates it to be more generic for the STi
family of SoCs.

So instead of looking like this

[  271.672555] Hardware name: STiH415/416 SoC with Flattened Device Tree
[  271.678998] [<c0310490>] (unwind_backtrace) from [<c030bb54>] (show_stack+0x10/0x14)
[  271.686746] [<c030bb54>] (show_stack) from [<c058bc4c>] (dump_stack+0x98/0xac)
[snip]

it now looks like this:

[    2.669879] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.6.0-rc3-00026-g38a1ce6-dirty #76
[    2.677973] Hardware name: STi SoC with Flattened Device Tree
[    2.683723] [<c0310490>] (unwind_backtrace) from [<c030bb54>] (show_stack+0x10/0x14)
[    2.691472] [<c030bb54>] (show_stack) from [<c058bc0c>] (dump_stack+0x98/0xac)
[snip]

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
2016-07-11 09:15:29 +02:00
Chen-Yu Tsai 1384a147b1 ARM: dts: sun7i: bananapi-m1-plus: red LED is power LED
The red led on the Bananapi M1+ is wired to light up as soon as the
board is powered, and continues to be lit while the GPIO is floating.

Rename the LED to "pwr", remove the default trigger, and mark it as
default on.

Also fix the pinmux node that was specifying a different pin for this
LED.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-11 08:26:17 +02:00
Chen-Yu Tsai 28b725e0a4 ARM: dts: sun7i: bananapi-m1-plus: Unify suffix for board specific labels
The dts file uses "bananapi" for some labels and "bananapim1plus" for
other. Use the shortened "bpi_m1p" suffix for all board specific labels.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-11 08:26:17 +02:00
Chen-Yu Tsai 8b0b593af7 ARM: dts: sun7i: bananapi-m1-plus: Reindent whole file using tabs
The bananapi-m1-plus dts file was indented using 4 spaces, without
tabs. This does not match the code style.

Reindent the whole file before we do anything else.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-11 08:26:17 +02:00
Chen-Yu Tsai 6be9aa1341 ARM: dts: sun7i: lamobo-r1: Enable audio codec
Lamobo R1 has a headphone jack for audio output, and an onboard
microphone. These are tied to the SoC's internal audio codec.

Enable the audio codec.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-11 08:26:17 +02:00
Chen-Yu Tsai f64cb7c724 ARM: dts: sun7i: lamobo-r1: Fix GPIO flags in reg_ahci_5v
reg_ahci_5v uses a GPIO in active high mode. Use the proper macro,
instead of just 0 for the GPIO flags.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-11 08:26:17 +02:00
Alexandre Belloni cd9b518b98 rtc: v3020: move rtc-v3020.h to platform_data
rtc-v3020.h belongs to include/linux/platform_data/

Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2016-07-09 10:24:21 +02:00
Chen-Yu Tsai 0cd3d11730 ARM: dts: sun8i-h3: Rename sinovoip-bpi-m2-plus to bananapi-m2-plus
The Banana Pi series is a well known series of single board computers.
The manufacturer, Sinovoip, is less well known. Moreover, the board
markings do not mention Sinovoip, but only the Banana Pi logo, and
the BPI-M* model name.

Rename the dts file to use the more well known name. Also fix up
some of the model names and labels to match other Banana Pi boards.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-09 10:11:09 +02:00
Chen-Yu Tsai bec72ca528 ARM: dts: sun7i: lamobo-r1: Remove usb1 vbus regulator
USB1 VBUS is directly tied to the 5V rail on the board. It is not
individually controllable. Drop the regulator.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-09 10:10:14 +02:00
Chen-Yu Tsai 377c2b3483 ARM: dts: sun7i: lamobo-r1: Fix USB-based WiFi module power
On the Lamobo R1, USB2 is connected to the RTL8192CU WiFi module.
The power enable pin is connected to PH12.

Fix the enable pin the reg_usb2_vbus.

Also disable ohci1, as the WiFi module is USB 2.0 capable.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-09 10:09:59 +02:00
Joachim Eastwood 29d7a6ab10 ARM: configs: lpc18xx: enable adc and dac iio drivers
Enable ADC and DAC IIO drivers for LPC18xx/43xx SoCs.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-07 20:42:29 -07:00
Olof Johansson 2869576d0f This device-tree pxa update brings :
- pin control nodes for pxa2xx and pxa3xx
  - the LCD controller for pxa2xx
  - the missing pxa3xx pulse width modulator nodes
  - an USB Host fix for pxa3xx
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXJG5pAAoJEAP2et0duMsSArQQAKF5Le4F20VWpHGSAtKTn9bW
 1A4kyRVhFwB+NouPnY/B/++/l9WiZ4pzXqTtb1VOjPs8F/fL5U+czH4rgNMgq5CT
 JVhD/06sg4vMOaPBrPMBKUEY0thsUXNQSoPw+Zf/hXPLDoDNTQZu9CEA7M0IVHnu
 u/qdD8ZMGoSfASZIcCEDZLzEzYh/Zr6Mu8+Ey/lV3IR7A8AK/DvOIc0f2/oJmj3C
 2gx/z4hCh6h58Lf7SM3gGkEwpQpcjZMoNH6s0zIYpH2Fwilbs0brr/uz5qvQUUpo
 /3ezpxHn997jcV5eGEpTRIza00LWtcjveRDwM9HZq9nxD06bnh8lGKfHeyDHD4h+
 3fCkkZwI41t4J+WO9nrwmahqSDg3fRtkr9aW8mcKE3gC8zi3zYWVtK+j39FvKgXU
 /Wrq6xzc/8kE+OKqdOy0bWMoMD9VU5UkfL5w3TrNHnuS8dMF/gYAKDzTF7RCo61w
 +2+GabL5w5pb3q2YjpTsB1HXXJsX7AG15mz2Zt8w53627MIfO/dIRf5WLGYWNgFZ
 VIOsvjA6Is4qU7OebYPYCL/jJAQa9LF0Jb3wljT6CHau3stD35tg7aemHlxBFw7j
 DqVn82ZgShLYqtIpNrKMFSCUn3xvVFrgb1QRD+h54/qQ73WvXmfF29wrJkicQN9Z
 KmdrkDO7YovgE64w5DKe
 =9doC
 -----END PGP SIGNATURE-----

Merge tag 'pxa-dt-4.7' of https://github.com/rjarzmik/linux into next/dt

This device-tree pxa update brings :
 - pin control nodes for pxa2xx and pxa3xx
 - the LCD controller for pxa2xx
 - the missing pxa3xx pulse width modulator nodes
 - an USB Host fix for pxa3xx

* tag 'pxa-dt-4.7' of https://github.com/rjarzmik/linux:
  ARM: dts: pxa3xx: add pincontrol helpers
  ARM: dts: pxa: add pinctrl to pxa3xx
  ARM: dts: pxa: fix the ohci clock for pxa3xx
  ARM: dts: add pincontroller to pxa27x
  ARM: dts: pxa: add pxa3xx pwm nodes
  ARM: dts: pxa: add pxa framebuffer device

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-07 20:39:01 -07:00
Jungseung Lee 6176d8efb8 ARM: iop: Fix indentation
Fix indentation in iop3xx_std_desc

Signed-off-by: Jungseung Lee <js07.lee@samsung.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07 18:06:40 +02:00
Michael Turquette efea375fa9 arm: meson: explicitly select clk drivers
The AmLogic clock controller code is used by both arm and arm64
architectures. Explicitly select the core code for all Meson (32-bit
arm) builds, and also select the Meson8b driver when that machine is
built.

Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07 17:54:25 +02:00
Russell King e6978e4bf1 ARM: save and reset the address limit when entering an exception
When we enter an exception, the current address limit should not apply
to the exception context: if the exception context wishes to access
kernel space via the user accessors (eg, perf code), it must explicitly
request such access.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2016-07-07 16:01:01 +01:00
Marc Gonzalez a30eceb7a5 ARM: tango: add Suspend-to-RAM support
Ask firmware to put RAM in self-refresh mode and power system down.

    echo mem > /sys/power/state

See Documentation/power/states.txt

Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07 16:09:30 +02:00
Arnd Bergmann 147de9757d Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into next/soc
Merge "the second part of the Broadcom ARM-based SoC changes" from Florian Fainelli:

- Florian updates the DEBUG_UART_BCM5301X entry to cover both NS and NSP SoCs
  since they both have the same location

* tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux:
  ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
2016-07-07 16:09:25 +02:00
Thomas Gleixner 3d93f42d44 Merge branch 'clockevents/4.8' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull the clockevents/clocksource tree from Daniel Lezcano:

  - Convert the clocksource-probe init functions to return a value in order to
    prepare the consolidation of the drivers using the DT. It is a big patchset
    but went through 01.org (kbuild bot), linux next and kernel-ci (continuous
    integration) (Daniel Lezcano)

  - Fix a bad error handling by returning the right value for cadence_ttc
    (Christophe Jaillet)

  - Fix typo in the Kconfig for the Samsung pwm (Alexandre Belloni)

  - Change functions to static for armada-370-xp and digicolor (Ben Dooks)

  - Add support for the rk3399 SoC timer by adding bindings and a slight
    change in the base address. Take the opportunity to add the DYNIRQ flag
    (Huang Tao)

  - Fix endian accessors for the Samsung pwm timer (Matthew Leach)

  - Add Oxford Semiconductor RPS Dual Timer driver (Neil Armstrong)

  - Add a kernel parameter to swich on/off the event stream feature of the arch
    arm timer (Will Deacon)
2016-07-07 15:41:13 +02:00
Arnd Bergmann 885a976e2c This pull request contains additional Broadcom ARM-based SoC Device Tree changes:
- Lubomir updates all BCM2835 (Raspberry Pi family) Device Tree source files with
   their proper information about the on-board USB Ethernet adapter so there is
   appropriate binding between this USB device and a device_node (useful for MAC
   address fetching and stuff)
 
 - Raveendra adds the ADC controller Device Tree nodes to the Cygnus SoC device
   tree include files
 
 - Rafal updates the BCM5301x Device Tree by separating how we specify the NAND
   chip-select information in a first change and then fixes the NAND controller
   ECC configuration for the D-Link DIR-885L
 
 - Florian adds support for the BCM953012ER reference board, adds the HW random
   number generator DT node and adds proper memory node information to the
   BCM958625HR reference board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfcRZAAoJEIfQlpxEBwcEiIwP/1mQJV/My4pqLeFg3oLxZBe6
 IekL3RjFm/eC/bP7Lzd5AbexExK+00kkGacZZNr9dabV/WiUYtJMzPQfayQsZim1
 6kdVXe1zYsOvWy4n+MAk0LCkq8p+uDoK/RE+6Jt0V3ALfBcaZwtCqDjVo7jfBzp1
 njo+ksdK5PifO+jGTDIyC9/7RnUzVksriYvrZo0+u71XFtwhP5fs59yA7IaHgnGU
 Zq70dnUH18VitFOr0MtMbhyCrwWwdLkTYTKuAHj2tNk98HEZ+65EOwWr5PllISfF
 tyw+DCttGEK8wSOIRRyCYJEe5A2yaR/QyqLz3Kzu8q5wW/Clbo91hd4YsylvgW/H
 MgFNi8a/pjOm8gYY/wrDsjFRqT8VC4y1XPihvcbLKRueYIuT6BdNWy0vCjI/xnF+
 S0YuuuAHkcJiMaBroZWszXtUK+qCKShtzd9pg3Cd4zEmZen1ZotSDAt2sm6ocfsz
 D+lFNqc7X0ey/rdBUMzjHGRCrMlD1agB6o3WH3NAC+gwalq0v0o3wlrRZ7UYKrYD
 vT6LHQC6RKTDqh+edoJEIm0m5EQNZ6qWpYO/xlapJFOigcs+mVH8YyEobha9nXmD
 5jyNuWa8JIGmUx0mMhH7mPp5sY0DZxboICno9o6w1Py6ptp0uZEXY1jddo1lapCW
 8Htj6SEUjMH+qw+i6wFK
 =Ie0I
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.8/devicetree-part2' of http://github.com/Broadcom/stblinux into next/dt

Merge "additional Broadcom ARM-based SoC Device Tree changes" from Florian Fainelli:

- Lubomir updates all BCM2835 (Raspberry Pi family) Device Tree source files with
  their proper information about the on-board USB Ethernet adapter so there is
  appropriate binding between this USB device and a device_node (useful for MAC
  address fetching and stuff)

- Raveendra adds the ADC controller Device Tree nodes to the Cygnus SoC device
  tree include files

- Rafal updates the BCM5301x Device Tree by separating how we specify the NAND
  chip-select information in a first change and then fixes the NAND controller
  ECC configuration for the D-Link DIR-885L

- Florian adds support for the BCM953012ER reference board, adds the HW random
  number generator DT node and adds proper memory node information to the
  BCM958625HR reference board

* tag 'arm-soc/for-4.8/devicetree-part2' of http://github.com/Broadcom/stblinux:
  ARM: dts: NSP: Specify RAM amount for BCM958625HR board
  ARM: BCM5301X: Fix NAND ECC parameters for D-Link DIR-885L
  ARM: BCM5301X: Specify NAND chip select and ECC in separated files
  ARM: dts: Cygnus: Add Broadcom iproc-static-adc DT node
  ARM: dts: BCM5301x: Add BCM953012ER board
  ARM: dts: BCM5301x: Add RNG Device Tree node
  ARM: bcm2835: dt: Add the ethernet to the device trees
2016-07-07 15:28:37 +02:00
Arnd Bergmann 800daa61a3 ARM: mach-hisi: Hisilicon SoC updates for 4.8
- Consolidate the hisilicon armv7 SoCs machine entries
 - Avoid the compiling warning by making unexported symbols static
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfj+gAAoJEAvIV27ZiWZc11EP/0kPj0ppDbsRKzNYxi9c4SG5
 lRKhpRhmZ8ZpGg/LZH4WttN1aQ5ul+AM0OD6naYnbArZrgnYsMuxW1jz6LBjhxaC
 ZuUWgGIPnaIxUQjKLrLuWGYM1xTw3iBYLO0hW3OIY2y/092K1w6+pQTkY4ONPNiT
 79V2I/ktq5GKRPBSxT02MBvsICN0PXlpgkOEjSuhSOrAA6BjyulwcQql2JHZ1XCK
 KtLiUxfX+xSSoPzUAzJnXhVZ3ez+VQUoL6ZHSdIJ7FiI95xBI+uBAAE5bsy2GqHe
 9HBwTN6F5BNPIwP85nnqTqYx/5Le6LX3lm7KcqxsQb5fsnYWCoc3eChkvRMDptNC
 pYC/SxtXFRuDKYBwcJQAFTa1Y5BRCvP49R5kJ6McZ8toazef4404LtppwRcIzTgN
 k57k5114kVG/wKPChslfJ3GB4ab91orJbHkwqpUOhrn+EttQcr0EadxHv/skElkh
 8E2uX5uNTC/heJqKQCC2hEwlFhDO6/oAth147aAHJzb7Q41NdK2EgyNu/Tf47UIr
 2UZi5Ex23u3qRB/jNaa9LydDXxuy7Dj5WFWy7SxRmjNdLdIcS1OLJZnG0VY1ISye
 aDjCPTjNlvQXNSIDyopafNVgsWVx5hsEFaKJ7Q/xWeJplZhDeRl3B1w6Qky3LS/w
 z719l6AyJYyQHLyYNtZ5
 =W1iC
 -----END PGP SIGNATURE-----

Merge tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi into next/soc

Merge "ARM: mach-hisi: Hisilicon SoC updates for 4.8" from Wei Xu:

- Consolidate the hisilicon armv7 SoCs machine entries
- Avoid the compiling warning by making unexported symbols static

* tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi:
  ARM: hisi: consolidate the hisilicon machine entries
  ARM: hisi: make unexported symbols static
2016-07-07 14:56:34 +02:00
Arnd Bergmann dddaea6b96 ARM: DT: Hisilicon ARMv7 SoC Hi3519 DT updates for 4.8
- Add device tree bindings for hi3519 sysctrl
 - Add dts files for hi3519
 - Tidy up DTB makefile entries to keep the list sorted
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfMdXAAoJEAvIV27ZiWZcS0UP/R1ihe0zFwK1SGZDAjIBZyhe
 Zq7sk/VhjPiD3ewtbjNQkAmRaSTtF+gii3t40FEPjNZL/skLhMFLEKyUAAhiipqG
 8OMF+PnooC6kOXB/RnMCxggWK2lOwbuaXsOHv0Ux7wWqP+sLWQzji3hgIk7hJsXx
 Y9ZYCMBuDgEqPwldpK6E8+jmpPoqktC7MpahWjk+t6fVIPFX+QIm2uUM4BvGI61P
 tcEe59v4OSKcm/QC50bhPmYVikk9R8Mt3gCL5Qjh4rFHtRyKzyJiPy7HdkJMDf6R
 pACKnF8qwyT2Qr1V5qn7M2Xygqwfh20tq9mcBcLLR1qlZHjdzxWNxT706elX9pWp
 D9DDQQdbe22gejq8nDYCBttXiFrzRdSOG5Vx2dTdGxfFXog93tADSvgScwI8Gon+
 frPXbJaqWeLR6K5QhM/jUcj0/9kPAE2B0c/fP89I6IFIcOm0EbB7hJaDzudQb2Vz
 ewEigYqpamEhqBiOFMpgl60/HbMyAWpJ2869YpzFITO6XXRGMxiPc31ShLrziQmJ
 fcuAlVfixmM8tBdmdMVFN8U8bRnwY+KSChWO9J00ehnDeNOnqc8JsvNTppHo7h2U
 XklSru6iLB9TxTk6Ld8oPPJTaNKO0HdmATpJrCM10oCk67TYWs25v24cYnSyRBrk
 AxmKI8yNwpznX9/cNPYD
 =7zT7
 -----END PGP SIGNATURE-----

Merge tag 'hisi-armv7-soc-dt-for-4.8-v2' of git://github.com/hisilicon/linux-hisi into next/dt

Merge "ARM: DT: Hisilicon ARMv7 SoC Hi3519 DT updates for 4.8" from Wei Xu:

- Add device tree bindings for hi3519 sysctrl
- Add dts files for hi3519
- Tidy up DTB makefile entries to keep the list sorted

* tag 'hisi-armv7-soc-dt-for-4.8-v2' of git://github.com/hisilicon/linux-hisi:
  ARM: dts: add dts files for Hi3519 and tidy up the makefile entries
  ARM: dt-bindings: add device tree bindings for Hi3519 sysctrl
2016-07-07 14:53:43 +02:00
Arnd Bergmann 349f9d5239 Allwinner DT changes for 4.8
The usual amount of DT patches, among which:
   - I2S support
   - Support for the AXP809 in the relevant boards (A80 based)
   - New boards: Banapi M1+, Banapi M2+, Allwinner Parrot (R16 EVB),
   - The other patches to enable various controllers on our boards, most
     notably USB OTG
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfBQtAAoJEBx+YmzsjxAgtzkP/0T6yzjDAp6Kfi5on+VrUdvb
 9253W7nsg5WVuLKEBbsyEDTsX9fI8sziKnyzh0JHGDJou9Uvfv+Fl/vbNpjPXqjx
 gzkSGrNVcXuL9RMeu/acxnTt+zmI54PwwQrSq2WY0hmCyvGeyiDTjgAaYUgYJxoh
 UVwbSBzudx4InR7neyfxeTryQdqam28g61YLueuAy5aKfXPCTdzreHFUN8gbakBg
 pERhBQy++ZjcNlmR+CRQrtimqv3G0VQZUUPZQzsllkCtqRhVt7JXREcAEZ3ogz5i
 gs9fZKSpYUexlOKIqhkGQfs4cP49J8ykmjolj6J90DOhPWl0noNeoqUoWLVcXntl
 o1ELEktLv2nH0SMZ5LVJ1Rm5w32GU6Jv/3Gq83IutN2z+M3ojQu6M/OuLmq7DvK6
 wIWh9Jj8gjiL9LHmqszQ9xaB2z7MehA+ZOZPaIxPsRpFHgmG+0fblYKVqXafobK7
 bhMcOmbnI5L/RD+/uh52ex1MDXocUGJkppb9R9wc0aGqazSuzIAsVepkKGZZdWE5
 jnn0CqhBdEqSDp5eMIAd4RtrQx2WGsedwzJdhEYwHuAAq7YomPk6ALIMMKuQ4gTP
 CEKsOxNJzFcYgVu6OaEsUpP/9ZuPUAVPKnpriB6j7bI/M7pxKY2LgfishCxgueU1
 AheCSB/LBq/6Or5tYjJC
 =XPdf
 -----END PGP SIGNATURE-----

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

Merge "Allwinner DT changes for 4.8" from Maxime Ripard:

The usual amount of DT patches, among which:
  - I2S support
  - Support for the AXP809 in the relevant boards (A80 based)
  - New boards: Banapi M1+, Banapi M2+, Allwinner Parrot (R16 EVB),
  - The other patches to enable various controllers on our boards, most
    notably USB OTG

* tag 'sunxi-dt-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (54 commits)
  ARM: dts: sun5i: Enable otg on the auxtex t004
  ARM: sun5i: Allow PLL3 2x fixed factor clock to change PLL3 rate
  ARM: sun7i: Add DAI nodes
  ARM: sun7i: Add mod1 clock nodes
  ARM: dts: sun5i: Add mmc1 / sdio-wifi node to mk802
  ARM: dts: sun5i: Add axp152 pmic node to mk802
  ARM: dts: sun5i: Enable otg on the mk802
  ARM: dts: sun7i: Add BCM53125 switch nodes to the lamobo-r1 board
  ARM: sun8i: Add Parrot Board DTS
  ARM: dts: sun5i: q8-common: Enable USB-based WiFi
  ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  ARM: dts: sun8i-q8-common: Add support for USB wifi controllers
  ARM: dts: sun9i: a80-optimus: Order nodes by alphabetical order
  ARM: dts: sun9i: cubieboard4: Order nodes by alphabetical order
  ARM: dts: sun7i: Add NFC node to Allwinner A20 SoC
  ARM: dts: sun4i: Add NFC node to Allwinner A10 SoC
  ARM: dts: sun6i: Add pmic / regulator nodes to Mele M9 dts
  ARM: dts: sun6i: Add pmic / regulator nodes to Mele A1000G quad dts
  ARM: dts: sun6i: The blue led on the Mele M9 is a power led
  ARM: dts: sun6i: The blue led on the Mele A1000G quad is a power led
  ...
2016-07-07 14:46:48 +02:00
Arnd Bergmann 0c789933d2 Allwinner defconfig changes for 4.8
Two patches to enable the DRM driver in the sunxi and multi_v7 defconfig.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfBKiAAoJEBx+YmzsjxAg7q8P/2+bdNaxfnqEEUDNUVkWPxx0
 /5FezVeOAYsrcB2BFhyAokGfz+hU1XbRc8ctYkdsiWJVwQmu29EmWqKSyWYtdoxa
 AISn1abz1UGlwILaUSaBQJspJyhHrnebxgSz85RkL+rpcCMI0wdxxuQ804g2ACai
 WT9ZeALIliz24kZbd6YPueVozJ/HatEdbuMChN9yeH9afqjO0vE66fdfvxOstMGD
 403ZVGN/Sz0k88OH8SVdTSUzGgjwbEs97HFGRWC4uldZln0qOG2vtjZ6ZSZSY6IY
 ZTZgAyjhPa4iY8VMe0FDM8LoGpyElchxlqGAY7HOFf2X+mpFATM02DrmTQD8t8yA
 e2NdDKKc0pLDodBIEufdl6QYFb3KhuLC6LwRxvoKunRAUAqVjvTgXvk2yY/JpQSS
 5uPVO9T9gdfA6vE1AxCPyykznNfVp2shRdNHg5fNNmEQJYqYULBiTREuqWKeco5j
 7/CPHXHurLV7BxC8VfsWO/XYY0RE1F3urSwetu9jxoFya9wIN/kJ81cMahsHl+tP
 Dv9t7pqClF3CEV0aFZmVpxFAvtSr8MgC0fW/7h+B+qJ9g9mv8gaW2Hgel/k+64No
 3/cVZDApk33yCQc7Gp25eCm1GTC3U+7UaQ/ISLd4dKe8PTpWBaNgY2MIgla6ELgn
 NW3HeAIcV8F+c5QUoHzz
 =CrDC
 -----END PGP SIGNATURE-----

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

Merge "Allwinner defconfig changes for 4.8" from Maxime Ripard:

Two patches to enable the DRM driver in the sunxi and multi_v7 defconfig.

* tag 'sunxi-defconfig-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Enable sun4i DRM driver
  ARM: multi_v7: Enable sun4i DRM driver
2016-07-07 14:44:34 +02:00
Arnd Bergmann 04b6d0a300 Few more omap SoC changes for v4.8 merge window:
- Fix a make randconfig build error for recent SMP kexec changes
 
 - A series of clock related fixes to prepare things for moving
   device clkctrl register handling to drivers/clk
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXe11sAAoJEBvUPslcq6Vz/XwQAItR9F4G/DibYl6CgIgvxdZF
 heCFfhg/TjNnAlOdqSszAmCDxrL0cSj9/Djm7PBmcZz6T0XQWp2xviTsW/08N9LI
 Hcugi179a10IjOan6EASQlITRDC6S9Elkq2arMDTxkRMH8jRBGCG3Wk7H3N4084O
 x7XCZH2zDGDsYJp12L1iZ6DZ+aYneSmcK3WmUmAiKQTZw1fK0AfMtc95fHh2iCTJ
 hK0+LCbg2gUL1+GKZTIa+caLDdU+48XDpxagAnnIDiWJH+TC1DOve14I0OqzZiCB
 YZC/W14ulIwkTMpUNHZufcG9ZVg0G3gtvnfKISxLI8gf/X/CrbcGsVnqRmsA3P2g
 r3rIVpdoZ4UbHfKZnE36jR6EggX71pQ+h8M3iazb9aoraWQKOL6NanqPbf3WZO3i
 PGXDOwrnXqK2mjfkMWr+ERLKcLFJSnYQaeZuZF84s1TqLIvzm7ouvGfD0fcbvW9N
 RA/imL/FqLeuu3X6PtE0mReS+aGJ+Ov2ZpmPpemdOryys3LotYHoC8fJyD9l5GKp
 M5sHHEVZicFHPesYaBnjThVbM5zVHYnmb1o+Yyjizwnh52kOKJO8SrJ9+qBvJ9Bo
 JitY8Y2+52IVDPtpeST2METORIP2HDZF4GnQdx8EakJBok4EPfVgXUzT7M1XB7Bw
 RnGWoAxSVQzrzr7kSMHS
 =qmem
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.8/soc-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Merge "Few more omap SoC changes for v4.8 merge window" from Tony Lindgren:

- Fix a make randconfig build error for recent SMP kexec changes

- A series of clock related fixes to prepare things for moving
  device clkctrl register handling to drivers/clk

* tag 'omap-for-v4.8/soc-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: AM33xx: fix module_wait_ready without clkctrl register
  ARM: OMAP2+: clockdomain: add usecounting support to autoidle APIs
  ARM: OMAP2+: timer: change order of hwmod data handling
  ARM: OMAP2+: hwmod: fetch main_clk based on hwmod name
  ARM: OMAP2+: omap_device: create clock alias purely from DT data
  ARM: OMAP2+: Fix build with CONFIG_SMP and CONFIG_PM is not set
2016-07-07 14:34:43 +02:00
Arnd Bergmann 82be1178ee Fix a long time regression for ir-rx51 driver for n900 device tree
booting.
 
 This driver has been unusable with multiarch because of the hardware
 timer access. With the recent PWM changes, we can finally fix the
 driver for multiarch and device tree support. And naturally there
 is no rush for these for the -rc cycle, these can wait for the
 merge window.
 
 The PWM changes have been acked by Thierry. For the media changes
 I did not get an ack from Mauro but he was Cc'd in the discussion
 and these changes do not conflict with other media changes.
 
 After this series we can drop the remaining omap3 legacy booting
 board files finally.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXe1v2AAoJEBvUPslcq6VzLvsQALIWLcgyqUKNgPV6EOxAsxeO
 azvjPPZgI0oTl5+voS6dzSg5mXhQt3rVlaXxJXxCdxYgOf67zYjugrJqf5Sm4stF
 BEtzPGLRTwR8miJbHNB8eGfcBGU3q+hx19dT+U7EAsPQqItlFfxVTh5ZzS0TOZc2
 9bQGO6MYIWNEk6V0TRxNUfRt+4fQN17zRdIpKL8NCJOsoBn9ZpztB76GeHUnd34t
 pYeaMFPdVUqBCQOmE9EA3dmOB7q37JgtsM312zpn72OgzpTTttza1Vo6HAh7dTWM
 Pmphin+H54zmsrB3wvI0h4G2WmuZjNNEHBTbLV4fgTjDer4o84RHJUGOgQmmPnni
 q9nyuV0y1gudk8ihlq7hxnickPS+NCSk8aQgAfspY+8rhxYWstJdJ66gUl+bUPlQ
 qaOvNACaEMVuRdeqnuTLm/mhQdVLz5VuUzSZkAWosVVuCVY9ONLt/t/Mxbylqf9P
 CfKiDBEUp+DQ8Ly4L0odD7n4fOWOq6XOx3RR6C4IJqkLyb6VL5O8POKNsHuMvb1q
 ptWyN1aWHrdYvd4PD0QB6hakY+C2P9BSAMb0t9ZscAX1nGvkGY27TRzHD8rkhHZD
 WKy5J4gzr8VDLnQom9MwoXcoqrWKTGY5QCqw1hdUrqNlVnRJTu2jYc5NrYxOK0mD
 TUC5drgK5e2mjmgUv95q
 =frvc
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.8/ir-rx51-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

Merge "omap ir-rx51 driver fixes for multiarch for v4.8 merge window"
from Tony Lindgren:

Fix a long time regression for ir-rx51 driver for n900 device tree
booting.

This driver has been unusable with multiarch because of the hardware
timer access. With the recent PWM changes, we can finally fix the
driver for multiarch and device tree support. And naturally there
is no rush for these for the -rc cycle, these can wait for the
merge window.

The PWM changes have been acked by Thierry. For the media changes
I did not get an ack from Mauro but he was Cc'd in the discussion
and these changes do not conflict with other media changes.

After this series we can drop the remaining omap3 legacy booting
board files finally.

* tag 'omap-for-v4.8/ir-rx51-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ir-rx51: use hrtimer instead of dmtimer
  ir-rx51: add DT support to driver
  ir-rx51: use PWM framework instead of OMAP dmtimer
  pwm: omap-dmtimer: Allow for setting dmtimer clock source
  ir-rx51: Fix build after multiarch changes broke it
2016-07-07 14:32:08 +02:00
Arnd Bergmann 1ed59b8f43 Defconfig changes for 4.8 #2:
- Addition of the sama5d2 xplained PMIC: ACT8945A
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJXemchAAoJENiigzvaE+LC9LIP/jU3O5r54sHQsbmZzCaf0GZY
 1v2Q6EWDTP2aoFLxZ6dpRi4G+Gu7ycf/wy0CFF0LNjZbsYPrYf3A4dNBVzii7Qkh
 xEjQBr3Qc0EOR3xUV2lkdNzJNWbEolHgAmdA5dDRdZK55m8F/3j+yzeizTk96tc/
 n8gf9Rk2hz0KZnuP7M2jP29nzIYiShkbx0uQQ95VQwNYYJJeNJAgKOvUnK2cwnQT
 3xw0tf/QWk9azBQs0eRwz0tp7YBpvOdgrT3zdQrGPZl0BknJ75f6pQhiV3+Ez++y
 QSPjj8bsZVx1bpnqKd2G+hbsMMj+aCy4jYt+LP4LdYqwaeD1o0ytDuAMEXPQtgrO
 SAe+5B37M1QKq0DaMjj4aQu5Iod/bpg9FGBC9EsiUYH3jikluexqjW9IRL305yJD
 B4dSZXuKbFODTLvEauD0q2zL0KMgWTqog3B77zlZ6oYk1pHUPnN7Wans1FUYGzbB
 x9Wqf8rQmEB3bdIl1aquiivP8zwsEqQbNOhxqVO0vFlB1mAMl99x2tUpOrlBWu5j
 hk1Y1pA24kgF2Yoz7WKOZSZlOp3x9pD0qiDCzypCa/9uIdv8NDxPlGQbJZukJ9P2
 mjjV7hUVYfv3zms9dUJ7SCKajnYcF8BmUeJfTQL9tGEDTZGu6U8Ai5Ms7yHFw1CT
 Bl9MKpor+uoBnloV+RN5
 =21yF
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig

Merge "Defconfig changes for 4.8 #2:" from Alexandre Belloni:

 - Addition of the sama5d2 xplained PMIC: ACT8945A

* tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: multi_v7_defconfig: add ACT8945A
  ARM: at91/defconfig: Add ACT8945A driver
2016-07-07 14:06:14 +02:00
Linus Walleij 83919ef0a5 ARM: dts: Ux500: fix up TVK sensor data
- Fix the I2C address and supply line names for the AK8974

- Sets up the interrupt lines to the different components as they
  actually are connected, I was confused for some time by the fact
  that several lines were connected with <NM> 0 Ohm resistors, which
  means NOT MOUNTED and is thus not 0 Ohm at all but infinite ohms,
  i.e. not connected at all.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07 14:05:02 +02:00
Jiancheng Xue abee8fbf2b ARM: hisi: consolidate the hisilicon machine entries
The original patch was to add compatible string for Hi3519 soc
and do some cleanup.

Since the generic machine entry could meet most of the cases,
so I did a further cleanup to reuse it and just keep one machine
entry that needs map_io here.

Signed-off-by: Jiancheng Xue <xuejiancheng@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-07-07 09:37:59 +01:00
Olof Johansson a7f856d6ad Audio support and spi-flash on rk3288-veyron Chromedevices
as well as i2s and ethernet support on rk3228/rk3229 devices
 and a dts file for the rk3229 eval board.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJXdbKVAAoJEPOmecmc0R2B4t8H/3J/l3fXyAskseN12883GkgO
 WxEaCe4LeLbxp9Lcd3jmhXM4WZKPbfngYdLvL6kNh/LZeZT3naa2B55ot0FiIOHQ
 PVvAC9ce7T0wTeK/aC2iFU6two6ZMbk8jSRfpfpijHIwK9U1NQcXTssuzvHR+S/L
 +QP29M2TP3Y9UrPydx8kpCeH0kav2WmdqNmRdpQ9hokCqAiR2jbXi2N4PNtVl9v9
 Vy/s+kFa8RSLzWTUICalwrMzS7j/VyeFKq61NPPjVdfS0Q+poCcdaDw5ZPEtZYBu
 eerD1hTou+z7MPz6F5SM3J5U9G8NEp0NO4b3C0eWvAuA9cMv0smJFfqVD4erp40=
 =wEmr
 -----END PGP SIGNATURE-----

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

Audio support and spi-flash on rk3288-veyron Chromedevices
as well as i2s and ethernet support on rk3228/rk3229 devices
and a dts file for the rk3229 eval board.

* tag 'v4.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add support rk3229 evb board
  ARM: dts: rockchip: add GMAC nodes for RK322x SoCs
  ARM: dts: rockchip: add i2s nodes for RK322x SoCs
  ARM: dts: rockchip: rename rk3228.dtsi to rk322x.dtsi
  clk: rockchip: add clock-ids for rk3228 MAC clocks
  clk: rockchip: add clock-ids for rk3228 audio clocks
  ARM: dts: rockchip: rename i2s model for Veyron devices
  ARM: dts: rockchip: move rk3288 io-domain nodes to the grf
  ARM: dts: rockchip: Enable analog audio on rk3288-veyron chromebooks
  ARM: dts: rockchip: Add shared file for audio on rk3288-veyron boards
  ARM: dts: rockchip: add SPI flash node for rk3288-veyron

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:22:19 -07:00
Lucas Stach 5eb495349f ARM: tegra: beaver: Allow SD card voltage to be changed
This allows to switch the card signal voltage level to 1.8 V, which is
needed for any ultra high speed modes to work.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:21:40 -07:00
Olof Johansson c341376ae9 Second Round of Renesas ARM Based SoC Updates for v4.8
* Add DT support to the APMU driver and prioritise DT APMU support
 * Obtain extal frequency from DT
 * Add support for r8a7792
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdR2IAAoJENfPZGlqN0++PFsP+QG1N24uc3pc1+kDFvgnPzqH
 Hs3SzPdSLTjx72K4gybaxLp6N6IMLWwHZUSfWDa1WoUDw8j4yVieJ+bTqPQ52SAS
 +9bRbUb5P1kowQ643xIxOoNPKN+XERJtFMUgt9NW/auzxGJFtVuxkDkxzovwWtgm
 f4+wQSgf0zgl/JabbD1qZtf8zhm8gPGsG92CFJqPmkGYoXjVNkiGwsAF4W1WCKfJ
 oXGUAwuVCpoZluLTg7sY2drqIb/L2mZ0QunjdY3dEJO7YxDF7cYTCE0BgGhN/oGH
 nFme3l9WPi2cPMfEl6Ucfvj4lXPeReXhTIGq8XzKCyJy75WlZsCCPgNJ0nuBvriC
 i0V4q2wfpfubzxjcVGdGfP/05QOY2ZZbvBvqaLyxorjw7atTGhn0QPgQtIfL4P1T
 nlf1fMMtlG5m8CjM7J3nAR6BKcEEF1plUL0c1ZG6UeZCAENX9MyB0J47B7+umI1a
 xuNugqKJg2Z8OsFKJ40MwdvlQuw6QRNw8am4erEou0pt3tzY2+O9pgw7yV2ElNkX
 OVskuk+ove0uK5XAmOdClZHtTl5+wNp+XKCKTcUGHY7L4RaC9zax0YujrrBoe/wz
 QvqwZF5As7pXk8ckzDS4Zvxsc2AuKQBRKfIp9JMcM9urEwRdlWvhb/OgKUjlqsve
 BSj+hDjpO4V4VZCSQv8r
 =+RmG
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Second Round of Renesas ARM Based SoC Updates for v4.8

* Add DT support to the APMU driver and prioritise DT APMU support
* Obtain extal frequency from DT
* Add support for r8a7792

* tag 'renesas-soc2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791: Prioritize DT APMU support
  ARM: shmobile: r8a7790: Prioritize DT APMU support
  ARM: shmobile: smp: Add function to prioritize DT SMP
  ARM: shmobile: apmu: Add APMU DT support via Enable method
  ARM: shmobile: apmu: Move #ifdef CONFIG_SMP to cover more functions
  ARM: shmobile: rcar-gen2: Correct arch timer frequency on R-Car V2H
  ARM: shmobile: rcar-gen2: Obtain extal frequency from DT
  ARM: shmobile: r8a7792: basic SoC support
  soc: renesas: rcar-sysc: Improve SYSC interrupt config in legacy wrapper
  soc: renesas: rcar-sysc: Move SYSC interrupt config to rcar-sysc driver
  soc: renesas: rcar-sysc: Make rcar_sysc_init() init the PM domains
  soc: renesas: rcar-sysc: Fix uninitialized error code in rcar_sysc_pd_init()
  soc: renesas: rcar-sysc: add R8A7792 support
  soc: renesas: rcar-sysc: Add support for R-Car M3-W power areas
  soc: renesas: Add r8a7796 SYSC PM Domain Binding Definitions
  soc: renesas: rcar-sysc: Document r8a7796 support

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:21:11 -07:00
Olof Johansson b85751c761 Second Round of Renesas ARM Based SoC R-Car SYSC Updates for v4.8
* Prepare for handling SYSC interrupt configuration purely
   from DT in the rcar-sysc driver for new SoCs, while preserving
   backward compatibility with old DTBs for R-Car H1, H2, and M2-W
 * Add R8A7792 support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdRvUAAoJENfPZGlqN0++qocQAJ6MApU5z9Bn+bLCCLOUeL+F
 5qtRZIQoO/VQ+7sbRR7pBTTLbKs13Zeizq9CxvhGVtq/YUqzP25/RJ8mE25j1Hq1
 +X3QVVOIqCnRQVDlGSq6Og7IMOvCVsNgqxWdmAwtkuiRkD75Qsb6lkmLH8MyNkRj
 6UcC7UUJ5P/Pes9Qgh7ZqfWHD+A7JkUbYlN8THQkuSOJyA5Vf/jAry6riQSkJiuy
 854xJ/f1FRAQas/Usqr3i+6gpZtRw66n5DA+JFubXJLxvrqnZUDdjV2d1tS8phC6
 /AIGxx8n967lPg7j9DO6YxEViF3sxFrvQNds8qYoxzH6+z7FtApBJW9EDLkb58+H
 nvP93DnYz1PzIjcKq0CDreqVnPDtBFK4kfDzkMxLIfbfQVgtSQlo0rpjHQzUA24u
 6zk0Nhl2DM7pe9BYxQNGwWK9f9QIKxiKx9y8Qqkghylq27V34tG+dBgRj0Klv6G+
 QHJNg2ShGZ/esup14eOh4YOw4ks6oNPeda0Rbl4ox3Ec970/42uIR495rsM40Avb
 G17hpvsCd4oVq5xhmr8CKSDzNleewRYGxbzs5Yp1VpWxAjkKOO2AlCxaWSYtYpQe
 gO1sT/YDWx4m0wiEa1/W0z3tO+U3w3wKaKOtxOZyjOj6dq99MJxPwMRoHYUGyMKW
 gGN/bJjsoxBJO/Kl0om+
 =/p9r
 -----END PGP SIGNATURE-----

Merge tag 'renesas-rcar-sysc2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Second Round of Renesas ARM Based SoC R-Car SYSC Updates for v4.8

* Prepare for handling SYSC interrupt configuration purely
  from DT in the rcar-sysc driver for new SoCs, while preserving
  backward compatibility with old DTBs for R-Car H1, H2, and M2-W
* Add R8A7792 support

* tag 'renesas-rcar-sysc2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  soc: renesas: rcar-sysc: Improve SYSC interrupt config in legacy wrapper
  soc: renesas: rcar-sysc: Move SYSC interrupt config to rcar-sysc driver
  soc: renesas: rcar-sysc: Make rcar_sysc_init() init the PM domains
  soc: renesas: rcar-sysc: Fix uninitialized error code in rcar_sysc_pd_init()
  soc: renesas: rcar-sysc: add R8A7792 support

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:12:04 -07:00
Olof Johansson 5fd70b1b17 Second Round of Renesas ARM Based SoC DT Updates for v4.8
* Use APMU on R-Car Gen2 and provide SMP for r8a7793 SoC
 * Update console parameters to uniformly use chosen/stdout-path,
   serial0, not provide kernel unnecessary command line parameters
 * Add DU pins to silk board
 * Add support for blanche/r8a7792
 * Name pfc subnodes after device name
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdSEnAAoJENfPZGlqN0++T0kP/jc/xLIytIA61qGuaTALFFaz
 h5d3b5gxww8jaQSPsTiaNueQLUCGWdimDp9Jl7r2CduZ633B62l9awobY5E5mx9X
 tPL90nZM1wuuKGwcwDl2LDKUJ/jUbUDb6MN+YIGHhp8qTOa75GxHpGhhdYQH8Uzs
 MlxWkWqucmTMsSQs9USX5/XloQwzZVSbplvS6wHjS4HoaBToB9lQS8qcjX8DGx+j
 OrndwruYx9B5cYA0Fp7xcae/YKiyfyhMdDX2iRKpIAfpheO9/Km7HFES2dY57Xw5
 DN4U4g/iDrdcIBfh6VR6MtfGh+JprOyoelFloh3hKtTL7Pu6bkN4ZnPlN5z6W3Ej
 jFrjgUrf9TSGQaAUaOdzTAjSPRCj63Z3xy8twNn0De0D7dk+AjTQbbdtGR6afAUR
 20i6+8ktB08vZHwoB3DxC5xnDOwugceHLHrR9lbPx+s2eXYQpEze6UNgr5/2r6eo
 HCa1NeFk60F1gJHGvKBbCoFSgP+6QYALt7p5KJ4xfKh/ta08DKz6d3b93KbcXaWM
 NAzrFT0yWdWMHspvsKdTfMA2xyUquWFDzj6URGZ1q84vGJqrXAoZ7XaEl/DKnhdk
 H8+qwSR4Y8jL7MSzGwesaQIrUF9CjYt47+nvAERvJYjZsFHHbq7TuRslTicTgleT
 Bl6Kaqg/1nFH0Xu/9NOD
 =gmxg
 -----END PGP SIGNATURE-----

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

Second Round of Renesas ARM Based SoC DT Updates for v4.8

* Use APMU on R-Car Gen2 and provide SMP for r8a7793 SoC
* Update console parameters to uniformly use chosen/stdout-path,
  serial0, not provide kernel unnecessary command line parameters
* Add DU pins to silk board
* Add support for blanche/r8a7792
* Name pfc subnodes after device name

* tag 'renesas-dt2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (41 commits)
  ARM: dts: r8a7792: add SMP support
  ARM: dts: r8a7793: Add APMU node and second CPU core
  ARM: dts: r8a7791: Add APMU node
  ARM: dts: r8a7790: Add APMU nodes
  devicetree: bindings: Renesas APMU and SMP Enable method
  ARM: dts: kzm9g: Update console parameters
  ARM: dts: kzm9d: Update console parameters
  ARM: dts: marzen: Add serial port config to chosen/stdout-path
  ARM: dts: genmai: Update console parameters
  ARM: dts: armadillo800eva: Update console parameters
  ARM: dts: r8a7792: add JPU support
  ARM: dts: r8a7792: add JPU clocks
  ARM: dts: silk: add DU pins
  ARM: dts: blanche: add Ethernet support
  ARM: dts: blanche: initial device tree
  ARM: dts: blanche: document Blanche board
  ARM: dts: r8a7792: add IRQC support
  ARM: dts: r8a7792: add [H]SCIF support
  ARM: dts: r8a7792: add SYS-DMAC support
  ARM: dts: r8a7792: initial SoC device tree
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:11:20 -07:00
Olof Johansson 51a8506608 Renesas ARM Based SoC Defconfig Updates for v4.8
* Enable newly added support for r8a7792 SoC in multi_v7 and shmobile
   defconfigs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdRmbAAoJENfPZGlqN0++/BEQALN/c/IywQ7haJ1X7U3BIAea
 zDgRMbZxtKCnEVw51hqpOjkobhW3dvMP8Yw1WVngmUJRMnpF1YFbYRXtezS5rMsl
 5nAMvzR4uuqjKbGVcR6DMT5EJMbWCY99MGyqB9OLfzuCC90Y3L85kdkWNi3JCukK
 /0DQ3NU39FdnHnloauVDyXa1WauEl+Tti/kXU2EIoK3fxEmBVWauUGxAlpf0MBa9
 2B8lZlS930r5srQOZBlOiWWNVQT0mYvljSjO9GX9MHjmhLQGfY5LcHPaRupcEHmv
 weDInqnwk0OvHJBjLFNJuMpG11TU7UMGuEVFDNjfel3ItRwzQ+lwZRrn6g58pr52
 N1jotBGeZhtc7ozOmgMqj5oFjhvo+KXAnQiVtpQECAHFo8NL45HCT81+ZRbpmOHG
 Q9EGgOJyh7hnTa6GLgqfG5n+UCCQQmtIYo4mkbhuBIgiBTVaKvLINgrGnghTeul7
 xJyvzafWa3D81NeJB3fnQWfvug/GKSQJp8axk4yultNtLUd8mEAABL5C5fCqYmKL
 xPtDEfmGlVEsJa/L42aDYVrTOhRzt4S8Cy3z5nJkJah7X5FwPAGn8Sx0zkexhS4j
 ANrk2I/ec5ttVUP+2sjmgyvU+JbIyPgjQhP2lp3ifEGosWbYxA4/u5GTzJiyheuX
 6PC9YZ0dQzStAx/QoYWT
 =f6TZ
 -----END PGP SIGNATURE-----

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

Renesas ARM Based SoC Defconfig Updates for v4.8

* Enable newly added support for r8a7792 SoC in multi_v7 and shmobile
  defconfigs

* tag 'renesas-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: defconfig: Enable r8a7792 SoC
  ARM: shmobile: defconfig: Enable r8a7792 SoC

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 22:07:19 -07:00
Arnd Bergmann 8264dde537 ARM: tango: fix CONFIG_HOTPLUG_CPU=n build
Building with CONFIG_HOTPLUG_CPU disabled fails for mach-tango:

include/linux/stddef.h:7:14: error: excess elements in struct initializer [-Werror]
 #define NULL ((void *)0)
arch/arm/mach-tango/platsmp.c:48:15: note: in expansion of macro 'tango_cpu_kill'
  .cpu_kill  = tango_cpu_kill,

the problem as that the .cpu_kill and .cpu_die struct members are
unavailable and we must not try to assign them in this configuration.

Hiding the two (as all other platforms do too) lets us get rid of
the #else clause as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-06 21:44:58 -07:00
Florian Fainelli 2dc9e0b9f1 ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
Northstar Plus SoCs (ARCH_BCM_NSP) have the exact same UART location and
properties like the register shift of 0, so make it usable.

Acked-by: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-06 19:43:22 -07:00
Florian Fainelli 9a4865d42f ARM: dts: NSP: Specify RAM amount for BCM958625HR board
Add 512MB of memory starting at physical offset 0x6000_0000.

Fixes: 65e9ac208c8e ("ARM: dts: NSP: Add new DT file for bcm958625hr")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-06 19:42:43 -07:00
Rafał Miłecki 70a0ae1c33 ARM: BCM5301X: Fix NAND ECC parameters for D-Link DIR-885L
This device uses BCH-1 instead of BCH-8. This fixes ECC errors and makes
NAND usable with brcmnand.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-06 19:42:33 -07:00
Rafał Miłecki 8ab5f1fbd3 ARM: BCM5301X: Specify NAND chip select and ECC in separated files
Using separated file with common chip select parameters will allow us
adding other ECC setups without code duplication.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-06 19:42:26 -07:00
David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-07-06 10:35:22 -07:00
Arnd Bergmann 7c2d780ec0 Merge ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB changes into next/soc
* commit '5c34a4e89c743339f78cafb2f2a826a010f0746a':
  ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB
  ARM: uniphier: drop code for old DT binding

These cause a harmless conflict with the clps711x multiplatform
support, and it's easy to resolve.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 18:00:32 +02:00
Alexander Shiyan c86f51737f ARM: clps711x: Switch to MULTIPLATFORM
Switch CLPS711X to multiplatform.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 17:57:56 +02:00
Alexander Shiyan 4a56f46a7d ARM: clps711x: Remove boards support
Any CLPS711X-based board can be replaced with devicetree equivalent.
Remove the board files.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 17:57:55 +02:00
Alexander Shiyan 46e6b3aa65 ARM: dts: clps711x: Add DT Cirrus Logic EDB7211 Development board
This adds the Cirrus Logic EP7209,EP7211 DT templates and support for
EDB7211 Development board.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 17:57:40 +02:00
Alexander Shiyan 0db943ec02 ARM: clps711x: Add basic DT support
This patch adds basic support to run Cirrus Logic ARMv4T CPUs
with device-tree support.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 17:38:54 +02:00
Alexander Shiyan 32981ea5b9 ARM: clps711x: Reduce static map size
Last CLPS711X CPU register is PLLR has 0xa5a8 address, so we can reduce
the map to 48k and align the end of the static at VMALLOC_START.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 17:38:52 +02:00
Alexander Shiyan 295e14b105 ARM: config: Add a multi_v4t_defconfig
To allow regression build testing of multi v4t systems, add a
multi_v4t_defconfig, similar to the multi_v5(v7)_defconfig.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-06 17:36:31 +02:00
Juergen Gross 4b5ae0150f arm/xen: add support for vm_assist hypercall
Add support for the Xen HYPERVISOR_vm_assist hypercall.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
2016-07-06 10:42:14 +01:00
Juergen Gross ecb23dc6f2 xen: add steal_clock support on x86
The pv_time_ops structure contains a function pointer for the
"steal_clock" functionality used only by KVM and Xen on ARM. Xen on x86
uses its own mechanism to account for the "stolen" time a thread wasn't
able to run due to hypervisor scheduling.

Add support in Xen arch independent time handling for this feature by
moving it out of the arm arch into drivers/xen and remove the x86 Xen
hack.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
2016-07-06 10:34:48 +01:00
Shannon Zhao 0cac5c3018 Xen: EFI: Parse DT parameters for Xen specific UEFI
The EFI DT parameters for bare metal are located under /chosen node,
while for Xen Dom0 they are located under /hyperviosr/uefi node. These
parameters under /chosen and /hyperviosr/uefi are not expected to appear
at the same time.

Parse these EFI parameters and initialize EFI like the way for bare
metal except the runtime services because the runtime services for Xen
Dom0 are available through hypercalls and they are always enabled. So it
sets the EFI_RUNTIME_SERVICES flag if it finds /hyperviosr/uefi node and
bails out in arm_enable_runtime_services() when EFI_RUNTIME_SERVICES
flag is set already.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
2016-07-06 10:34:47 +01:00
Shannon Zhao be1aaf4e40 ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services
When running on Xen hypervisor, runtime services are supported through
hypercall. Add a Xen specific function to initialize runtime services.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Tested-by: Julien Grall <julien.grall@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
2016-07-06 10:34:46 +01:00
Shannon Zhao 9b08aaa319 ARM: XEN: Move xen_early_init() before efi_init()
Move xen_early_init() before efi_init(), then when calling efi_init()
could initialize Xen specific UEFI.

Check if it runs on Xen hypervisor through the flat dts.

Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Julien Grall <julien.grall@arm.com>
Tested-by: Julien Grall <julien.grall@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
2016-07-06 10:34:45 +01:00
Shannon Zhao d22cbe651f arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI
The kernel will get the event-channel IRQ through
HVM_PARAM_CALLBACK_IRQ.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Julien Grall <julien.grall@arm.com>
Tested-by: Julien Grall <julien.grall@arm.com>
2016-07-06 10:34:44 +01:00
Shannon Zhao 3cf4095d74 arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table
Use xen_xlate_map_ballooned_pages to setup grant table. Then it doesn't
rely on DT or ACPI to pass the start address and size of grant table.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Julien Grall <julien.grall@arm.com>
Tested-by: Julien Grall <julien.grall@arm.com>
2016-07-06 10:34:42 +01:00
Jiancheng Xue 747a1af0bb ARM: dts: add dts files for Hi3519 and tidy up the makefile entries
- add dts files for Hi3519
- shuffle ARCH_HIGHBANK, ARCH_HISI, ARCH_HIX5HD2 and ARCH_HIP0X
  around to keep the list sorted

Signed-off-by: Jiancheng Xue <xuejiancheng@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-07-06 09:39:14 +01:00
Krzysztof Kozlowski 9251e1d634 ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu
The iomem passed to s5p_init_cpu is used as read-only.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
2016-07-06 08:12:27 +02:00
Olof Johansson 2941895aa0 Samsung defconfig update for v4.8, part 2:
1. Enable Virtual Video Test Driver on nulti_v7 and exynos defconfigs.
    Useful for testing.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdL4UAAoJEME3ZuaGi4PX/MQP/3dUeUXT83Yg3dQMEZJXLI8Z
 aciTCgUeozP+LYQGn5XzRPl0dOePZGLU+n8AcWsKBxIFfMl0lYYrdk9Y78Wd22dT
 1V2dpHkVy6zC88WCEzK7abjiaq0g5PA4jdnLfog4t6fgKHF/EwrWYqGAics9RDZ+
 yGoOy/KOAS8bYHg2MZ8GDH/9AIahQ1u1s+2/rJDgWM+ioJgmRqd17eVj7HlI9A5d
 TZMXHGOz+ToJH87i1Yd/U5tIdQ82TWmSrBszKfRcs7R0Ayqnx+s4WcPklj8xOSz9
 P0wkl3F39ihqDHO/MJScjRuD/Di92PVjLsGBLWqicuQIQ4fzRh5cv/bxnR7kQLnW
 7c4CVcyzkEz42HQ3QxnmfFNTzzr2yz/XLjg+mLPEXqOBs4ZSa9rMzUjfWatlZk0e
 SjogdR5Pxhcei2XMarxG2dFISVKEsTggmjW8hlO/xuukSG/0wEKwBFDqe1PsPA6K
 j1yJcA9FfoIE4x1hM5OJopot8sXLG7KZWqqK0VRsQIOU9XvMjNAyRP/PPju6MLHs
 D6Uwm4QXk0DS4GFrD+mI4neI1X92e/yDzX/Jjou8dcqPNO2zlZtJJWFQh+MdWjyK
 q/V8OjdjFxRfIjx4ddj5i5ESPL5rwWd7KUkmiQJGi36s1vKCVCn5HD/Y1Kn1j1gv
 EDwyrUCgpbGKElmJcV2V
 =9A1f
 -----END PGP SIGNATURE-----

Merge tag 'samsung-defconfig-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Samsung defconfig update for v4.8, part 2:
1. Enable Virtual Video Test Driver on nulti_v7 and exynos defconfigs.
   Useful for testing.

* tag 'samsung-defconfig-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Enable vivid driver as a module
  ARM: exynos_defconfig: Enable vivid driver as a module

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:49:00 -07:00
Olof Johansson 8fe9c8b750 Topic branch for Exynos MFC changes for v4.8, part 2:
Replace hardcoded reserved memory ranges with auto-allocated ones
 and enable MFC for all boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdL1gAAoJEME3ZuaGi4PXDgEP/1iPrO92izin4BTql9CxJQ5L
 LlSHwWeE6JTd/qaMcs8bbRrP1mROLkZozyqkj7QUgxoZxeyXrVpzhjerUp9QSLz4
 Pq9Ql57cc4F03mns1uNaZ9Bz9c3vhtoohwkLRHvC4n7yQ4zvjCoyRDXGZ4+osz+K
 vrlRpm3ZZrkr/MM4QuW9E7O2vL8/1kuPjn10vgCGEyWTSsMHHJe1+m4mpz5p/uPb
 RB8I1ZIdrvXyBJeNAhgCxWJ27nw2xpotqjAO5h2z/XZ8VSOIktd2iiouu199knso
 jPrVdJWuY0vv8YBXdJG/3/86T3S8w+HN1ULtaVIcYAbG44TLkzz1YCku3UUWB2yK
 INZ2J4dreXZ8NvcQPQffcE3B25w+hNx6mDlrAmRaapstLlPIkeNWeiYMI4CaoxTa
 1lOGqUuw6gc9JlBrEkJilBS18A9ExzNlquiBJa3EiP/74axe2AriSxbZZCpQ6na0
 mOkuW/0xO9iSE56+j1pUuz/GCmoJt4rCMTCRVp17eE6WUM6OW+oUWm0ArVefBCy/
 Er5E3WwXNA4nhEuWU6Y1oh/ji2SNzr9eNU3eja254xgOGsHIW1iqaCappUBi4+VC
 cm6TaXSlzDBv3v/1kQT947LiHkc+5A4/mldizDSaujF9vjIyQvHzG+yGpHEbyWAT
 qf37rI3BB2GJgs13U5Jf
 =sS8p
 -----END PGP SIGNATURE-----

Merge tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Topic branch for Exynos MFC changes for v4.8, part 2:

Replace hardcoded reserved memory ranges with auto-allocated ones
and enable MFC for all boards.

* tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: enable MFC device for all boards
  ARM: dts: exynos: move MFC reserved memory regions from boards to .dtsi
  ARM: dts: exynos: replace hardcoded reserved memory ranges with auto-allocated ones
  ARM: dts: exynos: Enable MFC device on Exynos4412 Odroid boards
  ARM: dts: exynos: Convert MFC device to generic reserved memory bindings
  ARM: EXYNOS: Remove code for MFC custom reserved memory handling
  media: s5p-mfc: add iommu support
  media: s5p-mfc: replace custom reserved memory handling code with generic one
  media: s5p-mfc: use generic reserved memory bindings
  of: reserved_mem: add support for using more than one region for given device
  media: set proper max seg size for devices on Exynos SoCs
  media: vb2-dma-contig: add helper for setting dma max seg size
  s5p-mfc: Fix race between s5p_mfc_probe() and s5p_mfc_open()
  s5p-mfc: Add release callback for memory region devs
  s5p-mfc: Set device name for reserved memory region devs

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:46:39 -07:00
Olof Johansson 553228d073 Samsung mach/soc update for v4.8, part 2:
1. Endian-friendly fixes.
 2. Maintainers update.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdL7uAAoJEME3ZuaGi4PX9E0P/2XqWeRT2Ln1hrySGefz1zN+
 xIW7bsYaHWiFp0/ol4uWdDcyKTyN+Y8ROcsJmdnPjXrPRb/7Vicg9bMj4KziQGtG
 uQBJ7vu1sInf6ocMv0JaXagGiN9UbegXrJ/+HrS41NeQ4le75i//QleKppgY5cJ9
 1ymXfeKLPYAtuL7jVXh7+kvMEtrTpbH6JiIwSHk3pLUsxhTkiMI2nIcoe/NTGxkL
 Dr1yvtcXwOcWT8Bkn4cyb+hOculqwnc2jTvfUeWhqDEtGqAn8YJDFhMfJNxGd7bt
 EafSWVbdhG0KEOIvTSrHk7qek6exLXl9Kx5P0yRyE4D3/+CyO9Ya2rRi5WlGrGHI
 w9TSOoPzqHYt3aZ1XAY66yYhgfsaIk6TxbGaPtPjt1nZ6E86KqnK0821CF1HZiRL
 ySp2lO7PlGPtqNT9cVwZDSVBgeoYDhkiQUIQnJwAKauCZirmS6TRordnbBKU39SW
 bLUKzSFKHnPBa/u4NOJhflWIy4fg4ARJYDycCH7m/P01JvxNb4OJ6ycz/XeO90oS
 k1HKXOFjFNbklloC/sjyLRP71+ZkJuogH6uzYwuhShwRKyCXdfoI4yLS024mGejM
 u5r6MGVVKI9ZxZ9ImK8gfhgQ705AfxkhKFHu9BjHCLIsLg/F+PgdiNObI9FoA7Ym
 6sgq5xOhnhjjGaENvHFD
 =/T5k
 -----END PGP SIGNATURE-----

Merge tag 'samsung-soc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc update for v4.8, part 2:
1. Endian-friendly fixes.
2. Maintainers update.

* tag 'samsung-soc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  MAINTAINERS: Extend Samsung SoC entry with S3C/S5P drivers
  ARM: SAMSUNG: Fix missing s5p_init_cpu() declaration
  ARM: EXYNOS: Fix UART address selection for DEBUG_LL
  ARM: EXYNOS: Fixup for __raw operations in suspend.c
  ARM: SAMSUNG: Fixup usage of __raw IO in PM
  ARM: EXYNOS: Fixup endian in pm/pmu
  ARM: EXYNOS: Fixups for big-endian operation
  ARM: SAMSUNG: Fixup endian issues in CPU detection
  ARM: EXYNOS: Fixup debug macros for big-endian
  ARM: s3c24xx: Sort cpufreq tables
  ARM: SAMSUNG: Fix typos

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:41:01 -07:00
Olof Johansson 355e5ce71f Second set of device tree updates for omaps for v4.8 merge window.
This is a series of dtc warning fixes when compiled with make W=2
 from Javier Martinez Canillas <javier@osg.samsung.com>.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdMKhAAoJEBvUPslcq6Vz9d0P/Redrumw0+JuFTBIUyJNtILX
 6u+TXabPgPvkxEZ/eFPLv6b8EcZBkOVXPfbTnvUKzsT+VXjD1QnufYm1fw+qzmBA
 Fijii54z5EyhnOMEm8Zr962rExwL7rMr/lHi62Dfs/d8zG9AEMq8UU9hO1vn3vkr
 JDsK2BdyoFTDq+PVYXpjKCaVpXPV0+FS8YDH5uoXzCF1vYD7fSCGRnM4HwaNEA65
 RukMtafx0Kv9euS8fpjeZ+dHQI+tcrp72hokhmGkSAN1zAVWGLllvwxHudwvYHSi
 ZHhSIr6m5REF2JC7PekYMA8nsf0WfdoYwLB52fckissrIzXllW3MgFxgXrqbH4iZ
 sx3aXZvM6grZmn0Ou8jbUsaGd8ri1wRCb5SAJx9yYMuywWVKUO+D5ViLhLHUSmva
 XeiXLw7cBZQyBJv00lR66H6G5ABcNjdnvuwpRUHIWWH+6/DGXnzM1ZejHQjR6phZ
 1XEF3Mo7ZgTUXARTEBNgu7KGyMhx1YH1OVLF4Ri8eM77qZ84CQbP3AeqAQxsSJPi
 7YDqhZZJ4bVHeEy7RQdf/OSz5Gf7jgRreqYpfenZc/3OlfYsnewbu9Fo3w87L81E
 EzE5Jdwq/vyjEs5EBwEP7uvKzYh64qVfp+puCxUBpPZmPiD2zMkCndt3O849Sm6x
 qHfIDkk9XN6fPXlQRiwW
 =ikLv
 -----END PGP SIGNATURE-----

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

Second set of device tree updates for omaps for v4.8 merge window.
This is a series of dtc warning fixes when compiled with make W=2
from Javier Martinez Canillas <javier@osg.samsung.com>.

* tag 'omap-for-v4.8/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits)
  ARM: dts: am57xx: sbc-am57x: remove unneded unit name
  ARM: dts: omap5-board-common: remove unneded unit names
  ARM: dts: omap5-cm-t54: remove unneded unit names and add reg properties
  ARM: dts: am437x: cm-t43: remove unneded unit names
  ARM: dts: am437x-gp-evm: remove unneded unit name
  ARM: dts: am43xx-epos-evm: remove unneded unit name
  ARM: dts: omap4-var-om44customboard: remove unneded unit name
  ARM: dts: omap4-sdp: remove unneded unit names
  ARM: dts: omap4-panda-common: remove unneded unit names
  ARM: dts: omap4-duovero-parlor: remove unneded unit name
  ARM: dts: omap3-thunder: remove unneded unit name
  ARM: dts: sbc-t3x30: remove unneded unit names
  ARM: dts: omap3-pandora-common: remove unneded unit name
  ARM: dts: omap3-overo-common-dvi: remove unneded unit names
  ARM: dts: omap3-igep0020-common: remove unneded unit names
  ARM: dts: omap3: overo: remove unneded unit names in display nodes
  ARM: dts: omap3-ha-lcd: remove unneeded unit name
  ARM: dts: omap3-gta04: remove unneeded unit names
  ARM: dts: omap3-devkit8000-lcd-common: remove unneeded unit names
  ARM: dts: omap3-devkit8000: remove unneeded unit names
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:33:16 -07:00
Olof Johansson df92d2e393 SoC related changes for omaps for v4.8 merge window:
- A series of DSS platform_data fixes to prepare for DSS driver changes
 
 - Add tblck clck aliases for PWM
 
 - A series of trivial spelling corrections
 
 - Remove bogus eQEP, ePWM and eCAP hwmod entries
 
 - A series of McBSP sidetone fixes
 
 - Remove QSPI and DSS addresses from hwmod, these come from dts
 
 - Fix RSTST register offset for pruss
 
 - Make ti81xx_rtc_hwmod static
 
 - Remove wrongly defined RSTST offset for PER Domain, note
   that the subject for this one wrongly has "dts" in the
   subject
 
 - Add support for omap5 and dra7 workaround for 801819
 
 - A series of patches to make kexec work for SMP omaps
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdMXwAAoJEBvUPslcq6VzL9oQAKfitWelEieWYINsm475xHUL
 DDckxrFtbVzrkI7rsY1wCi8v3i1DKEKBps47pnapy+AoD+js1C+vTKaQA2IXouFi
 CWlwgCuwJpLc4VoYGrbszXSJQeJowFHIH/zVk3CJrqBIwYKqnjH6sGCHRN23KNdN
 U2SPA7qV8XwwCrFR4e2+KWe5ulb7QsxvkCKqLyDrAwyu0wUQml1/4UjX5NYOkr1Y
 G5CyvGy7WBZ/t5MOFMPAR7rhxKQazUdNlgC7rGfVr+JUuYWtsyET6FBZ1kUBVFpa
 xc+usR78C+7gaQps8bbuIr2ymcOYamVlpjVwsvpTCWyFcnseK0hXsrf8KihRHfYh
 5p1yyDlqGg5qS6B16cyNgUqi/jVNa7NuRJWavgS+oWIm1j2WkUe9gdVyqP7WQGUZ
 UGF4OAXoo7aykvSsYEug/5U1d4T5aShESyoukTGsLbtRGhyiSxP3OqsoHzBwyfCM
 bA6OZzVxR/MRinpc/udvOsi/C7erm1iA6C+Fg4Gggk59Xt0yU+e4Scg40khQQ6X9
 1ND/HTG0rQ+ygLttUXPCK0kBg1u+SU/zh0+j9EV3I6CA624JQ2Gm2Bb/6xHk3vkL
 dmQosa5U2wLiXY6EKS2VcjAv7+yuaLdj/MMoOBh7TXz181/SnciNzAb6kEEXRNak
 vA0yKATY6AftMYBMwhPn
 =d4B3
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.8/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC related changes for omaps for v4.8 merge window:

- A series of DSS platform_data fixes to prepare for DSS driver changes
- Add tblck clck aliases for PWM
- A series of trivial spelling corrections
- Remove bogus eQEP, ePWM and eCAP hwmod entries
- A series of McBSP sidetone fixes
- Remove QSPI and DSS addresses from hwmod, these come from dts
- Fix RSTST register offset for pruss
- Make ti81xx_rtc_hwmod static
- Remove wrongly defined RSTST offset for PER Domain, note
  that the subject for this one wrongly has "dts" in the
  subject
- Add support for omap5 and dra7 workaround for 801819
- A series of patches to make kexec work for SMP omaps

* tag 'omap-for-v4.8/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (30 commits)
  ARM: OMAP2+: Fix build if CONFIG_SMP is not set
  ARM: OMAP4+: Allow kexec on SMP variants
  ARM: OMAP4+: Reset CPU1 properly for kexec
  ARM: OMAP4+: Prevent CPU1 related hang with kexec
  ARM: OMAP4+: Initialize SAR RAM base early for proper CPU1 reset for kexec
  ARM: dts: am43xx: Remove wrongly defined RSTST offset for PER Domain
  ARM: OMAP: make ti81xx_rtc_hwmod static
  ARM: AM43XX: hwmod: Fix RSTST register offset for pruss
  ARM: DRA7: hwmod: remove DSS addresses from hwmod
  ARM: DRA7: hwmod: Remove QSPI address space entry from hwmod
  ARM: OMAP2+: McBSP: Remove the old iclk allow/deny idle code
  ASoC: omap-mcbsp: sidetone: Use the new callback for iclk handling
  ASoC: omap-mcbsp: Rename omap_mcbsp_sysfs_remove() to omap_mcbsp_cleanup()
  ARM: OMAP3: pdata-quirks: Add support for McBSP2/3 sidetone handling
  ARM: OMAP3: McBSP: New callback for McBSP2/3 ICLK idle configuration
  ARM: OMAP3: hwmod data: Fix McBSP2/3 sidetone data
  ARM: AM335x/AM437x: hwmod: Remove eQEP, ePWM and eCAP hwmod entries
  ARM: OMAP2+: Fix typo in sdrc.h
  ARM: OMAP2+: Fix typo in omap_device.c
  ARM: OMAP2+: Fix typo in omap4-common.c
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:22:58 -07:00
Neil Armstrong fa06f54a18 ARM: oxnas: Change OX810SE default driver config
Since the SP804 timer changes will not been merged upstream, switch the
default OX810SE config to the OXNAS RPS Timer driver configuration.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:10:11 -07:00
Olof Johansson 01ba96dff1 The i.MX defconfig update for 4.8:
- Enable TOUCHSCREEN_ADS7846, USB_FUNCTIONFS and USB_USBNET support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXcm6FAAoJEFBXWFqHsHzOdFEH/jF1mfZbRBYDjkLsg6H++MJ1
 q/Yd8GTahIgIQyjAglBbiF5nLnLD6OK03HPu4M5H7fBo/tS6Og5Tk8LshwXzEucZ
 eAC6/5iDRlY1AgdFrdxhXqGwVyG04dgK553PQijCR5GSZ9MMhQO9JFJ49Lf64FuV
 TqZ0VPDUO7fw0qlE7yqd1JWy1SHa5LthRxUpx8gJUk+6nqJVQO26Ciga1BP6uSsB
 5nprCGpWo00Hfn6hMHqWXCyOm4vaWPq+N2E9aHFdo6VNnAIZxbqvYJ3RpfDu1UfV
 PoCoRVaNSfqEIr5yaliMykXI96U8gbLfoWXf/E4K08/Z9uB0gyIqbXCmvHoMhC0=
 =EWUm
 -----END PGP SIGNATURE-----

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

The i.MX defconfig update for 4.8:
 - Enable TOUCHSCREEN_ADS7846, USB_FUNCTIONFS and USB_USBNET support

* tag 'imx-defconfig-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select ADS7846 support
  ARM: imx_v6_v7_defconfig: enable USB FFS gadget
  ARM: imx_v6_v7_defconfig: build in usbnet to support NFS for non-ethernet board

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 21:15:26 -07:00
Olof Johansson ab4b4340c7 The i.MX device tree update for 4.8:
- Add two i.MX23/STMP3780 based MP3 player device support, Creative
    X-Fi3 and SanDisk Sansa Fuze+
  - Add the support of Auvidea H100 device which is a SolidRun MicroSOM
    baseboard
  - Restructure i.MX7Dual DTS files to support i.MX7Solo and add Toradex
    Colibri iMX7S/iMX7D boards
  - Device additions and enabling for various boards: mmc device for
    utilite-pro, IRQ controller and CAN support for TS-4800, display and
    touchscreen support for imx7d-sdb, SAI audio and LCD support for
    imx6ul-14x14-evk, gpio power off support for imx6q-bx50v3, etc.
  - Update the boards from Freescale/NXP to use WDOG_B pin for reset
  - PCI reset polarity correction for imx6qdl-sabresd and imx6q-tbs2910
  - Update i.MX board dts files to use generic uart-has-rtscts DT
    property instead of vendor specific one
  - DTC warning fixing for a few boards which are mostly mismatch between
    unit-address and reg property
  - Remove SION setting from all mux modes on i.MX25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXcmoVAAoJEFBXWFqHsHzOQfEH/1z78cIe4bBd61boOge5VGUc
 BdVGC4U6vcB1cRxceA8sh6U8QVyDtnojB1r5C3W+Zad4VMIdptGwbxAJne268WTt
 iSRY8+Mu81KgrvkQ4flosTp7w8J4DfzithMGzDnhq3vTFblaaAT63u9AcDlcSGCq
 1p/wPpqUb7COEBYOAxcOfypIPkZXrcvTfHHm3KOAV+cvNEQHZ0n4kLDWfjFxiUgo
 oE+RDTku2q7mfXs22QXCUyTLNlwzuczsQ35sPM4JbIc6JBVYyyF/tHQFB162MB7u
 ELK79F4LKip4wUS8b52M3xEQWiB0Cb1jtymomHLdGzguk7FtaV18vSUvA918GB8=
 =2NUH
 -----END PGP SIGNATURE-----

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

The i.MX device tree update for 4.8:
 - Add two i.MX23/STMP3780 based MP3 player device support, Creative
   X-Fi3 and SanDisk Sansa Fuze+
 - Add the support of Auvidea H100 device which is a SolidRun MicroSOM
   baseboard
 - Restructure i.MX7Dual DTS files to support i.MX7Solo and add Toradex
   Colibri iMX7S/iMX7D boards
 - Device additions and enabling for various boards: mmc device for
   utilite-pro, IRQ controller and CAN support for TS-4800, display and
   touchscreen support for imx7d-sdb, SAI audio and LCD support for
   imx6ul-14x14-evk, gpio power off support for imx6q-bx50v3, etc.
 - Update the boards from Freescale/NXP to use WDOG_B pin for reset
 - PCI reset polarity correction for imx6qdl-sabresd and imx6q-tbs2910
 - Update i.MX board dts files to use generic uart-has-rtscts DT
   property instead of vendor specific one
 - DTC warning fixing for a few boards which are mostly mismatch between
   unit-address and reg property
 - Remove SION setting from all mux modes on i.MX25

* tag 'imx-dt-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (47 commits)
  ARM: dts: imx7: add Toradex Colibri iMX7S/iMX7D support
  ARM: dts: imx7d: move input header into base device tree
  ARM: dts: imx7d: recreate imx7d.dtsi with i.MX 7Dual specifics
  ARM: dts: imx7d: use imx7s.dtsi as base device tree
  ARM: dts: imx7d-sdb: Add support for touchscreen
  ARM: dts: imx7d-sdb: Add display support
  ARM: dts: imx7d: Add SPI support
  ARM: dts: imx6q-bx50v3: Add gpio power off support
  ARM: dts: imx6ul-pico-hobbit: Fix Ethernet PHY reset GPIO
  ARM: dts: imx6q-tbs2910: fix pcie reset polarity
  ARM: dts: imx6sx-sdb: Use WDOG_B pin reset
  ARM: dts: imx6ul-evk: Use WDOG_B pin reset
  ARM: dts: imx7d-sdb: Use WDOG_B pin reset
  ARM: dts: imx6qdl-sabresd: Use WDOG_B pin reset
  ARM: dts: utilite-pro: add mmc card slot support
  ARM: dts: imx6q-cm-fx6: fix the operation points
  ARM: dts: imx6qdl.dtsi: add "arm,shared-override" for pl310
  ARM: imx25-pinfunc: remove SION from all modes
  ARM: imx25-pinfunc: document SION being important for MX25_PAD_SD1_CMD__SD1_CMD
  ARM: dts: ls1021a: Add dis_rxdet_inp3_quirk property to USB3 node
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 21:00:05 -07:00
Olof Johansson 213ae9025d The i.MX SoC changes for 4.8:
- A patch series including both cpuidle and FEC driver changes to
    disable deeper idle states when FEC is active while board level
    workaround for ERR006687 is not available
  - A number patches to fix sparse warnings and spell errors
  - A fix for TZIC FIQ translation from VIRQ to HWIRQ
  - Support compatible of i.MX7 Solo SoC which has a subset of i.MX7 Dual
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXcmFTAAoJEFBXWFqHsHzOxXoH/A5B4yRv82dM9L6KcCYqxc8B
 UL8Rt11mMsezj/mSoikPjdDV7rKRcbSyY7ujUs0g9jhdKzl2sCCu9rXtYN+oeDpH
 iJrndyQ8+Y0UDitmvZGwyW5HImUKuoMvFjJpg7D3WGs/2wACj9TVrrNl+AWawZXR
 B+mNO6vT3MEnflzFKkcZmYhwtMXPmaGDc732pS6sgqBLjAJp8X37wWoWJ2lVG9zf
 8fjEfUcB3jqWFr6YYJk/adWEjFwRBQ1QayY994Cxeym9kSo3BXfDJ3wcnG1sdOvF
 jsM0fsV75gMQNCy8VqiHTNhLk5DGM5PYKQLrQ8r0yoAwvXLLAbu+gPXJSWrACig=
 =yWZX
 -----END PGP SIGNATURE-----

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

The i.MX SoC changes for 4.8:
 - A patch series including both cpuidle and FEC driver changes to
   disable deeper idle states when FEC is active while board level
   workaround for ERR006687 is not available
 - A number patches to fix sparse warnings and spell errors
 - A fix for TZIC FIQ translation from VIRQ to HWIRQ
 - Support compatible of i.MX7 Solo SoC which has a subset of i.MX7 Dual

* tag 'imx-soc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: add support for i.MX 7Solo
  ARM: i.MX: Disable supervisor protect for i.MX51
  ARM: imx6: fix missing <soc/imx/cpuidle.h> in cpuidle-imx6q.c
  ARM: i.MX: Fix FIQ interrupt handling for TZIC
  ARM: imx6: fix static declaration in include/soc/imx/cpuidle.h
  ARM: imx6q: export cpuidle functions needed by fec driver
  ARM: imx: fix missing include of common.h
  ARM: imx: fix missing includes
  ARM: imx6: disable deeper idle states when FEC is active w/o HW workaround
  ARM: mach-imx6q: fix spelling mistake in error message

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 20:58:46 -07:00
Olof Johansson 8ec3dc29e6 The i.MX cleanup for 4.8:
- A series from Arnd to clean up cpu_is_mx*() from i.MX platform
  - A series from Andrey to clean up i.MX L2-cache code by using
    core support as much as possible
  - Remove the orphan header eukrea-baseboards.h from i.MX platform
  - Remove boilerplate code from TZIC driver by using IRQCHIP_DECLARE
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXcje3AAoJEFBXWFqHsHzO1DcH/2DOFJOaTTAPLJKI4rChNw4/
 04iNpUulFoFuPOI6xmjfMM8lxNQKEiQ/VLE6NuuV9OLiBSSkblEsZ7s50b0hubOC
 78bVsbM4UvWU1Sc7LIdxe/OZJFT3RaESIWXfeSrZjak6GAbZDzW5VVcovE12ih87
 NY/PcS6aAxASjO6PiQuQ+LTlhXxxiEUzyseLwGcLl2SUnqoL4pwN4KYlg93nJUDy
 Fli6+ZDBkM5aCYWZG0xcUiueWcbRGXHUbEe7QYy7czV5jNGfLZOgWSeRli2H++VR
 G20NqcRcsU+/BrBOiQjHVS/QND4A4jPksiDH0joWYQH9HXC4GJpSHwW11pOTifU=
 =Vena
 -----END PGP SIGNATURE-----

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

The i.MX cleanup for 4.8:
 - A series from Arnd to clean up cpu_is_mx*() from i.MX platform
 - A series from Andrey to clean up i.MX L2-cache code by using
   core support as much as possible
 - Remove the orphan header eukrea-baseboards.h from i.MX platform
 - Remove boilerplate code from TZIC driver by using IRQCHIP_DECLARE

* tag 'imx-cleanup-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: remove cpu_is_mx*()
  ARM: imx: remove last call to cpu_is_mx5*
  ARM: imx: rework mx27_pm_init() call
  ARM: imx: deconstruct mx3_idle
  ARM: imx: deconstruct mxc_rnga initialization
  ARM: imx: remove cpu_is_mx1 check
  ARM: i.MX: Do not explicitly call l2x0_of_init()
  ARM: i.MX: system.c: Tweak prefetch settings for performance
  ARM: i.MX: system.c: Replace magic numbers
  ARM: i.MX: system.c: Remove redundant errata 752271 code
  ARM: i.MX: system.c: Convert goto to if statement
  ARM: imx: Use IRQCHIP_DECLARE for TZIC
  ARM: imx: Remove orphan header

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 20:57:57 -07:00
Marc Gonzalez 222de7bfdf ARM: tango: add HOTPLUG_CPU support
cpu_die() and cpu_kill() are implemented in firmware.

Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 20:57:13 -07:00
Florian Fainelli 9b31970c3b This pull request brings in the change to describe the ethernet in the
DT so that the firmware can tell us its MAC address.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJXea5HAAoJELXWKTbR/J7ofl4P/36ReBOwgWtXa2h/kDAU9cjM
 lAaFedQ4GesRRPNkFboyO5YM05H1EnyVSmbJglpCRVsQI0STph/NXGmTH+tIN29L
 iC/pJw1Nz1rQOhQDdDch5xhqC1lgfZ7g4PFmDuTJr9NTLFcOKQVsxSmBMqDZSbxC
 bWrlUW6YdZBK7tUfK4lf6p9tAnpNeYyn3VGXPKb2l49DcwZfZgU6D28mmH4/PfHc
 KB5cNUfEEE3wt6DtCB6cWsqwPlofwyz/62NP1kwotMFbFRrHmraVVkR08OdrfxwJ
 I2Q/tD+ztc8/FQq5hQYHfxSX9RXNmRutrRZYJlT6hwPAAue91uy9r9jYMCl6hwm3
 7zG32GU7SL8mqUdYLjVnZ6H8vqc7+GUf0hdz46vnXDLwquawWMmOory7PX1fgXJc
 pLiaUtfRvYd2RmMSsbm7QCdQu1yQ93Q3ytcAJsDCq2fJ+ySMpHWgQ+El3yRKmnIk
 fr4c5e1qqMutEfbl4hirU8Dg9dx0KbQDoY3L1e+sRQRSy9YppRHD2Lw3pOKlY3X6
 NUUvvoAfjDwDHNCJQAi2n9FRxlhhrUNynFlGfsjXXDOZHtFpOGC4zOEgMXr2uMNm
 r1qYNiB03vhYVHFfUsNDtD8LSmSQ3FEmMMvL4fhKjRsjYuLHccPs7H5l+Oq45OH0
 OndYBA60urgkG2QnonR3
 =byP6
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfH8AAAoJEIfQlpxEBwcE0zoP/1kuAYK43BkVAvQzDaA154tR
 W5kV89q4VwhfQ+q+XkCkqljPFZzAPhhr6BA0D4gcVzGTvrCSWroL+yAl+D04Pyi0
 oDmxk/KCvDblsAg87he/OQSKrKVeBYeOiLwvO48LzFWbLd4JFxAOhCTAGNsDAWkl
 QMIWH+dbbB2ql9J1X1qP7nHkejIDG4Sb8ti88NKyKNlGsS0rVNFW9RXEXmBQPNVp
 PEbraANLWP99gtv1ASomAWcAXglR0TJTtucB8oCZ47cJ5/Cgkv1q+sbIHl9dPwbX
 iFze27hzIhd0bP1PvHnjy1yjYmWhYRcN8UBqn5kx+73keF3LvhoThwPagcifFfsJ
 ZAk5/LF20rc3D92ucYQHq9EaCrQ5rlCOnFWW4MZY48fj1nIKTguw9NJruKMHEWli
 DfnxJSYNeHJq9oMFPpwyblWlQyF/snIwOtKUFJmKC3Zdls1G0qw400COrvi7E1y6
 FNCqxF8ueoV3eHrVoreylJqPYa1HYJ2K2nYkUhHyu3Jn3+fRUvCwedNcupsx3XJI
 CdyxoANsA9NPzxbOW5bXRfuhMGk/NPR307Wp7bFcupjPgT7IWOG9rr7cE9MYnvjj
 xGuhWCeyH1h9nUsv/UOxoW0qKIY7oTfXdW93xQ8ERs/eM6J4rg/1+K2KjFFxYqQX
 +w97VoUBS/w2grkrpmh2
 =AyiN
 -----END PGP SIGNATURE-----

Merge tag 'bcm2835-dt-next-2016-07-03' into devicetree/next

This pull request brings in the change to describe the ethernet in the
DT so that the firmware can tell us its MAC address.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-05 20:45:58 -07:00
Raveendra Padasalagi fd048c6b34 ARM: dts: Cygnus: Add Broadcom iproc-static-adc DT node
This patch adds the DT node for Broadcom's iproc-static-adc
controller driver.

Signed-off-by: Raveendra Padasalagi <raveendra.padasalagi@broadcom.com>
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Reviewed-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-05 08:00:23 -07:00
Arnd Bergmann 86545b9437 mvebu fixes for 4.7 (part 2)
Fix a regression introduced by a cleanup on kirkwood_pm_init
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAld6ybAACgkQCwYYjhRyO9VsWQCfefz5UuHAc7FxLV0iBt8VDkQC
 FkIAnib3ZBRDdXLp/JrzaBJ4CiuPF4ep
 =+5mH
 -----END PGP SIGNATURE-----

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

Pull "mvebu fixes for 4.7 (part 2)" from Gregory CLEMENT:

Fix a regression introduced by a cleanup on kirkwood_pm_init

* tag 'mvebu-fixes-4.7-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: compile pm code conditionally
2016-07-05 15:56:33 +02:00
Arnd Bergmann 600da64b77 Allwinner Fixes for 4.7
Two patches fixing simplefb on the SoCs that had their display clocks
 enabled, and one fix for the CHIP that will enable its sched clock.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXerPiAAoJEBx+YmzsjxAgqYQQAKSnJgsTtxJ2XiE96IiQtvuC
 V1oU4AhDgTji3+wAuBgdjj2nYCeph/ex4V6rwdQsBTwshSStms61+uotQnbNHpme
 EPKJLkmhQhfuRA7lol7TXSPMUDDxehDtV3u5oPTUezed385PucKNbV0Kcm+DyHr/
 2e8GIe6/IGtReixSp+aaB4ezX3jgTO6pE2EoU7HCpsyuSBHFTaCyDQvekAUp/5zJ
 T4W6sktCL0nQTtZXzmQZlWYvTmnlkUK3/yvhYXRp69NXvD0qyZlhW8N4AA7R3FaE
 QoKZp0Vupm9RYa4By5LsxbqoRKDaeMMxKGSnnJ88sL15RAbU/AJhJ4HJXlMUup86
 TNi7sPEGbpxMpMk2G9QgcenpiclU/k8rQ7veoCTZzE0z8PYeN64ZIlHqqi5sc9LZ
 CFj7IEKsUfdt6oioszfdNMfnCOs1lgDXZOP1oQSfIRIG3QYqwFkKj9rGjA3FLGiL
 GRsl5j+RGPfFNZSqmuaK/FZenf4hIdljJHfJEjkLmIVUtco5ZcW2TRPhB0Ns2Qkl
 rb3x8J0+rsffARQyp9Oe2JKjFK8nt848dZVZexpYjFc6l/PDLSBYWse/nvVE1O7k
 CgNYGa4u49b7P7o4NAspRFQYCMZIEx24k1Q/yVawpJcLNYARlUvPDupRfztVQtOE
 CJsQdSEItn0CVYRehZEc
 =tU7Y
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-fixes-for-4.7' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

Pull "Allwinner Fixes for 4.7" from Maxime Ripard:

Two patches fixing simplefb on the SoCs that had their display clocks
enabled, and one fix for the CHIP that will enable its sched clock.

* tag 'sunxi-fixes-for-4.7' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: dts: sun7i: Fix pll3x2 and pll7x2 not having a parent clock
  ARM: dts: sunxi: Add pll3 to simplefb nodes clocks lists
  ARM: sunxi/dt: make the CHIP inherit from allwinner,sun5i-a13
2016-07-05 15:55:12 +02:00
Hans de Goede d509e205d8 ARM: dts: sun5i: Enable otg on the auxtex t004
The auxtek t004 has its otg usb vbus hardwired to 5v (likely in case
people use it to power the board instead of the dedicated power micro
usb connector), it does have an id pin, so it allows full otg
functionality.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-05 08:54:33 +02:00
Masahiro Yamada 06de15694b ARM: uniphier: remove empty DT machine descriptor
Since the initial support of mach-uniphier, this has always been
just empty.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 22:39:36 -07:00
Olof Johansson 24cf731637 Qualcomm Device Tree Changes for v4.8
* Reverse BAM dma node reverts
 * Add BAM remote control options for affected platforms
 * Enable peripherals on APQ8074 dragonboard
 * Enable PMA8084 pwrky
 * Fix PMIC reg entries by removing unnecessary size element
 * Add SCM binding and support for all currently supported boards
 * Add Qualcomm WCNSS binding documentation
 * Rename db600c to SD_600eval and add peripheral nodes
 * Remove gpio key entry from Nexus7
 * Add APQ8060 based dragonboard and associated peripherals
 * Add ARMv7 PMU for IPQ4019
 * Update smem state cells to match documentation
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXcarRAAoJEFKiBbHx2RXVWsMQAJuNe5NNiNQlbI2oqT1sjanu
 CUq0Wlt1JxDJd/TZM7/Mb47JCUus6jWZsjuH6G4h8EnIHJqiRfgtW0QBL8pIE6Sh
 qZkFZgnXkdIr2paW8Ut0Pt6Dg+23tAM5+LxO6ouYAsQy8iDPhyqqUTI/KOCFsQte
 j0JjoiSsC9OwCYfU3M5gVxInS6TeWF5k9+NJ0EFc0MC/ta1hKuHu1j3XVzBB7Ncv
 CS+rneijpNRdCELvCaRMzmfNoK9rPNO4Z2E8OB+qjm5aXOk2REFAEYBSk7T8leLI
 NUGQiXfYfKwO0Y+MqORtCTmJ5AGkCqlTRglZROsQ2mVcgSvpbscJaauQLSn4r1w7
 JRHC+T6LqxaAAqZcw1uYDgO5GHKHJ8nLC9+1oXmc5Ztx8mmeuNHAOgsiIrgyBjOu
 oXcZmrgp/iLFTVWHCqOGusXoN2J85TcsHvzXH0p0gG/SK0SOS+l/z8dZ+gqYq5TA
 KMzx6yNm4d9f4NoGjdlwRyVLB2+4UrEz2aiVlitizMNWfN9kWxTQxFpeSm+pstzy
 YtyuVo1t4MmaUZVeqFh5DwlHe6POnJ1chU2XwTTJyiYit4rKYkGNSdAVn4EP1b3H
 bHJTQgrbt6wG6H/FAFzxVp8+t41/VIPqslidVUDVhyInQnpbBsa6uQr2J42Yi7L5
 G+O0abSwLiPBy7XLBZS8
 =WKcG
 -----END PGP SIGNATURE-----

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

Qualcomm Device Tree Changes for v4.8

* Reverse BAM dma node reverts
* Add BAM remote control options for affected platforms
* Enable peripherals on APQ8074 dragonboard
* Enable PMA8084 pwrky
* Fix PMIC reg entries by removing unnecessary size element
* Add SCM binding and support for all currently supported boards
* Add Qualcomm WCNSS binding documentation
* Rename db600c to SD_600eval and add peripheral nodes
* Remove gpio key entry from Nexus7
* Add APQ8060 based dragonboard and associated peripherals
* Add ARMv7 PMU for IPQ4019
* Update smem state cells to match documentation

* tag 'qcom-dt-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (26 commits)
  dts: ipq4019: support ARMv7 PMU
  ARM: dts: add Qualcomm APQ8060-based Dragonboard
  ARM: dts: move the fixed MMC regulator to SURF board
  ARM: dts: fix the MSM8660 RTC base address
  ARM: dts: add I2C block in GSBI12
  ARM: dts: add L2CC and RPM with regulators for MSM8660
  ARM: dts: add SDCC5 to Qualcomm MSM8660
  ARM: dts: add GPIO and MPP to MSM8660 PMIC
  device-tree: nexus7: Remove power gpio key entry and use pmic8xxx-pwrkey
  arm: dts: qcom: Update smem state cells usage
  ARM: dts: qcom: msm8974-honami: Set DMA as remotely controlled
  ARM: dts: sd_600eval: Fix eMMC lockup issue
  ARM: dts: apq8064: rename db600c to SD_600eval
  ARM: dts: apq8064: move sdcc3 pinctrls out of baord file
  ARM: dts: apq8064: move sdcc1 pinctrl nodes to soc file
  dt: binding: Add Qualcomm WCNSS control binding
  dts: qcom: apq8064: Add SCM firmware node
  dts: qcom: msm8974: Add SCM firmware node
  dts: qcom: apq8084: Add SCM firmware node
  dt/bindings: firmware: Add Qualcomm SCM binding
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 22:38:25 -07:00
Olof Johansson b45efe38f6 Qualcomm ARM Based SoC Updates for v4.8
* Add MSM9615 support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXcaPsAAoJEFKiBbHx2RXVrFQP/Ap4sa0tZhp/5sp9tuOMdZUy
 Xvtrb1pv+6Bpb2bMjpA7mO0FMX6ly9iOOU+fgVxwVMUlx5z8Bou83WFy6OphwaN/
 HpCK6/sthvZvAVGPmYv8h+OMAo3HrikJIZ86aEIwESNdLHEV4+c+MvZQMRyJws76
 OdM85EWquc+kbFvusTpsjMXeu+nKYFr9e1VtkC/sWbI6vOSuVq1nsuiCz6Oje7Wg
 gElppda57W9n/BZKyeHyCfuY9nEIyCqFPztfrTJUmCujAkDsHtKVdEM2hrGzbXj9
 qBK3p71ClcOQr2U+w+P01v7nxh1kNGK3+zcLCdjYNB+kVUvnin7SOfVCMDeax6hH
 dZEQ97xCzOvcBj3Lk+e7mAKxHqCCiB0sozDOPX3949fkhP1AWvrmc+42eM48ywCB
 hus30EZlR3Ofpz/KQusNxs5DoGD4t4ljCpqabv0v9/2F7WvxN2ai/tCXsLCzxSmW
 tOgPoLsk4Rjj1gmj/Mk6lkL6Ty7EQ0KDd7rE8k1GRhovm8mArxFyNbPJm4DI81Zc
 II+fZKpLPB49JnqZhEmknBeLDeyj6CbWOsCrjxICJrPJXW5JWcfj4b+469ZqnyH2
 5SOzJYpU7yC4jPyEGU3SR+Hvc/AXqNHSqEZV4ArBCpi71X0U4hJJm/JluS1Y/Cqw
 qwwXUnYw1agSICZEIDra
 =clyf
 -----END PGP SIGNATURE-----

Merge tag 'qcom-soc-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc

Qualcomm ARM Based SoC Updates for v4.8

* Add MSM9615 support

* tag 'qcom-soc-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: qcom: Add support for MDM9615

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 22:35:47 -07:00
Olof Johansson a963e09240 Qualcomm ARM Based defconfig Updates for v4.8
* Enable MSM9615 board support
 * Enable MSM8660 pinctrl support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXcaEcAAoJEFKiBbHx2RXVhAYP/jK9BUCfGmPw/t5pS5UCO8oq
 PDLAajeQ818dJUlJcIcIcxPZjIqO2XqpxihqrGfaFTWExWo2yeg+kCts+enCrASz
 JlktLZGT3yiHUigZ4HnUtaN3KWq9AXlawFAwm27Vf3TnvSdwo+Jz7Q7YZyIUBu3I
 uW5hTCsilVq954tUUxMkzk4iT8oWtubkREVXnnUhw7v4vPpJQ7qn830kgPiUBMMR
 21zEoK50PBppU9ZFlZ6A2qj4mGldj9y0kK/OUtWnOSEXFUUvOCYFG63UfnJ6e0OH
 O0HA8yLLLdjjWUJlGGhR9hCDcQihfIefhiiUxjcAqVpuIc+szlXt37aJW6ifpfnx
 x//hfSgtwNlrvNusqrSb8ZZIAEpHJbRrutwkidd2c+KC6Xoy8s7H4u0tbWeGrigc
 kPkJjaabNtfFH/Ftkv1OfXckA8Hq0y26FJeL8zjj/fQpN0+Cgc8BcsKCEQCRNEXi
 UFQndJXGbj3ssamiEVUQQtuj+MesOH3ZfAfy8rJn9i3De+UwO4UMxG9GPkFKv9E7
 DrUt0p8CverZmXQg4hYU7muDHqW6b84bIf+UsElMwKqQOlNwBpUWHR1p0J3icHhL
 NTM33C8s7dgHn0rKNY0KVkTFLFo+Mlxo3E7pJk0b3h9WVruXZBdy82jddHlqqA7P
 Kcwg9GTfYPG4glwx6bDj
 =5MS4
 -----END PGP SIGNATURE-----

Merge tag 'qcom-defconfig-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig

Qualcomm ARM Based defconfig Updates for v4.8

* Enable MSM9615 board support
* Enable MSM8660 pinctrl support

* tag 'qcom-defconfig-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: configs: qualcomm: Add MDM9615 missing defconfigs
  ARM: defconfig: enable the MSM8660 pin controller

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 22:22:01 -07:00
Olof Johansson d6e29da921 Clean-up unused pdata for DaVinci McBSP
audio driver and add McBSP clocks for
 DaVinci DA850 SoC.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXbR2nAAoJEGFBu2jqvgRNhkQP/3kdyyZCvVIFXYRu7pKsV5f6
 VxJPNFUT32LVktCWNU/cSVAIMVtwI4n2Hy77xj3mT4ND6OpYWdVUi/pgVLvs6RCO
 yiLR/ffSY34Gc9Lht3obm/Nlv84oA7mQuKVx9X84unM8ZthAN7P3rdj5twU6BVST
 s01p9Pz16bU2nvtKQuiR7D9tn0DsATHMlqyHZUkZUu3QyuJ93dywr4vzOZhcBfBc
 rYaAZxOrGEWciokl2gQHYlUgI6i1tQ4qwzYAne3bTzglHrazWv9hfGlrQAsXP2LD
 +2PhBQPg8+5vMtZeo509j7qWDAJ+FYVf3pn8NDFgnCEMC5tSlGr2Oc0Nc85peJCs
 9YUAcWrhe+Rm8pLDoGGDhCyoG4VsIgOcfTH1wK2rBZr1hFyp7nQoIpMZsxTmFfok
 jh3jB9FgmhQB/m+6e/Z0opWGG0A9MvZ7HRYTV6hwUG454vEcATKkevmj+ssgURm6
 W/XCn5+8EGBskYIctcCUcjX7D9TC10ppscKVjnTfM3Ok5NVrUNBxUDfw7gJdFQYO
 qd0N7YQSEJljHLGeGgXI1KnkI8TQwOYYZ0b4Tc20H5GyeFwj3VqmsUiLT83r6P1l
 FLvPaSpcag9xOTNlS/d/OmDl5hu/N9RrjtuPu/w/B8W2+2MsWigS0gdZ9rMsnYVS
 ckty3emzWxHqb7pS3BzX
 =4TdX
 -----END PGP SIGNATURE-----

Merge tag 'davinci-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Clean-up unused pdata for DaVinci McBSP
audio driver and add McBSP clocks for
DaVinci DA850 SoC.

* tag 'davinci-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: remove unused davinci-i2s pdata
  ARM: davinci: da850: add clocks for mcbsp0 and 1

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 22:18:09 -07:00
Olof Johansson 59f23b6e42 SoCFPGA defconfig updates for v4.8
- enable PL330 DMA, PCIe, Touchscreen and USB Mass Storage
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXbEsVAAoJEBmUBAuBoyj0pKoQAIsk9tlctYUQXNR/L87nq5lG
 08WvUDG6mVvbe59LQ6RIAo9sj/FP6k2PmIZIgWLuZ1eLjSLq00PnItbQJavoO3Ob
 d6zuDBUnENScpaIw2xb72w7328TT0zw0Hpl2GLh6VHZ9VNaQpLRf2M86pdtxC5JI
 vsCFO+z4G0VXhT4NzVHX1hT1l1AurnJSQxrHPIfP/0JT+m6CK24IQeCGqehixeRt
 l3SpOewzAmsEL+DQ/9CmQGovCl/qBfA6J6mUBMt9w84idHi5bv++oYmqUeb8gjR9
 IT+btyKnEK6zG0QuM4Dbm41SzKDKvi+4uCLUgAw8/oxxl4ag0q3UzaWX/z59er2Z
 a6Ej+8oAA8NVxpqN6Ml24HRHRxO9dvhZ6xk9ONggE57zf2Lg67iX97KnQOkXX1Wu
 DI0aBgAAGilH+ZYwGLaf0oOgqD5UlRyhyXZzWpSs0oDs0lN0cRPmw7zV8SRj3iou
 HQ8y9HdVlDEq7XfitX73vwxekRVp9C9dWxdKoTGZbtYliVivMclUX92UMaTMfz9J
 SnmT5SJQvirgNfLVmnOkIMIQUWXd/oBm8NhLwbGPZbomVOt9jrg+9BJuvgDmftTP
 7mLmpIEyBTWLTjufnE0GvkubIlz7vjECD/CFFf2SUCRB+eg6UbevYhYSasD8umLL
 f8kigptluVb8gK2bWLS8
 =pjpb
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_defconfig_updates_for_v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/defconfig

SoCFPGA defconfig updates for v4.8
- enable PL330 DMA, PCIe, Touchscreen and USB Mass Storage

* tag 'socfpga_defconfig_updates_for_v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: enable PL330 DMA in socfpga_defconfig
  ARM: socfpga: add PCIe to socfpga_defconfig
  ARM: socfpga: Update socfpga_defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 21:49:15 -07:00
Olof Johansson abda5334d2 Device tree changes for omaps for v4.8 merge window:
- PWM binding updates and related dts changes
 
 - OCM RAM updates for dra7
 
 - Enable n900 lirc-rx51 driver
 
 - omap3-gta04 updates for backlight, bma180, itg3200, hmc5843 and wifi
 
 - am335x, am437x and am57xx operating point updates and additions
 
 - am335x-icev2 pca9536 node
 
 - dra72-evm regulator updates
 
 - edma spelling fixes
 
 - am335x and am437x ethernet phy update
 
 - a series of mcbsp updates
 
 - omap3-gta04 eeprom
 
 - dra7 PCIe unit address fix
 
 - stdout-path for beaglebone variants
 
 - crypto accelerator nodes for am335x, am437x and dra7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXam0sAAoJEBvUPslcq6VzYewP/imm4it6lqwtsfNthtmSW/Qi
 PO6XyZ/j8ayRcddsrnjTPFLH8/fPaIkKxI2eCQZpe+rHhK6Ifg2lGrZonJS7pHmu
 6NqRe0OkUHw3EIRuHW0uP4OCzYnyinJf0A7jp1nuQq5CBH8rzqHS7xyNEBryeKMQ
 rScauNPU+Z+/LM0Qz2mpYAAwWnJHlT/K8Pok+JoB16TiHsiNbhXoQlSwB1bDe+b6
 5Ssz42AG68rp9dGJ8SnbY25qBwQc1oBZeE21ItHTMwfUlAeQiG4nxejzqYaPISQw
 Aj/5Q0+qYp8aiCbQXaYrt0+Tz7UBfFTK3xIuw3011P48SaJAVbTe3tjPbZuORZng
 RvUHtavk2hEAoHQfU9gRYFPHt9uNLZqGU8gTmILLL/Go9oPENeQeOmEPPMtDC2eu
 nBOa1ROsAsXPBKTWJrpDRCaH7i5W4md4U9mo8LCG2iCXVrPHXXnWoRWGiUchiMzm
 ykPK9ynL+CwQ6M5dHFhW4rsnDZdrG2v5YAVDdhLnCnl9MrIFINTNLA/6Axz+xq4/
 8B+ymUyW9ymrxeoxEQpCbFWHg3UfN0B97r1JUy1D8wDdfberGHM35FspkESEjEeP
 PYOcrk0zx1wbVOBhEthvwInPX72T870xyDyCgl7Y2ayp6upTMQXL6C3uK4DR4W1p
 TO/qrewNdyK5iA+FWtYr
 =2xdp
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.8/dt-part1-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Device tree changes for omaps for v4.8 merge window:

- PWM binding updates and related dts changes
- OCM RAM updates for dra7
- Enable n900 lirc-rx51 driver
- omap3-gta04 updates for backlight, bma180, itg3200, hmc5843 and wifi
- am335x, am437x and am57xx operating point updates and additions
- am335x-icev2 pca9536 node
- dra72-evm regulator updates
- edma spelling fixes
- am335x and am437x ethernet phy update
- a series of mcbsp updates
- omap3-gta04 eeprom
- dra7 PCIe unit address fix
- stdout-path for beaglebone variants
- crypto accelerator nodes for am335x, am437x and dra7

* tag 'omap-for-v4.8/dt-part1-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (42 commits)
  ARM: dts: AM43xx: Add node for RNG
  ARM: dts: AM43xx: clk: Add RNG clk node
  ARM: dts: DRA7: Add DT node for RNG IP
  ARM: dts: DRA7: Add support for SHA IP
  ARM: dts: DRA7: Add DT nodes for AES IP
  ARM: dts: DRA7: Add DT node for DES IP
  ARM: dts: am335x-bone-common: use stdout-path in Beaglebone boards.
  ARM: dts: DRA7: fix unit address of second PCIe instance
  ARM: dts: omap3-gta04: Add RFID eeprom node
  ARM: dts: omap4-duovero: Add pdmclk binding for audio
  ARM: dts: omap4-var-som-om44: Add pdmclk binding for audio
  ARM: dts: omap4-sdp: Add pdmclk binding for audio
  ARM: dts: omap4-panda-common: Add pdmclk binding for audio
  ARM: dts: omap5-board-common: Add pdmclk binding for audio
  ARM: dts: omap3: Add clocks to McBSP nodes
  ARM: dts: am335x-bone-common: Mark MAC as having only one PHY
  ARM: dts: am437x-idk-evm: Mark MAC as having only one PHY
  ARM: dts: Correct misspelling, "emda3" -> "edma3"
  ARM: dts: dra72-evm: Rename 3.3V regulator tag
  ARM: dts: am335x-icev2: Add DT node for TI PCA9536
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 21:48:14 -07:00
Olof Johansson 35902cf1da DT Changes for 4.8 #2:
- New board: at91sam9260ek
  - Fixes for the sam9_l9260
  - Sama5d2 Xplained PMIC fix
  - Addition of the PMU node for the sama5d2
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJXem7KAAoJENiigzvaE+LCxNYP/19OGNvo56+RwyuLXbdIzzen
 1UsOUsYd1GBs/tuGzAmVPhgtnmjP4zKqUN2Vxvqpk2hq4sqKx4n47igsH+upqarQ
 q4Z9a0bqdqFUzyiq9ajQaNdM8axzz/Ydc21Kup1b6eJBLLU/JDys2d3UxHM3oY2Y
 IjsDNVMX5J/m8ihCy+YajuBH/3zqXcZOH3DY7TfWXaKr/FgDsQAafFny2nA4xcyO
 bGU4ucM3z58RyqCAgCKnj9k5Kc3gVsdHj6TbfIincX+P1Lh4o65D011pzxWFk8ag
 /TeWjRdQ3QpP2Lu8U3iDqN/zpsymGSW8Yc1DYzNPpQiId5rTNsNA0wOXCXvXTWka
 5ZpBo7nkpD5ZpaJJUhV0X3+Hu9D8jlGQumXDVLzeOLpNradLh6hGFbwrhfPFQydp
 Y3gbpaTR8Dc4Sz54Q4fWkrGKjrOXXaUXEh0T1KgxTrKOK3HNNWkK16DMAClGC8v3
 7+AEw6Jb0TaBfOGmU81PaIxXhU/jMn6xyqdFAhtz1Na3+4b4mhFhu9ZO6/JqHpIC
 8TvFRIMrTCQ6IBrwW+q1EI+hD07ucHDRIzn3Me/CE+WbNwuIO+gRZVyDHvbj1DjH
 kRxEnyYW4UxZrasF2JpqSXb5JF4paSI1l+0yIPhleQ9DJTAqp4dJA0/PlSffEfJI
 H/rbrSzD5M1Tu6Fy+Le9
 =F38N
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-4.8-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

DT Changes for 4.8 #2:
 - New board: at91sam9260ek
 - Fixes for the sam9_l9260
 - Sama5d2 Xplained PMIC fix
 - Addition of the PMU node for the sama5d2

* tag 'at91-ab-4.8-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: sama5d2_xplained: Update the pmic node
  ARM: dts: at91: sama5d2: add PMU node
  ARM: dts: at91: sam9_l9260: Modify information in LED nodes.
  ARM: dts: at91: sam9_l9260: Add pinctrl information to ethernet node.
  ARM: dts: at91: add at91sam9260ek board DT

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 21:15:39 -07:00
Olof Johansson 217c55dbd0 SoC changes for 4.8 #2:
- Add final documentation for sama5d2
  - Fix some compilation warnings
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJXaW9lAAoJENiigzvaE+LCYmIP+welOH1GNuP+8kfGoA5x5jHw
 AJFSVMMNtuxmwLT+9gzhYG2SnCeA7eAkwnXtwWHPO2Wuok9GhrEASXC+lq35ZyOF
 RlJ9OTrnzMjIiVaPdeL3c5631ceK8FCzdPeiaQnbr2vE9oMLJMZscbD2+rnrX4i2
 qK0e9q6GSdadnhtHMDtTiZvyN2ko43gj6Pok0oRH7R4gOAM1UUvMkTEJp4BzHV2m
 q4Fok4GNI+mgZwsQhKMh4vIN5kKg5ginWMEmwMemqmch7O3jCcsGSj2RnxJzOMG+
 /sglhASPEq419o7iDfonT3XHvgul+GXB/za7FfehghUuZH1TKQzohmO6HSDhqA1Q
 zGw+1L14NG8QrROIH3kQkIoBOKLxtU8d3QKZ0aEKdIL3vGU27w/qzgjXbYxqWVq4
 rg92nbkWn+GtN1BjDJ4qfChzeMy9DeHQcCdOUYNU66jtStETMqw/CU2lonWPRnwj
 2putuXVlYLU+iwYnB2dcV6z9G78OLZWpQbBKpSgJgLkpmR5OXhts3ta4nKZdNp6b
 uPtlbWF89NdjDtBR4GjuI5WCCsyzJRM8c8j+ujhquWcbxLA0JKWypdVmEo95U3zk
 EY/GlYWVYGqW7ApD2o2pllIj4Wi44DmmUwVGERSWTO0bWQixcQMJ/siB+FZ2R1Hz
 mCrF+o6Ikj4/+6ANP2wZ
 =dIzO
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-4.8-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc

SoC changes for 4.8 #2:
 - Add final documentation for sama5d2
 - Fix some compilation warnings

* tag 'at91-ab-4.8-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91: fix warnings in pm.c
  ARM: at91: Documentation: update the sama5d2 entry

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 21:14:58 -07:00
Olof Johansson c2383b04ee ARM: Keystone fix for 4.8
- pm_domain warning fix.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXaW53AAoJEHJsHOdBp5c/SyUP/09xxlMh5Pt+FxH1aoAnipoq
 uEcdoVDC+GpHu8m5Q4QQp9W0nZgF3P04fqZJJziz01sYslADoZSvDUYqyLzDoWVG
 x/O3jLxfYYpruL3CZCb0Tf3YX+EER+ejoPVM/BOONFvHV6l4vR0aoxo5aQXJjxm0
 iIpx1qC+eHEYTC6rTQSSWvmiQp9PFvHm1d7NxwvA2HiLOxCBG6N3lNkabtDuXA+b
 NaxxUUD9DWXzx+JRt83xnLzYw7Bans3oWunI3nGYoYzzzGWnb+P3APSjLlcsoZnX
 3Y5G2S1GWg19RMwhCr0CQ3UoX3EY55V8yvAuaktV6WfRngKCZ0z5T4b8ONF/Uwba
 7rVUQT6BDWykqjMTrzsePZj/Vi8c7wWvwZjXl6LuVR/KjHQjblFwHMHxY98xsQN3
 +O2Dc5KRA5R4zB6JNhYJb4+UC3zbE5eTQgY1nEzQtFN1MHAKfWzfyuMKDiNUuAWz
 KKo4tL36geSEj6B2I+2n+/vOjnJ22COUBJGdEkgkCKAXvhXROBRJILBgB0v/qqky
 +qHx6RCSaVAFEPgrXJ2fkawWCS6wE8MnY5bg9YLqw9D5k9ycMen7f8YtX4ROpNsg
 xH0/S8ifikMyPCOmgwWcLJyr7DNLmLV1XTbv8fNupo9CSFpiQkN8B3DLehfgv7aH
 GDC8PRi1JDWWrzQiWgaX
 =NNcq
 -----END PGP SIGNATURE-----

Merge tag 'keystone_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc

ARM: Keystone fix for 4.8

	- pm_domain warning fix.

* tag 'keystone_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: keystone: fix missing keystone.h in pm_domain.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 20:52:30 -07:00
Olof Johansson 208b3e2038 ARM: Keystone config updates for 4.8
- Enable PINCTRL support
 	- Remove redundant ARM_PATCH_PHYS_VIRT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXaW4cAAoJEHJsHOdBp5c/FhoP/R7A/KDlR0BLatvPb1aYRZ74
 kycyMYq0c66Rh4oYsV8ypcJKyKK/eUXXIsJ5BQ/YD9eLRESanf6UwxLJKagdaGJf
 L19rQSJGYfwS52W/m7AnW6NFAnkYbq+xH+LnWO0Y93Wy5L+2JucwHNR5p9kV7bZz
 DsFCym6a1mZUDHLS7IDtfRKkCXd1oVIl2QannGar1GXy83E0zwQHiv5caC5U0zp0
 Tvs07rpB8vWDtqqLLL/JvAeRtJkWz+/MAk4SnC2OaoGgQrT6cwKvlNemyDKe0+fs
 EWfRUb3+uX5QjGMm2Y+be4jzxmAFNwVnmxd2Yg8HkzgdB7P8l3qWY36wv8Vtvpaf
 d6CpHQGPlUA5b/Y0+Rt62e3iXS3GoUQj6gxZN6jho9GyCg3srzBBrgQ5sqyeaWSR
 IZLHrTsE3yM0ObihujU0Jd+tWLGJkdgLa55WLcHrESKrFA5uVi36cM3PNKb8rMDy
 c7wFtaOMWwo8DJrjUe8bS/fLFjW8enOdWfjKyX25zuH2DHCTxAShTBXgC8C9hzgo
 Qne1YCh01IsqqSE9dMvLb5QMv3L+wj5Mebu0+ckKWvcPQnEKlJuQeJmruYCEAxFS
 iN4oGN4cJnv58rO0kItA8uCQDTIKnEtPOkTrgMAXaqMgPt/2Shb7VMVN1e1o+U1+
 R4Uq/aWSGFhVRHTKUKgT
 =QlWV
 -----END PGP SIGNATURE-----

Merge tag 'keystone_config_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig

ARM: Keystone config updates for 4.8

	- Enable PINCTRL support
	- Remove redundant ARM_PATCH_PHYS_VIRT

* tag 'keystone_config_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: keystone: remove redundant depends on ARM_PATCH_PHYS_VIRT
  ARM: keystone: Enable PINCTRL_SINGLE Config
  ARM: keystone: Enable PINCTRL config

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 20:51:03 -07:00
Olof Johansson 64f618a7a1 ARM: Keystone DTS update for 4.8
- Pinmux entries for K2G
 	- PCI DTS entry fixup
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXaW1xAAoJEHJsHOdBp5c/kk8P/RRJZZVoqgxQkun/Un9uCo8k
 w72o0YNnm/iae/2V2TvBIq+w9u7hvyemAIo4oHgf4RhQDhHLtRW48DefqoZbCxdB
 5YokyM6msFaaQGOuGd0206PDQLyWjzcgrhTFap4yKG1qVaZ+AriERJGsfG73AXUa
 jiUPy3fCDfGdprxjzBMKRyq7LtWBKtUpBaLfc8ZeWwP8Ik5fbPFqe3iwJPcvW2SD
 cc5kWKUWO6lqvrx11mdEWhy+5u0wUcEDWyYI9mSse9uLMFAJ6ztYrMiDBcp6/lhk
 EgNIKO7+BFjRd/3cRfSxKazAc2Zgq+y0Y6HCUALapoWr+SPvlvzBrMp+pemgXHge
 QQbZcdb9GS6vcVMQ1cXJfUx1KqVpGlAR3G66QJMmZ/p3pJebD4dvGpcbBkH5ZFsG
 Qi61N9UDjgoxbkk83bCDRjr9KjVBhajPpq4KG0Vu3GvlMaFPAGpm29t7juphbZai
 fq4tuMT9fEUNxQE4kRNOX2iAp4ns5E2QNwWxOoMzpW39Znsc2iFNTH818cQfx+Fh
 oXSXtlEINgHqD6hRaBGrq2nkFB1ly2FGQJK1n58frTadP+9vVbggVMjT780B8FWV
 6yl0c2w1RZcZhmMNhKVbFpqbPWiGCdwChR0RBNrR4uVBknFMOnshQxJnWihcYUk6
 ZPZKqt/WzI4noVCqUKkQ
 =L7oP
 -----END PGP SIGNATURE-----

Merge tag 'keystone_dts_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

ARM: Keystone DTS update for 4.8

	- Pinmux entries for K2G
	- PCI DTS entry fixup

* tag 'keystone_dts_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: k2g-evm: Add pinmuxing for UART0
  ARM: dts: keystone: Header file for pinctrl constants
  ARM: dts: k2g: Add pinctrl support
  ARM: dts: keystone-k2l: Add pinctrl node
  ARM: dts: keystone: add interrupt property to PCI controller bindings
  ARM: dts: keystone: remove bogus IO resource entry from PCI binding

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 20:46:16 -07:00
Olof Johansson 49a7114fa9 mvebu cleanup for 4.8 (part 1)
Various warning fixes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAldpAwMACgkQCwYYjhRyO9WIhACeJQPPSTdBX/Gaa23T1aQT9gwq
 /g8AoJeSQumzfxqnQLCuz86ba4sXQkyx
 =JyAq
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-cleanup-4.8-1' of git://git.infradead.org/linux-mvebu into next/cleanup

mvebu cleanup for 4.8 (part 1)

Various warning fixes

* tag 'mvebu-cleanup-4.8-1' of git://git.infradead.org/linux-mvebu:
  ARM: Kirkwood: fix kirkwood_pm_init() declaration/type
  ARM: Kirkwood: make kirkwood_disable_mbus_error_propagation() static
  ARM: orion5x: make orion5x_legacy_handle_irq static
  mvebu: add definition for coherency_base
  mvebu: make mvebu_armada375_smp_wa_init() static
  mvebu: fix missing include of common.h in cpu-reset.c
  mvebu: fix missing include of common.h in pm.c
  mvebu: fix missing includes in pmsu.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-04 20:38:20 -07:00
Maxime Ripard 73ba3a1c64 ARM: sun5i: Allow PLL3 2x fixed factor clock to change PLL3 rate
In order to be able to properly generate its pixel clock, the pll3-2x fixed
factor needs to be able to change the PLL3 rate too.

Add the needed extra compatible so that it behaves that way.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:11 +02:00
Maxime Ripard 6a706356b4 ARM: sun7i: Add DAI nodes
Add the new DAI blocks to the device tree.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:11 +02:00
Emilio López 60ecb1ef1e ARM: sun7i: Add mod1 clock nodes
This commit adds all the mod1 clocks available on A20 to its device
tree. This list was created by looking at the A20 user manual.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:10 +02:00
Hans de Goede e6495c86a3 ARM: dts: sun5i: Add mmc1 / sdio-wifi node to mk802
The a10s mk802 uses a rtl8189es sdio wifi chip, add a node enabling
the mmc1 controller, this enables using the wifi chip (together with
an out of tree sdio driver for it).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:10 +02:00
Hans de Goede afdfcf7c81 ARM: dts: sun5i: Add axp152 pmic node to mk802
Add a node describing the axp152 pmic to the mk802 dts, note there are
no regulator nodes as we do not yet support the regulators on the
axp152.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:09 +02:00
Hans de Goede ba40e221de ARM: dts: sun5i: Enable otg on the mk802
Enable the otg controller, the id pin is not connected so enable
it in peripheral only mode.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:09 +02:00
Florian Fainelli d7b9eaff5f ARM: dts: sun7i: Add BCM53125 switch nodes to the lamobo-r1 board
Now that we have a proper binding for Ethernet switches hanging off
different buses, and a driver for the BCM53125 switch, add its Device
Tree as a child MDIO node, at MDIO address 30 (Broadcom pseudo-PHY
address) and describe the ports layout of the Lamobo R1 board.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:08 +02:00
Quentin Schulz 29bc949088 ARM: sun8i: Add Parrot Board DTS
The Parrot Board is an evaluation board with an Allwinner R16 (assumed
to be close to an Allwinner A33), 4GB of eMMC, 512MB of RAM, USB host
and OTG, a WiFi/Bluetooth combo chip, a micro SD Card reader, 2
controllable buttons, an LVDS port with separated backlight and
capacitive touch panel ports, an audio/microphone jack, a camera CSI
port, 2 sets of 22 GPIOs and an accelerometer.

Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:08 +02:00
Chen-Yu Tsai 3463f32f4c ARM: dts: sun5i: q8-common: Enable USB-based WiFi
The early A13 Q8 tablets all use a Realtek WiFi module connected to
USB1. The module is powered by AXP209's LDO3 at 3.3V.

Move the related settings from sun5i-a13-q8-tablet.dts to
sun5i-q8-common.dtsi, for all q8-based tablets.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:07 +02:00
Luo Yi 04c85ecad3 ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
Add support for the Bananapi M1 Plus A20 development board from
sinovoip.com.cn . This board is nearly a clone of the Lemaker's
Bananapro, but differ with the wlan chipset connection and i2s pinout.
And I also enable the integrated audio codec on default.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:07 +02:00
Hans de Goede 1cdc0aa5aa ARM: dts: sun8i-q8-common: Add support for USB wifi controllers
Some of the sun8i q8 boards have an usb wifi controller, on other
variants this will result in an used usb root-hub, but the best
way to deal with wifi on this boards is to simply let the kernel
auto-detect usb or sdio wifi controllers.

This has been tested on an a23 based q8 tablet with a RTL8188ETV wifi
controller.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:06 +02:00
Chen-Yu Tsai 659757c20d ARM: dts: sun9i: a80-optimus: Order nodes by alphabetical order
Move the mmc nodes above the ohci nodes for proper ordering by name.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:06 +02:00
Chen-Yu Tsai 08ff3e4ef0 ARM: dts: sun9i: cubieboard4: Order nodes by alphabetical order
Move the &pio node below the mmc nodes for proper ordering by name.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:05 +02:00
Boris Brezillon b2a83ad217 ARM: dts: sun7i: Add NFC node to Allwinner A20 SoC
Add NAND Flash controller node definition to the A20 SoC.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:05 +02:00
Boris Brezillon cefd486072 ARM: dts: sun4i: Add NFC node to Allwinner A10 SoC
Add NAND Flash controller node definition to the A10 SoC.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:04 +02:00
Hans de Goede 1199451186 ARM: dts: sun6i: Add pmic / regulator nodes to Mele M9 dts
Add pmic / regulator nodes to Mele M9 dts.

Note both reg_usb1_vbus and reg_dldo4 need to be on for the hub attached
to usb1 to work, and we can list only one usb1_vbus-supply, so dldo4 is
marked as regulator-always-on.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:04 +02:00
Hans de Goede a4038fd095 ARM: dts: sun6i: Add pmic / regulator nodes to Mele A1000G quad dts
Add pmic / regulator nodes to Mele A1000G quad dts.

Note both reg_usb1_vbus and reg_dldo4 need to be on for the hub attached
to usb1 to work, and we can list only one usb1_vbus-supply, so dldo4 is
marked as regulator-always-on.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:03 +02:00
Hans de Goede 3d9e2b66cf ARM: dts: sun6i: The blue led on the Mele M9 is a power led
The blue led on the Mele M9 is wired to light up as soon as the board
has powered (it will be on while the gpio is still in input / floating
mode), also its location on the top-set box clearly signals "power led".

Until now we've been treating this as a generic usr function led, which
means that when you plug power into the top-set box, the power-led lights
and then turns off as soon as the kernel loads, which looks wrong.

This renames the led from m9:blue:usr to m9:blue:pwr and marks
it as default on, fixing this.

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>
2016-07-04 21:18:03 +02:00
Hans de Goede a46579bfd9 ARM: dts: sun6i: The blue led on the Mele A1000G quad is a power led
The blue led on the Mele A1000 is wired to light up as soon as the board
has powered (it will be on while the gpio is still in input / floating
mode), also its location on the top-set box clearly signals "power led".

Until now we've been treating this as a generic usr function led, which
means that when you plug power into the top-set box, the power-led lights
and then turns off as soon as the kernel loads, which looks wrong.

This renames the led from m9:blue:usr to a1000g:blue:pwr (fixing a copy
and paste error in the prefix while at it) and marks it as default on,
fixing this.

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>
2016-07-04 21:18:02 +02:00
Hans de Goede d22d64a506 ARM: dts: sun4i: The blue led on the Mele A1000 is a power led
The blue led on the Mele A1000 is wired to light up as soon as the board
has powered (it will be on while the gpio is still in input / floating
mode), also its location on the top-set box clearly signals "power led".

Until now we've been treating this as a generic usr function led, which
means that when you plug power into the top-set box, the power-led lights
and then turns off as soon as the kernel loads, which looks wrong.

This renames the led from a1000:blue:usr to a1000:blue:pwr and marks
it as default on, fixing this.

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>
2016-07-04 21:18:02 +02:00
Hans de Goede b2face5229 ARM: dts: sun8i-a23-polaroid-mid2809pxe04: Disable ehci0
The Polaroid mid2809pxe04 tablet uses an sdio esp8089 wifi chip, so
ehci0 is not used and should be disabled.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:01 +02:00
Hans de Goede 4e4cb0df58 ARM: dts: sun8i-a23-polaroid-mid2809pxe04: Add full otg support
Now that we've all the necessary bits in place we can enable
full otg support on these tablets.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:01 +02:00
Hans de Goede 77b1be43da ARM: dts: sun8i-a?3-q8-tablet.dts: Add full otg support
Now that we've all the necessary bits in place we can enable
full otg support on these tablets.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:00 +02:00
Hans de Goede 46850c55c6 ARM: dts: axp22x.dtsi: Add reg_drivebus node
Add a node describing the drivebus regulator which is an (optional)
part of the axp221/axp223 pmic. Since this regulator may not be
available at all depending on the board, mark it as disabled by
default.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:18:00 +02:00
Hans de Goede 94efd9da3a ARM: dts: axp22x.dtsi: Add usb_power_supply node
Add a node describing the (optional) usbpower-supply of the
axp221 / axp223 pmic.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:59 +02:00
Hans de Goede c365df39d9 ARM: dts: axp22x.dtsi: Disable axp22x ldo_io# regulators by default
Use of these as regulators conflicts with use of the gpio pins as
gpios, so disabled the ldo_io# regulators by default, this avoids
the regulator core touching them when the pins are used as gpios.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:59 +02:00
Aleksei Mamlin d130f2e7cf ARM: dts: sun7i: Re-order pinctrl nodes alphabetically
No functional change. Re-order sun7i pinctrl nodes alphabetically.

Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:58 +02:00
Aleksei Mamlin 03907ab3db ARM: dts: sun4i: Re-order pinctrl nodes alphabetically
No functional change. Re-order sun4i pinctrl nodes alphabetically.

Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:58 +02:00
Hans de Goede 0162117056 ARM: dts: sun7i: HDMI and the tv-encoder use tcon ch1 not ch0
Update the simplefb nodes for hdmi / tv-encoder out to point to
tcon0_ch1 instead of tcon0_ch0 as tcon clock.

While at it fix the clocks lines being longer than 80 chars.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:57 +02:00
Hans de Goede a8af25e1ea ARM: dts: sun4i: HDMI and the tv-encoder use tcon ch1 not ch0
Update the simplefb nodes for hdmi / tv-encoder out to point to
tcon0_ch1 instead of tcon0_ch0 as tcon clock.

While at it fix the clocks lines being longer than 80 chars.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:56 +02:00
Hans de Goede fc51b632c7 ARM: dts: sunxi: Add a startup delay for fixed regulator enabled phys
It seems that recent kernels have a shorter timeout when scanning for
ethernet phys causing us to hit a timeout on boards where the phy's
regulator gets enabled just before scanning, which leads to non working
ethernet.

A 10ms startup delay seems to be enough to fix it, this commit adds a
20ms startup delay just to be safe.

This has been tested on a sun4i-a10-a1000 and sun5i-a10s-wobo-i5 board,
both of which have non-working ethernet on recent kernels without this
fix.

Cc: stable@vger.kernel.org
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:56 +02:00
Chen-Yu Tsai 1f241993d4 ARM: dts: sun9i: cubieboard4: Drop sunxi-common-regulators.dtsi
sunxi-common-regulators.dtsi provided dummy regulators vcc3v0, vcc3v3,
vcc5v0. 3.0V/3.3V and 5.0V are commonly used voltages in Allwinner
devices. These dummy regulators provide a stand-in when bindings that
require one, but the real regulator is not supported yet.

Since these are no longer needed, we can drop the include file.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:55 +02:00
Chen-Yu Tsai 5f4d0ebe88 ARM: dts: sun9i: a80-optimus: Drop sunxi-common-regulators.dtsi
sunxi-common-regulators.dtsi provided dummy regulators vcc3v0, vcc3v3,
vcc5v0. 3.0V/3.3V and 5.0V are commonly used voltages in Allwinner
devices. These dummy regulators provide a stand-in when bindings that
require one, but the real regulator is not supported yet.

Since these are no longer needed, we can drop the include file by
copying over reg_usb1_vbus.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:55 +02:00
Hans de Goede 2480c018ea ARM: dts: sun5i-a10s-wobo-i5: Enable ldo4 too
It seems that the wifi chip is powered by both ldo3 and ldo4 tied
together and that using only one results in the wifi-chip dropping of
the USB bus sometimes.

Ideally we would have a proper way of modelling this (this is being
worked on), but currently we do not. This is not an issue since we need
to keep these regulators always-on anyways, due to these boards
crashing when ldo3/4 get turned back on after having been turned off.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:55 +02:00
Chen-Yu Tsai 1db9c753f7 ARM: dts: sun8i-h3: Add dts file for Sinovoip BPI-M2+
The BPI-M2+ is an H3 development board. It is a smaller form factor than
the original BPI-M2, with the new H3 SoC.

It has 1GB DRAM, 8GB eMMC, a micro SD card slot, HDMI output, 2 USB
host connector and 1 USB OTG connector, an IR receiver, WiFi+BT based
on Ampak AP6212.

The board also has a 3 pin header for (debug) UART, a 40 pin GPIO header
based on the Raspberry Pi B+, but the peripheral signals are not the
same, and an FPC connector for connecting BPI's camera.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:54 +02:00
Chen-Yu Tsai 966c11a3b5 ARM: dts: sun8i-h3: Add uart1 pinmux setting
Add uart1 pins for 4 pin (RX/TX/RTS/CTS) mode.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:54 +02:00
Chen-Yu Tsai 2bcb2b1b95 ARM: dts: sun8i-h3: move uart0 pins to sort pinmux list in proper order
Move uart0 pins to sort the list of pin settings in alphabetical order.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:53 +02:00
Chen-Yu Tsai 1e1dea7265 ARM: dts: sun9i: cubieboard4: Add AXP809 PMIC device node and regulators
The AXP809 PMIC is the primary PMIC. It provides various supply voltages
for the SoC and other peripherals. The PMIC's interrupt line is connected
to NMI pin of the SoC.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:53 +02:00
Chen-Yu Tsai aa4a27bc81 ARM: dts: sun9i: a80-optimus: Add AXP809 PMIC device node and regulators
The AXP809 PMIC is the primary PMIC. It provides various supply voltages
for the SoC and other peripherals. The PMIC's interrupt line is
connected to NMI pin of the SoC.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:52 +02:00
Chen-Yu Tsai 51189d6484 ARM: dts: sunxi: Add dtsi file for AXP809 PMIC
The AXP809 PMIC is used with the Allwinner A80 SoC, along with
an AXP806 PMIC as a slave.

This patch adds a dtsi file for all the common bindings and default
values unrelated to board design. Currently this is just listing all
the regulator nodes. The regulators are initialized based on their
device node names.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:52 +02:00
Michal Suchanek b976e7be5c ARM: dts: sun5i: add spi2 on A10s Olinuxino Micro
spi2 is available on the UEXT connector

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
[Maxime: Fixed the node order]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:51 +02:00
Michal Suchanek 5c7b745584 ARM: dts: sun5i: a10s: add spi2 pins
Used on A10s Olinuxino.

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:51 +02:00
Chen-Yu Tsai 5313ab7e32 ARM: dts: sun5i: q8-common: Enable display pipeline and LCD display
Q8 form factor A13 tablets have a 7" LCD panel. Unfortunately we
don't know the exact model of the panel. Just pick a panel with
display timings close to what we know.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:50 +02:00
Chen-Yu Tsai dddc8e0b4c ARM: dts: sun5i: q8-common: Enable audio codec
The Q8 tablets use the audio codec to provide audio output via a
headphone jack or a small mono speaker. A GPIO output is used to
control speaker amp.

The tablets may or may not have an internal microphone.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:50 +02:00
Chen-Yu Tsai 815c159385 ARM: dts: sun5i: q8-common: Enable USB power supply
On the A13 Q8 tablets, the PMIC's USB power supply (VBUS) is connected
to the external OTG port. This can be used to provide power and OTG VBUS
sensing.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:49 +02:00
Chen-Yu Tsai 90041d0758 ARM: dts: axp209: Disable ldo5 by default
The output pin of LDO is also a GPIO pin, and the on/off settings of the
regulator are actually pinmux settings.

Disable it by default so it doesn't conflict with GPIO usage.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:49 +02:00
Maxime Ripard 2cbc7295cd ARM: sun5i: Move display blocks to A13
Most of the display engine is shared between the R8 and the A13. Move the
common parts to the Á13 DTSI.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:48 +02:00
Maxime Ripard 0090dc5f6c ARM: sun5i: a13: Add LCD pins
The RGB bus can be used in several configurations, one of which being the
RGB666.

Add a pinctrl group for that case.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:48 +02:00
Priit Laes f1afc13792 ARM: sun7i: A20: Add display and TCON clocks
Enable the display and TCON clocks that are needed to drive the display
engine, tcon and TV encoders.

Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:45 +02:00
Priit Laes f5e1648cea ARM: sun4i: A10: Add display and TCON clocks
Enable the display and TCON clocks that are needed to drive the display
engine, tcon and TV encoders.

Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-07-04 21:17:01 +02:00
Greg Kroah-Hartman c318a821b9 Merge 4.7-rc6 into usb-next
We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2016-07-04 08:19:21 -07:00
Tero Kristo 183e2077d0 ARM: AM33xx: fix module_wait_ready without clkctrl register
If the module has no clkctrl register defined, module_wait_ready should
not try to access this. This can potentially cause an illegal register
access, and result in bad idle reporting also.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-07-04 07:15:47 -07:00
Tero Kristo 1d9a542565 ARM: OMAP2+: clockdomain: add usecounting support to autoidle APIs
The previous implementation was racy in many locations, where the current
status of the clockdomain was read out, some operations were executed,
and the previous status info was used afterwards to decide next state
for the clockdomain. Instead, fix the implementation of the allow_idle /
deny_idle APIs to properly have usecounting support. This allows clean
handling internally within the clockdomain core, and simplifies the
usage also within hwmod.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-07-04 07:15:38 -07:00
Tero Kristo e98580e880 ARM: OMAP2+: timer: change order of hwmod data handling
With the introduction of hwmod module clocks, the name of the hwmod
main clk may not be available before hwmod setup, as hwmod setup
may lookup the main clock dynamically based on the hwmod name.
Thus, change the order of hwmod setup and main clock handling for
the timer code, to make sure the main clock is going to be
available.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-07-04 07:15:28 -07:00
Tero Kristo 9fabc1a26e ARM: OMAP2+: hwmod: fetch main_clk based on hwmod name
With the transition to hwmod module clocks, all hwmods will have
their main clocks named <hwmod_name>_mod_ck. Use this info to
fetch main_clk, and use it if found.

Also, if a main_clk is found based on the hwmod name, disable
the direct PRCM modulemode access from hwmod.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-07-04 07:15:22 -07:00
Wenyou Yang b8bca7eaef ARM: dts: at91: sama5d2_xplained: Update the pmic node
Due to introducing the new driver - ACT8945A MFD drive,
change the pmic device node to align with the ACT8945A
regulator and charger drivers.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2016-07-04 15:59:46 +02:00
Olivier Schonken fcac40c94d ARM: dts: at91: sama5d2: add PMU node
Add node to support SAMA5D2 Performance Monitor Unit.

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2016-07-04 15:59:46 +02:00
Raashid Muhammed ee7657b030 ARM: dts: at91: sam9_l9260: Modify information in LED nodes.
Add power led node and rename status led node.

Signed-off-by: Raashid Muhammed <raashidmuhammed@zilogic.com>
Reviewed-by: Vijay Kumar B. <vijaykumar@bravegnu.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2016-07-04 15:59:45 +02:00
Raashid Muhammed ba5c30ac21 ARM: dts: at91: sam9_l9260: Add pinctrl information to ethernet node.
Add missing pinctrl information to ethernet node.

Signed-off-by: Raashid Muhammed <raashidmuhammed@zilogic.com>
Reviewed-by: Vijay Kumar B. <vijaykumar@bravegnu.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2016-07-04 15:59:44 +02:00
Nicolas Ferre 1dd6e8631e ARM: dts: at91: add at91sam9260ek board DT
Add Device Tree source file for at91sam9260ek board. This official Atmel
Evaluation Kit is designed around a SoC based on a ARM 926 core the
at91sam9260.

The board is also added to the dts Makefile.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2016-07-04 15:59:44 +02:00
Alexandre Belloni 526b87fdba ARM: multi_v7_defconfig: add ACT8945A
ACT8945A is the PMIC present on the sama5d2 Xplained.

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2016-07-04 10:45:05 +02:00
Tero Kristo 59dcfc48eb ARM: OMAP2+: omap_device: create clock alias purely from DT data
This avoids the need to add most of the clock aliases under
drivers/clk/ti/clk-xyz.c files.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-07-03 23:42:53 -07:00
Tony Lindgren b3bf289c1c ARM: OMAP2+: Fix build with CONFIG_SMP and CONFIG_PM is not set
I found one more make randconfig build error with the recent
SMP kexec changes. We need the mpuss now always available early.

Fixes: 0573b957fc ("ARM: OMAP4+: Prevent CPU1 related hang
with kexec")
Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-07-03 23:29:45 -07:00
Marc Zyngier 6c41a413fd arm/arm64: Get rid of KERN_TO_HYP
We have both KERN_TO_HYP and kern_hyp_va, which do the exact same
thing. Let's standardize on the latter.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier eac378a9ce arm/arm64: KVM: Check that IDMAP doesn't intersect with VA range
This is more of a safety measure than anything else: If we end-up
with an idmap page that intersect with the range picked for the
the HYP VA space, abort the KVM setup, as it is unsafe to go
further.

I cannot imagine it happening on 64bit (we have a mechanism to
work around it), but could potentially occur on a 32bit system with
the kernel loaded high enough in memory so that in conflicts with
the kernel VA.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier f7bec68d2f arm/arm64: KVM: Prune unused #defines
We can now remove a number of dead #defines, thanks to the trampoline
code being gone.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier e537ecd7ef arm: KVM: Allow hyp teardown
So far, KVM was getting in the way of kexec on 32bit (and the arm64
kexec hackers couldn't be bothered to fix it on 32bit...).

With simpler page tables, tearing KVM down becomes very easy, so
let's just do it.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier cd602a37e8 arm: KVM: Simplify HYP init
Just like for arm64, we can now make the HYP setup a lot simpler,
and we can now initialise it in one go (instead of the two
phases we currently have).

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier 26781f9ce1 arm/arm64: KVM: Kill free_boot_hyp_pgd
There is no way to free the boot PGD, because it doesn't exist
anymore as a standalone entity.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier 12fda8123d arm/arm64: KVM: Drop boot_pgd
Since we now only have one set of page tables, the concept of
boot_pgd is useless and can be removed. We still keep it as
an element of the "extended idmap" thing.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier 0535a3e2b2 arm/arm64: KVM: Always have merged page tables
We're in a position where we can now always have "merged" page
tables, where both the runtime mapping and the idmap coexist.

This results in some code being removed, but there is more to come.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier 1df3e2347a arm/arm64: KVM: Export __hyp_text_start/end symbols
Declare the __hyp_text_start/end symbols in asm/virt.h so that
they can be reused without having to declare them locally.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier 3f0f8830d4 arm/arm64: KVM: Remove hyp_kern_va helper
hyp_kern_va is now completely unused, so let's remove it entirely.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:41:27 +02:00
Marc Zyngier 50926d82fa KVM: arm/arm64: The GIC is dead, long live the GIC
I don't think any single piece of the KVM/ARM code ever generated
as much hatred as the GIC emulation.

It was written by someone who had zero experience in modeling
hardware (me), was riddled with design flaws, should have been
scrapped and rewritten from scratch long before having a remote
chance of reaching mainline, and yet we supported it for a good
three years. No need to mention the names of those who suffered,
the git log is singing their praises.

Thankfully, we now have a much more maintainable implementation,
and we can safely put the grumpy old GIC to rest.

Fellow hackers, please raise your glass in memory of the GIC:

	The GIC is dead, long live the GIC!

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2016-07-03 23:09:37 +02:00
Matija Glavinic Pecotic f6492164ec ARM: 8577/1: Fix Cortex-A15 798181 errata initialization
Current errata initialization doesn't take properly revision and REVIDR
into account. Depending on the core revision, revidr bits should not be
taken into account. Errata misleadingly declares r3p3 to be error-free,
but this is not the case. Include rp3p3 in errata initialization.

Here are possible fixes defined in revidr register for r2 and r3 [1,2]:

r0p0-r2p1: No fixes applied

r2p2,r2p3:

REVIDR[4]: 798181 Moving a virtual page that is being accessed by
    an active process can lead to unexpected behavior
REVIDR[9]: Not defined

r2p4,r3p0,r3p1,r3p2:

REVIDR[4]: 798181 Moving a virtual page that is being accessed by
   an active process can lead to unexpected behavior
REVIDR[9]: 798181 Moving a virtual page that is being accessed by
   an active process can lead to unexpected behavior
   - This is an update to a previously released ECO.

r3p3:

REVIDR[4]: Reserved
REVIDR[9]: 798181 Moving a virtual page that is being accessed by
   an active process can lead to unexpected behavior
   - This is an update to a previously released ECO.

And here is proposed handling from the same document:

* In r3p2 and earlier versions with REVIDR[4]= 0,the full workaround is
  required.
* In r3p2 and earlier versions with REVIDR[4]=1, REVIDR[9]=0, only the
  portion of the workaround up to the end of step 6 is required.
* In r3p2 and earlier versions with REVIDR[4]=1, REVIDR[9]=1, no
  workaround is required.
* In r3p3, if REVIDR[9]=0, only the portion of the workaround up
  to the end of step 6 is required.
* In r3p3, if REVIDR[9]=1, no workaround is required.

These imply following:

REVIDR[9] set -> No WA
REVIDR[4] set, REVIDR[9] cleared -> Partial WA
Both cleared -> Full WA

Where certain bits should and should not be taken into account
depending on whether they are defined for the revision.

Although not explicitly mentioned in the errata note, REVIDR[9] set,
with REVIDR[4] cleared is valid combination which requires no WA. This
is confirmed by ARM support and errata will be updated.

[1] ARM CortexTM-A15 MPCore - NEON
    Product revision r3
    Software Developers Errata Notice
    ARM-EPM-028093 v20.0 Released

[2] ARM CortexTM-A15 MPCore - NEON
    Product Revision r2
    Software Developers Errata Notice
    ARM-EPM-028090 v19.3 Released

Signed-off-by: Matija Glavinic Pecotic <matija.glavinic-pecotic.ext@nokia.com>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2016-07-02 12:13:03 +01:00
Arnd Bergmann dd665be0e2 ARM: 8584/1: floppy: avoid gcc-6 warning
gcc-6.0 warns about comparisons between two identical expressions,
which is what we get in the floppy driver when writing to the FD_DOR
register:

drivers/block/floppy.c: In function 'set_dor':
drivers/block/floppy.c:810:44: error: self-comparison always evaluates to true [-Werror=tautological-compare]
   fd_outb(newdor, FD_DOR);

It would be nice to use a static inline function instead of the
macro, to avoid the warning, but we cannot do that because the
FD_DOR definition is incomplete at this point.

Adding a cast to (u32) is a harmless way to shut up the warning,
just not very nice.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2016-07-02 11:02:13 +01:00
Kees Cook 14c4a533e0 ARM: 8583/1: mm: fix location of _etext
The _etext position is defined to be the end of the kernel text code,
and should not include any part of the data segments. This interferes
with things that might check memory ranges and expect executable code
up to _etext. Just to be conservative, leave the kernel resource as
it was, using __init_begin instead of _etext as the end mark.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2016-07-02 11:01:30 +01:00
Masahiro Yamada 520319de0c ARM: 8582/1: remove unused CONFIG_ARCH_HAS_BARRIERS
Since commit 2b749cb3a5 ("ARM: realview: remove private barrier
implementation"), this config is not used by any platform.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2016-07-02 11:01:08 +01:00
Wenyou Yang 2e1a705a84 ARM: at91/defconfig: Add ACT8945A driver
Include ACT8945A mfd, regulator and power drivers.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2016-07-01 21:06:02 +02:00
Paolo Bonzini 6edaa5307f KVM: remove kvm_guest_enter/exit wrappers
Use the functions from context_tracking.h directly.

Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-07-01 11:03:21 +02:00
Paolo Bonzini f5c5c225fc KVM/ARM Fixes for v4.7-rc6:
Fixes a build issue without CONFIG_ARM_PMU and plugs pid leak on arm/arm64.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXdSB4AAoJEEtpOizt6ddyg10H/1lQnxqF8K+NOIahMMvDs26N
 efujHsGlwHjCQTjThb+BC4qfA2tvcbZ+0UIV0mgvk750llVlrAz83aw83Wvgll9L
 hDIwE55yePR9zFeOtTnwLOSIhYyeozSC58RB1OR8oQ1IzHIuokFx/3Iylbk7UjY0
 y5LAxdNRWUK7IsFrnC2u8kfYaT+6xxV40KFE23NlCy8drHesrbEPOzDwRpX51u2z
 o/68icxpU6TakmTZQwM5RvpgoTn1uEGneSgLSYbVlnHtkA1tr97+fOTFlzmFJyQj
 oM7Mk7d9hRSr77dkXKwsDIGVcd0kRvzax2taGHmrrcPgDpkl0PHAfkseWKbb3LI=
 =yPs9
 -----END PGP SIGNATURE-----

Merge tag 'kvm-arm-for-v4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM Fixes for v4.7-rc6:

Fixes a build issue without CONFIG_ARM_PMU and plugs pid leak on arm/arm64.
2016-06-30 17:11:20 +02:00
Sergei Shtylyov 8fd763c75c ARM: dts: r8a7792: add SMP support
Add the device tree nodes for the Advanced Power Management Unit (APMU)
and the second Cortex-A15 CPU core.
Use the "enable-method" prop  to point out that the APMU should be used
for the SMP support.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-30 14:26:14 +02:00
Arnd Bergmann b44439e429 ARM: mvebu: compile pm code conditionally
A cleanup to include the headers correctly caused another build problem:

arch/arm/mach-mvebu/kirkwood-pm.c:70:13: error: redefinition of 'kirkwood_pm_init'
arch/arm/mach-mvebu/kirkwood-pm.h:23:20: note: previous definition of 'kirkwood_pm_init' was here

The underlying issue is that kirkwood-pm.o is not actually meant to be
used when CONFIG_PM is disabled, so we should also leave it out of the
Makefile.

The same seems to be true for the PM code in MACH_MVEBU_V7, and I'm
treating it the same way here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: d705c1a66e ("ARM: Kirkwood: fix kirkwood_pm_init() declaration/type")
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2016-06-30 13:47:52 +02:00
David S. Miller ee58b57100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-06-30 05:03:36 -04:00
Ivaylo Dimitrov 79cdad3635 ir-rx51: use hrtimer instead of dmtimer
Drop dmtimer usage for pulse timer in favor of hrtimer. That allows
removing PWM dmitimer platform data usage.

Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-06-29 21:54:35 -07:00
Ivaylo Dimitrov b540617698 ir-rx51: add DT support to driver
With the upcoming removal of legacy boot, lets add support to one of the
last N900 drivers remaining without it. As the driver still uses omap
dmtimer, add auxdata as well.

Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-06-29 21:54:23 -07:00
Ivaylo Dimitrov 3fdd1526e6 ir-rx51: use PWM framework instead of OMAP dmtimer
Convert driver to use PWM framework instead of calling dmtimer functions
directly for PWM timer. Remove paragraph about writing to the Free Software
Foundation's mailing address while at it.

Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2016-06-29 21:54:13 -07:00
Magnus Damm f89a51700d ARM: shmobile: r8a7791: Prioritize DT APMU support
Adjust the r8a7791 SoC support code to not configure any non-DT SMP code
in case the DT-based enable-method has been installed already.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-29 14:43:40 +02:00