Commit graph

691,473 commits

Author SHA1 Message Date
Ana Rey
ce674173e9 netfilter: nft_meta: add cgroup support
This allows you to filter traffic by process control group (cgroup).

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-11-09 16:21:22 +01:00
Tomasz Figa
2891ba2906 pinctrl: exynos: Add support for Exynos4415
The pin controllers of Exynos4415 are similar to Exynos4412, but certain
differences cause the need to create separate driver data for it. This
patch adds pin controller and bank descriptor arrays to the driver to
support the new SoC.

Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Thomas Abraham <thomas.abraham@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
[cw00.choi: Rebase it on mainline kernel]
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
[tomasz.figa@gmail.com: Resolved merge with earlier clean-up series.]
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 22:28:07 +09:00
Naveen Krishna Ch
50cea0cff7 pinctrl: exynos: Add initial driver data for Exynos7
This patch adds initial driver data for Exynos7 pinctrl support.

Signed-off-by: Naveen Krishna Ch <naveenkrishna.ch@gmail.com>
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Reviewed-by: Thomas Abraham <thomas.ab@samsung.com>
Tested-by: Thomas Abraham <thomas.ab@samsung.com>
Acked-by: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 22:27:23 +09:00
Abhilash Kesavan
14c255d35b pinctrl: exynos: Add irq_chip instance for Exynos7 wakeup interrupts
Exynos7 uses different offsets for wakeup interrupt configuration registers.
So a new irq_chip instance for Exynos7 wakeup interrupts is added. The irq_chip
selection is now based on the wakeup interrupt controller compatible string.

Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Reviewed-by: Thomas Abraham <thomas.ab@samsung.com>
Tested-by: Thomas Abraham <thomas.ab@samsung.com>
Acked-by: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 22:27:19 +09:00
Abhilash Kesavan
6f5e41bd8f pinctrl: exynos: Consolidate irq domain callbacks
Adding a irq_chip field to the samsung_pin_bank struct helps in
consolidating the irq domain callbacks for external gpio and wakeup
interrupt controllers. The exynos_wkup_irqd_ops and exynos_gpio_irqd_ops
have now been merged into a single exynos_eint_irqd_ops.

Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Reviewed-by: Thomas Abraham <thomas.ab@samsung.com>
Tested-by: Thomas Abraham <thomas.ab@samsung.com>
Acked-by: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 22:27:14 +09:00
Abhilash Kesavan
0d3d30db93 pinctrl: exynos: Generalize the eint16_31 demux code
The function exynos_irq_demux_eint16_31 uses pre-defined offsets for external
interrupt pending status and mask registers. So this function is not extensible
for Exynos7 SoC which has these registers at different offsets. Generalize
the exynos_irq_demux_eint16_31 function by using the pending/mask register
offset values from the exynos_irq_chip structure. This is done by adding a
irq_chip field to the samsung_pin_bank struct.

Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Reviewed-by: Thomas Abraham <thomas.ab@samsung.com>
Tested-by: Thomas Abraham <thomas.ab@samsung.com>
Acked-by: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 22:26:49 +09:00
Tomasz Figa
8100cf4769 pinctrl: samsung: Separate per-bank init and runtime data
Currently the driver mixes constant init data with runtime data, which
is far from being elegant and can invite potential hard to track issues.
This patch intends to solve this by introducing a new
samsung_pin_bank_data structure to hold only constant data known at
compile time, which can be copied to main samsung_pin_bank struct used
at runtime.

In addition, thanks to this change, all per-bank initdata can be marked
with const and __initconst keywords and dropped after init completes.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 21:30:15 +09:00
Tomasz Figa
1bf00d7a6d pinctrl: samsung: Constify samsung_pin_ctrl struct
In order to separate initialization constants from runtime data, this
patch modifies the driver to store only constant data in
samsung_pin_ctrl struct and copy data required at runtime to
samsung_pinctrl_drv_data struct. This makes it possible to mark all
existing instances of samsung_pin_ctrl struct as const and __initconst.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 21:30:14 +09:00
Tomasz Figa
94ce944bed pinctrl: samsung: Constify samsung_pin_bank_type struct
This structure is not intended to be modified at runtime and functions
as constant data shared between multiple pin banks. This patch makes all
instances of it constant across the driver.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 21:10:28 +09:00
Tomasz Figa
e06deff967 pinctrl: samsung: Drop unused label field in samsung_pin_ctrl struct
There is no code using it and in fact there are pin controller variants
that do not even have this field initialized in their init data. This
patch removes it completely.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 21:10:28 +09:00
Tomasz Figa
87993273fe pinctrl: samsung: Make samsung_pinctrl_get_soc_data use ERR_PTR()
Currently the function returns a valid pointer on success and NULL on
error, so exact error code is lost. This patch changes return convention
of the function to use ERR_PTR() on error instead.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
2014-11-09 21:10:28 +09:00
Oded Gabbay
f1386fbc2b amdkfd: Display MEC fw version in topology node
This patch displays the firmware version of the microcode that is currently
running in the MEC.
This is needed for the HSA RT, so it could differentiate its behavior based on
fw version. e.g. workarounds for bugs in fw

