Commit graph

547,770 commits

Author SHA1 Message Date
Will Deacon
a82e62382f arm64: atomics: tidy up common atomic{,64}_* macros
The common (i.e. identical for ll/sc and lse) atomic macros in atomic.h
are needlessley different for atomic_t and atomic64_t.

This patch tidies up the definitions to make them consistent across the
two atomic types and factors out common code such as the add_unless
implementation based on cmpxchg.

Reviewed-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:53 +01:00
Will Deacon
4e39715f4b arm64: cmpxchg: avoid memory barrier on comparison failure
cmpxchg doesn't require memory barrier semantics when the value
comparison fails, so make the barrier conditional on success.

Reviewed-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:52 +01:00
Will Deacon
0bc671d3f4 arm64: cmpxchg: avoid "cc" clobber in ll/sc routines
We can perform the cmpxchg comparison using eor and cbnz which avoids
the "cc" clobber for the ll/sc case and consequently for the LSE case
where we may have to fall-back on the ll/sc code at runtime.

Reviewed-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:52 +01:00
Will Deacon
e9a4b79565 arm64: cmpxchg_dbl: patch in lse instructions when supported by the CPU
On CPUs which support the LSE atomic instructions introduced in ARMv8.1,
it makes sense to use them in preference to ll/sc sequences.

This patch introduces runtime patching of our cmpxchg_double primitives
so that the LSE casp instruction is used instead.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:52 +01:00
Will Deacon
c342f78217 arm64: cmpxchg: patch in lse instructions when supported by the CPU
On CPUs which support the LSE atomic instructions introduced in ARMv8.1,
it makes sense to use them in preference to ll/sc sequences.

This patch introduces runtime patching of our cmpxchg primitives so that
the LSE cas instruction is used instead.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:51 +01:00
Will Deacon
c8366ba0fb arm64: xchg: patch in lse instructions when supported by the CPU
On CPUs which support the LSE atomic instructions introduced in ARMv8.1,
it makes sense to use them in preference to ll/sc sequences.

This patch introduces runtime patching of our xchg primitives so that
the LSE swp instruction (yes, you read right!) is used instead.

Reviewed-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:51 +01:00
Will Deacon
084f903727 arm64: bitops: patch in lse instructions when supported by the CPU
On CPUs which support the LSE atomic instructions introduced in ARMv8.1,
it makes sense to use them in preference to ll/sc sequences.

This patch introduces runtime patching of our bitops functions so that
LSE atomic instructions are used instead.

Reviewed-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:51 +01:00
Will Deacon
81bb5c6420 arm64: locks: patch in lse instructions when supported by the CPU
On CPUs which support the LSE atomic instructions introduced in ARMv8.1,
it makes sense to use them in preference to ll/sc sequences.

This patch introduces runtime patching of our locking functions so that
LSE atomic instructions are used for spinlocks and rwlocks.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:51 +01:00
Will Deacon
c09d6a04d1 arm64: atomics: patch in lse instructions when supported by the CPU
On CPUs which support the LSE atomic instructions introduced in ARMv8.1,
it makes sense to use them in preference to ll/sc sequences.

This patch introduces runtime patching of atomic_t and atomic64_t
routines so that the call-site for the out-of-line ll/sc sequences is
patched with an LSE atomic instruction when we detect that
the CPU supports it.

If binutils is not recent enough to assemble the LSE instructions, then
the ll/sc sequences are inlined as though CONFIG_ARM64_LSE_ATOMICS=n.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:50 +01:00
Will Deacon
c0385b24af arm64: introduce CONFIG_ARM64_LSE_ATOMICS as fallback to ll/sc atomics
In order to patch in the new atomic instructions at runtime, we need to
generate wrappers around the out-of-line exclusive load/store atomics.

This patch adds a new Kconfig option, CONFIG_ARM64_LSE_ATOMICS. which
causes our atomic functions to branch to the out-of-line ll/sc
implementations. To avoid the register spill overhead of the PCS, the
out-of-line functions are compiled with specific compiler flags to
force out-of-line save/restore of any registers that are usually
caller-saved.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 15:28:50 +01:00
Maarten Lankhorst
8c10342cb4 drm/atomic: Update legacy DPMS state during modesets, v3.
This is required for DPMS to work correctly, during a modeset
the DPMS property should be turned off, unless the state is
crtc is made active in which case it should be set to DPMS on.

Changes since v1:
- Set DPMS to off when a connector is removed from a crtc too.
- Update the legacy dpms property too.
- Add an exception for the legacy dpms paths, it updates its own state.
Changes since v2:
- Do not preserve dpms property.

Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-07-27 16:23:29 +02:00
Maarten Lankhorst
9a69a9ac20 drm: Make the connector dpms callback return a value, v2.
This is required to properly handle failing dpms calls.
When making a wait in i915 interruptible, I've noticed
that the dpms sequence could fail with -ERESTARTSYS because
it was waiting interruptibly for flips. So from now on
allow drivers to fail in their connector dpms callback.