v2: Send the KGD_ENGINE_MEC1 as a parameter to the get_fw_version()

Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2014-11-09 12:46:56 +02:00
Oded Gabbay
f7694323b4 drm/radeon: Add implementation of get_fw_version
This patch implements a new interface that was added to the kfd-->kgd interface.
The new interface function retrieves the firmware version that is currently
in use by a specific engine. The firmware was uploaded to the engine by the
radeon driver.

v2: Returns the fw version of the specific engine, as passed into the function
by a new parameter

Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2014-11-09 12:45:11 +02:00
Oded Gabbay
61466c651f drm/amd: Add get_fw_version to kfd-->kgd interface
This patch adds a new interface to the kfd-->kgd interface.
The new interface function retrieves the firmware version that is currently in
use by the MEC engine. The firmware was uploaded to the MEC engine by the kgd
(radeon).

v2: Added parameter of engine type to interface function

Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2014-11-09 12:42:22 +02:00
Peter Rosin
fbace43e88 ASoC: tfa9879: New driver for NXP Semiconductors TFA9879 amplifier.
Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Mark Brown <broonie@kernel.org>
2014-11-09 09:46:43 +00:00
Lars-Peter Clausen
427d204c86 ASoC: Remove snd_soc_cache_sync() implementation
This function has no more non regmap user, which means we can remove the
implementation of the function and associated functions and structure
fields.

For convenience we keep a static inline version of the function that
forwards calls to regcache_sync() unconditionally.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
2014-11-09 09:06:30 +00:00
Lars-Peter Clausen
6cc79294ef ASoC: Forward calls to snd_soc_cache_sync() to regcache_sync()
For convenience for drivers that do not want to keep their own pointer to
regmap struct around forward calls to snd_soc_cache_sync() to
regcache_sync() if the driver is using regmap. This is similar to what we do
for snd_soc_read()/snd_soc_write().

This patch also fixes drivers which already have been converted to regmap,
but still use snd_soc_cache_sync() for trying to the sync the cache.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
2014-11-09 09:06:30 +00:00
Pali Rohár
4ab8f7f320 Input: alps - ignore potential bare packets when device is out of sync
5th and 6th byte of ALPS trackstick V3 protocol match condition for first
byte of PS/2 3 bytes packet. When driver enters out of sync state and ALPS
trackstick is sending data then driver match 5th, 6th and next 1st bytes as
PS/2.

It basically means if user is using trackstick when driver is in out of
sync state driver will never resync. Processing these bytes as 3 bytes PS/2
data cause total mess (random cursor movements, random clicks) and make
trackstick unusable until psmouse driver decide to do full device reset.

Lot of users reported problems with ALPS devices on Dell Latitude E6440,
E6540 and E7440 laptops. ALPS device or Dell EC for unknown reason send
some invalid ALPS PS/2 bytes which cause driver out of sync. It looks like
that i8042 and psmouse/alps driver always receive group of 6 bytes packets
so there are no missing bytes and no bytes were inserted between valid
ones.

This patch does not fix root of problem with ALPS devices found in Dell
Latitude laptops but it does not allow to process some (invalid)
subsequence of 6 bytes ALPS packets as 3 bytes PS/2 when driver is out of
sync.

So with this patch trackstick input device does not report bogus data when
also driver is out of sync, so trackstick should be usable on those
machines.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Pali Rohár <pali.rohar@gmail.com>
Cc: stable@vger.kernel.org
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2014-11-08 23:51:30 -08:00
Olof Johansson
6ac8d6859d ARM: at91: fix build breakage due to legacy board removals
Fixes the following missing includes:

arch/arm/mach-at91/at91sam9g45.c: In function 'at91sam9g45_init_time':
arch/arm/mach-at91/at91sam9g45.c:39:23: error: 'NR_IRQS_LEGACY' undeclared (first use in this function)
  at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);
                       ^
arch/arm/mach-at91/at91sam9g45.c:39:23: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [arch/arm/mach-at91/at91sam9g45.o] Error 1
arch/arm/mach-at91/at91sam9rl.c: In function 'at91sam9rl_init_time':
arch/arm/mach-at91/at91sam9rl.c:51:23: error: 'NR_IRQS_LEGACY' undeclared (first use in this function)
  at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);

Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 22:39:51 -08:00
Valentin Rothberg
cc641d5529 checkkconfigsymbols.py: improve detection of defects
This patch improves the detection of defects by updating the
regular expression to find Kconfig identifiers in the source
code, and fixes some cases of false positives. The following
changes are made:
- improve regex to find Kconfig identifiers in the source
- exclude .log files from analysis
- improve filtering of false positives (e.g, CONFIG_XXX)
- change output format from (feature:\tlist) to (feature\tlist)

Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-11-08 20:50:43 -08:00
Boris BREZILLON
25963dbd07 irqchip: atmel-aic: Add missing entry for rm9200 irq fixups
The at91rm9200 have an RTT block and thus must at91rm9200_aic_irq_fixup
has to be called when initializing the irqchip.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Link: https://lkml.kernel.org/r/1415003464-29239-6-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:37:47 +00:00
Boris BREZILLON
624cba5726 irqchip: atmel-aic: Rename at91sam9_aic_irq_fixup for naming consistency
Rename at91sam9_aic_irq_fixup into at91rm9200_aic_irq_fixup to be
consistent with other fixup functions.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Link: https://lkml.kernel.org/r/1415003464-29239-5-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:37:16 +00:00
Boris BREZILLON
f3b7bf1bd7 irqchip: atmel-aic: Add specific irq fixup function for sam9g45 and sam9rl
The at91sam9g45 and at91sam9rl SoCs embed one RTT (Real Time Timer) and one
RTC block and thus need to call both rtt and rtc fixup functions.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Link: https://lkml.kernel.org/r/1415003464-29239-4-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:37:03 +00:00
Boris BREZILLON
ae25eac251 irqchip: atmel-aic: Add irq fixups for at91sam926x SoCs
The at91sam9260, at91sam9261, at91sam9263 and at91sam9g20 embed an RTT
(Real Time Timer) block and thus need to call the aic_common_rtt_irq_fixup
function.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Link: https://lkml.kernel.org/r/1415003464-29239-3-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:36:53 +00:00
Boris BREZILLON
4185315a9a irqchip: atmel-aic: Add irq fixup for RTT block
Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Link: https://lkml.kernel.org/r/1415003464-29239-2-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:36:38 +00:00
Kevin Cernekee
1abbdbac36 irqchip: brcmstb-l2: Convert driver to use irq_reg_{readl,writel}
This effectively converts the __raw_ accessors to the non-__raw_
equivalents.  To handle BE, we pass IRQ_GC_BE_IO, similar to what was
done in irq-bcm7120-l2.c.

Since irq_reg_writel now takes an irq_chip_generic argument, writel must
be used for the initial hardware reset in the probe function.  But that
operation never needs endian swapping, so it's probably not a big deal.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/1415342669-30640-15-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:03:35 +00:00
Kevin Cernekee
c17261fac3 irqchip: bcm7120-l2: Convert driver to use irq_reg_{readl,writel}
On BE MIPS systems this needs to use the new IRQ_GC_BE_IO gc_flag.  In
all other cases it will use the standard readl/writel accessors.

The initial irq_fwd_mask setup runs before "gc" is initialized, so it
is unchanged for now.  This could potentially be a problem on an ARM
system that boots in LE mode but runs a BE kernel, but currently none
of the supported ARM platforms are ever expected to run BE.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/1415342669-30640-14-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:03:27 +00:00
Kevin Cernekee
a4fcbb8614 irqchip: bcm7120-l2: Decouple driver from brcmstb-l2
Some chips, such as BCM6328, only require bcm7120-l2.  Some BCM7xxx STB
configurations only require brcmstb-l2.  Treat them as two separate
entities, and update the mach-bcm dependencies to reflect the change.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lkml.kernel.org/r/1415342669-30640-13-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:03:17 +00:00
Kevin Cernekee
c76acf4dff irqchip: bcm7120-l2: Extend driver to support 64+ bit controllers
Most implementations of the bcm7120-l2 controller only have a single
32-bit enable word + 32-bit status word.  But some instances have added
more enable/status pairs in order to support 64+ IRQs (which are all
ORed into one parent IRQ input).  Make the following changes to allow
the driver to support this:

 - Extend DT bindings so that multiple words can be specified for the
   reg property, various masks, etc.

 - Add loops to the probe/handle functions to deal with each word
   separately

 - Allocate 1 generic-chip for every 32 IRQs, so we can still use the
   clr/set helper functions

 - Update the documentation

This uses one domain per bcm7120-l2 DT node.  If the DT node defines
multiple enable/status pairs (i.e. >=64 IRQs) then the driver will
create a single IRQ domain with 2+ generic chips.  Multiple generic chips
are required because the generic-chip code can only handle one
enable/status register pair per instance.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/1415342669-30640-12-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:03:13 +00:00
Kevin Cernekee
05b8ce8260 irqchip: bcm7120-l2: Use gc->mask_cache to simplify suspend/resume functions
The cached value already incorporates irq_fwd_mask, and was saved the
last time an IRQ was enabled/disabled.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/1415342669-30640-11-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:02:59 +00:00
Kevin Cernekee
0b5cb32ca5 irqchip: bcm7120-l2: Fix missing nibble in gc->unused mask
This mask should have been 0xffff_ffff, not 0x0fff_ffff.

The change should not have an effect on current users (STB) because bits
31:27 are unused.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lkml.kernel.org/r/1415342669-30640-10-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:02:49 +00:00
Kevin Cernekee
38e3a6e819 irqchip: bcm7120-l2: Make sure all register accesses use base+offset
A couple of accesses to IRQEN (base+0x00) just used "base" directly, so
they would break if IRQEN ever became nonzero.  Make sure that all
reads/writes specify the register offset constant.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/1415342669-30640-9-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:02:45 +00:00
Kevin Cernekee
60b2a29e1a irqchip: bcm7120-l2, brcmstb-l2: Remove ARM Kconfig dependency
This can compile for MIPS (or anything else) now.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lkml.kernel.org/r/1415342669-30640-8-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:02:34 +00:00
Kevin Cernekee
f668f074ff irqchip: bcm7120-l2: Eliminate bad IRQ check
This check may be prone to race conditions, e.g.

1) Some external event (e.g. GPIO level) causes an IRQ to become pending
2) Peripheral asserts the L2 IRQ
3) CPU takes an interrupt
4) The event from #1 goes away
5) bcm7120_l2_intc_irq_handle() reads back a 0 status