Encoder and crtc dpms callbacks are unaffected.

Changes since v1:
- Update kerneldoc for the drm helper functions.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
[danvet: Resolve conflicts due to different merge order.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-07-27 16:23:28 +02:00
Maarten Lankhorst
613d2b2721 drm/atomic: pass old crtc state to atomic_begin/flush.
In intel it's useful to keep track of some state changes with old
crtc state vs new state, for example to disable initial planes or
when a modeset's prevented during fastboot.

Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
[danvet: squash in fixup for exynos provided by Maarten.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-07-27 16:23:22 +02:00
Vaishali Thakkar
71a5a50843 power_supply: bq24735: Convert to using managed resources
Use managed resource functions like devm_kasprintf and
devm_power_supply_register in bq24735_charger_probe. To be
compatible with the change, replace various gotos by direct
returns and drop unneeded labels.

Also, remove bq24735_charger_remove as it is now redundant.

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
2015-07-27 16:09:53 +02:00
Will Deacon
d964b7229e arm64: alternatives: add cpu feature for lse atomics
Add a CPU feature for the LSE atomic instructions, so that they can be
patched in at runtime when we detect that they are supported.

Reviewed-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 14:34:39 +01:00
Will Deacon
40a1db2434 arm64: elf: advertise 8.1 atomic instructions as new hwcap
The ARM v8.1 architecture introduces new atomic instructions to the A64
instruction set for things like cmpxchg, so advertise their availability
to userspace using a hwcap.

Reviewed-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 14:34:39 +01:00
Will Deacon
c275f76bb4 arm64: atomics: move ll/sc atomics into separate header file
In preparation for the Large System Extension (LSE) atomic instructions
introduced by ARM v8.1, move the current exclusive load/store (LL/SC)
atomics into their own header file.

Reviewed-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 14:34:39 +01:00
Jun Nie
3309aa4941 power/reset: zx: Remove unnecessary include file
Including ARM related header file cause build failure
in i386 build because COMILE_TEST also involve building
zx driver. Remove the unnecessary include file.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
2015-07-27 15:33:30 +02:00
Will Deacon
144e9697a9 arm64: cpufeature.h: add missing #include of kernel.h
cpufeature.h makes use of DECLARE_BITMAP, which in turn relies on the
BITS_TO_LONGS and DIV_ROUND_UP macros.

This patch includes kernel.h in cpufeature.h to prevent all users having
to do the same thing.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 14:26:34 +01:00
Will Deacon
9511ca19da arm64: rwlocks: don't fail trylock purely due to contention
STXR can fail for a number of reasons, so don't fail an rwlock trylock
operation simply because the STXR reported failure.

I'm not aware of any issues with the current code, but this makes it
consistent with spin_trylock and also other architectures (e.g. arch/arm).

Reported-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-07-27 14:26:34 +01:00
Krzysztof Kozlowski
599ad5ac9a of: Drop owner assignment from platform and i2c driver
platform_driver and i2c_driver do not need to set an owner because core
will set it.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Rob Herring <robh@kernel.org>
2015-07-27 08:24:39 -05:00
Alban Bedel
3b6e644e65 DEVICETREE: Misc fix for the AR7100 SPI controller binding
Fix the clocks property documentation and use lower case for
hex values in the example.

Signed-off-by: Alban Bedel <albeu@free.fr>
Signed-off-by: Rob Herring <robh@kernel.org>
2015-07-27 08:24:39 -05:00
Tomeu Vizoso
35068ce8cb of: constify drv arg of of_driver_match_device stub
With this change the stub has the same signature as the actual function,
preventing this compiler warning when building without CONFIG_OF:

   drivers/base/property.c: In function 'fwnode_driver_match_device':
>> drivers/base/property.c:608:38: warning: passing argument 2 of 'of_driver_match_device' discards 'const' qualifier from pointer target type
      return of_driver_match_device(dev, drv);
                                         ^
   In file included from drivers/base/property.c:18:0:
   include/linux/of_device.h:61:19: note: expected 'struct device_driver *' but argument is of type 'const struct device_driver *'
    static inline int of_driver_match_device(struct device *dev,
                      ^

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Rob Herring <robh@kernel.org>
2015-07-27 08:23:27 -05:00
Will Deacon
fc9eb93cd4 Merge branch 'locking/arch-atomic' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into aarch64/for-next/core
Merge in PeterZ's logical atomic ops so that we can implement them in
our subsequent LSE atomics.
2015-07-27 14:21:15 +01:00
Rob Herring
39da809e86 of: add HAS_IOMEM depends to OF_ADDRESS
On UML builds, of_address.c fails to compile:

../drivers/of/address.c:873:2: error: implicit declaration of function ‘ioremap’ [-Werror=implicit-function-declaration]

This is due to CONFIG_OF now being user selectable. Add a dependency on
HAS_IOMEM to OF_ADDRESS in order to fix this.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Grant Likely <grant.likely@linaro.org>
2015-07-27 08:21:04 -05:00
Linus Walleij
802bb9b67d pinctrl: nomadik: depromote GPIO to subsystem_init()
We no longer have to do GPIO initialization before the
pinctrl initialization, instead we can initialize the pinctrl
portions of the driver first and then the GPIO. Thus we can
move GPIO initialization to a subsystem_initcall(), but
not yet to a device_initcall().

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 15:12:29 +02:00
Linus Walleij
ee04139d91 pinctrl/ARM: move GPIO and pinctrl deps to device tree
This gets the GPIO ranges out of the driver and into the device
tree where they belong. Standard DT bindings already exist for
this. Since no systems with this are deployed we can just augment
all device trees and the drivers at the same time and simplify
the world.

This also defines the array of GPIO chips related to the pin
controller.

Cc: arm@kernel.org
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 15:04:40 +02:00
Rabin Vincent
d705073cda gpio: etraxfs: add support for ARTPEC-3
Add support for the GIO block in the ARTPEC-3 SoC.  The basic
functionality is essentialy the same as the version in the ETRAX FS,
except for a different set of ports, including a read-only port.

Cc: devicetree@vger.kernel.org
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 15:02:23 +02:00
Rabin Vincent
91492a44b9 gpio: generic: support input-only chips
Allow chips to indicates that they are input-only and thus cannot set
the output value.  This will be used by the gpio-etraxfs driver.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 15:01:05 +02:00
Rabin Vincent
1296fba1a3 gpio: etraxfs: fix set register flag
BGPIO_F_UNREADABLE_REG_SET is incorrect, since the set register _is_
readable.  What's really required is BGPIO_F_READ_OUTPUT_REG_SET:
reading the set register reads the set output value.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 14:59:30 +02:00
Maxime Ripard
d8323c6b03 pinctrl: sunxi: Add custom irq_domain_ops
The current interrupt parsing code was working by accident, because the
default was actually parsing the first node of interrupts.

While that was mostly working (and the flags were actually ignored), this
binding has never been documented, and doesn't work with SoCs that have
multiple interrupt banks anyway.

Add a proper interrupt xlate function, that uses the same description than
the GPIOs (<bank> <pin> <flags>), that will make things less confusing.

The EINT number will still be used as the hwirq number, but won't be
exposed through the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 14:56:30 +02:00
Masahiro Yamada
a3ff83d205 MAINTAINERS: add entries for UniPhier device trees and drivers
This clarifies the location of the files maintained by me.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:55:21 +02:00
Masahiro Yamada
622372309f ARM: dts: UniPhier: add UART and USB pinmux nodes
The DT nodes in uniphier-pinctrl.dtsi provide the default pinctrl
settings that would be suitable for most boards.  You can still
override them in your board DTS file if necessary.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:54:47 +02:00
Masahiro Yamada
55d945b249 ARM: dts: UniPhier: add pinctrl device nodes
Add the pinctrol device nodes for UniPhier PH1-LD4, PH1-Pro4,
and PH1-sLD8.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:54:45 +02:00
Ulrich Hecht
8cd14702be gpio: rcar: Add r8a7795 (R-Car H3) support
R-Car Gen3's GPIO blocks are identical to Gen2's in every respect.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 14:51:40 +02:00
Olof Johansson
a9a7f260e0 This is the pxa changes for v4.3 cycle.
There is mostly one evolution on the dma side, to enable cooperation
 of the legacy pxa DMA API, and the new dmaengine API.
 Once all drivers using DMA are converted, the legacy DMA API should
 be removed.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVqigoAAoJEAP2et0duMsSDNQP/idE619mjen6EJkKXFAB96HU
 /c3/i9ySIF6mMWu95BFIiyRkQJJ4mFYl9SzwJui/9T00pE02531Klysz5TT2D5Ic
 k2YRfA54h1SkUQay2BLefot0MmLwjV31nojXApap/PUYNMhUQHHzyr7XEE4t0Dxu
 uRbmlrSbURFHfMyea0DUQYlMds92YgqpQmj9BGw2zgvU3PpFkg65Y0W70yJecaHQ
 JgXX3UhvRd7HgRN0xsoJQGvtEF3WGSuEbgWqCYCBw5SEZSqGVwu8fpSoGlwId7yY
 ZVdNNUv5ZSrqYP7bH8321jPiUbBUqVM3B4CPYWm2IswAh9KJmG/Mrhh/z3N6c4PJ
 4yq7MathipykILU+KjfsHicZy00NG/OcF04iI42DgvAolBKAGSC3RNgsrMmgi25r
 l73vj79/elsGm76Pm4x6twF4mlhpqCLHwkIDFJn7/P7y0mcscszFSKTSfXK1YgFM
 Q0EKLTG6IQZfDwUyO1kY7ZsRF77amSbWBBEB4mJIO7qB79DPi6zHT3CgHTaKCpMZ
 E3JA81RtZpadqvu7QDd8Gs00nUF9wgQR1DlS0iwNHCVldXf6G8CNqaMAXfAsRmmo
 CPK8xoAVxDHUVcuowuYSWRyQaCopIBcC36P9gOEt96zuFA+K3ZHm8cjoz46/hwei
 AiL9MXAWZwUQcYRSbTCC
 =sHkc
 -----END PGP SIGNATURE-----

Merge tag 'pxa-for-4.3-v2' of https://github.com/rjarzmik/linux into next/soc

This is the pxa changes for v4.3 cycle.

There is mostly one evolution on the dma side, to enable cooperation
of the legacy pxa DMA API, and the new dmaengine API.
Once all drivers using DMA are converted, the legacy DMA API should
be removed.

* tag 'pxa-for-4.3-v2' of https://github.com/rjarzmik/linux:
  ARM: pxa: Use setup_timer
  ARM: pxa: Use module_platform_driver
  ARM: pxa: transition to dmaengine phase 1

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:49:24 +02:00
Sebastian Andrzej Siewior
4dbada2be4 gpio: omap: use raw locks for locking
This patch converts gpio_bank.lock from a spin_lock into a
raw_spin_lock. The call path is to access this lock is always under a
raw_spin_lock, for instance
- __setup_irq() holds &desc->lock with irq off
  + __irq_set_trigger()
   + omap_gpio_irq_type()

- handle_level_irq() (runs with irqs off therefore raw locks)
  + mask_ack_irq()
   + omap_gpio_mask_irq()

This fixes the obvious backtrace on -RT. However the locking vs context
is not and this is not limited to -RT:
- omap_gpio_irq_type() is called with IRQ off and has an conditional
  call to pm_runtime_get_sync() which may sleep. Either it may happen or
  it may not happen but pm_runtime_get_sync() should not be called with
  irqs off.

- omap_gpio_debounce() is holding the lock with IRQs off.
  + omap2_set_gpio_debounce()
   + clk_prepare_enable()
    + clk_prepare() this one might sleep.
  The number of users of gpiod_set_debounce() / gpio_set_debounce()
  looks low but still this is not good.

Acked-by: Javier Martinez Canillas <javier@dowhile0.org>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 14:49:00 +02:00
Olof Johansson
743ca9e9f8 omap dts changes for minimal dm814x support for v4.3 merge window.
These changes make dm814x boot and adds minimal board support for
 dm814x-evm and hp t410.
 
 Note that to boot these depend on omap-for-v4.3/soc-signed branch,
 but as dm814x support is currently broken, these can be merged
 separately with the other dts changes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVsdAPAAoJEBvUPslcq6VzYCcP/iKG90+TAEz/r4Si5OrK+N2B
 lszU2Ztm8I8SMdgfnlXqkllddFBCaCeQvD0yDFQxR2cF7v85LQ94BXhrfiuWAkgf
 Rl8yFginoDhB8nrI/ftU9RRP3Fw8XVI6+dKXTLfm81A+4ZwCZkXJqXqZ/w7bx/cm
 O3NdSXn96kwZUTC/6bSOlz8T/Y4vb6SGV4Ac38SraHpjgGtlSH7MQbwvKo90ubet
 RjMdbmwuWMGOyYQHf1DQgZ0mBPZEVefOFV9NVLFBfbVIVCMlAN8JF6v3AWzB8U8I
 e5a71p0C72Xc8z6E/byEX0NJNAoQ5d6VKwoPRz5WdpHcM/1U0Ep5PKk3f0bqs5WY
 H2XQeB1wR9avQNyXlfrIPpZ7z8gJxJeSbaQRYTtwbBAzXK9KADgnBjejiLUIRCKT
 tfl+Yw6Y841KGvIyccTcW4ZhlkDdArLlTmf+4YtcOtkXKYAyiJYWQ2i98TaiRa3m
 14G/wiUeNlb2VKrS2VrYd8+8aocFwJRrC4JBNheSKckmMpS64VposgTTTkIj2pYd
 cjafc0GZaXhi+SrmQbn4j7hRnXeMwcnHQ3qpMxsE46hap21Toe9IpniJqXRseibl
 ibDV6ZABHvVbnJaHgPz7Y8qJQFEZ9o5u6HgOeRgG9Byoz8e5geRHSbR6wYh+np03
 Y2YRo/lloq8koKMEEEuE
 =TVm+
 -----END PGP SIGNATURE-----

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

omap dts changes for minimal dm814x support for v4.3 merge window.

These changes make dm814x boot and adds minimal board support for
dm814x-evm and hp t410.

Note that to boot these depend on omap-for-v4.3/soc-signed branch,
but as dm814x support is currently broken, these can be merged
separately with the other dts changes.

* tag 'omap-for-v4.3/dt-dm814x' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Add custom abort handler for t410
  ARM: dts: Add minimal support for HP T410
  ARM: dts: Add minimal dts support for dm8148-evm
  ARM: dts: Add minimal clocks for dm814x
  ARM: dts: Add minimal dm814x support

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:48:07 +02:00
Masahiro Yamada
e324957096 pinctrl: use dev_err() to show message in pinmux_func_name_to_selector()
Use dev_err() rather than pr_err() to display the error message.

pinctrl_dev_get_name(pctldev) is no longer necessary because
dev_err() shows which device the message is related to.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 14:44:33 +02:00
Masahiro Yamada
2b38ca6d1a pinctrl: use dev_err() to show message in pinctrl_register_one_pin()
Use dev_err() rather than pr_err() to display the error message.
(Besides, dev_err() is already used 7 lines below in this function.)

Also, drop the redundant information "on %s" because dev_err() shows
which device the message is related to.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 14:43:43 +02:00
Takashi Iwai
527c465a3c Merge branch 'for-linus' into for-next
... to make easier developing HDA ext code.
2015-07-27 14:43:29 +02:00
Benjamin Tissoires
ba53219809 HID: core: do not reject devices when they declare too many usages
Some device present proprietary collections with a usage min of 0x00 and
a usage max of 0xffff. hid-core currently reject them while most of the
time this is harmless.
Let's ignore the exceeding usages, and hope for the best.

Reported-by: Simon Wörner <mail@simon-woerner.de>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
2015-07-27 14:41:30 +02:00
Masahiro Yamada
d1aceb80c6 gpio: remove unneeded initializer in gpiochip_add_to_list()
This variable is used as an iterator and initialized in the
list_for_each() loop.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-07-27 14:40:33 +02:00
Olof Johansson
d7018b1558 SoC changes for omaps for v4.3 merge window:
- Clean-up omap4_local_timer_init to drop deal legacy code
 
 - Provide proper IO map table for dra7
 
 - Clean-up IOMMU layer init code as it now uses IOMMU framework
 
 - A series of changes to fix up dm814x support that's been in a broken
   half-merged state for quite some time
 
 - A series of PRCM and hwmod changes via Paul Walmsley <paul@pwsan.com>:
 
   - I/O wakeup support for AM43xx
   - register lock and unlock support to the hwmod code (needed for the RTC
     IP blocks on some chips)
   - several fixes for sparse warnings and an unnecessary null pointer test
   - a DRA7xx clockdomain configuration workaround, to deal with some hardware
     bugs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVsc29AAoJEBvUPslcq6VzLNkQALzsnwliV3Q8x5qGOyOfm6Wf
 N5KKG94iwcfSf2P6xDP9n3H0xgG9LNK5jQn5kXRdXl1R2eZwPuMiuSXJVEErwZY2
 tMH+1lRYieyioLOzHAsuvNNbcB5UAY33jHtip5ofi6STaRocc5BMl0dhuUAusRcG
 Qmso5zsiA04KKQqI3JWZkWFRyPX89SLMXOHnFXdKqAWSh1n+tCmSh+cO/EqAluPZ
 X89mUldJESaLXR4xdAGRNthDQ68T78PTHX2GcCi2F6IGMwgdwOBqVid65gg8Ewac
 bDEX+ZK32+sQxAmd+VtJCVXw6TnumnWSlTGH1xTwmRIfBmgWr4tQfu8b9INfloei
 YjZYzBmWVR4SeWeATO1a/qP9snjtjlzxJ+34fzWndFq4eeM9YkF0lH53dbCnxlYp
 TJnEOHFJdMOQVKxClME5n9ds1y7/K/p+jCwUrAF9z3wxiSms9RImvFroWPI54uzr
 NEdduyetJLthhxTVaICT4K6ay8gouJvcjY3R8Xp0b2f5szdaxGmGqnVJynGL4fdU
 CFY1orgJLS4Em50phOZZpjaSla2A2uAz79zQlFt6mr71uKeSzRXTXsOczAheyR0M
 5UGqFOs1X2uqFctlGmacrTTgyxhtueOCG7R/kQ5oLHB6R39Tm07PeomGreG9Fznm
 1Ylbo1BeYHn3rsSkCLfi
 =1coy
 -----END PGP SIGNATURE-----

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

SoC changes for omaps for v4.3 merge window:

- Clean-up omap4_local_timer_init to drop deal legacy code

- Provide proper IO map table for dra7

- Clean-up IOMMU layer init code as it now uses IOMMU framework

- A series of changes to fix up dm814x support that's been in a broken
  half-merged state for quite some time

- A series of PRCM and hwmod changes via Paul Walmsley <paul@pwsan.com>:

  - I/O wakeup support for AM43xx
  - register lock and unlock support to the hwmod code (needed for the RTC
    IP blocks on some chips)
  - several fixes for sparse warnings and an unnecessary null pointer test
  - a DRA7xx clockdomain configuration workaround, to deal with some hardware
    bugs

* tag 'omap-for-v4.3/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits)
  ARM: OMAP2: Add minimal dm814x hwmod support
  ARM: OMAP2+: Prepare dm81xx hwmod code for adding minimal dm814x support
  ARM: PRM: AM437x: Enable IO wakeup feature
  ARM: OMAP4+: PRM: Add AM437x specific data
  ARM: OMAP: PRM: Remove hardcoding of IRQENABLE_MPU_2 and IRQSTATUS_MPU_2 register offsets
  ARM: dts: AM4372: Add PRCM IRQ entry
  ARM: AM43xx: Add the PRM IRQ register offsets
  ARM: OMAP4: PRM: Remove hardcoding of PRM_IO_PMCTRL_OFFSET register
  ARM: OMAP2+: Add support for initializing dm814x clocks
  ARM: OMAP2+: Add custom prwdm_operations for 81xx to support dm814x
  ARM: OMAP2+: Add minimal clockdomains for dm814x
  ARM: OMAP2+: Fix scm compatible for dm814x
  ARM: OMAP2+: Fix dm814x DT_MACHINE_START
  ARM: OMAP2+: Remove module references from IOMMU machine layer
  ARM: DRA7: Provide proper IO map table
  ARM: OMAP2+: Clean up omap4_local_timer_init
  ARM: OMAP2: Delete an unnecessary check
  ARM: OMAP2+: sparse: add missing function declarations
  ARM: OMAP2+: sparse: add missing static declaration
  ARM: OMAP2+: hwmod: add support for lock and unlock hooks
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:36:53 +02:00
Olof Johansson
97de17fde7 Renesas ARM Based SoC Defconfig Updates for v4.3
* Remove marzen_defconfig
 * shmobile_defconfig and multi_v7_defconfig
   - Enable DPCM Sound Card
   - Enable r8a7793/gose platform
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVsfrSAAoJENfPZGlqN0++zokP/0vGtl0tko0fip3chM3v6zdd
 fZKE0aty/bzSFDtdeIVeTd+KwJqMgKVhxWCwIf/VUUv92vMSTapXLnzW0KtdLImw
 naHto6ej7vCHJjXiyxsdBiqFl099zZvGEP/2KZ6+lyq794hdtxCpwpjWm9P1EiCH
 StSn3fbBS5FcPkRqm1oFizcF9MdSBzvhk+I6X2MTgF9eP7f9lPsQ+vWIiexIhTrP
 rqtJwfjV8ya8fxGuH4FWrntC1NXtE9SYW7bqNfZaMMqolCQbqhjFr5MPnY9Rurlq
 Mi1GxtmvFNxtX3DhoRa9OCser5kH9jxOth1HixgN+3/Ri4GcZ8Zox0nQG8aCpvVF
 BnY7+MICIGtT/Opqg6+8v609fxvtlF6xcZs1xMQTB0NLxOm8BIOuuT3mbusBMNKw
 j//THpjWlBGgNP+bUlQvy0Wn8Yj8CcEtk6XlPscFnhp6WVTOFznAovhZ/XWoD1Ab
 3YF4TdwlrtPgLLBYV+B3KdAr4OA8AzjWP3NtCLYbjZpglqnENfblYvlfv7jQOSiz
 VGd7E94sO3iNlpvnGVdzMLINr/HKUbvF70JEratsGIE+zJj1L1jttkCQZUl1QqN/
 adIFRrhPjeLlDy3yGh4K2xB0hG5yJs92NEzYRA8iXkSsGpFl/yWO8jo/AZix3Bdh
 jz4SqvzvmLjXzK8SVZuK
 =ERL7
 -----END PGP SIGNATURE-----

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

Renesas ARM Based SoC Defconfig Updates for v4.3

* Remove marzen_defconfig
* shmobile_defconfig and multi_v7_defconfig
  - Enable DPCM Sound Card
  - Enable r8a7793/gose platform

* tag 'renesas-defconfig-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove marzen_defconfig
  ARM: multi_v7_defconfig: add Renesas DPCM Sound Card
  ARM: shmobile: defconfig: add Renesas DPCM Sound Card
  ARM: multi_v7_defconfig: Enable shmobile r8a7793/gose platform
  ARM: shmobile: Enable gose board in multiplatform defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:35:39 +02:00
Olof Johansson
c3d3dbddd3 Renesas ARM Based SoC Updates for v4.3
* Add basic support for gose/r8a7793
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVsfFqAAoJENfPZGlqN0++0nMP/0HUoqadAgV4PvPWEeb1Q/iq
 /BMzUIyw2QAB/RRrd4ejiP3247KN7/kv5q8YRsGC1BMirHivsbpLJViVVAdLiwMC
 yNcNLmoc1P5XmwX/3FkLSSRArhM5ufrvytMkmtThsuAe29FNm5Qqz56yCDaUie/x
 cruHTkUmf6Cjz9JWVSfNtz8e9JlxjRApfH5rA+vEqiUEI5R90bjd3eAgpbsqD7uw
 j7jMmKuSYtxXPZ/n4oJSwp/UkQk1xhUVpFegdPspGVIHB/s0k4RPz0FJ4zCcntKg
 IjnOj55kulmgOhQpijdmv/00dg4M/RvcxEBMYz7MwY0iVVGsgJ0Kiv5JPkr7XK5P
 O58upS3A59J1Ppgsced4eb4rodb3K+GT+ORjSNCryfqc997EhEcDMcClHdZBmt8r
 E0gd2u8hZxxuSY1oVwu2ggcz30KpChsiOHf5pRhYAjU3YxjxB51gy/4CLNZoOEGI
 MxhFHA1Kn/Rh0DNCxrJV8GBTMc3T2Oa2JsrOTtfWAAWne0NTuTai9gnegX4z3eac
 PrWEWapEsqf+m61tHp1+uQ3s5iFojT49I2IJQ7ADosoldotEjZHb3LOF7QcUteWv
 ahNPi9AZwyVyNFomqBEK5gP+IPtCrbas7kaBqyGzE0mo1EskqkjLQdmc6JjZOn6M
 dOmS4R5Xo5zb+tdxjP5i
 =sElP
 -----END PGP SIGNATURE-----

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

Renesas ARM Based SoC Updates for v4.3

* Add basic support for gose/r8a7793

* tag 'renesas-soc-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: gose: enable R-Car Gen2 regulator quirk
  ARM: shmobile: Basic r8a7793 SoC support

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:33:56 +02:00
Dan Carpenter
926631c201 ext4: memory leak on error in ext4_symlink()
We should release "sd" before returning.

Fixes: 0fa12ad1b285 ('ext4: Handle error from dquot_initialize()')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jan Kara <jack@suse.com>
2015-07-27 14:30:45 +02:00
Olof Johansson
d1005cc96b Second Round of Renesas ARM Based SoC DT Updates for v4.3
* Add Audio MIX and CTU support to r8a779[01] SoCs
 * Correct IRQ sense for adv7511 on lager board
 * Add sound label to koelsch and lager boards
 * Add IIC support to emev2 SoC
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVsfDJAAoJENfPZGlqN0++97QP/3aAapMZDRh/JH6pwUZRuAFG
 Y++xqO8VacSmhw8MzvLrSd9st2aaje3KEM+z0a8Fs7BrWfcqBROJFHH2o6scotYS
 Q+d+SCv1zDAokJrmwtooXzn6q6JPd+GgBW1y+r3YmPy1zduMbcbHK0/lk9OyKFGD
 7Ei/zVs1EBXVEALVvwAD1/fCX2htPh08/9pkHKXGMSRcMDaTzqA9JMKimxas4sH3
 S0sv6fC6ZrinJf26VW3HHvnrCcaFwG69aTdd4mo/qTIlZEeEqbYLQ+Hr9I+G+xBR
 L+XZuyP9bJ2InbmQxMXPw86yrCiDckMHzXvL+FVfHGJmXc7i/xwDcSg5VCzZnBlc
 zm0+X/qKkhLY579eCresjhImg4GOodTKJgQaGjJom4SgjdzlU8vzwMK/6GIhFvVR
 7DEIVatCVL2PsRUbhhgJFh1keLKgFJhbRDkE8jl2YvxA5nmSFoGGjSB6j9t/UiNH
 cKN4vVfUaD3mLcu2zoCtKHzFHdaxScNM/E84+NhEBQWj63Hi3b7osEeoHpgE96Dm
 +1aFpf/RAkY7gu86l16YfTV47R1J+SiNNHXPNRivCmwEvCesD07mqm8LIMu2TYIN
 zXdNwpv9Fj1DWLO6nt+iEvKRCh0SSkjkNq9TtG+33gM5+098JXLVOXw85HzgZP/g
 1zGyFPYcQ6uNM5DX0BBL
 =wbDB
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt2-for-v4.3' 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.3

* Add Audio MIX and CTU support to r8a779[01] SoCs
* Correct IRQ sense for adv7511 on lager board
* Add sound label to koelsch and lager boards
* Add IIC support to emev2 SoC

* tag 'renesas-dt2-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791: Add Audio MIX support on DTSI
  ARM: shmobile: r8a7791: Add Audio CTU support on DTSI
  ARM: shmobile: r8a7790: Add Audio MIX support on DTSI
  ARM: shmobile: r8a7790: Add Audio CTU support on DTSI
  ARM: shmobile: lager: Fix adv7511 IRQ sensing
  ARM: shmobile: koelsch: add sound label on DTS
  ARM: shmobile: lager: add sound label on DTS
  ARM: shmobile: emev2: kzm9d: enable IIC busses
  ARM: shmobile: emev2: add IIC cores to dtsi

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:28:23 +02:00
Olof Johansson
a115681460 Second Round of Renesas ARM Based SoC Cleanup for v4.3
* Silence APMU build warnings
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVsfIIAAoJENfPZGlqN0++4rQQAIj27EoVkb3IRct8KH68YwwJ
 EB+kGP8cGlfTOwz59X0rNjs1c9Gxk0vplFn/nUGE/9q8VjTJGM8GFbsgkpBTjhWZ
 B3hEBQfmnmWtuShSPJdVwN82/Xemrj8aN1ny//bDXTrdYYjOw/qOfaHyOYehKg0t
 1gjWUDpfMzhj/7nHWZ4c8uMKhUrm1kWlol2p7rkf/pnW/U19nQ6NvfGMEa5bDfid
 IRbAHHyyLOs61oNhXV8l20qQqDWjY0nq/gw2ihEuP8MV5cuLHofpKmJfpLrUNVpv
 jBugFAzMvMLCFgOEaS2UIzwWFRQyPHQARSvOZHJEqNvsM9CQ2KMU7UOfZobgbjNX
 MUkxmrv3Nw3R4vqLySrOmdSRNeI6813Tt76A27h8A1ZkSuAfxlx+K3itewuQwoY/
 BCrauIip4BLeyGmKBctkynkI267wwYT7ONunSoTxf/YWQx8K2nVe9ZC0Dsbxnh9n
 U9JUSssZmZKJk+3MmdnRhEGTWWFkoACgkGitc2diFwt3f+pSy/Pqhk5o0boUHdzw
 qVzFOM0ikEcvxuVn5fETqbCM1McZNfW3K9+qM580IVGIHGQsaVVYoJwxtBEo2kKm
 gBeMIfRvHbnjw/I6NJtVna3xHRq7ljDLqcDpA4CqRrZWXmEuU3n7VBWJSyHFFTVv
 4TN950dT9MJgu8JtZRdJ
 =buS4
 -----END PGP SIGNATURE-----

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

Second Round of Renesas ARM Based SoC Cleanup for v4.3

* Silence APMU build warnings

* tag 'renesas-cleanup2-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: apmu: silence build warnings

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:27:13 +02:00
Olof Johansson
6951630344 STM32 DT updates for v4.3, round 1.
Highlights:
 -----------
  - Add RCC clocks support to STM32F429
  - Add STM32429i-EVAL board support
  - Use stdout-path instead of linux,stdout-path in Disco board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVsHlOAAoJEMo4jShGhw+JzIgQAIndmciWCpT383ulXawm6Mwy
 lxD/8VdTG97kQJQFswaKlw0AhY8/cGH/9ZF2gHaTtqGNqT4gHCD0+4QVlOuEbH9x
 p72dA3fJstYCUuSg0WcZLfHs1xkcJyYO7burpGVxy/8FhMogryqhlbPCMUKUFaSi
 V2Jid69PmWhuiIvFXSp4y94hyvvcgFWxxdBi4ygWLG34n1OvzDmxOiDCqvd/Zx6n
 YBMEeXPvIInfqfAsY1uS25MkpSsL+mdK4CuBmpdKqZaDOfQcHB8ioe+9F0Y1WoLx
 AMLvEnPRnXMNeQ7nrAGMgWM0IsqmUj6GecJNhJdxg2iYYS6CTZmnVHWtp+chffGC
 gFDKDp+BLhy0MoQwhYCVRIXJVSrIRD+tq273SCq8fd8irtHFB9B6AvfyRonVIqyk
 7S5sSWVW4jPVJs9OBcnrhoVY0uteQPRhKA046vPZMaNVWrWKPft5s0oNRvq5PEjT
 DBeXA2j+XZYNwUMz2JFsEfStQCDC0VJ04LxvsSr2iBVAvZCzBpFBJKe3GZl9YEbD
 BWTIrc0DQ9ZsKt+wgzmPD0WI3QcPYGr3LmR3JoNMs4aQ5DBeit7rDeDivK5CRrpN
 qafD17pIICMnt+xdXsNb8aThgKEHAbIe9U++Hb1lAKqbyPu5alYUzrL/k4UIXTeK
 kBMMPsDKvoKB79CQidfx
 =FWox
 -----END PGP SIGNATURE-----

Merge tag 'stm32-dt-for-v4.3-1b' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32 into next/dt

STM32 DT updates for v4.3, round 1.

Highlights:
-----------
 - Add RCC clocks support to STM32F429
 - Add STM32429i-EVAL board support
 - Use stdout-path instead of linux,stdout-path in Disco board

* tag 'stm32-dt-for-v4.3-1b' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32:
  ARM: dts: Use stdout-path in STM32F429 Discovery board
  ARM: dts: Add STM32429i-EVAL board support
  ARM: dts: stm32f429: Adopt STM32F4 clock driver

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-07-27 14:26:03 +02:00