Unlike the hardware supported by brcmstb-l2, the bcm7120-l2 controller
does not latch the IRQ status.  Bits can change if the inputs to the
controller change.  Also, do_bad_IRQ() is an ARM-specific macro.

So let's just nuke it.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/1415342669-30640-7-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:02:29 +00:00
Kevin Cernekee
05f1275745 irqchip: brcmstb-l2: Eliminate dependency on ARM code
The irq-brcmstb-l2 driver has a single dependency on the ARM code, the
do_bad_IRQ macro.  Expand this macro in-place so that the driver can be
built on non-ARM platforms.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lkml.kernel.org/r/1415342669-30640-6-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:02:10 +00:00
Kevin Cernekee
b79055952b genirq: Generic chip: Add big endian I/O accessors
Use io{read,write}32be if the caller specified IRQ_GC_BE_IO when creating
the irqchip.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/1415342669-30640-5-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:02:00 +00:00
Kevin Cernekee
2b28037632 genirq: Generic chip: Allow irqchip drivers to override irq_reg_{readl,writel}
Currently, these I/O accessors always assume little endian 32-bit
registers (readl/writel).  On some systems the IRQ registers need to be
accessed in BE mode or using 16-bit loads/stores, so we will provide a
way to override the default behavior.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/1415342669-30640-4-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:01:40 +00:00
Kevin Cernekee
332fd7c4fe genirq: Generic chip: Change irq_reg_{readl,writel} arguments
Pass in the irq_chip_generic struct so we can use different readl/writel
settings for each irqchip driver, when appropriate.  Compute
(gc->reg_base + reg_offset) in the helper function because this is pretty
much what all callers want to do anyway.

Compile-tested using the following configurations:

    at91_dt_defconfig (CONFIG_ATMEL_AIC_IRQ=y)
    sama5_defconfig (CONFIG_ATMEL_AIC5_IRQ=y)
    sunxi_defconfig (CONFIG_ARCH_SUNXI=y)

tb10x (ARC) is untested.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/1415342669-30640-3-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 04:01:22 +00:00
Thomas Petazzoni
1dacf194b1 irqchip: irq-armada-370-xp: Use proper return value for ->set_affinity()
The ->set_affinity() hook of 'struct irq_chip' is supposed to return
one of IRQ_SET_MASK_OK or IRQ_SET_MASK_OK_NOCOPY. However, the code
currently simply returns 0. This patch fixes that by using
IRQ_SET_MASK_OK, which tells the IRQ core that it is responsible for
updating irq_data.affinity.

Note that this patch does not cause any change to the compiled code,
as IRQ_SET_MASK_OK has the value 0. This is therefore just a simple
cleanup.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1414151970-6626-4-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 03:56:37 +00:00
Ezequiel Garcia
172ed82cef ARM: mvebu: Remove thermal quirk for A375 Z1 revision
The Armada 375 Z1 SoC revision is no longer supported. This commit
removes the quirk required to "fix" the reg property and the compatible
string of the thermal devicetree node.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1415116839-4323-3-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-09 03:19:39 +00:00
Joe Perches
c0560b9c52 dccp: Convert DCCP_WARN to net_warn_ratelimited
Remove the dependency on the "warning" sysctl (net_msg_warn)
which is only used by the LIMIT_NETDEBUG macro.

Convert the LIMIT_NETDEBUG use in DCCP_WARN to the more
common net_warn_ratelimited mechanism.

This still ratelimits based on the net_ratelimit()
function, but removes the check for the sysctl.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-08 21:22:54 -05:00
Olof Johansson
17908a13a4 Nomadik changes for the v3.19 development series:
- Rearrange the DTS files to make a pure SoC-specific file and
   a pure board file for S8815.
 - Add the device tree for the NDK15 board.
 - Update the defconfig and configure in the STMPE expander by
   default on the Nomadik.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUWyzIAAoJEEEQszewGV1z0Q0P/3yvUT1NWTSRAhu+5V1ycVSi
 UmctP58ZPSU14Zavvb6E4XunfgrLNRIGTXAL1YbSUURGLNJ6+bsKLmBHQB3z/oQ4
 4ynSE0pqdLna3fxhgxqfikh4Oc1213Nppnb1RcGupS1S7ya5JGsg6PD50nSlUCan
 xR+WG4U5ZQ80Z0eWMoafFeESt4n2xv4J1BwNyiFDoSDaAmUdRJTiWtXYlVaMcuXD
 Ysrp7QNSihvUO74AcS43H2zv1nMxnUDgKpKWTq4UGHMRkdDSlAo2zskATmYhenBd
 CteDwuGHgTtBcnUOEA+AHidSw25Pl2QmS5CX9Dgt70DNq/OCKIOyi2nwn4NnKhWY
 +WfL4TKLshREe83GCBOkDO5bBNV4qP9W81ASisIp2T6ALCQQEqyRU4BIF1vsAJuR
 fynPzzSDuwAzPbxOTVB8HVyzY2XEKEzMOwAFLBt7U1dteuIGkOUbfM8bso13AAYR
 bI4XPaPpY5l5TE5OKC3AzdMltiVU8onwsMaBfx4Gp3aIhzVN+OH/Tr4Bu1TDAhSb
 hSZ74Z+SAKdrLBvZRe6FJUp+8bV5znTFq/R9g4QmIruw3drOWzxIdZFvvA+Oyz/J
 pGH/kBSRKze1TJfYy2QMbZ1vKj2sD0S8AOIOGTL+hXjHZFDyd7367JsuSWrTGXK6
 oHtUyZhKmHQ+rIUhawy6
 =6oZZ
 -----END PGP SIGNATURE-----

Merge tag 'nomadik-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

Merge "Nomadik updates for the v3.19 series" from Linus Walleij:

Nomadik changes for the v3.19 development series:
- Rearrange the DTS files to make a pure SoC-specific file and
  a pure board file for S8815.
- Add the device tree for the NDK15 board.
- Update the defconfig and configure in the STMPE expander by
  default on the Nomadik.

* tag 'nomadik-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: configure in STMPE support
  ARM: update Nomadik config
  ARM: nomadik: device tree for NHK15 board
  ARM: nomadik: push ethernet down to board
  ARM: nomadik: set up MCDATDIR2
  ARM: nomadik: move GPIO I2C to S8815 board file
  ARM: nomadik: disable chrystals in top level board files
  ARM: nomadik: move MMC/SD card detect GPIO to board DTS

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:59:39 -08:00
Andreas Färber
92c9e0c780 ARM: dts: zynq: Enable PL clocks for Parallella
The Parallella board comes with a U-Boot bootloader that loads one of
two predefined FPGA bitstreams before booting the kernel. Both define an
AXI interface to the on-board Epiphany processor.

Enable clocks FCLK0..FCLK3 for the Programmable Logic by default.

Otherwise accessing, e.g., the ESYSRESET register freezes the board,
as seen with the Epiphany SDK tools e-reset and e-hw-rev, using /dev/mem.

Cc: <stable@vger.kernel.org> # 3.17.x
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:57:44 -08:00
Olof Johansson
678a438d82 First batch of cleanup/SoC for 3.19:
- removal of old at91x40 !MMU ARM7TDMI support which was kind of rusty
 - removal of board-sam9m10g45ek.c and board-sam9rlek.c from mach-at91
   and the code related to these board C files + defconfigs. Use DT for them
   now!
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJUV8AoAAoJEAf03oE53VmQV3cH+wbCgoOjhLmlVHmXi6ZXw53G
 tubx1l6Su2xfz89eO6gPrBjm/LtsQgxz8kWUQbQEr1dNBIYig/NR16LK1skIkSfl
 p7Xx+4d3DZulkDhzS8evbc7AvQxbMHTTdal1Dlf1Rj/AlVt3Fba3UqchFtIs++85
 CPOBDNsI5CeUm0swiLuHkHbjfvzWykX+g055bDKAiPxht7zUknggRVnst5FBc2ql
 R+YUI/O/9ta8unLGKTQuPs3Cb/mitQfWvRw0WFUvaEMI+JgvtyKRCG0NqYUkW9bD
 wmUnGvLrJUBb48hfd5OsmC3JVBbLb9Wy5hgVazMqz5FHZXnQeTf5lOggeyhELSw=
 =aZf5
 -----END PGP SIGNATURE-----

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

Merge "at91: cleanup for 3.19 #1" from Nicolas Ferre:

"The pull-request that was sent late for 3.18. It was removing the old
!MMU at91x40 and 2 board files plus the whole code in at91sam9g45 &
at91sam9rl files for implementing this deprecated method. For these
particular ones, the EK were the only one to use this code. We can use
these boards with DT right now."

First batch of cleanup/SoC for 3.19:
- removal of old at91x40 !MMU ARM7TDMI support which was kind of rusty
- removal of board-sam9m10g45ek.c and board-sam9rlek.c from mach-at91
  and the code related to these board C files + defconfigs. Use DT for them
  now!

* tag 'at91-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91: remove at91sam9rl legacy board support
  ARM: at91: remove at91sam9g45/9m10 legacy board support
  ARM: at91: remove no-MMU at91x40 support

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:54:46 -08:00
Olof Johansson
b265a6df89 First DT batch for 3.19:
- CAN device nodes for at91sam9263 and at91sam9x5
 - at91sam9x5 DMA definitions for usart
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJUV73TAAoJEAf03oE53VmQJYcH/1ExETCf3J9ohXxF3n9R7zf4
 fp+KxCVmpmFdkZSyUSemxTp31MLAgHUD/155pPveaAJ9LsgnEqalX+cqz0b4NVuT
 +5GivQQp5CQGvb8rqrC9UYFroMWJjUY/lNrDDo2WRmX6ay1jLpM7nFupoUxt6+fh
 c/KXHNXf+vQ0Qhx6vVYmGRHnzqAPJEMkLy5LhFo2Yjmg0IRAvhVDZBCVZ2W7Fwy9
 A16w2YIuyQ0Yw2YYPP6KCLls2gRqUvDtNJMKAQ7YB473GwNLRU4qGpdfVJQTgAe/
 4SsMGZHen4DT2k2WgbnQl7b4pwUVaud5F/vshAoU/4NJs4XiTEhItfV3cI9xU3o=
 =r9z8
 -----END PGP SIGNATURE-----

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

Merge "at91: dt for 3.19 #1" from Nicolas Ferre:

"Very little DT update for AT91. More will come but I want to send this first
batch soon so it doesn't get in the way of larger modifications."

First DT batch for 3.19:
- CAN device nodes for at91sam9263 and at91sam9x5
- at91sam9x5 DMA definitions for usart

* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: at91sam9263: Add CAN device nodes
  ARM: at91/dt: at91sam9x5: Add CAN device nodes
  ARM: at91/dt/trivial: at91sam9x5_can.dtsi: comment and whitespace fixes
  ARM: at91: at91sam9x5 dt: add usart dma definitions to dt

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:53:48 -08:00
Olof Johansson
85b80b6bfd Generic power domains for the Ux500
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUVqxEAAoJEEEQszewGV1zRcQP/AxYB/o+6Zb/HgCxIT+9vujJ
 4ghuDElDUffBCXhv8IGuvzcAK+UKAqoj98vZNmI6Kl/MvXoHLcyTfu7e9i/zPFcM
 szYdlG+ui4PEhuwPgWHCpOzyWWjqBuujFyYG8Kk/akUtMntV0NXoS7snqoAw47Y1
 IAn7oov+UHFDw8ewWU+i5qrdPKOQ4IaIQcWB58EfJHfsU4f9sUB6JVSBJ3mCtAhg
 N8P3qg9WV0sqvZt1oI+naTRZL/CtNlrDYVnWVQb0WeGEI3MGEibEkWr1HScHmwko
 eNsOvTV+/3iFz/RUQtFqw4kidHiIdpTHgCLEauJ+KBz86X5sRq23CXLWnZy3h9Mw
 q/05yl0/IgTZlNCrULqmkcapjLp89nk5PGYOtuXuaYPj7y8og3LWc+bCYIXJd7Ay
 OMH9CJQpysWdyDOMt2C7xOI3/IkUjluEvOGN8iWoze9k8Dxr2+Ajmvf74lu0QtYm
 hejdKS6Jr0a43FHwJFS/oX7LAGSft76xvs9bGa033YRcNGLXYLcjlbNqynep0Hhm
 SKk67IfI+FXjo28FWlp7sXWsfhyg3tJHkAgEPZ1o+V8UNWT5Pb+Pop/DqJG6Jvjc
 +F3m+wkvcP7kOpVHdyFqY026lb0nMyDimTvqYjfDxwaElVcUSBu3/0/A9SJGqBcH
 L0mMNkBMP5HDmwy6bo2u
 =8T8T
 -----END PGP SIGNATURE-----

Merge tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

Merge "Ux500 core changes for v3.19" from Linus Walleij:

"please pull in these Ux500 core changes for this kernel development
cycle: mainly a generic power domain implementation from Ulf Hansson
that needs to get queued up in -next and tested."

Generic power domains for the Ux500

* tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: Add i2c devices to the VAPE PM domain
  ARM: ux500: Add spi and ssp devices to the VAPE PM domain
  ARM: ux500: Add sdi devices to the VAPE PM domain
  ARM: ux500: Add DT node for ux500 PM domains
  ARM: ux500: Enable Kconfig for the generic PM domain
  ARM: ux500: Initial support for PM domains
  dt: bindings: ux500: Add header for PM domains specifiers
  dt: bindings: ux500: Add documentation for PM domains
  ARM: u300: Convert pr_warning to pr_warn
2014-11-08 16:51:39 -08:00
Olof Johansson
f26e294535 Berlin DT changes for v3.19 (round 1)
- AHCI and SATA PHY nodes for BG2Q
 - Reset controller binding docs
 - Ethernet nodes for BG2, BG2CD
 - SDHCI nodes for BG2, BG2CD
 - Corresponding board changes to enable AHCI, Ethernet, SDHCI
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUVhGkAAoJEN2kpao7fSL42icQAIC5LG0eL8yi6HXOAhI1Tkky
 0g6J2/HZtUqoGHKU92kvBa7kba852oMi2NIIF9LI03b8o1z7E4Of8sZCPCvH/BQ/
 hBmUIDi6himQ8+SxDBFcsETjIu2vPgemvy1mvwd/OUNY2YEFkYLKT48qrU3pD5oU
 F2W33RpHrkkazG7/WrcRa+Tk2G2eb3tC90czAjE5A5PkAp4LUEZq24treuVv424h
 S6qe76WQs+EHIW3nkIBmRjr3D7yWW1U9vknxwz6XNyNkvW9bcMfTMq1dQY5RXt17
 JiZli9d62Z1Fu8k0qDebcgTw5YzyoXIuLd4+hbPn8qFkT/umjIgrZOZYD4dZmBvB
 vxwQ5NOw1mI27Lbb1IkpizldzpJ1XwhvY3POfgGVYSeI5R4CyLamvzaMJbo8zWWs
 CvneMaghQNWweC9AiOlUXJKzlaYJMu6pfMJssZuzyLx4g+YGKQunoGIEXehWzRAh
 g8K0bUfYxWHmhZPz9nQLaDJTJI85Xytm0/iP14STp59OsKQsFokm4m9X5ZyJrQHc
 ig1NivEC8qDZqegRhjDLsatkI8xsQA6ovA/h7HHil5D04hxI6OlRiFfob9ZAhkxc
 hud9Ne7vocJ6uhB72xm4eTKcMSg1iSi6wDEsaoK/jU6yTdOgV2i3QvIr8wQZ+yru
 SFy2OPWebL9AaCdgTfaO
 =VVTX
 -----END PGP SIGNATURE-----

Merge tag 'berlin-dt-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt

Merge "ARM: berlin: DT changes for v3.19 (round 1)" from Sebastian Hesselbarth:

"This is Berlin DT changes for v3.19 and contains those patches that missed
the v3.18 merge window plus corresponding patches to catch-up with Antoine's
BG2Q improvements for BG2 and BG2CD. We now have working SDHCI and Ethernet
on all SoCs (well, BG2CD has HDMI HEC only), SATA PHY support for BG2 is still
pending."

Berlin DT changes for v3.19 (round 1)
- AHCI and SATA PHY nodes for BG2Q
- Reset controller binding docs
- Ethernet nodes for BG2, BG2CD
- SDHCI nodes for BG2, BG2CD
- Corresponding board changes to enable AHCI, Ethernet, SDHCI

* tag 'berlin-dt-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: dts: berlin: Enable eMMC on Sony NSZ-GS7
  ARM: dts: berlin: Enable WiFi on Google Chromecast
  ARM: dts: berlin: Add SDHCI controller nodes to BG2/BG2CD
  ARM: dts: berlin: Enable ethernet on Sony NSZ-GS7
  ARM: dts: berlin: Add phy-connection-type to BG2Q Ethernet
  ARM: dts: berlin: Add BG2CD ethernet DT nodes
  ARM: dts: berlin: Add BG2 ethernet DT nodes
  ARM: dts: berlin: Add GPIO leds to Google Chromecast
  ARM: dts: berlin: enable timer 1 for sched_clock
  ARM: dts: berlin: add a required reset property in the chip controller node
  Documentation: bindings: add reset bindings docs for Marvell Berlin SoCs
  ARM: dts: berlin: enable the eSATA interface on the BG2Q DMP
  ARM: dts: berlin: add the AHCI node for the BG2Q

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:47:37 -08:00
Olof Johansson
c6c65189f9 Berlin SoC changes for v3.19 (round 1)
- Select the reset driver for all SoCs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUVhBVAAoJEN2kpao7fSL4RXMQAMLSPSdTh1n1jkrRysdWiR8F
 lWKIlsrCykPQsEGlGeY05sEvvsvixjWDMSz/ksVRyxxnw2Cx3vlF+KuVwSmWrhnC
 aWLBWz9vgTt1Bltt5sDgbIS+ls0RYI7HVEGvQxCF71o0+ONiKFJpbwi3oNPmylnv
 4kYpg4jKLM+c5CBFqF4lfLWYYGI5SCED9QETl9A9aGdoyn9FM8+HzwaCQc1YIWuE
 lG2NDlSay4ch0hhKmQ0Ysx2EDcmoAiDN9CAtsxaX42oGaRT3QkXEWeROf4IUHaJ+
 ysjFTc6JnIYr931jiBGYs/9pFlX67tCUlvwGrXAZ5jqfZStoCobCsL3Y30I2XSZT
 rwOHvPBNs82EbZhdPMHHn4fDLTgiS3eTv70YiFMvcJ4kraMQuybA0JU+syAcEs/v
 SnmEwf8tSU+NqalPhBQzxuohIZUfvQI5i0bY1GKRUrU7qscesitSu0n4k7/Nh03a
 zgQVBr7I9315QEwXRTfd6db/1ugiKTRq+jLPpyFP4gRckAqKGb0xmzoAGRZCfjSx
 8sY5jFekKnRYYD37m3NOlpsvpSNY7CtzX7I4KnqG5rYRz0ryP/7jc0XYVJBqlJ1g
 Pzk/+pikRhWeZVQSVEIsF94yv1oWNcSW46yr1SWv/vGi0GldbTXa8qRGGHjFsOBz
 Ths5Ksg5GqmzghfJlXvb
 =W5QD
 -----END PGP SIGNATURE-----

Merge tag 'berlin-soc-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc

Merge "ARM: berlin: SoC changes for v3.19 (round 1)" from Sebastian
Hesselbarth:

Berlin SoC changes for v3.19 (round 1)
- Select the reset driver for all SoCs

* tag 'berlin-soc-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: Berlin: select the reset controller

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:46:36 -08:00
Olof Johansson
fe9b86fb26 Berlin Driver changes for v3.19 (round 1)
- Reset driver, Acked by Philipp Zabel
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUVg9xAAoJEN2kpao7fSL4y1IP/0Phv0XWjkTAVUO37tWG7n/X
 F2zEbRaKJ7Dzjb/4PPiON0rDqCm3b9riAeo9DNwapYaM3LrUq8vdtGPX6GyhwjdR
 kR6EafSVPCHSa2qxP/S0R5CyT/+ZNAjgKPv4Rxatb1PIgR4njVt1zJOKsNZvQXTZ
 vuwIh5qym3is6T0a2LrERZwJQytp+CjqzqkwcNlLFfmI0SzCOhA3SLZXYQDJqI19
 2aOsWqwo7YUKYQRKQ0pETvhaODBvEKMwQ6QtnUzKVYE6+INKYrZm7MItSkt/ee4V
 emP1jx9yzQAPr3jqD2sF0AilDrh0pVAZrroCMeUUtDXGQnQ98sjgBPT+Iv1QHE7P
 KfgBzbRe5P4++bgJsePLOSvKfvqImUToAaEktqpV8J7FVe4Bqjp8f83vS/8X9UiF
 0ApsUxf9pavw0ibYq0iRAO9lunLIZ8F/ooLzxf4h+M+p5A4dA7YsYY4gkPcxnhUW
 MG0u5lK51ZX0USApCV4oTt/v9LwzNsDGUa6YZ1LyAhZiQZpoFqH/5fw+yV56ltRv
 90UYdaNwTuy93xeKd5fbEbsSm3OR+yDXVizXnMNjEbIIjTzuv4ETtrx6Mzq86Xh4
 AoUQc+lqNxQ5pqsiouRtFQbGvUmgu6aIUYBTV+KrEblhRJ3A9+/LZ/T1Aq4lduAY
 CR990F42KkZSrKy3l912
 =5cUT
 -----END PGP SIGNATURE-----

Merge tag 'berlin-driver-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/drivers

Merge "ARM: berlin: Driver changes for v3.19 (round 1)" from Sebastian
Hesselbarth:

Berlin Driver changes for v3.19 (round 1)
- Reset driver, Acked by Philipp Zabel

* tag 'berlin-driver-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  reset: add the Berlin reset controller driver

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:41:37 -08:00
Olof Johansson
1749e1fc9e STi DT updates for v3.19, round 1.
Highlights:
 -----------
  - Add SDHCI support for STiH41x B2020 boards
  - Add reset controllers to STiH407 SoC
  - Add MiPHY & SATA support to STiH416
  - Add Thermal supportto STiH416
  - Add Clock support to STiH407 SoC
 
 This tag also includes STiH407 bindings definitions for reset controller.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUU24fAAoJEMo4jShGhw+J8AMP/ii1CVgJZkaimGllZlO6kOwj
 tB6tZ3n8EGoC7P4UismVzmKqqGCkLGChzlUzvJMqSjE8kmmtwYPODxUy6nRZ5Gii
 S9PGAmJ8vRqEyG/8y83Y1OGnV7WBzVQfHnwFr0JvrFvCYyiHnpbUlxIKkA85F+JG
 Hnd+HKqOymhwY8eSN8nH/slrFkCYAEaGLoVV7tZWtr0p6gQYA7rP7XkFOXs1Ln5G
 iA8wtTDaPIyRH7X5/WeESjhkBMP8YcmslLUtaagIrORcQWC+TYNSFwWkciyFothd
 sz0szIO0/j9uLgxdKLnHxAU8mwx1in0ZNDaC+WlKtSE7V39C2PhaSmJ9sL+0Dxu3
 2HSoUPBgEJ0Zu5U7xSNgYQZrfANGx059B00J2OqDJfLshyDmpJrbJZtsQTW6Qz6N
 c8fGebGTXHHkLvjRHfh6LXRN30CpJc6m+mmwybhROnYyXdv7htv2q2V340GoG2mI
 6l5JY46g91KrSjEf91//qXLBvesoRVAPS9g2wKBjiePIl1nzdjZOfZ0vpw+vn1PV
 t9DUk1S2OuzeMdqSIt6XsjJQQcTL8npx2V+88ibo5BkAlOdLcCSOUuTzAHEBZtwB
 GJVTXog3TX3SoDmCc/guUAN7gzto3LBAz9GwcIuC28tkF0UufUX3v6wU+yz1+l00
 vLV6A2aJwUAZ3rRbQI2b
 =YmAW
 -----END PGP SIGNATURE-----

Merge tag 'sti-dt-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/dt

Merge "STi DT updates for v3.19, round 1" from Maxime Coquelin:

Highlights:
-----------
 - Add SDHCI support for STiH41x B2020 boards
 - Add reset controllers to STiH407 SoC
 - Add MiPHY & SATA support to STiH416
 - Add Thermal supportto STiH416
 - Add Clock support to STiH407 SoC

This tag also includes STiH407 bindings definitions for reset controller.

* tag 'sti-dt-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux-sti:
  ARM: STi: DT: STiH407: Fix: clk-tmds-hdmi clock is missing
  ARM: STi: DT: STiH407: Add all defines for STiH407 DT clocks
  ARM: STi: DT: STiH407: 407 DT Entry for clockgenA9
  ARM: STi: DT: STiH407: 407 DT Entry for clockgen D0/D2/D3
  ARM: STi: DT: STiH407: 407 DT Entry for clockgen C0
  ARM: STi: DT: STiH407: 407 DT Entry for clockgen A0
  ARM: DT: STi: STiH416: Add DT node for ST's SATA device
  ARM: DT: STi: STiH416: Add DT node for MiPHY365x
  ARM: STi: DT: STiH416: Supply Thermal Controller Device Tree nodes
  ARM: STi: DT: Enable second sdhci controller for stih416 b2020 boards.
  ARM: STi: DT: Enable mmc0 for both stih415 and stih416 SoCs
  ARM: STi: DT: Add sdhci controller for stih415
  ARM: STi: DT: Add sdhci pin configuration for stih415
  ARM: STi: DT: Add sdhci controller for stih416
  ARM: STi: DT: Add sdhci pins for stih416
  ARM: sti: Add STiH407 reset controller support.
  ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET
  ARM: STi: DT: STiH41x: Convert all uppercase non-defines to lowercase
  reset: stih407: Add reset controllers DT bindings

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-08 16:39:12 -08:00