Commit Graph

33157 Commits

Author SHA1 Message Date
Arnd Bergmann 617d1464ab ARM: footbridge: make screen_info setup conditional
The global screen_info structure is used to communicate
data about the console from platform code to the console
driver, but is only defined on ARM if either the VGA or
dummy consoles are in use.

This changes the footbridge code so we don't try to access
this structure in case it is not defined, which prevents
a possible randconfig build error.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
2014-03-21 18:26:10 +01:00
Arnd Bergmann 570977a1fc ARM: footbridge: fix build with PCI disabled
The dc21285.c source file cannot be built when CONFIG_PCI is
disabled, because it calls a number of PCI core interfaces.

This changes the Makefile so we don't include this file in the
build if CONFIG_PCI is disabled. No other code references anything
defined inside of this file in this case.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
2014-03-21 18:26:09 +01:00
Arnd Bergmann ad9faf4c4c ARM: footbridge: don't build floppy code for addin mode
The ARCH_EBSA285_ADDIN platform does not provide the
ISA_DMA API, which is required by the floppy driver.

Let's ensure that the floppy code can only be built
when ISA_DMA is also enabled, by moving the select
statement into ARCH_EBSA285_HOST.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
2014-03-21 18:26:08 +01:00
Arnd Bergmann fa04e209ae ARM: rpc: autoselect CPU_SA110
ARCH_RPC no longer supports other CPUs aside from StrongARM110,
so we can make the option implicitly selected by the platform
and no longer give the option of building a kernel without CPU
support.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
2014-03-21 18:26:07 +01:00
Arnd Bergmann edd4c7208b ARM: pxa: trizeps4 and trizeps4wl use the same file
The trizeps4 and trizeps4wl platforms are both implemented
using the same board file. Since the trizeps4wl code is a
superset of trizeps4, it makes no sense to enable just the
latter, but with the current Kconfig logic, it causes the
board file not to be built at all.

Selecting MACH_TRIZEPS4 from MACH_TRIZEPS4WL ensures that
we are actually building the board file.

Found during randconfig testing.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Daniel Mack <zonque@gmail.com>
2014-03-21 18:26:06 +01:00
Arnd Bergmann c7dc7d49fa ARM: pxa: select I2C_GPIO only if I2C is on
The Arcom/Eurotech VIPER SBC enables the I2C_GPIO driver, but
that has a dependency on I2C, and causes build failures if I2C
is disabled. To keep existing configurations running while fixing
the randconfig problems, this changes the logic to only enable
I2C_GPIO if I2C is already enabled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Daniel Mack <zonque@gmail.com>
2014-03-21 18:26:05 +01:00
Arnd Bergmann 419606ec4d ARM: pxa: remove broken balloon3_gpio_vbus reference
balloon3_udc_init() tries to register a balloon3_gpio_vbus
device, but this has never been defined in the mainline
kernel. To avoid the obvious build failure when this function
is enabled, remove the bogus reference here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Daniel Mack <zonque@gmail.com>
2014-03-21 18:26:04 +01:00
Arnd Bergmann 847e34969d ARM: pxa: fix colibri build
The colibri_ohci_init function performs a register access through
the io_p2v() macro, which requires the IOMEM macro to be defined.

By explicitly including the asm/io.h header file that contains
this macro, we avoid the build error:

arch/arm/mach-pxa/colibri-evalboard.c: In function 'colibri_ohci_init':
arch/arm/mach-pxa/colibri-evalboard.c:68:2: error: implicit declaration of function 'IOMEM' [-Werror=implicit-function-declaration]
  UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Daniel Mack <zonque@gmail.com>
2014-03-21 18:26:02 +01:00
Arnd Bergmann e914f19f03 ARM: pxa: enable pxafb unconditionally for some boards
The SAAR and TAVOREVB machines try to call functions from
the PXAFB frame buffer driver from their platform code,
which only works if that driver is built-in.

This patch ensures that both the generic frame buffer
code and the specific pxafb driver are always enabled
when we build a kernel for one of the two boards.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Daniel Mack <zonque@gmail.com>
2014-03-21 18:26:01 +01:00
Arnd Bergmann a0ad0fdb88 ARM: pxa: don't "select" SMC91X on MACH_XCEP
We normally don't hard-enable Kconfig options just because
a board contains a specific piece of hardware. In this case,
selecting SMC91X causes a build error, if we don't also enable
basic network device driver support.

Since the platform has no direct dependency on this driver
at link time, we can just remove the 'select' statement.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Daniel Mack <zonque@gmail.com>
2014-03-21 18:26:00 +01:00
Arnd Bergmann 32ff4971ec ARM: orion5x: make dns323 independent of PHY support
The D-Link DNS-323 machine tries to unconditionally select CONFIG_PHYLIB,
but that has other dependencies that might not necessarily be enabled,
causing random build errors.

To work around this, this patch removes the 'select' statement and
instead uses a compile-time check to skip the phy_register_fixup_for_uid()
call if PHYLIB is not available in the kernel.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-03-21 18:25:59 +01:00
Arnd Bergmann 9e1280419e ARM: mvebu: add missing header
The definition for SIGBUS may not be visible without including
linux/signal.h, as I found during randconfig testing.

Adding an explicit include is certainly the right thing to do.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-03-21 18:23:35 +01:00
Arnd Bergmann 0b31c53b13 ARM: omap1: don't rely on tps65010
The code for h2 and osk implicitly assumes that the tps65010
driver is built-in, in order to perform the initial regulator
setup.

This is fine for most real uses, but it does get into the way
of build testing with 'make randconfig', since we don't want
platforms to implicitly select device drivers and subsystems
such as I2C.

This patch by contrast changes the board files to not call
into the tps65010 driver when that is not built-in, allowing
us to build all configurations including some that will not
work properly on this hardware.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-21 18:23:34 +01:00
Felipe Balbi 84bef11710 ARM: omap1: fix build when !CONFIG_OMAP_32K_TIMER
If CONFIG_OMAP_32K_TIMER isn't enabled, we will
try to use enable_dyn_sleep which wasn't defined
anywhere.

In order to fix the problem, we always define
enable_dyn_sleep as 0 when !CONFIG_OMAP_32K_TIMER.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-21 18:23:33 +01:00
Arnd Bergmann b25a7912eb ARM: msm: export legacy DMA interfaces
The msm_sdcc MMC driver and the msm_serial_hs uart driver both
use the pre-dmaengine interfaces provided by the MSM platform.

Since these drivers can be loadable modules, we should export
the functions used in the drivers.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
2014-03-21 18:23:32 +01:00
Arnd Bergmann d967b0100f ARM: msm: avoid calling debug_ll_addr on !MMU
MSM7X00A has an open-coded version of debug_ll_io_init so it
can use MT_DEVICE_NONSHARED as required by the platform.

However, this fails to build on no-MMU kernels because the
debug_ll_addr function is not available. Since the iotable_init
function doesn't actually do anyting in this configuration,
we can simply get away by enclosing the broken function call
in an #ifdef, which seems to be the least ugly workaround.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
2014-03-21 18:23:31 +01:00
Arnd Bergmann 404ed596de ARM: msm: add missing include of linux/module.h
After the restructuring of the module.h and init.h headers,
we now need to include this explicitly here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
2014-03-21 18:23:30 +01:00
Arnd Bergmann 22833d5574 ARM: lpc32xx: export lpc32xx_return_iram_size
This symbol is used by the lpc_eth driver, which may
be a loadable module.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Roland Stigge <stigge@antcom.de>
2014-03-21 18:23:29 +01:00
Arnd Bergmann de94abfa0f ARM: ks8695/og: make PCI setup conditional
The 'og' machine tries to always initialized the PCI code, but that
may be disabled in Kconfig, leading to a build error.

This patch changes the code to use the same Kconfig symbol to decide
about calling the ks8695_init_pci function at build time that we
use to decide about building the ks8695 PCI support.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Greg Ungerer <gerg@uclinux.org>
2014-03-21 18:23:28 +01:00
Arnd Bergmann 48ba81f6fd ARM: ixp4xx: fix gpio rework
Commit 098e30f655 "ARM: ixp4xx: stop broadcasting the custom GPIO API"
changed the internal gpio code of ixp4xx to be accessible only from
common.c, but unfortunately that broke the Goramo MultiLink code, which
uses this API.

This tries to restore the previous state without exposing the
API globally again. A better solution might be needed.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Imre Kaloz <kaloz@openwrt.org>
2014-03-21 18:23:27 +01:00
Arnd Bergmann 926aabde63 ARM: ixp4xx: avoid use of PCIBIOS_MIN_MEM in io.h
When using CONFIG_IXP4XX_INDIRECT_PCI, we run into a recursive
header file dependency between mach/io.h and asm/pci.h, resulting
in a build failure:

mach-ixp4xx/include/mach/io.h: In function 'is_pci_memory':
mach-ixp4xx/include/mach/io.h:53:18: error: 'PCIBIOS_MIN_MEM' undeclared (first use in this function)
  return (addr >= PCIBIOS_MIN_MEM) && (addr <= 0x4FFFFFFF);
                  ^
mach-ixp4xx/include/mach/io.h:53:18: note: each undeclared identifier is reported only once for each function it appears in

We can work around this by referencing the pcibios_min_mem variable
directly through an extern declaration, rather than using the macro.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
2014-03-21 18:23:26 +01:00
Arnd Bergmann e9c610a49b ARM: ixp4xx/omixp: always include linux/leds.h
The omixp board code unconditionally defines a gpio-led
device, but for some reason includes the header file
for this only if CONFIG_LEDS_CLASS is enabled, causing
a build error otherwise.

Removing the #ifdef fixes the build error with no downsides
whatsoever.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
2014-03-21 18:23:25 +01:00
Arnd Bergmann 1d858f3177 ARM: hisi: fix building without CONFIG_HOTPLUG_CPU
The hisi SMP code always uses the hi3xxx_set_cpu() function
defined in the hotplug.c file, so we cannot build without
this when CONFIG_SMP is enabled. This patch slightly restructures
the code so we always build the parts of hotplug.c that we need
but just leave out the CPU disable logic if CONFIG_HOTPLUG_CPU
is turned off.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
2014-03-21 18:22:09 +01:00
Arnd Bergmann 67e108c530 ARM: ep93xx: export ep93xx_chip_revision
ep93xx_chip_revision is used by the pata_ep93xx driver,
which can be a loadable module. Exporting the symbol
avoids a link error in this case.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <rmallon@gmail.com>
2014-03-21 18:22:08 +01:00
Arnd Bergmann 1df13d9d0f ARM: efm32: select AUTO_ZRELADDR
The efm32 platform does not provide a zreladdr-y line its Makefile.boot,
so we always have to use CONFIG_AUTO_ZRELADDR in order to successfully
build and link a zImage.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Uwe Kleine-König <kernel@pengutronix.de>
2014-03-21 18:22:07 +01:00
Arnd Bergmann 06f07c9ec7 ARM: davinci: fix Kconfig for DA850_EVM
The DAVINCI_DA850_EVM board uses an unusual method to
enable the GPIO_PCA953X and KEYBOARD_GPIO_POLLED symbols,
which leads to the dependencies on these symbols being
ignored. As GPIO_PCA953X actually requires I2C, that
can lead to build failures when I2C is disabled.

This patch removes the duplicate symbol definitions
and instead enables them from the davinci_all_defconfig
file.

A different question whether we actually want to automatically
enable them at all or rather put them into defconfig,
but that should be a separate patch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: davinci-linux-open-source@linux.davincidsp.com
2014-03-21 18:19:33 +01:00
Arnd Bergmann 4bbef1da78 ARM: davinci: make dm644x-evm phy fixup conditional
We cannot call phy_register_fixup_for_uid() if CONFIG_PHYLIB
is not built into the kernel, and we should not enforce that
to be built into vmlinux either, because one might want to
disable the entire network stack.

This change uses a compile-time condition on CONFIG_PHYLIB
to remove the call in the cases where it cannot work.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: davinci-linux-open-source@linux.davincidsp.com
2014-03-21 18:19:32 +01:00
Arnd Bergmann a1628604fd ARM: at91: sama5 always uses DT
It makes no sense for sama5 support to be enabled if we don't
also enable USE_OF. Making this automatic in Kconfig avoids
a possible randconfig conflict between the old and new clock
support code.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
2014-03-21 18:19:31 +01:00
Arnd Bergmann 871336a937 ARM: at91: fix broken "if () else" statement
If CONFIG_PATA_AT91 is disabled, the code in at91_add_device_cf
is turned into invalid C statements due to the lack of an
expression before the 'else' clause.

This moves the first half of the condition inside of the #ifdef,
which seems to be what the author intended.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
2014-03-21 18:19:30 +01:00
Arnd Bergmann c85fc989f9 ARM: at91: export sam9_smc interfaces
The pata_at91 driver uses interfaces defined in the sam9_smc
platform code. Since the pata driver can be a loadable module,
we have to export those symbols in order to link cleanly.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
2014-03-21 18:19:29 +01:00
Arnd Bergmann dfe3676326 ARM: at91: don't provide dt init code for at91x40
at91x40 has no support for device tree, but Kconfig allows
us to enable CONFIG_OF anyway, causing a link error in the
at91 reset controller initialization.

The easiest fix is to adapt the existing #ifdef to omit
the broken code on at91x40 where it is never called anyway.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
2014-03-21 18:19:28 +01:00
Arnd Bergmann fe138c236b ARM: at91: split out at91x40 into a top-level option
at91x40 is different from all the other at91 machines, and it is
impossible to build a kernel that works on both this SoC and
any of the others, even though it is possible to build a noMMU
kernel for any at91 machine.

By turning at91x40 into a separate top-level option, we explicitly
forbid enabling invalid configurations that include mutually exclusive
machines.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
2014-03-21 18:19:27 +01:00
Tomasz Figa 8dec067dc9 ARM: EXYNOS: Fix compilation error in cpuidle.c
The big series refactoring Exynos suspend to RAM handling missed the
cpuidle driver that is disabled in exynos_defconfig, leaving it
including old mach/pm_core.h header and using old s3c_cpu_resume symbol
instead of new exynos_cpu_resume, resulting in compilation failures with
CONFIG_ARCH_EXYNOS and CONFIG_CPU_IDLE enabled.

This patch fixes that silly mistake and performs necessary modification
to arhc/arm/exynos/cpuidle.c to make it compile again.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 07:17:17 +09:00
Tomasz Figa 58f37b0d47 ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h
This patch fixes compilation failure due to missing explicit inclusion
of linux/serial_s3c.h in mach/pm-core.h, which contains definitions
required for further code in this header.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 07:17:16 +09:00
Stephen Warren 95552f5afc ARM: tegra: fix Dalmore pinctrl configuration
Remove some entries from Dalmore's device tree that attempt to set some
options which aren't supported for the drive_gma pin group.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-20 14:45:08 -07:00
Olof Johansson 3545992ba7 ARM: tegra: defconfig updates for 3.15
The following options are enabled:
 - ams AS3722 is used as system PMIC for Tegra124 based Venice2.
 - NXP PCA9546 is used in Cardhu Tegra30 board to connect to 3 cameras.
 - GSPCA to support the webcam on Venice2.
 - Allocate 64 MiB for CMA by default; the default 16MiB is not enough
   for the majority of use-cases. This can still be overridden by the cma
   command-line option.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGisIAAoJEMzrak5tbycxElsP/2hc6033i5w2sdwULYAmBpt4
 aVi3WkP78Dd6mwvgb3uvLcuEO+zS9GQOkfwhQNM0wVUJCbeugutGrTJX5lZV0u7m
 cqaUpaJPPQUFFqpbgSmrz5IK0bKcimM9rgVx0lC47+CpQXQrYxw3yFfXFil4wUiB
 IsIvA+TzBuTYa2P9bHonPFgZqrQclMmDySxLqXnDyWtS+ElxXR23AJj6UED5G0C+
 a5q2jLDBEwAsDXJ3ONLSI02Mb329gznWWTNQUJtiFEf5A3DVll+b8KaLabGeEiEF
 CdLTbu2pH+17Yrc/C9fQNLgWAPODUMaY8UURhlyDHJCpqAYyMa/U0iB13hw2dwaU
 HeHYGCpkXz5J9eqQD6w+npVZkL0j40s0tNSo76sLoPX8NYPNgxJkytK3OJs2zmMi
 jnD8nI5zSHOje0IiK3vhJrqrwdMApQ/Bi5WZCTJheNmtuk4Es3+ByDOLdjnGvCLb
 RtymqKf5Un2lf/9x/SEcEURLkeLoVO0dAT/lJng6GIIUFazzFEjNH4DCUKKJ49gN
 AJvtDeL/edCumqoWM0WSzpCo4wGS461+ZajGBPNWOTaUOvg+sbpKjBF0CEhGYX4s
 IlRhTmPFPcNL13g6goDBt1440j7LnJ/b2wcFN5v+3CFl2KjnH4cPRXfRdyWKM/8Z
 jmvVt20n0kH9dvMN3K0R
 =ubYV
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.15-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/boards

Merge "ARM: tegra: defconfig updates for 3.15" from Stephen Warren:

The following options are enabled:
- ams AS3722 is used as system PMIC for Tegra124 based Venice2.
- NXP PCA9546 is used in Cardhu Tegra30 board to connect to 3 cameras.
- GSPCA to support the webcam on Venice2.
- Allocate 64 MiB for CMA by default; the default 16MiB is not enough
  for the majority of use-cases. This can still be overridden by the cma
  command-line option.

* tag 'tegra-for-3.15-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: defconfig updates

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-20 14:41:47 -07:00
Olof Johansson 414c8385c5 ARM: tegra: device tree changes for 3.15
This enables:
 * host1x and eDP support on Tegra124.
 * LCD panel support for a few Tegra20 devices and Venice2.
 * Enables power down, SPI flash, and USB on Venice2.
 * Documents which Dalmore revision is supported.
 * Adds an I2C bus mux to Cardhu.
 
 Additionally, Tegra124 is converted to use #address-cells=<2> since the
 HW suports more than 32-bits of address space, and various cleanups are
 included.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGiq1AAoJEMzrak5tbycxM48P/17/DY8vXhIGs7/BW0StsMOV
 kr333+12dxBQB0kftHoOtTv4/WutV4jjKAJm+pRBdu/yJ2on9FKKu11Q3r5EjI/B
 9GDk5JSyHRkSIFdzPx4f0QskklmDqJuXD+MNfiQIGC2pv/WQotLUd6rJLcVWE/bk
 8oVFg4b1kAFB2RKqwMywOMPh3X5A6xQKz/yCNLbEYsQXk9p9Iri/nX0Wq6dNVVP/
 qjbll69anJ4IjhCJO4ndrGPWob2GTQpB5a5YGl+0sSZGUEzX/dsCJRgKRrP/JjeC
 mZDWEqRTkqs2g8ZdNdseqMEgW9aksGAT57UCHbVMEd+1szY9RXB2kbvlPdUaU2XL
 oPQpF0dvh3/i/227vvgI8dK4Vo56TPvVWdyztZS1mHL59ouAR6CajRgAQP4Ra6Ug
 4qNJt/CKqm1lRO4eDXgDwt7zL+vP3bL4Mpcc7mN3d45iTz4uRN0KFoUbz/B++Mii
 20+Y5Qn1mZr6CukPcUcT1bivQR42DPQslidaEruaamoBg6Fnn+yNr3KhKcRwS4Xs
 4LuW6D4Bi+DIFwztCtQYf7pkuVHziQGUc1LnAQPqXYurMKVvnjbSjSXCxUsclkUT
 W6gaqZ9QKdjlELuuz97eO866uodZpHNZVxBlnuSaTpHZexRIkLWRHTUUFPtlL+AR
 MJW+8QCUrR08we1WmjlC
 =cniI
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

Merge "ARM: tegra: device tree changes for 3.15" from Stephen Warren:

This enables:
- host1x and eDP support on Tegra124.
- LCD panel support for a few Tegra20 devices and Venice2.
- Enables power down, SPI flash, and USB on Venice2.
- Documents which Dalmore revision is supported.
- Adds an I2C bus mux to Cardhu.

Additionally, Tegra124 is converted to use #address-cells=<2> since the
HW suports more than 32-bits of address space, and various cleanups are
included.

* tag 'tegra-for-3.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (21 commits)
  ARM: dts: tegra: add PCIe interrupt mapping properties
  ARM: tegra: use 2 address cells for Tegra124 DT
  ARM: tegra: Rename as3722 node to pmic
  ARM: tegra: Fix whitespace around '='
  ARM: tegra: Enable USB on Venice2
  ARM: tegra: Add Tegra124 USB support
  ARM: tegra: Enable eDP for Venice2
  ARM: tegra: Add Tegra124 eDP support
  ARM: tegra: Add Tegra124 host1x support
  ARM: tegra: Hook up SDMMC3 power-supply on Venice2
  ARM: tegra: Overhaul Venice2 regulators
  ARM: tegra: Combine VBUS enable pins into one node
  ARM: tegra: Use "disabled" for status property
  ARM: tegra: add SPI flash to Venice2 DT
  ARM: tegra: enable PCA9546 on Cardhu
  ARM: tegra: enable LCD panel on Ventana
  ARM: tegra: enable LCD panel on Seaboard
  ARM: tegra: add system-power-controller property for PMIC node
  ARM: tegra: document which Dalmore revisions are supported
  ARM: tegra: Properly sort clocks property
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-20 14:40:56 -07:00
Olof Johansson eccceebd7e ARM: tegra: core SoC changes for 3.15
A couple of minor fixes, plus the removal of the EMC scaling driver,
 which hasn't been active since we converted clocks to device tree.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGinRAAoJEMzrak5tbycx0V0QAM2muYdm4Wi/a4vO+1lZ75hS
 SZB82RaXI/NsHh0mEH74ed6I1+fCUTtQt/Ht75X+egaw28O05zso/kjy6X4o3GGr
 BKOUo1KAYZmKk2Obmwoz4Rv6bzNkz32Q34jSOMj/iXVU8QlbxNd1tMG2RKz3KccN
 uHQXNPoPK2od0ZzE5pqdomy2Aqk56l5eKAPIFLOvupLpgOnD4b4EQb3SqEBQG0RZ
 qxvooL0lxmUWyr+Ffre4CP0la+BwHbS+LrNuz5dVcv2jD2MDxbuJiOLzHcJKyp/H
 MChxRadBss0Z5J0xXYQDfZ1K0Sm9Y885RG0/ZGxQQ2v5G24c6Ss1iay/SCcmzNdv
 g7hPWMzH4So5oGQFj0rMZp6Gec1Vbffqr+hGhmgSQjmWx7mnLVO8SrQOWTEE+Vz4
 FwBkFSm1DiGMyygCSO/Sy4ce6e7QgoxFAAakEv1l3uSx6XXCQ/D8tQvQAFGneHh6
 uqu479SFpTCjm+TQqMgwt4FOof39l4m3BjoQAR1/M+EbWaPKQEWxaWqjlLPLl9UC
 RSscgIAWmQ/+dn9pRsBLRS4b0NcKszmUYWk5F9uQEdWRUPkEJPkjrDE7npRVTfRm
 o0mKR4Px/hdeQmT7b3gAN52xilHMNncIwzzj/JaNAQCOb5u03JG2DcDhSALsboHX
 kbT6d5wM3PVroRB9Yqow
 =vOsC
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc

Merge "ARM: tegra: core SoC changes for 3.15" from Stephen Warren:

A couple of minor fixes, plus the removal of the EMC scaling driver,
which hasn't been active since we converted clocks to device tree.

* tag 'tegra-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Export I/O rail functions
  ARM: tegra: remove tegra EMC scaling driver
  ARM: tegra: don't timeout if CPU is powergated

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-20 14:38:53 -07:00
Olof Johansson 5d4089a4ad ARM: tegra: Trusted Foundations work for 3.15
This pull request contains a number of cleanups and enhancements for the
 Trusted Foundations firmware used on production Tegra SoCs. The changes
 allow kernels without TF support to run on HW that uses TF, albeit with
 reduced functionality, and also fix the cpuidle feature.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGilTAAoJEMzrak5tbycx1sYQAJ+G3LcFyATZ90urnAoEUXHA
 vr6EODBGemPheNQ1vqY15M03nAigwIqfchfPYRZ87f6iE5Q1SueOd70/zEKnHYvg
 3gk9dob0/MjqiwBzLzIMNk3OtSm2t0M4niYAUup2QhwVXjEOQD8hgR5K6scU33Fd
 pG98Bh0RhJbIKjms6X+ZMzIZ/gQrtiCFJynf02FgM7rBtGZOBc9sCXytbybIRHUb
 0781i3AXKPE1aR1PRKab1j6rFcVmnkEPNEAc1gLJzJRPXYgruMMEXbQm7uWgn8dB
 bz19rBnhcnexItv/WslUMzhsJ3IVKBS3h9KSV6pnNB+/0MnUyG0A+O9oBslrlsVj
 v0dRQRe0cSRyXC21CWzWhdK1fZFWCu2MilRVNUm/Nh3UZ8n80wvKJNPe0pBvNQSC
 I0Q7x379G03K2/RngHQQgF43B6vxRvGaOKMHxXrJyBLNrYZ74vSszpvLIr0qxh5Z
 NkKKenrJpLIdn6DCLRTqKDbs4fdQgDbX0lDE3iJqNj27/+OZYiEoY7KpQyeDm/HR
 VxqSsOc1HYqbAtpBEYzMFcqWE77wvOuc/PAK1QHiYplU4oI4eGL9UUdmGIe+NnG8
 TAp1p3cHiMF1hBD7bdgHsRCFdz5GcA/59WGgqljayQvt85ktkc/aCxBxu4PIw4nS
 Z71RAeVrPr5J7ZuP1KPU
 =B/hn
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.15-tf' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc

Merge "ARM: tegra: Trusted Foundations work for 3.15" from Stephen Warren:

This pull request contains a number of cleanups and enhancements for the
Trusted Foundations firmware used on production Tegra SoCs. The changes
allow kernels without TF support to run on HW that uses TF, albeit with
reduced functionality, and also fix the cpuidle feature.

* tag 'tegra-for-3.15-tf' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: cpuidle: use firmware for power down
  ARM: trusted_foundations: implement prepare_idle()
  ARM: firmware: add prepare_idle() operation
  ARM: firmware: enable Trusted Foundations by default
  ARM: trusted_foundations: fallback when TF support is missing
  ARM: trusted_foundations: fix vendor prefix typos

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-20 14:35:13 -07:00
Ivan Khoronzhuk 3babe30608 ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
As suggested by Olof Johansson at
http://www.spinics.net/lists/arm-kernel/msg314009.html.
It be better just keeping a "ti,keystone" top-level compatible and
just using that to probe. If so we don't have to touch the file
for new boards in the future.

So use common "ti,keystone" compatible in keystone.c for all boards.

Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Olof Johansson <olof@lixom.net>

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-03-20 17:00:27 -04:00
Murali Karicheri 7eb7e8bc68 ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
The UBIFS partition size was incorrectly defined as for 128M NAND,
but on k2hk-evm installed NAND flash size is 512M.
Hence, correct it.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-03-20 16:39:21 -04:00
Sachin Kamat 1aa9c483d1 ARM: EXYNOS: Remove hardware.h file
This is a dummy placeholder file. Delete it.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:49:03 +09:00
Sachin Kamat 2bb1ad17d6 ARM: SAMSUNG: Remove hardware.h inclusion
The contents of this header file are not referenced anywhere in the
included .c files except in devs.c. Remove its inclusion. For devs.c,
explicitly include sizes.h header for SZ_* macros.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:48:59 +09:00
Sachin Kamat 144bf7b0a9 ARM: S3C24XX: Remove invalid code from hardware.h
Remove the code that is not referenced anywhere. While at it also
remove incorrect file path.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:48:07 +09:00
Tushar Behera 602408e3de dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock
Most of the clock related dt-binding header files are located in
dt-bindings/clock folder. It would be good to keep all the similar
header files at a single location.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Reviewed-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:31:30 +09:00
Tushar Behera 55ace6b285 ARM: dts: Keep some essential LDOs enabled for arndale-octa board
LDO3 and LDO23 need to be enabled in order for soft-reset to work.
Additionally LDO9 needs to be enabled for USB operations.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:27:45 +09:00
Tushar Behera 3da355c03a ARM: dts: Disable MDMA1 node for arndale-octa board
MDMA1 can support both secure and non-secure AXI transactions. When this
is enabled in the kernel for boards that run in secure mode, we get
imprecise external aborts causing the kernel to oops.

Unhandled fault: imprecise external abort (0x1406) at 0x00000000
Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000007

Suggested-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Tested-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:27:36 +09:00
Mark Brown e1a9d00c68 ARM: S3C64XX: Fix build for implicit serial_s3c.h inclusion
Some very recent change appears to have removed an implicit inclusion of
serial_s3c.h causing build failures due to references to UART registers
in the serial port restore code in next-20140318.  Include it explicitly
to fix the build.

Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:12:37 +09:00
Tomasz Figa dd8ac696b2 ARM: EXYNOS: Allow wake-up using GIC interrupts
This patch restores the ability to receive wake-up events from internal
GIC interrupts, e.g. RTC tick or alarm interrupts.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:09:29 +09:00
Tomasz Figa d710aa3187 ARM: EXYNOS: Stop using legacy Samsung PM code
Since Exynos SoCs does not follow most of the semantics of older SoCs
when configuring the system to enter sleep, there is no reason to rely
on the legacy Samsung PM core anymore.

This patch adds local Exynos suspend ops and removes all the code left
unnecessary. As a side effect, suspend support on Exynos becomes
multiplatform-friendly.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:09:28 +09:00
Tomasz Figa 559ba23799 ARM: EXYNOS: Remove PM initcalls and useless indirection
This patch simplifies Exynos PM initialization and makes it
multiplatform friendly by replacing initcalls used originally to invoke
all the initialization code with explicit function calls.

In addition, an useless subsys_interface is removed, as all its .add_dev
callback did was setting two function pointers.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:09:27 +09:00
Tomasz Figa dbc5ca163d ARM: EXYNOS: Fix abuse of CONFIG_PM
CONFIG_PM means that at least one of CONFIG_PM_SLEEP and
CONFIG_PM_RUNTIME is enabled, while multiple entries in
mach-exynos/Kconfig abused it to enable sleep- and runtime-specific
functionality.

This patch fixes this abuse by replacing dependencies on CONFIG_PM with
appropriate dependencies on either CONFIG_PM_SLEEP or CONFIG_PM_RUNTIME,
whichever is appropriate.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:09:26 +09:00
Tomasz Figa f682426630 ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h
To allow using Samsung PM memory check helpers on platforms that do not
use the legacy Samsung PM core, this patch moves prototypes of relevant
functions to plat/pm-common.h header.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:09:26 +09:00
Tomasz Figa b27899178c ARM: SAMSUNG: Move common save/restore helpers to separate file
To separate legacy PM code from generic helpers, this patch moves the
generic register save/restore helpers to a new file called pm-common.c
that is compiled always when CONFIG_PM_SLEEP is enabled, to allow
platforms that do not want to use the legacy PM code use the generic
helpers.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:09:25 +09:00
Tomasz Figa 72551f6cf1 ARM: SAMSUNG: Move Samsung PM debug code into separate file
Not all Samsung SoC platforms are going to use the legacy Samsung PM
code enabled by CONFIG_SAMSUNG_PM_DEBUG. To allow using Samsung PM debug
helpers on such platforms, related code is moved to separate file and
a plat/pm-common.h header is added to separate legacy and generic code.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:09:16 +09:00
Tomasz Figa d38688a69f ARM: SAMSUNG: Consolidate PM debug functions
This patch removes one-line functions that was used just to pass
constant arguments to lower level functions. After previous patches the
need for those constants has been eliminated, so the main functions can
be called directly.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:06:12 +09:00
Tomasz Figa 99b2fc2b8b ARM: SAMSUNG: Use debug_ll_addr() to get UART base address
This patch modifies Samsung PM debug helpers to use a multiplatform
friendly way of getting base address of debug UART port, so instead
of using a per-mach static macro, a generic debug_ll_addr() helper
is used.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:06:11 +09:00
Tomasz Figa de7fe0807c ARM: SAMSUNG: Save UART DIVSLOT register based on SoC type
The only SoC that does not have DIVSLOT register is S3C2410, so instead
of exporting a variable for platforms to set if DIVSLOT register should
be preserved, it's enough to simply check whether we are running on
a S3C2410 instead.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:05:57 +09:00
Tomasz Figa 0424106961 ARM: SAMSUNG: Add soc_is_s3c2410() helper
Due to the S3C2410 SoC being quite different from other S3C24xx SoCs
in some aspects, such as availability of DIVSLOT register in its UART
blocks, there is a need sometimes to check whether we are running on
this SoC, not just the S3C24xx series. This patch adds soc_is_s3c2410()
helper function for this purpose.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:04:51 +09:00
Tomasz Figa 61557b8bac ARM: EXYNOS: Do not resume l2x0 if not enabled before suspend
Trying to resume l2x0 if it was not enabled before suspend leads to
system crash. This patch prevents this by checking if l2x0_regs_phys is
a valid pointer to l2x0 context data saved on initialization.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 04:04:42 +09:00
Kukjin Kim 8460dc7f27 Merge branch 'v3.15-next/cleanup-samsung-2' into v3.15-next/s2r-pm-samsung-2 2014-03-21 04:04:15 +09:00
Sachin Kamat 8bdb31b4d1 ARM: dts: Update Exynos DT files with generic compatible strings
Add generic compatible strings to the respective board DT files.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 02:17:22 +09:00
Sachin Kamat 4868123ceb ARM: EXYNOS: Add generic compatible strings
Add generic compatible strings for Exynos4 and 5 platforms so that
future SoCs can use them if there is nothing extra/specific to be
differentiated.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 02:14:59 +09:00
Sachin Kamat cbf08b9ebd ARM: EXYNOS: Consolidate exynos4 and exynos5 machine files
Since there is very little difference between these two files,
they can be easily combined into one with necessary SoC checks.
While at it also merge the common.c file into this as it does
not have any other users.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 02:14:39 +09:00
Sachin Kamat 6eb84669cf ARM: EXYNOS: Consolidate CPU init code
cpu_table was used to distinguish between different Exynos4 and 5
SoCs and based on the type do the initialization and io mapping.
exynos_init is dummy and no longer needed as we do a DT based booting.
By having a common io mapping function we can get rid of the whole
table and avoid populating it for every SoC.

Tested on Exynos4210, 5250 and 5420 based boards.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Tested-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 02:09:39 +09:00
Sachin Kamat 58553078c1 ARM: SAMSUNG: Introduce generic Exynos4 and 5 helpers
Add helpers to check for Exynos4 and 5 family of SoCs.
This will eliminate comparing long list of SoCs and make
code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 02:00:21 +09:00
Sachin Kamat 7ed3001500 ARM: EXYNOS: Add support to reserve memory for MFC-v7
Reserve memory for MFC-v7 IP.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 02:00:09 +09:00
Tushar Behera 8b3e8bbd13 ARM: SAMSUNG: Reorganize calls to reserve memory for MFC
Reorganize code so that "plat/mfc.h" is no more referred
from mach-exynos directory.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-21 02:00:09 +09:00
Eric Paris 579ec9e1ab audit: use uapi/linux/audit.h for AUDIT_ARCH declarations
The syscall.h headers were including linux/audit.h but really only
needed the uapi/linux/audit.h to get the requisite defines.  Switch to
the uapi headers.

Signed-off-by: Eric Paris <eparis@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
Cc: linux-s390@vger.kernel.org
Cc: x86@kernel.org
2014-03-20 10:11:59 -04:00
Eric Paris 5e937a9ae9 syscall_get_arch: remove useless function arguments
Every caller of syscall_get_arch() uses current for the task and no
implementors of the function need args.  So just get rid of both of
those things.  Admittedly, since these are inline functions we aren't
wasting stack space, but it just makes the prototypes better.

Signed-off-by: Eric Paris <eparis@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
Cc: linux390@de.ibm.com
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linux-arch@vger.kernel.org
2014-03-20 10:11:59 -04:00
AKASHI Takahiro 7a01772128 audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL
Currently AUDITSYSCALL has a long list of architecture depencency:
       depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML ||
		SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT) || ALPHA)
The purpose of this patch is to replace it with HAVE_ARCH_AUDITSYSCALL
for simplicity.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com> (arm)
Acked-by: Richard Guy Briggs <rgb@redhat.com> (audit)
Acked-by: Matt Turner <mattst88@gmail.com> (alpha)
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Signed-off-by: Eric Paris <eparis@redhat.com>
2014-03-20 10:11:10 -04:00
Srivatsa S. Bhat 8146875de7 arm, kvm: Fix CPU hotplug callback registration
On 03/15/2014 12:40 AM, Christoffer Dall wrote:
> On Fri, Mar 14, 2014 at 11:13:29AM +0530, Srivatsa S. Bhat wrote:
>> On 03/13/2014 04:51 AM, Christoffer Dall wrote:
>>> On Tue, Mar 11, 2014 at 02:05:38AM +0530, Srivatsa S. Bhat wrote:
>>>> Subsystems that want to register CPU hotplug callbacks, as well as perform
>>>> initialization for the CPUs that are already online, often do it as shown
>>>> below:
>>>>
[...]
>>> Just so we're clear, the existing code was simply racy as not prone to
>>> deadlocks, right?
>>>
>>> This makes it clear that the test above for compatible CPUs can be quite
>>> easily evaded by using CPU hotplug, but we don't really have a good
>>> solution for handling that yet...  Hmmm, grumble grumble, I guess if you
>>> hotplug unsupported CPUs on a KVM/ARM system for now, stuff will break.
>>>
>>
>> In this particular case, there was no deadlock possibility, rather the
>> existing code had insufficient synchronization against CPU hotplug.
>>
>> init_hyp_mode() would invoke cpu_init_hyp_mode() on currently online CPUs
>> using on_each_cpu(). If a CPU came online after this point and before calling
>> register_cpu_notifier(), that CPU would remain uninitialized because this
>> subsystem would miss the hot-online event. This patch fixes this bug and
>> also uses the new synchronization method (instead of get/put_online_cpus())
>> to ensure that we don't deadlock with CPU hotplug.
>>
>
> Yes, that was my conclusion as well.  Thanks for clarifying.  (It could
> be noted in the commit message as well if you should feel so inclined).
>

Please find the patch with updated changelog (and your Ack) below.
(No changes in code).

From: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Subject: [PATCH] arm, kvm: Fix CPU hotplug callback registration

Subsystems that want to register CPU hotplug callbacks, as well as perform
initialization for the CPUs that are already online, often do it as shown
below:

	get_online_cpus();

	for_each_online_cpu(cpu)
		init_cpu(cpu);

	register_cpu_notifier(&foobar_cpu_notifier);

	put_online_cpus();

This is wrong, since it is prone to ABBA deadlocks involving the
cpu_add_remove_lock and the cpu_hotplug.lock (when running concurrently
with CPU hotplug operations).

Instead, the correct and race-free way of performing the callback
registration is:

	cpu_notifier_register_begin();

	for_each_online_cpu(cpu)
		init_cpu(cpu);

	/* Note the use of the double underscored version of the API */
	__register_cpu_notifier(&foobar_cpu_notifier);

	cpu_notifier_register_done();

In the existing arm kvm code, there is no synchronization with CPU hotplug
to avoid missing the hotplug events that might occur after invoking
init_hyp_mode() and before calling register_cpu_notifier(). Fix this bug
and also use the new synchronization method (instead of get/put_online_cpus())
to ensure that we don't deadlock with CPU hotplug.

Cc: Gleb Natapov <gleb@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ingo Molnar <mingo@kernel.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2014-03-20 13:43:41 +01:00
Srivatsa S. Bhat c5929bd3a9 arm, hw-breakpoint: Fix CPU hotplug callback registration
Subsystems that want to register CPU hotplug callbacks, as well as perform
initialization for the CPUs that are already online, often do it as shown
below:

	get_online_cpus();

	for_each_online_cpu(cpu)
		init_cpu(cpu);

	register_cpu_notifier(&foobar_cpu_notifier);

	put_online_cpus();

This is wrong, since it is prone to ABBA deadlocks involving the
cpu_add_remove_lock and the cpu_hotplug.lock (when running concurrently
with CPU hotplug operations).

Instead, the correct and race-free way of performing the callback
registration is:

	cpu_notifier_register_begin();

	for_each_online_cpu(cpu)
		init_cpu(cpu);

	/* Note the use of the double underscored version of the API */
	__register_cpu_notifier(&foobar_cpu_notifier);

	cpu_notifier_register_done();

Fix the hw-breakpoint code in arm by using this latter form of callback
registration.

Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ingo Molnar <mingo@kernel.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2014-03-20 13:43:41 +01:00
Thomas Gleixner b524ca742e arm: omap: Fix typo in ams-delta-fiq.c
8435cf757 (arm: Replace various irq_desc accesses) typoed
irq_get_irq_chip() instead of irq_get_chip().

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-03-20 12:44:02 +01:00
Kevin Hilman b737f51d42 ARM: davinci: fix DT booting with default defconfig
Davinci boards tend to have older booloaders without DTB support.
Enable appended DTB support by default to allow DT booting on older
platforms.  While there, also enable /proc/device-tree support for
easy verification of DT boot.

Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2014-03-20 15:39:38 +05:30
Tomi Valkeinen 703cc5df19 Merge branch '3.15/dss-dt-dts' into 3.15/fbdev
OMAP DSS related .dts changes
2014-03-20 08:18:27 +02:00
Tomi Valkeinen 17d5ca91cf Merge branch '3.15/dss-dt' into 3.15/fbdev
Merge OMAP DSS DT support
2014-03-20 08:13:50 +02:00
Christopher Covington 95c52fe063 ARM: 8007/1: Remove extraneous kcmp syscall ignore
The kcmp system call was ported to ARM in
commit 3f7d1fe108
"ARM: 7665/1: Wire up kcmp syscall".

Fixes: 3f7d1fe108 ("ARM: 7665/1: Wire up kcmp syscall")
Signed-off-by: Christopher Covington <cov@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-03-19 20:20:37 +00:00
Alexander Shiyan 1ef2bf8227 ARM: 8006/1: Remove redundant code
Statements following return will never be executed.
This patch removes this code.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-03-19 20:19:01 +00:00
Russell King 566b60c04a Merge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into devel-stable
This patch series adds basic uprobes support to ARM. It is based on
patches developed earlier by Rabin Vincent. That approach of adding
hooks into the kprobes instruction parsing code was not well received.
This approach separates the ARM instruction parsing code in kprobes out
into a separate set of functions which can be used by both kprobes and
uprobes. Both kprobes and uprobes then provide their own semantic action
tables to process the results of the parsing.
2014-03-19 20:15:46 +00:00
Viresh Kumar 0b443ead71 cpufreq: remove unused notifier: CPUFREQ_{SUSPENDCHANGE|RESUMECHANGE}
Two cpufreq notifiers CPUFREQ_RESUMECHANGE and CPUFREQ_SUSPENDCHANGE have
not been used for some time, so remove them to clean up code a bit.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
[rjw: Changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2014-03-19 14:10:24 +01:00
Tomi Valkeinen 1133420fe1 ARM: omap3-n900.dts: add display information
Add DT data for OMAP3 N900 board. The board has the following displays:

lcd: LCD panel connected to OMAP's SDI output
tv: analog svideo

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Sebastian Reichel <sre@debian.org>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 11:14:17 +02:00
Javier Martinez Canillas dd186aa5a0 ARM: omap3-igep0020.dts: add display information
Add DT data for OMAP3 IGEPv2 board. The board has the following displays:

dvi: uses TFP410 encoder to convert DPI to DVI

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 11:14:01 +02:00
Tomi Valkeinen 9955a9e5bd ARM: omap3-beagle-xm.dts: add display information
Add DT data for OMAP3 Beagle-xM board. The board has the following displays:

dvi: uses TFP410 encoder to convert DPI to DVI
tv: analog svideo

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 11:11:38 +02:00
Tomi Valkeinen 8cecf52bef ARM: omap3-beagle.dts: add display information
Add DT data for OMAP3 Beagle board. The board has the following displays:

dvi: uses TFP410 encoder to convert DPI to DVI
tv: analog svideo

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 11:11:27 +02:00
Tomi Valkeinen 7c572d5eb6 ARM: omap4-sdp.dts: add display information
Add DT data for OMAP4 SDP board. The board has the following displays:

lcd0: a command mode DSI panel connected to OMAP DSI1 encoder
lcd1: a command mode DSI panel connected to OMAP DSI2 encoder
hdmi: OMAP HDMI output with TPD12S015 ESD/level shifter

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 11:11:09 +02:00
Tomi Valkeinen 6a0e6b3872 ARM: OMAP2+: DT 'compatible' tweak for displays
As there is no common panel framework in the kernel, we have OMAP
specific panel drivers. However, the DT data should be generic. This
brings the issue that some other platform could use the same panels, and
would need to create a driver with the same 'compatible' string as the
OMAP driver.

In the long run, we have to get a common panel framework. For the time
being, this patch solves the issue:

At early boot time, we go through the DT nodes looking for the panels
the kernel supports for OMAP. For each found node, the 'compatible'
string is prepended with "omapdss,", i.e. "sony,acx565akm" becomes
"omapdss,sony,acx565akm". The OMAP display drivers all have "omapdss,"
at the beginning of their compatible field.

This allows us to have generic DT data, but OMAP specific display
drivers.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 11:02:46 +02:00
Tomi Valkeinen dcdf407b9d ARM: OMAP2+: add omapdss_init_of()
The OMAP display architecture requires a bunch of platform devices which
are not created via .dts (for now). We also need to pass a few function
pointers and the DSS hardware version from the arch code to omapdss
driver.

This patch adds omapdss_init_of() function, called from board-generic at
init time, which handles those tasks.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 10:52:23 +02:00
Tomi Valkeinen 661637ca2e ARM: omap4-panda.dts: add display information
Add DT data for OMAP4 Pandaboard. The board has the following displays:

dvi: uses TFP410 encoder to convert DPI to DVI
hdmi: OMAP HDMI output with TPD12S015 ESD/level shifter

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 09:50:00 +02:00
Tomi Valkeinen cfe86fcf2d ARM: omap4.dtsi: add omapdss information
Add DT data for OMAP4 display subsystem, which contains the following
blocks:

dss - the wrapper/glue for the display modules
dispc - display controller
dsi - MIPI DSI encoder (two independent modules)
rfbi - MIPI DBI encoder
venc - analog TV encoder
hdmi - HDMI encoder

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 09:31:49 +02:00
Tomi Valkeinen b8a7e42b68 ARM: omap3.dtsi: add omapdss information
Add DT data for OMAP3 display subsystem, which contains the following
blocks:

dss - the wrapper/glue for the display modules
dispc - display controller
dsi - MIPI DSI encoder
rfbi - MIPI DBI encoder
venc - analog TV encoder

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 09:31:49 +02:00
Tomi Valkeinen 0f3b1e4415 ARM: omap2.dtsi: add omapdss information
Add DT data for OMAP2 display subsystem, which contains the following
blocks:

dss - the wrapper/glue for the display modules
dispc - display controller
rfbi - MIPI DBI encoder
venc - analog TV encoder

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 09:31:48 +02:00
Tomi Valkeinen 1d3361f622 ARM: dts: set 'ti,set-rate-parent' for dpll4_m4 path
Set 'ti,set-rate-parent' property for clocks in the dpll4_m4 clock
path, which is used for DSS functional clock. This fixes DSS driver's
clock rate configuration, which needs the rate to be propagated properly
to the divider node (dpll4_m4_ck).

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 09:31:48 +02:00
Tomi Valkeinen c368dbe2de ARM: dts: use ti,fixed-factor-clock for dpll4_m4x2_mul_ck
We need to use set-rate-parent for dpll4_m4 clock path, so use the
ti,fixed-factor-clock version which supports set-rate-parent property.

The set-rate-parent flag itself is set in the following patch, this one
just changes the clock driver to ti,fixed-factor-clock without any other
changes.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 09:31:48 +02:00
Tomi Valkeinen 64a900ff47 ARM: dts: fix DPLL4 x2 clkouts on 3630
OMAP3630 DPLL4 is different than on OMAP3430, in that it doesn't have
the x2 multiplier for its outputs. This is not currently reflected in
the clock DT data.

Fix the issue by setting the clock multiplier to 1 (instead of 2) for the
DPLL4 output clocks.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 09:31:47 +02:00
Tomi Valkeinen 9512c6fec8 ARM: dts: fix omap3 dss clock handle names
The DSS fclk and iclk handles are named differently on OMAP3430 ES1 than
on later OMAP revisions. The ES1 has handles 'dss1_alwon_fck_3430es1'
and 'dss_ick_3430es1', whereas later revisions have similar names but
ending with 'es2'.

This means we don't have one clock handle to which we could refer to
when defining the DSS clocks.

However, as the namespaces are separate for ES1 and ES2+ OMAPs, we can
just rename the handles to 'dss1_alwon_fck' and 'dss_ick' for both ES1
and ES2+, removing the issue.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
2014-03-19 09:31:47 +02:00
David A. Long c7edc9e326 ARM: add uprobes support
Using Rabin Vincent's ARM uprobes patches as a base, enable uprobes
support on ARM.

Caveats:

 - Thumb is not supported

Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: David A. Long <dave.long@linaro.org>
2014-03-18 16:39:40 -04:00
David A. Long b4cd605ca9 ARM: Make arch_specific_insn a define for new arch_probes_insn structure
Because the common underlying code for ARM kprobes and uprobes needs
to share a common architecrure-specific context structure, and because
the generic kprobes include file insists on defining this to a dummy
structure when kprobes is not configured, a new common structure is
required which can exist when uprobes is configured without kprobes.
In this case kprobes will define a dummy structure, but without the
define aliasing the two structure tags it will not affect uprobes and
the shared probes code.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:40 -04:00
David A. Long 602cd2609e ARM: Add an emulate flag to the kprobes/uprobes instruction decode functions
Add an emulate flag into the instruction interpreter, primarily for uprobes
support.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:39 -04:00
David A. Long 47e190fafd ARM: Change the remaining shared kprobes/uprobes symbols to something generic
Any more ARM kprobes/uprobes symbols which have "kprobe" in the name must be
changed to the more generic "probes" or other non-kprobes specific symbol.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:39 -04:00
David A. Long 44a0a59c53 ARM: Rename the shared kprobes/uprobe return value enum
Change the name of kprobes_insn to probes_insn so it can be shared between
kprobes and uprobes without confusion.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:38 -04:00
David A. Long eb73ea97e6 ARM: Change more ARM kprobes symbol names to something more generic
Change kprobe_emulate_none, kprobe_simulate_nop, and arm_kprobe_decode_init
function names to something more appropriate for code being shared
outside of the kprobes subsystem. Also, move the new arm_probes_decode_init
declaration out of the kprobes.h include file and into the probes.h include file.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:38 -04:00
David A. Long f145d664df ARM: Make the kprobes condition_check symbol names more generic
In preparation for sharing the ARM kprobes instruction interpreting
code with uprobes, make the symbols names less kprobes-specific.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:37 -04:00
David A. Long 7579f4b376 ARM: Remove use of struct kprobe from generic probes code
Change the generic ARM probes code to pass in the opcode and architecture-specific
structure separately instead of using struct kprobe, so we do not pollute
code being used only for uprobes or other non-kprobes instruction
interpretation.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:37 -04:00
David A. Long 3e6cd394bb ARM: use a function table for determining instruction interpreter action
Make the instruction interpreter call back to semantic action functions
through a function pointer array provided by the invoker.  The interpreter
decodes the instructions into groups and uses the group number to index
into the supplied array.  kprobes and uprobes code will each supply their
own array of functions.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:36 -04:00
David A. Long 87abef63ea ARM: move generic thumb instruction parsing code to new files for use by other feature
Move the thumb version of the kprobes instruction parsing code into more generic
files from where it can be used by uprobes and possibly other subsystems. The
symbol names will be made more generic in a subsequent part of this patchset.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:36 -04:00
David A. Long c18377c303 ARM: Move generic arm instruction parsing code to new files for sharing between features
Move the arm version of the kprobes instruction parsing code into more generic
files from where it can be used by uprobes and possibly other subsystems. The
symbol names will be made more generic in a subsequent part of this patchset.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:35 -04:00
David A. Long b2531dd5e5 ARM: move shared uprobe/kprobe definitions into new include file
Separate the kprobe-only definitions from the definitions needed by
both kprobes and uprobes.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:35 -04:00
David A. Long 21254ebc9e ARM: Fix missing includes in kprobes sources
Make sure includes in ARM kprobes sources are done explicitly. Do not
rely on includes from other includes.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18 16:39:34 -04:00
Santosh Shilimkar 400550ae7e ARM: dts: Build all keystone dt blobs
Now we have additional two SOC/boards supported, so add
make file rule so that all device tree blobs can be build
for keystone with 'make dtbs'.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-03-18 16:02:34 -04:00
Ivan Khoronzhuk 1f9f5201a3 ARM: dts: keystone: Fix control register range for clktsip
The control register range for clktsio interferes with clkaemifspi clock.
And it causes issues for NAND/AEMIF. So fix it.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-03-18 15:59:26 -04:00
Ivan Khoronzhuk 754f67cdfe ARM: dts: keystone: Fix domain register range for clkfftc1
The domain register range for clkfftc1 has to be 0x0235004c
instead of 0x023504c0.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-03-18 15:58:45 -04:00
Arnd Bergmann a65b5f4ccd Merge branch 'cleanup/kconfig' into next/drivers
This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18 16:25:47 +01:00
Arnd Bergmann 9ad2a24f37 Merge tag 'sti-reset-for-v3.15' of git://git.stlinux.com/devel/kernel/linux-sti into next/drivers
Merge "STi Reset controller support" from Srinivas Kandagatla:

* tag 'sti-reset-for-v3.15' of git://git.stlinux.com/devel/kernel/linux-sti:
  ARM: STi: Add reset controller support to mach-sti Kconfig
  drivers: reset: stih416: add softreset controller
  drivers: reset: stih415: add softreset controller
  drivers: reset: Reset controller driver for STiH416
  drivers: reset: Reset controller driver for STiH415
  drivers: reset: STi SoC system configuration reset controller support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18 16:20:12 +01:00
Arnd Bergmann 4569f2b7be Merge branch 'sti/dt' into next/drivers
This is apparently a dependency for the STi reset controller driver.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18 16:19:50 +01:00
Arnd Bergmann 98907c2d3d Merge tag 'DT-for-v3.15-part-1-v2' of git://git.stlinux.com/devel/kernel/linux-sti into next/dt
Merge "STi DT changes part 1 v2" from Srinivas Kandagatla:

Patches : 01-02 are DT patches, adding interrupt support to pin
controller driver, Driver changes are already going via Linus W's
pinctrl tree.

Patches: 03 - 06 are DT patches for reset/softreset controller. Reset
controller driver is Acked by Philipp Zabel.

Patches: 07, 08 are DT patches, adding Ethernet controller support
patches, actual driver changes are already in v3.14-rc4 via Dave Millers
net tree.

Patches: 09, 10 are DT patches for IR driver support, actual IR driver
is already available since v3.12. Reason for the delay is due to
dependency on reset controller driver/headers.

* tag 'DT-for-v3.15-part-1-v2' of git://git.stlinux.com/devel/kernel/linux-sti:
  ARM: STi: STIH416: Add IR support.
  ARM: STi: STIH415: Add IR support.
  ARM: STi: STiH416: Add ethernet support.
  ARM: STi: STiH415: Add ethernet support.
  ARM: STi: STiH416: Add soft reset controller support.
  ARM: STi: STiH416: Add reset controller support.
  ARM: STi: STiH415: Add soft reset controller support.
  ARM: STi: STiH415: Add reset controller support.
  ARM: STi: STiH415: Add interrupt support for pin controller
  ARM: STi: STiH416: Add interrupt support for pin controller

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18 16:14:47 +01:00
Arnd Bergmann b44ce3b0f9 Samsung non-critical fixes for v3.15
- fix typo CONFIG_CPU_S3C2443 in Kconfig
 - fix G3D regulator on because of entering low power mode
   for exynos5250-arndale
 - fix CONFIG_USB_EHCI_EXYNOS for exynos_defconfig
 - fix initcall of mach-crag6410-module.c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTJ8q+AAoJEA0Cl+kVi2xqZsIP/j92WX536fqnMF3tv2C4xslM
 S1KFpTkgV2d7i6+YP0mZh9C+vrO0Ek/K2+uautS/1WlBqQeQCQKc6OpsumAC8cY+
 GpI7/sXrmf/7wixNvkiHLO4etsoIYnow70Vm+3tRfaw69pf/IqVh3pCCljAWy9Jx
 2cXrn0mjGM9R0xLYkZMwSLZQg8AhkDQZkzY5NSKFooXZN4YM+TA7kV0FLywQdjdg
 02ccvVESiJpNhBWI950mKLKggU/v6EjQFZY1WHmOxuXGwxVCqTVGXAkyQJdX5HN8
 3EggmjeVn+qkH4ORCXWH5adeTHFNAnJpWTqF8FSc4ZPUM5DLxMUnBZJiuLRsaEQt
 JFZ6ZgGCEtdwGUbhiTcv5OYpOklDsLCf5pKc12BKTjXYNNdGiAxNUlakFYCMIW5v
 wDunCIbdKTF5C6TcEYoA3G2uljKhHSOaXKyvv5QiYJ9RU3SfW2g+Fp5d/c77OrEj
 lPUY8HktPeUPxH3I0bLX5VNy5GNxQ0Oce1Rm5TneCh3xm6NCQ4bxYA9uOKH83lEn
 wZIVQ1iHfrRoLvJPQsqTeGkawAgkVGhwNYq4iWhPuioVErGHwXzmcxtssnNDi9Ch
 mg3E8rLfzvGwKIhjxWy4e9I3bIt0rWc5JhYR13jytJyGqdhErG+KvL8UBaXWKiil
 dvZGkzLxttpNuKUZegt2
 =tJNW
 -----END PGP SIGNATURE-----

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

Merge "Samsung non-critical fixes for v3.15" from Kukjin Kim:

- fix typo CONFIG_CPU_S3C2443 in Kconfig
- fix G3D regulator on because of entering low power mode
  for exynos5250-arndale
- fix CONFIG_USB_EHCI_EXYNOS for exynos_defconfig
- fix initcall of mach-crag6410-module.c

* tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C64XX: mach-crag6410-module.c is not modular
  ARM: exynos_defconfig: Update EHCI config entry
  ARM: dts: Keep G3D regulator always on for exynos5250-arndale
  ARM: S3C24XX: Fix typo CONFIG_CPUS_3C2443

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18 16:06:37 +01:00
Arnd Bergmann 3524080826 ARM: mmp: allow platform devices with modular USB
The USB host drivers need platform data to be defined on
pxa168 and pxa910, but the conditionals used in the devices.c
file only work if the drivers are built-in. This patch
fixes the definition by changing the #ifdef to #if IS_ENABLED(),
which works both for built-in and modular Kconfig symbols.

I found one specific problem using 'randconfig' builds, but
for consistency, this patch uses IS_ENABLED() for all Kconfig
symbols in these three files.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
2014-03-18 16:03:44 +01:00
Simon Kågström bfdad565ae ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation
Non-PCI devices can use the entire 32-bit range, PCI dittos are
limited to the first 64MiB.

Also actually setup coherent_dma_mask.

The patch has been verified on a board with 128MiB memory, one
ipx4xx_eth device and a e100 PCI device.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18 16:03:43 +01:00
Zoltan Kiss 1429d46df4 xen/grant-table: Refactor gnttab_[un]map_refs to avoid m2p_override
The grant mapping API does m2p_override unnecessarily: only gntdev needs it,
for blkback and future netback patches it just cause a lock contention, as
those pages never go to userspace. Therefore this series does the following:
- the bulk of the original function (everything after the mapping hypercall)
  is moved to arch-dependent set/clear_foreign_p2m_mapping
- the "if (xen_feature(XENFEAT_auto_translated_physmap))" branch goes to ARM
- therefore the ARM function could be much smaller, the m2p_override stubs
  could be also removed
- on x86 the set_phys_to_machine calls were moved up to this new funcion
  from m2p_override functions
- and m2p_override functions are only called when there is a kmap_ops param

It also removes a stray space from arch/x86/include/asm/xen/page.h.

Signed-off-by: Zoltan Kiss <zoltan.kiss@citrix.com>
Suggested-by: Anthony Liguori <aliguori@amazon.com>
Suggested-by: David Vrabel <david.vrabel@citrix.com>
Suggested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
2014-03-18 14:40:19 +00:00
Yuvaraj Kumar C D ba0d7ed391 ARM: dts: enable ahci sata and sata phy for exynos5250
This patch adds dt entry for ahci sata controller and its
corresponding phy controller.phy node has been added w.r.t
new generic phy framework.

Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 07:49:14 +09:00
Naveen Krishna Chatradhi 183af2522d ARM: dts: add dt node for sss module for exynos5250/5420
This patch adds the device tree node for SSS module
found on Exynos5420 and Exynos5250

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 07:38:04 +09:00
Mark Brown 2547284b60 ARM: dts: Remove leftover spi0 node for smdk5250
Now that the SPI controllers are disabled by default for Exynos5250
there is no need to explicitly disable them in individual board files.
This hunk appears not to have been merged when doing the original
conversion, add it now.

Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 07:16:51 +09:00
Chanwoo Choi 4f42378891 ARM: dts: Add ADC and themistor nodes for exynos4412-trats2
This patch use ADC to get the temperature of SoC/battery by using NTC thermistor
driver in hwmon. NTC thermistor driver covnvert ADC's raw data to temperature
by using following variables:

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 06:25:59 +09:00
Chanwoo Choi 8bdfa203c5 ARM: dts: Move common dt data for interrupt combiner controller for exynos4x12
This patch move common dt data of interrupt combiner controller to
exynos4x12.dtsi. Each Exynos4x12 SoC has different number of interrput combiner
as following:
- Exynos4212 : interrput combiner 18(0 ~ 17)
- Exynos4412 : interrput combiner 20(0 ~ 19)

The exynos combiner driver initialize interrupt according to specific number
of interrput combiner.
- samsung,combiner-nr : The number of interrput combiners supported.

Also,
This patch arrange again the dt data according to register address
in exynos4212/exynos4412.dtsi.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 06:25:59 +09:00
Chanwoo Choi 10ea1f1833 ARM: dts: Add GPS_ALIVE power domain for exynos4x12
This patch add GPS_ALIVE power domain for Exynos4x12 SoC. GPS_ALIVE power domain
include GPS_BLK for GPS IP. Exynos SoC used generic power-domain driver to
control power domain. After completed kernel booting, Exynos power-domain driver
disable un-used power domain to reduce power-consumption/leak.

If GPS_ALIVE power domain isn't registered to Exynos power-domain driver,
happen power-leakage because GPS_ALIVE_CONFIGURATION is default power on state.

- 0x10023D00 : GPS_ALIVE_CONFIGURATION register address

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 06:25:58 +09:00
Chanwoo Choi be929999fd ARM: dts: Add PMU dt data to support PMU for exynos4x12
ARM CPU has its own performance profiling unit(PMU, Perforamnce Monitoring Unit).
This patch add PMU dt data to support PMU which count cache hit and miss events.

PMU interrput list of Exynos4212
- <2 2> : INTG2[2] - PMUIRQ[0] for CPU0
- <3 2> : INTG3[2] - PMUIRQ[1] for CPU1

PMU interrput list of Exynos4412
- <2 2> : INTG2[2], PMUIRQ[0] for CPU0
- <3 2> : INTG3[2], PMUIRQ[1] for CPU1
- <18 2> : INTG18[2], PMUIRQ[2] : CPU2
- <19 2> : INTG19[2], PMUIRQ[3] : CPU3

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 06:25:58 +09:00
Chanwoo Choi c63c574330 ARM: dts: Add ADC's dt data to read raw data for exynos4x12
This patch add ADC(Analog to Digital Converter)'s dt data to get raw data
with IIO subsystem. Usually, ADC is used to check temperature, jack type
and so on.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 06:25:58 +09:00
Arnd Bergmann 6df5132aee ARM: mach-bcm: soc updates for 3.15 - part 3
- enable bcm590xx regulator driver in bcm_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTJzTXAAoJEOfTILNwq7R4t1gQAI1Ag9+YfBKgo4ep+oHhMKEy
 3CmlqGTPIhsrQ0eoy5oXsedtzB1clqXi2g3sHagL4ANap6WIqZZwnvwapOkKsrx+
 W24Uc5n3QAEz0rxqi38uEC9x+RgWR0mLBkOaZpjwfKoTVHeGbZ+7foEPXT+Z3fBT
 V6I0mokalK5Ou1MfB5Jv2bpYEwGymQ5yQBEKg5vj/WAmMQeOXcewXLQHLKqwBC51
 Nygdkb2CR55m48Zg5HZjf7lDjgUvABwbw8MRNG/hBft8+s7DIMR31UYwBfgbebbv
 dE34i9c7nRPSjyC1n4y+fY6S0Erz6sMYDjdJgi5na0vcDT84Bo7W2a9lFR5HRXvl
 dgJ36LdDPdiS5Fq6IT3omtxa6cc14crQ/PzkkWXRIPsmp1loKj04PGtaeUr/sLxp
 FSkzJ/Sw8L+KHnsJTETlvgJEt9tDxQXQja6jBmLgK50wesBXsu0Nuv0yDhVNqfR6
 qbdN+1tWocnIpwCmNTpPYo4CAC6STC/RiiunPgZHwBeiJvVyAAU6z+m/HpGGF9aa
 THo5tEXnasvYqklvV26tCZuWlTy/WADnUbbyHi41snwerZUxSr4ZjPKKEWQbpBPZ
 N2mSWoc2Jm4SVE61Pynh0zdUBxDuX2oUEvGjrec8j3iSJP9X1fHK7fxV4kOkpU5h
 LtLo1U6LFm6Uso0heU6P
 =eaNd
 -----END PGP SIGNATURE-----

Merge tag 'armsoc/for-3.15/soc-4' of git://github.com/broadcom/mach-bcm into next/soc

Merge "ARM: mach-bcm: soc updates for 3.15 - part 3" from Matt Porter

- enable bcm590xx regulator driver in bcm_defconfig

* tag 'armsoc/for-3.15/soc-4' of git://github.com/broadcom/mach-bcm:
  ARM: configs: bcm_defconfig: enable bcm590xx regulator support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 20:04:30 +01:00
Sebastian Hesselbarth 5c436fbef2 ARM: add Marvell Dove and some drivers to multi_v7 defconfig
With Marvell Dove now being part of the multi_v7 family, add some Dove
specific drivers to multi_v7 defconfig.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 20:01:57 +01:00
Arnd Bergmann 48352e5286 ARM: prima2: build reset code standalone
The prima2 platform code currently depends on the rstc
implementation and that in turn depends on the reset
controller framework. This removes the platform dependency
by letting the driver access arm_pm_restart directly
to turn the driver into a standalone entity, and also
removes the dependency on the reset controller framework
by using "if (IS_ENABLED(CONFIG_RESET_CONTROLLER))". This
will cause all code that is used for the reset controller
to be dropped by the compiler if the framework is disabled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 19:46:12 +01:00
Greg Kroah-Hartman e40bffaeae Merge 3.14-rc7 into staging-next
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17 11:27:39 -07:00
Matt Porter 72585c8b99 ARM: configs: bcm_defconfig: enable bcm590xx regulator support
Enable BCM590xx MFD and regulator drivers to manage voltage
regulators on BCM281xx platforms.

Signed-off-by: Tim Kryger <tim.kryger@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
2014-03-17 13:35:53 -04:00
Arnd Bergmann 397d77a566 First batch of AT91 cleanup for 3.15
- some updates on the defconfig front
 - two SoCs converted to Device Tree: sam9261 and sam9rl
   (with use of CCF!)
 - a little PWM clock update that goes on top of this
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJTIJ7GAAoJEAf03oE53VmQ3xgIAMtWSo91ENlnr38ZtEN+J71j
 lrUdI/0sfv4pY2Dw0VbrnFS4hNmvM25C4dIR7SxU3iOnIC0vzzkPqs2hdRHwUY6y
 pw9NsnF3kW950vf/M6nDmHxQpwKZOCpABs5EDjO6S4Ky6sze4IPog+vb5Y7ovGCl
 LSqL9col3RCHIGyBWq77T3/NbWKOrz67Fy3eqJRyio7H8zYaEGnIrm2jPXYwtToT
 /FB9sZUunjYwdTRdGNhRiTHWktwlr4i4f8woHTZg85MGKY6DOsZgxzUvCXdGBeJx
 XaQ70hE8BF78Lglx8WUBgxowxJ1FvehxxcfzoYAVafwMlik+tSd3l0Zq3Sf6xD8=
 =Q3FC
 -----END PGP SIGNATURE-----

Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup

Merge "First batch of AT91 cleanup for 3.15" from Nicolas Ferre:

- some updates on the defconfig front
- two SoCs converted to Device Tree: sam9261 and sam9rl
  (with use of CCF!)
- a little PWM clock update that goes on top of this

* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
  ARM: at91: add PWM clock
  ARM: at91: move sam9261 SoC to common clk
  ARM: at91: prepare common clk transition for sam9261 SoC
  ARM: at91: updated the at91_dt_defconfig with support for the ADS7846
  ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
  ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs
  ARM: at91: dt: Add at91sam9261 dt SoC support
  ARM: at91: switch sam9rl to common clock framework
  ARM: at91/dt: define main clk frequency of at91sam9rlek
  ARM: at91/dt: define at91sam9rl clocks
  ARM: at91: prepare common clk transition for sam9rl SoCs
  ARM: at91: prepare sam9 dt boards transition to common clk
  ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
  ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs
  ARM: at91: Add at91sam9rl DT SoC support
  ARM: at91: prepare at91sam9rl DT transition
  ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig
  ARM: at91/defconfig: remove useless configuration in at91sam9260_9g20_defconfig
  ARM: at91/defconfig: refresh at91sam9rl_defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:38:07 +01:00
Krzysztof Hałasa 64cf9d07ef CNS3xxx: Fix PCIe early iotable_init().
This patch fixes the following BUG:

> kernel BUG at mm/vmalloc.c:1132!
> PC is at vm_area_add_early+0x20/0x84
> LR is at add_static_vm_early+0xc/0x60
>
> The problem is cns3xxx_pcie_init() (device_initcall) calls the "early"
> iotable_init().

Instead of merely calling the PCIe iotable_init() from
machine_desc->map_io(), this patch adds the required mappings to the
main CNS3xxx mapping table. This means we don't convert .pfn back to
virtual addresses in pcie.c. The size of the address space consumed for
PCIe control is reduced from 96 MiB (6 * 16 MiB) to about 32 MiB (this
doesn't include MMIO address space required by PCI devices):

- Size of the PCIe "host" mapping is reduced from 16 MiB to 4 KiB.
  It's a PCI configuration address space for the local (on-chip) PCIe
  bridge.

- Size of the "CFG0" mapping is reduced from 16 MiB to 64 KiB. It's for
  Type 0 Configuration accesses, i.e., accesses to the single device
  (with possible "functions") on the other end of the PCIe link.
  We really only need a 4 KiB page at 0x8000 (see the offset
  calculation in cns3xxx_pci_cfg_base()). There is still a potential
  problem with PCI bus numbers > 0xF, are they supported?

- The code in cns3xxx_pci_cfg_base() and cns3xxx_pcie_hw_init() should
  be clearer now.

- The maximum address space allocated for PCI MMIO is now correctly
  shown in /proc/iomem as 176 MiB (per each of the two PCI "domains"
  - previously only 16 MiB were reserved).

This patch has been tested on Gateworks Laguna board, masqueraded as
CNS3420VB.

Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:35:21 +01:00
Krzysztof Hałasa 75efba8151 CNS3xxx: Fix a WARN() related to IRQ allocation.
WARNING: at drivers/irqchip/irq-gic.c:952 gic_init_bases+0xe4/0x2b8()
Cannot allocate irq_descs @ IRQ16, assuming pre-allocated
Backtrace:
gic_init_bases    from cns3xxx_init_irq+0x24/0x34
cns3xxx_init_irq  from init_IRQ+0x24/0x2c
init_IRQ          from start_kernel+0x1a8/0x338
start_kernel      from 0x2000806c

The problem is that 64 CNS3xxx CPU interrupts, starting at 32, are
allocated by the ARM platform-independent code (as requested by
machine_desc->nr_irqs = 96), and then the GIC code tries to allocate
them again.

Tested on Gateworks Laguna board, masqueraded as CNS3420VB.

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:33:20 +01:00
Arnd Bergmann f18651eb2c Fixes for omaps that would be good to get in before v3.15-rc1.
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIihTAAoJEBvUPslcq6VzWPsQALe5kmAboudO0wPOtP5FH40o
 N6SJTtMsStr7w7KiSTMXGVJJKzw7HPlBqMM41YQn/K6CKfbp5D3ddNFQ7KsWk3ZG
 qB4dAEBoyagbas94CTxdd9zfOqm8LHVPf2Qol+9tuKYQDxhRNl4zfKh94FLK1Xg4
 8d8JpW8VpgxYbHZTQ2NfK9kqb7REbB4mn/VXudqucLgzaHu4SKglu3yLX8MBIO5w
 wv89571SFxuVVE4Lg2/OOw52ieHU8zf7/aJBuNpcklmg1Q1SC3pdbjHTrPJHlpun
 1++tsqfarw9EZG954aEqvpsujsIasN25ptpUT6n80Y0hJOagGoHL1DJlBNlmQdu6
 tOMBUIO3ASeoDIHWV8apBW04zWgm1L/hQTL0G85uo2NKG869QWzN4ADdFI4Hx/WH
 qp2MSdTWCnbGQwUBHhkRZgTiWJEU3912hLFRqrcqFcEUSRnDw+sDAfGFusPTS/+s
 ZnYPV62NlhtcXMk1Oo+6+YqkpF6A2tRw08AUiuoLg/qGTN8nUyem/PWYffm/KzdS
 HA5RlTud0KjcIhwUWF7jNTSfTsP/x8Fp8AtCOpMd920asXDHYe8G6v6n7QMy4DaX
 U9JCEpmQacBl8aRYLUBLemdVw0YCT4wTyuN75fjmPYycXdnxFCRZl8D3kKxrQWWV
 pngpx8EB0X+/KwGXqU/o
 =NkqH
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.15/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Merge "omap fixes for v3.15 merge window" from Tony Lindgren:

Fixes for omaps that would be good to get in before v3.15-rc1.

* tag 'omap-for-v3.15/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4: hwmod data: correct the idlemodes for spinlock
  ARM: dts: am33xx: correcting dt node unit address for usb
  ARM: dts: omap4/5: Use l3_ick for the gpmc node
  CLK: TI: OMAP4/5/DRA7: Remove gpmc_fck from dummy clocks
  ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM
  ARM: OMAP2+: INTC: Acknowledge stuck active interrupts

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:31:30 +01:00
Arnd Bergmann 22261b22f4 ARM: mach-bcm: dt updates for 3.15 - part 2
- BCM21664 SoC support
 - BCM59056 PMU support
 - BCM281xx reboot fix
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTI1oAAAoJEOfTILNwq7R4Eu8P/1nXYhNyzRyn1vLc2GuJrq2O
 jqD5wd4P2gUstaFtkm7DOXQq3Nui+kC+Bze3H1OkoPgblZ3PgtRJJXuVqJJl/7Ls
 cqrTcYiD7/2dk+KXGUUDSfNVowIeZYGRKBtB7MkVylPsLBlF7DKBlXS0MObYAwuI
 HlC98bwIHwkFeuF6JmqefnUF+yNaHHdLgLCfMfT65A4TIYvcUT851B0hb2ZzuHGx
 xigGlkKBX4xtExB2Q5rdQPnqFboXKNChCZ4/ckm2cHLZqKCDvNiqCXseDsI3ehm9
 7l8S+KVltxBaPBqPS3sOWlfuMBEME3+agrryyqJwr8WYfd7tubvYMWOHzGY/TdJv
 FkehEaSTXF9x6OgSCcRe2NaE+o9csFWbvfHBkbvYm4N2jKqrVVLymfqN77dIbmad
 8GR767kfgL3rSQBlJU0T0VxeupXbBrIergplWLMZGwTy/2jeWsjY2bckpmeHu4xP
 2KMwbqvNa8Wb2+WI0Pjap48rTqqEtYvKJRt8eX7eCNHHoHFQy3LVL1tRhCzr9ZT+
 mnoeDxX1qCMHoKzGTSlTQOqJXJitQpcvEDyPns4Sx61adAGuFClm9381e3N4r/CQ
 BgBtJMs+RpY12jlMLN0Gdcj2blowyhidudClELBzhfpqy/PYFGbkxoCdovj1+f/F
 zeZB1F7plWbt8Pf+3aTU
 =r/HW
 -----END PGP SIGNATURE-----

Merge tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm into next/dt

Merge "ARM: mach-bcm: dt updates for 3.15 - part 2" from Matt Porter:

- BCM21664 SoC support
- BCM59056 PMU support
- BCM281xx reboot fix

* tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm:
  ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
  ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
  ARM: dts: bcm21664: Add device tree files.
  ARM: DT: bcm21664: Device tree bindings

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:19:23 +01:00
Arnd Bergmann 38edc2da50 Updates to the .dts files to support more Gumstix boards.
These are sent separately from the rest of the .dts changes
 as these depend on the fixes merged into v3.14-rc4, and
 needed a bit more time to get updated on the fixes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIMPtAAoJEBvUPslcq6VzYzUP/R/CjdMRley2yjwnxkZ/pk6w
 cUitKvWpVcu4M7VMaEsGj7x33PuvYF3Ukn2RLX5/XrWEI+4ec6Ny3cWOAiRr8pmv
 7ojBfNTtM3l8wRlJE/cZ5tfX+24nc6Ofufwi0ax+LoFZEh/JNdWXzFwd68mlxlCM
 NlQakcwN3ReZ4y30C8vZJmQwLqiIw0LDFOoBPB9C7Zgc735brQBm5fnzVFJWrnq0
 RIIB5hWJ+fmyP3jHRN5XmNLPEMKULK7GUgX1UMF99imQf548agYvstbazZVRVr6D
 i1Tkq/9W8UTT1wrUYfagr94Oj61vyqSUZJm5pHjehi+hfUkvHX4sxLup+WXIIA9L
 LObz368BaHGQ7FrryEe/FYZdnmjaluK1nw4Huobnv5GXvp6XPG36yEo9L6LbiNvK
 +uRnV2k+OdJ9cHIYwxNQC7dNcr+qHvTWGOrU3Q++OAVi+dClUO7G0/+xh5NQbsBA
 jApGa8FQrk4S5jgNEFzFnpj4XPTE/88pbrQfZq5RsGQ+P1Jx5r9dbzndVft+b1C2
 uC0tLsJDX3RJCbk4N0JZACygaIvVfH4sybf34FTDP19r9eKWKSpHjHZAtnJ7AIss
 Iz0AxxKnUFwy3Kx01DN8vZeLt0wRF2THn+nOkqM0ZO5r1ptNa1dBHXkrWVP5gybn
 WnN9onC6O4Wa2wEvCxVd
 =rAdr
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Updates to the .dts files to support more Gumstix boards.

These are sent separately from the rest of the .dts changes
as these depend on the fixes merged into v3.14-rc4, and
needed a bit more time to get updated on the fixes.

* tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Add support for the Overo Summit
  ARM: dts: Add support for the Overo Chestnut43
  ARM: dts: Add support for the Overo Alto35
  ARM: dts: Add support for the Overo Gallop43
  ARM: dts: Add support for the Overo Palo43
  ARM: dts: overo: Add LIS33DE accelerometer
  ARM: dts: overo: Create a file for common Gumstix peripherals
  ARM: dts: overo: Push uart3 pinmux down to expansion board
  ARM: dts: omap3-tobi: Add AT24C01 EEPROM
  ARM: dts: omap3-tobi: Use include file omap-gpmc-smsc9221
  ARM: dts: omap: Add common file for SMSC9221
  ARM: dts: omap3-overo: Add HSUSB PHY
  ARM: dts: omap3-overo: Enable WiFi/BT combo
  ARM: dts: omap3-overo: Add missing pinctrl
  ARM: dts: omap3-tobi: Add missing pinctrl
  ARM: dts: overo: reorganize include files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Conflicts:
	arch/arm/boot/dts/omap3-overo.dtsi
2014-03-17 15:17:07 +01:00
Michal Simek 1a259251f3 ARM: zynq: Add waituart implementation
Add missing waituart implementation.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-03-17 15:12:08 +01:00
Michal Simek 4a32c74e76 ARM: zynq: Move of_clk_init from clock driver
Move of_clk_init() from clock driver to enable
options not to use zynq clock driver.
Use for example fixed clock setting.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-03-17 15:12:07 +01:00
Arnd Bergmann 937b5991ca Device tree related changes to the omap iommu driver as that
is finally getting updated. Also few trivial board related
 .dts updates to add more devices.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIMSBAAoJEBvUPslcq6VzimEP/2cJDRk76e+/kTvAmtl5L9JS
 Z1QaM/YZ6dObHjZmrkeh0HbiFV61aJvESXyEtET70FBDZmWJJICGlR+weQH9dGOk
 ejjsB14AdYiHDMRpp37V8M0xiZaUy0bUqEwwBCSE8HiTAM7lMluokXGZvKCRzxUQ
 aTUhekdIPVBLtdgIU9/2o194chpM7CEUlIlveam8IL5xpjLJguywgsjniM/xl0ni
 JcGaJM736HifgtOLCdIaWJ9SUk+UzmZ2cpP5auxt5+RAT1Omv3I2ztW8HTHMFNsK
 iRcmEiXlJus6itpJ0jroLksL1apoFpm3XKKIOTkIL2pD+UM10M/iYdf/r46EUY/Y
 pXABRkPIrYldgOMHrsFMCSxHfQJ7bqCs/Bs/mlJL90FwbB+akHFyuCuOTfLyaROQ
 RqmtGJQt+Y62QBtXdhoQ3OpOwNSxNlWgXyv0UoyE4ZHaaeoSwMjuLbqE/W0d4L+z
 CQdJLYWjKanWJkBZ/q6pYt5GKmW/oakDkHt28yI5rqwlWS3BUSgZQ5ghi12RPArG
 E2hBzoaVRl030nHNtjcz7sO5xBFnEvqzy3/XcWzeByjl1XlWtfxokVPxBB46aXcm
 sySlPnZGSJBY8S6Fnqs8/0hqQK+QLUfsZlXyvCYAWBVZGZ1OdzCdfR46dCx5xubD
 t7bGfgTMGSIiskjCxdU7
 =5f7K
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "omap device tree changes for v3.15, part 3" from Tony Lindgren:

Device tree related changes to the omap iommu driver as that
is finally getting updated. Also few trivial board related
.dts updates to add more devices.

* tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530
  ARM: dts: am335x-evmsk: enable DMA controller for USB
  ARM: dts: OMAP5: Add IOMMU nodes
  ARM: dts: OMAP4: Add IOMMU nodes
  ARM: dts: OMAP3: Add IVA IOMMU node
  ARM: dts: OMAP3: Update ISP IOMMU node
  ARM: OMAP2+: extend iommu pdata-quirks to OMAP5
  ARM: OMAP5: hwmod data: add mmu data for ipu & dsp
  ARM: OMAP2+: use pdata quirks for iommu reset lines
  ARM: OMAP2+: change the ISP device archdata MMU name for DT
  ARM: OMAP3: fix iva mmu programming issues
  ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:11:10 +01:00
Arnd Bergmann a38f8913da Allwinner DT additions for 3.15, take 2:
- Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME
   - Addition of the I2C for the A31
   - Addition USB Host mode for the A10, A10s, A13 and A20
   - Addition of SATA support for the A10 and A20
   - Change of compatible for the watchdog
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIdlxAAoJEBx+YmzsjxAgxg0P/jffCG55oTWWyVcvXqcyXwtz
 TS2pe6gUYSQIExd0wnFSWBQzCC0262vuA5oC9UzKya13j4RzrlFlHJzyrFSCuMWy
 FW1Nb1n+QHyQL1xtn8eLpU1vnTrh20xm87UGNqVugzL7pDZ2rbtLs2VEvpHYs7LX
 R36fM1GSe0QFPZS+43f8jQEl0sViB+mmYjHqVOGmyOAfZt6tDtqk5FsTvzBivfxN
 qMuw2Q6cA/zEGI6RrxmC+LU4+MjQScBbibKbij8EcsJ7QysktxeLWAaP/yKkTBCc
 JnMWuDjH6kUHCsKodgFms4WKQuHPh6oYZwaQLHofIMh1lHn31H+gjQSre1mwOZCp
 DJPdVenZKCyIGHwu+Ezzm8CGkzOGnDHywSeg+pDunUWoNiIm9yUpUCMvUX31tXgR
 eARZlXQXAS0PO57XVwwaTixqBKx/LTVJC3L4Sm+zI5RGn7jl+Rgtqpg9gWyXvzZL
 kJLJaNkoBayWRT5YXOdHb5TSCTp5YPSZMDzSFoQ4sKKj+sLKVyTW8YRHYqaiW8SG
 Bk4ULaGMSC6jJ+8sa1zqeXXXrMC04c1jMM4ywXcw66TOxAlWDjsUhkLhVJW/sxKb
 ipKem0NEe70YK6QTRq0SLo6nrY5LFdkr57OvKiGs/lj3bnXWX66aA/aHZlPsFkRc
 Y1grULUQVBHSMJ81TvWr
 =8O2D
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux into next/dt

Pull "Allwinner DT additions for 3.15, take 2" from Maxime Ripard:

  - Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME
  - Addition of the I2C for the A31
  - Addition USB Host mode for the A10, A10s, A13 and A20
  - Addition of SATA support for the A10 and A20
  - Change of compatible for the watchdog

* tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux: (23 commits)
  ARM: sunxi: dt: Update the watchdog compatibles
  ARM: sun6i: colombus: Enable the I2C controllers
  ARM: sun6i: Enable the I2C muxing options
  ARM: sun6i: Enable the I2C controllers
  ARM: sun4i: dt: Add support for the INet-97F_Rev_02 board
  ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board
  ARM: sun7i: dt: Add USB host nodes to a20-olinuxino-micro dts
  ARM: sun7i: dt: Add USB host nodes to cubieboard2 dts
  ARM: sun7i: dt: Add USB host nodes to cubietruck dts
  ARM: sun5i: dt: Add USB host nodes to a13-olinuxino-micro
  ARM: sun5i: dt: Add USB host nodes to a10s-olinuxino-micro
  ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino
  ARM: sun4i: dt: Add USB host nodes to pcduino.dts
  ARM: sun4i: dt: Add USB host nodes to mini-xplus dts
  ARM: sun4i: dt: Add USB host nodes to hackberry dts
  ARM: sun4i: dt: Add USB host nodes to cubieboard dts
  ARM: sun4i: dt: Add USB host nodes to Mele A1000 dts
  ARM: sun7i: dt: Add USB host bindings
  ARM: sun5i: dt: Add USB host bindings
  ARM: sun4i: dt: Add USB host bindings
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:08:59 +01:00
Arnd Bergmann 542798cdd5 First batch of AT91 DT material for 3.15
- activate DMA for NAND flash controller
 - some binding documentation update for usba and ADC (iio) drivers
 - removal of some deprecated ADC (iio) properties
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJTIYEQAAoJEAf03oE53VmQ3rsH/2dODKyRW80skncy+qUGA4KW
 7QWxK6roBmg6GRDIJRbHcsMopBDkNw/qJYRO8ejsaULwG6hYAfhjSRSscLMvQuDp
 atE/0IMDDSZC6uvzo554oQcrnkKJhTCC0DQJOYXlRnBExCTYQjaK1CChRB0Fz7In
 zABDXzKDi0/AbE9ngWIDDqqxsRF8rKbxivv4KFXZyp3bQcKzR24IQtSAbEC5aCBW
 pnmAwfOKm0DUn3gaDAwWSrHTmX9OxCWl9zpr3MxAamvBK8As8OKfFtDf4VDkf9GZ
 1RUF0fQHfD9UOBcrjiGUFONAww1+g9Femt+z298omaZycttcgUB2x100jqZsJEY=
 =fe38
 -----END PGP SIGNATURE-----

Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

Merge "First batch of AT91 DT material for 3.15" from Nicolas Ferre:

- activate DMA for NAND flash controller
- some binding documentation update for usba and ADC (iio) drivers
- removal of some deprecated ADC (iio) properties

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91/dt: at91-cosino: remove useless adc properties
  ARM: at91/dt: sama5d3: remove useless adc properties
  ARM: at91/dt: at91sam9x5: remove useless adc properties
  ARM: at91/dt: at91sam9g45: remove useless adc properties
  ARM: at91/dt: at91sam9260: remove useless adc properties
  ARM: at91/dt: at91-ariag25: remove useless adc properties
  Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txt
  Documentation: dt: iio: improve atmel-adc documentation
  ARM: at91: sama5d3: get rid of atmel_tsadcc driver
  ARM: at91/DT: atmel_usba correct atmel,vbus-gpio meaning
  ARM: at91/DT: add NAND + DMA property

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:05:35 +01:00
Arnd Bergmann 117a6df3ef This pull request removes da8xx_omapl_defconfig
enabling all ARMv5 davinci devices to be built
 using davinci_all_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGIbzAAoJEGFBu2jqvgRNCucP/0MuU0Y+Uk3AmBlbH5GBzk9i
 ML4/5/QFKorsxShFlpaXaFRbd6peMFhNlaa+ZIDx4mI+EAFNQC29bsSZ0A4AuUi1
 EqWvJIJYxUNfLhXQoK8ehdbUWeA4Qb2Sm9DW34Lzj05ScS8H+SMLQqqOz8twFY1D
 cLfwBF6HOAH0LEhzdOQEzO6FiCDPt6+bn5rmljDhS7UTLumfjDItuxrccJzWLZxs
 XVUf+bGMksMVtFLlOsWsKjkQX9Wk4uYbzNqHEuq1/c4UIIkPbYAjMqDzi7mlsXzX
 tzfhdGhR9DUbSOT1ovV3ceOTLpcP/wa6/+yfUBh1M08WfsJ0vfyUiRt827BhaNTK
 VTxEKRoD/B0Lhu4K8DpoWQ+VDHGySjFcRI9djYR3U9t6ci3fXUExLjVbZDkDxG5h
 tGq2iNlhLnnEKXdqbvWSpBsxa17UP3Y3unlAfHzl3sLZE82Gyd0Xhu3YwKYoSAYa
 EbzfyqDIe4Rf+u2ZUHwyy4y3YlEGZdTKgOeyH8ZmudmkB6nUtmijfChXpgCYvkoF
 +PSrvU9rnq/AxEo2YgxTbAzYU0nJxPo41wTg/VbH6aDSIRyfxE3P6FSPeHyc5O3u
 DSmWXJ4suZMPt+WOSOHXC4UsHsfIU/zvdtn7zhqyNJrbDCcf2PqQ7CdT9zeitEuG
 7KaszW59BI3bpBo0sizF
 =Jdld
 -----END PGP SIGNATURE-----

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

Merge "DaVinci SoC updates for v3.15" from Sekhar Nori:

This pull request removes da8xx_omapl_defconfig
enabling all ARMv5 davinci devices to be built
using davinci_all_defconfig

* tag 'davinci-for-v3.15/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: remove da8xx_omapl_defconfig
  ARM: davinci: da8xx: fix multiple watchdog device registration
  ARM: davinci: add da8xx specific configs to davinci_all_defconfig
  ARM: davinci: enable da8xx build concurrently with older devices

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 14:51:52 +01:00
Arnd Bergmann 9d6eccb9cc ARM: davinci: remove tnetv107x support
The tnetv107x support does not compile, and seems to have been broken
for a while with nobody caring to fix it. So far everyone I asked
said it's probably dead and completely unused and will never again
be needed in a future kernel release, so let's delete it.

If someone finds a use for this code later and is able to get it
to work again, we can always revert the removal.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Kevin Hilman <khilman@linaro.org>
2014-03-17 14:50:34 +01:00
Arnd Bergmann 3b325a494b ARM: mach-bcm: soc updates for 3.15 - part 2
- Add bcm21664 support
 - Use Kona Debug UART only on ARCH_BCM_MOBILE
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTI1XaAAoJEOfTILNwq7R4y+gP/R4b689mZGiNM48PgWqzqK1o
 EgOg7GU9hMpZqAdzpFznWlePJeO0hKo8JZ7ozUefPQe4l3Lxt92C3lgrrJzZxbi5
 40N3mGwhjyrAS8DfdjBGDIJzCW+GUmNbQBb4yh9rFa40Z3kOh5c3xj30J+tA+/5M
 JT4H8tHS1AEJEuGedtIDASyN45cehskCYJ/dIYfeNOTPH4CaLhq9RxyO6PNSEvHD
 f9UG0jC1GIu9bDfkPBBzKIaJABSXzdUwT9fd7coKB9gFR9DcmpUUgFUZ9ZGqWHUO
 sBzMtWQI4Z5ueV226nrJca2zth4W8eMOu/GHbjVT7YLoDmibqRL/HlJfnoOaJLOg
 e1lk/ZsNk+hnNNvmyuFhadpFjxaDuDQM1rRkjyV60EszJ5gwre4MtAyrMX48dtUr
 nPmbgciUateNabgtJNJxVGehH/NPKf42sLcEsq4z+hCF3JI9nNmjpoPD6wILwNIz
 k2HOoOCWXo9z/57XJv2EDOHZbTpqmnyEaiFvR7hjtiHTohXgFTNVb5BvNMf7GbtA
 GUKp0qmhnPjseKMteNO2TiSO8OiHKLUQ1elIKeLY7CedpuEHHK1uj+eU/nzx0W95
 AimQRlNaWFqxJaSMpYkYUa+DGrAxsxbxnsnIUJWcUy1sEboNREIhwhaGv0hlfPuS
 QVl4PoPnY5iZ+4xKDFQi
 =bmN2
 -----END PGP SIGNATURE-----

Merge tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm into next/soc

Merge "ARM: mach-bcm: soc updates for 3.15 - part 2" from Matt Porter:

- Add bcm21664 support
- Use Kona Debug UART only on ARCH_BCM_MOBILE

* tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm:
  ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE
  ARM: bcm21664: Add board support.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 14:45:28 +01:00
Arnd Bergmann 8efa50c5e1 Merge branch 'bcm/cleanup' into next/soc
This is a dependency for the bcm21664 support.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 14:45:02 +01:00
Arnd Bergmann 780d2bf3d0 Allwinner core additions for 3.15
Just a minor commit to adjust the restart code to take into account the new
 compatibles
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIduqAAoJEBx+YmzsjxAggcoP/0YRFVxd81Qg0oTD0LobNH25
 CkFKD5MjXkAN6Uu+rb4GGLeGUmH6jBQErF8US8gYWL1tAduWXlVCs9vBNuAgLe2D
 6aWTVyUrMTe6B9hYKeeM6lHNFGN+s+lPDBYWee2G3d7pNIvVEaViHql1GMNUxK4F
 IhnQmGuQzv8LldhoUgrljJXtKFgEY1wDBSvrbyxZ+bOlrOo9Mu1f1iYbImeL7db1
 cunlQ3h4s8Gs/puzf7G8YaKN724obJbXLpBRgD8lma0Kcfx6VFJXwTc5PxzOUyrR
 9ygQ8hdsw3pnpgEVfrN21dqwk4EuFtaiuJ9YezuifSkOsLFb1plZG9XWLMxGJCon
 OR86GpAUQbix6rFhbvS0DyG5mFDFNCv/TAoUlqD6ML5L5X2Y6iLlez8Isj9G4GZ6
 Xacf0VWDdaROe0N07iLVANYV3AESiqLWrQ/3Snu+33ntwTYK9MUZKE6qWs9rRiT+
 ojhzOsAk1fWBIptvRIZrJVOMiwuSNjsTWyxIFMEfX4Avi5RU2jimPVAs3l0UNVs2
 0sEIlONnZVTAglfxRmcomVyneViORSZNWwtFl0UTbPJi5N6r3QLmvPOzEAcWhCHB
 QjhUoh69t1ZEYH1aKRQD9JYvEAfRBpLkovbv8Iz6OJbsbOzJS8lzd/BPEs1O9hcw
 wzzqK9IJnuh/QipvG5Ip
 =foO/
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux into next/soc

Merge "Allwinner core additions for 3.15" from Maxime Ripard:

Just a minor commit to adjust the restart code to take into account the new
compatibles

* tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux:
  ARM: sunxi: Add the new watchog compatibles to the reboot code

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 14:41:54 +01:00
Arnd Bergmann dbf9387c08 Allwinner defconfig additions for 3.15
Enables SPI and SID drivers in sunxi defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIdxLAAoJEBx+YmzsjxAgzsMQAI9A16okCQhG02zlDE/dfWFG
 Qd1f6xsWT7rGSP3Q3OoooGpkus/Kxq6djmnc4tWWrWcj3K7C2WozidJXWYwJHUfn
 fim9nrx6OEe2zNPkVYtGG91zp4vFeOOtO40tsK6Df2sBa20RzPuWMKS6K3tAcxkr
 ctR6c45i970Sx6odYoyM395CgVtCBbPPCyUEJsucFKNK+hSSpWlyyYUKlqIo/bfP
 X8b45Cag6Xy+a18yn6LaPDJrfTwTbocyNcheuJ17PErrR9Pto/0YwpVstIjg4clf
 I4pmXbrznsdXhkOPCq+zAWqy9HTaipINzCLdl2Zt9sC2xBDDLJXxlU0OesJ1he7F
 JEn0XWB806Ed02d7DAZrjEcSWFsQsoCMGKlN3im5tWCdHgzwBuqEbs82JmBgpwCu
 JB4WTcAZGRexikQAAbyJT3o/QIGXBNltPNBcHKzO4twfljdFHkfn2t6I4NTl6zJU
 4GbWHxKAlwqUt5XTjmxB5ICtuCyfeUMKfPGqr9hxvOdRB1SL7v2NIACzYGvtvBZI
 yA5UHIxF1NpRwgoW3s7IBRFGRwaBAIhm+FeAHF4j6hJkHvkQpQ1ClLbGywhcMXjk
 kbFjQVNuTpo4Z8QgTvrJdZDzUB3wH0DRN3diBQV0RG16YZo7lJhFRkMB4IIKFoHK
 ZCOL91hLwIfAtKqniKb3
 =lt83
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux into next/boards

Merge "Allwinner defconfig additions for 3.15" from Maxime Ripard:

Enables SPI and SID drivers in sunxi defconfig

* tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux:
  ARM: sunxi: Enable A31 SPI and SID in the defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 14:37:21 +01:00
Arnd Bergmann 30c04fdd03 ARM: fix duplicate symbols in multi_v5_defconfig
A couple of lines in multi_v5_defconfig appear twice,
causing a harmless Kconfig warning. This removes one
of the two copies.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 14:35:44 +01:00
Kuninori Morimoto 313c84b273 ASoC: fsi: fixup compile error for simple-card
This patches fixes
c7a507eea1
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
commit's compie error

arch/arm/mach-shmobile/board-mackerel.c:512:2: \
  error: unknown field 'fmt' specified in initializer

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-03-17 13:20:11 +00:00
Chris Ball 2b5cc85135 Revert "dts: socfpga: Add support for SD/MMC on the SOCFPGA platform"
This reverts commit d9c3f5df53, which
should not have been merged via mmc-next.  It's in arm-soc instead now.
2014-03-17 09:04:57 -04:00
Rafael J. Wysocki 15afee3aea Merge back earlier 'pm-cpufreq' material. 2014-03-17 13:51:39 +01:00
Arnd Bergmann 0f4d5641a6 Merge tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v3.15 (incremental #5)" from Jason Cooper:

 - mvebu

    - 38x
       - add 2GHz fixed clock, core divider clock, and nand controller

    - 385
       - add nand controller and partitions to 385-DB board

* tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Enable NAND controller in Armada 385-DB
  ARM: mvebu: Add support for NAND controller in Armada 38x SoC
  ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
  ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 12:21:17 +01:00
Arnd Bergmann 64d865f403 Merge tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v3.15 (incremental #4)" from Jason Cooper:

 - dove
    - add system controller node
    - drop pinctrl PMU reg property _before_ it hits mainline and becomes ABI

 - mvebu
    - XP/370
       - change default PCIe apertures
       - switch GP and DB boards internal registers to 0xf1000000
       - correct RAM size on Matrix board
    - 385
       - correct phy connection type for DB board
       - add RD board

* tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu:
  ARM: dove: drop pinctrl PMU reg property
  ARM: mvebu: add Device Tree for the Armada 385 RD board
  ARM: mvebu: use the correct phy connection mode on Armada 385 DB
  ARM: mvebu: the Armada XP Matrix board has 4 GB
  ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000
  ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000
  ARM: mvebu: change the default PCIe apertures for Armada 370/XP
  ARM: dove: add system controller node

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 12:20:27 +01:00
Arnd Bergmann 54cab10f63 Merge branch 'mvebu/soc3' into next/dt
The dts Makefile has a bunch of nasty conflicts, attempt to resolve
these now to avoid trouble later.

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 12:13:09 +01:00
Arnd Bergmann 3a516b6afb mvebu defconfig changes for v3.15 (incremental pull #2)
- add multi_v5_defconfig
  - add mvebu_v5_defconfig
  - kirkwood: add HP T5325 devices
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTEXBFAAoJEP45WPkGe8ZnpokQAJ2uJHhDcWc1hIgJV7uBMYCt
 GdY7z0U4hcORU6hYnXfpzjDN8wwRlaXctc9S3GDYRcabtVoOep0V29mwOjRHbcJg
 /O+dvUHQBRExmdQ3jNE3JJtdryM0sgI0tCohCA3fl/cFrVQiIHL4FfJJ1NmH4mMo
 SdYM9jxKd/1zPYDcNPeDvaMrKJxFOszASMCufcVOvugcZI4esEpLIsF78TMstgog
 wa3wWZP0uyu8UkWHKE4LsClfZZL3U2h+TVlOiYgVY4b/7LPkmhtTllEKws/y/sMi
 0hQloWw0a4wpFS2M7MreF6rJk0vqClAVi6sQH2x89ShcqBG12OJnKXp7ia5pkgAe
 VpgxJRC8YzG/QfrBO5tI7IeIde6sDnKjaeCL70F/VgEUSnYvqhOGp5i2oHKdRQG/
 JlW52qkn3JdxiowU8VwHN/xsqnZhaxThvyMT2pzHUzE78inSVPsfMBO1a4O2uc6j
 zAY1JAZhY+Xv8EsXqEMYOievAC8Most/zav21RqjkWr+7zaTAniE38ipjLQvtJ3y
 8YOIzOxnvX3BpVjNhWemb9ZgF91dgfJwJWwijTMjH2QAMllHUN5xAt04CU4CLVYw
 APIxA7NwMEGlxnih6ibUbz4c2wjJK6OxNaFtiZUD5d9qG72mUWFLMTjT0YR/l0vg
 hlB2ZPVE9kIJbrrKSxtG
 =+mhV
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu into next/boards

Merge "mvebu defconfig changes for v3.15 (incremental pull #2)" from Jason Cooper

 - add multi_v5_defconfig
 - add mvebu_v5_defconfig
 - kirkwood: add HP T5325 devices

* tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig
  ARM: config: Add mvebu_v5_defconfig
  ARM: config: Add a multi_v5_defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 11:23:35 +01:00
Arnd Bergmann e887ae25b0 mvebu dt changes for v3.15 (incremental pull #3)
- mvebu
     - merge armada 375, 380, 385 boards (mvebu/dt-3xx)
 
  - kirkwood
     - Add many Synology NAS boards
     - add board HP T5325
     - add L2 cache node
     - add system-controller node
     - add audio node
 
  - dove
     - add pinctrl and global-config register
 
 Depends:
  - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
     - removed dove PMU interrupt controller
 
 Conflicts:
  - mvebu/soc (arch/arm/boot/dts/Makefile)
     - add/add conflict.
     - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTFTyxAAoJEP45WPkGe8ZnDnwP/j1mxhzK7jY6KHJlY79Z/Bjr
 ZXGcVZIcmzYQMEaEcpT1lMtzQnxRf9xqd8JMr2k33oNe0uzEOp6wiSfIkw7aldkV
 s2ZGp0PjaVhJZqhgzbH0LJhid73RRBTCUGNrzCYDQt9BWkvJygnP7iFjNHQzijVJ
 UjpXhxVdVXpx9RTVwgcHs7GtDskrUhiPBlDcJePuk3q8oRwNJA+jDiWxBTALtABd
 JdvpaNW4RHFR1KAoHTqxhFuS61W+DF3IQalH8PpcYHYV/MXs1QByP1nbEira7Dav
 HuIgGtiltfObMHN6DrU4uPQFvb0Ab13q5WoZmW4bR9Y01wpM5TgOQxXpLZi/aCbV
 dr4UmbcUSo9MDCMZvOEIHC+7FW5LutVNt4IwqQN/bJQyK1aZMjJTS4aVxmU+2Vl+
 mIaPyh3ePXAtGEg3Ai7iWfbEMANKz2qoqShckxbqEPLsDCeYY4ar9TnUHHSc8Mat
 LskwGE25ACcaQkf1vFkZNSaezEiB9yai37yGKu83FyYk8Vi/hsLxeb6EBHKULC//
 8uU4abC12nw8KAX/sHStjMKa64upoyycczVxhKjwLPmgwSSW47m8ZyE+tzxpNBE3
 4oBLB4C9lCouUXrpOxkkRv0uSSeJ/1dW8IhSxFWQuNRi2rl2KJsKzYKIWLEjNbqT
 YrrarK14xpMewjJduvat
 =38NX
 -----END PGP SIGNATURE-----

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

Merge "mvebu dt changes for v3.15 (incremental pull #3)" from Jason Cooper:

 - mvebu
    - merge armada 375, 380, 385 boards (mvebu/dt-3xx)

 - kirkwood
    - Add many Synology NAS boards
    - add board HP T5325
    - add L2 cache node
    - add system-controller node
    - add audio node

 - dove
    - add pinctrl and global-config register

Depends:
 - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
    - removed dove PMU interrupt controller

Conflicts:
 - mvebu/soc (arch/arm/boot/dts/Makefile)
    - add/add conflict.
    - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)

* tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add dts file describing HP T5325 thin client
  ARM: kirkwood: Add i2c alias so setting bus number
  ARM: kirkwood: Add audio node to kirkwood.dtsi
  ARM: mvebu: select dtbs from MACH_ARMADA_*
  ARM: dove: add global-config register node
  ARM: dove: add additional pinctrl registers
  ARM: mvebu: Instantiate system controller in kirkwood.dtsi
  ARM: kirkwood: Instantiate L2 cache from DT.
  ARM: mvebu: use macros for interrupt flags on Armada 375/38x
  ARM: mvebu: use GIC_{SPI,PPI} in Armada 375/38x DTs
  ARM: mvebu: use C preprocessor include for Armada 375/38x DTs
  ARM: Kirkwood: Add support for many Synology NAS devices
  DT: i2c: Trivial: Add sii,s35390a
  DT: Vendor prefixes: Add ricoh, qnap, sii and synology
  ARM: dove: dt: revert PMU interrupt controller node
  ARM: mvebu: add Device Tree for the Armada 385 DB board
  ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs
  ARM: mvebu: add Device Tree for the Armada 375 DB board
  ARM: mvebu: add Device Tree description of the Armada 375 SoC
  ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260

Conflicts:
	Documentation/devicetree/bindings/vendor-prefixes.txt
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 11:05:37 +01:00
Arnd Bergmann e7f274dccf mvebu soc changes for v3.15 (incremental #3)
- dove
     - move devicetree code from mach-dove/ to mach-mvebu/ :-)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGfujAAoJEP45WPkGe8ZnuKMP/R/KTnuK1sODQFoBQOqNYFLI
 8OnPourU4NDt7zdff+AAP+P2v3Cbr8/FPCcLXoZyFPPqGcnhx7KYKchOZ5SEaOSo
 VvUiKqsiuN01WutHGxtyYMU6g0HSxouH0U3rw9NLpFYkZEyWFLlVrPK1lIiVcsyv
 LMh6V7RKGathSLDRR2dUFlJhvfCDUpzfOnCVXuVmcKM3MuNEPTWaQNZ1JPPhCGF4
 gIwLiQqxrXGwaM3c7zLjHSvkK+TTmWirCRgU+VfxuSa+KB88NMbDjQ4TBv8zijKF
 vbFuGx2LO+T6HLrWlCPVDHV81dsivZydnW0GnNeTeO4wQMR2dgCfd9MWczFhE234
 qVmHT90V0fRLh2ly93zdDJC48i3aY6KainupODKB17TpDGX5Ua5iNdpdpv15ExAo
 5hgCvyeDlu2NLh66NBz7LL2giqDFL9SB3qQBExQbm4Ucv7JCnhTn9tQyyfuZX8UB
 RhMuiFv2ewgDLC+5kkPfVA90xanbSV1EpgNGY9GrSSB+0U+cXcXHCVvPzdJ8M60L
 ukknoQnbHlNw8IeWu6BqqyzZ1Eg8z8hmwwcBK1O6xGGjSyY8XKCKEHhwaLrsBQcW
 QkPHXmg5q8TdUGp32ieuMzCzza46C/3xwPbk+u/ZiTrBFyu62dqy92IEatneyLTO
 9jrz6J52uvHrAMy2Y4Ti
 =2I0p
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu into next/soc

Merge "mvebu soc changes for v3.15 (incremental #3)" from Jason Cooper:

 - dove
    - move devicetree code from mach-dove/ to mach-mvebu/ :-)

* tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: move DT Dove to MVEBU

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:53:49 +01:00
Arnd Bergmann d4324ce357 mvebu soc changes for v3.15 (incremental pull #2)
- mvebu
     - Add Armada 375, 380 and 385 SoCs
 
  - kirkwood
     - move kirkwood DT support to mach-mvebu
     - add mostly DT support for HP T5325 thin client
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTEVsQAAoJEP45WPkGe8ZnWhIP/2fBX1zLHThHf9ekmVHr/ikC
 pQ7NCS2abYAjuTU56ph9aW6WgFCf05+DicKKdI+sPbuispgSCyeqktXNVB6dIsGa
 LV9xPo4yZRlO6iW4GnMk6/c/F0ZBtMbT5bEoyk9B102WgGP28VBHK9V/BuX/SGIW
 R9dc5jee1VNN86ATpEexd+QAREJa0tDtRcTzFIliUsjSB1pS0LdrkTywfGnAShUa
 xcFHzIGJKIzcA+9c0pz8mDeFeooGmPDSlu+AOCXz0hQOffyaqpJ+fOqHHWRGFP3S
 EeJYPMaYN5Ge1d37OHu6CB843ikydjZWG415+5fEJWgTx/EWNgoypqX9M4npv/EZ
 ASnFrktql8ZusmqkJFuV8q1HC3D/DbWlnwgPC7b4UWLroW6cfqDt9zq+eY0tpBJE
 GgiwjEDbQ7Aw7GsOv6fCw1jIHlfAFdtv6XQT9Yp+qAPzUoyS1HI+ms1pTbChYz/c
 D2tF8rL2v3wYSMeCHLOEgJbcCPxujoZieq57VjfZ8i2sG9QiOAdkEvy+khnuvW8T
 thzxsNWYgNIYyYlkqt3yOT4xqFjrCVB95mN5NhhPsoE28DReXFEXz8+hL7eHrxtI
 vFlmW6ukPlzD9HlXS+6jqOzhX53mYN5L3RoZHPaSP/yGQT7I/gTb7cK8V6Ig7Rsy
 AcesuaH1VMa9+RtRTPxQ
 =CtOj
 -----END PGP SIGNATURE-----

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

Merge "mvebu soc changes for v3.15 (incremental pull #2)" from Jason Cooper:

 - mvebu
    - Add Armada 375, 380 and 385 SoCs

 - kirkwood
    - move kirkwood DT support to mach-mvebu
    - add mostly DT support for HP T5325 thin client

* tag 'mvebu-soc-3.15-2' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add HP T5325 thin client
  ARM: kirkwood: select dtbs based on SoC
  ARM: kirkwood: Remove redundant kexec code
  ARM: mvebu: Armada 375/38x depend on MULTI_V7
  ARM: mvebu: Simplify headers and make local
  ARM: mvebu: Enable mvebu-soc-id on Kirkwood
  ARM: mvebu: Let kirkwood use the system controller for restart
  ARM: mvebu: Move kirkwood DT boards into mach-mvebu
  ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU
  ARM: Fix default CPU selection for ARCH_MULTI_V5
  ARM: MM: Add DT binding for Feroceon L2 cache
  ARM: orion: Move cache-feroceon-l2.h out of plat-orion
  ARM: mvebu: Add ARCH_MULTI_V7 to SoCs
  ARM: kirkwood: ioremap memory control register
  ARM: kirkwood: ioremap the cpu_config register before using it.
  ARM: kirkwood: Separate board-dt from common and pcie code.
  ARM: kirkwood: Drop printing the SoC type and revision
  ARM: kirkwood: Convert mv88f6281gtw_ge switch setup to DT
  ARM: kirkwood: Give pm.c its own header file.
  ARM: mvebu: Rename the ARCH_MVEBU menu option

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:49:14 +01:00
Arnd Bergmann de65ded49e SOCFPGA updates for 3.15 version 2:
*Update SOCFPGA DTS to include ethernet, sd/mmc, and clock fixes
 *Add stmmac ethernet glue layer
 *Update socfpga_defconfig to include sd/mmc, and micrel_phy
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTHUB/AAoJEBmUBAuBoyj0jvUQAJ2l8RYqyBdf4vOtr2+SWcr+
 Oq7GovRYG0uIihzaYSQRzVh7gCRahP5iyMkxd0vd2NVqxmFSP7qRnErB/Oc+VZvn
 gK3LXzXXQZOBh9WSA6D/2NkxhJ/OjnSXhWMfIvYomOlwrpwZAzpQX/wWUGCPCUr/
 /woJC5XFRWGudyr7/f6EDsy63H0DL58oATDXLRxXYy6UCme2gJlSjWJOVLJp1MDI
 vSJG5b1uqFtcg9cghgXkJXc/QCreyW0sWAla/Jyr8M8OfO8IZ0Mw94HVT8JaYjkJ
 iDDLie61IyYXJwC96KAWfnbhvL3+J71gfh8HKqqC5OW94PM/KvGOR1GaUr65rfqf
 jMivoKNJXb7NTN09z6YB+rjHxMv3F7UBOJKyfsNRACOJmQHaSBxjBEGQ//AQm9SZ
 Aq41OJx9cGjJRG7lG+M0k6N6LTcNP9QqTFe/ccno32aTscPY++bhKxPeLJRWgtQL
 YvuxB3p6BEkNfYZ/3c35UCyhkjcvRaXa4TvscRcdR8jrBNaHfveT7O8OvsZPz9BO
 hgt0c7HZehdiCmJYKa92ZFRgxEHmxL/ZS6CuD6PNO17/5SN2WcS7+wigaPlr/4Hr
 oVZD6tzzt/cxcjcZ2KirnPUcvFRPrpFiI1UM17xILuT4onlpBX3rxQQlCGF7fugD
 PdNLQg/XY3mvK54vlFn1
 =0sQZ
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga-next into next/drivers

Merge "SOCFPGA updates for 3.15 version 2" from Dinh Nguyen:

*Update SOCFPGA DTS to include ethernet, sd/mmc, and clock fixes
*Add stmmac ethernet glue layer
*Update socfpga_defconfig to include sd/mmc, and micrel_phy

* tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga-next:
  dts: socfpga: Add sysmgr node so the gmac can use to reference
  dts: socfpga: Add support for SD/MMC on the SOCFPGA platform
  dts: socfpga: Update clock entry to support multiple parents
  ARM: socfpga: Update socfpga_defconfig
  dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
  net: stmmac: Add SOCFPGA glue driver

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:26:40 +01:00
Arnd Bergmann 3c883ef345 Two more dt related efm32 fixes
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJTI2uWAAoJEOLc3ZEyZpvWwWMP/1Ctb7sYvk3NDSQf4/TCI7sy
 stb4nfuIn6/uDFAFHRbMDnTZbt+sF9w+mNkb7lPHoiXu7MAXW1agHjdP/o46RuWd
 4a+4eL24VSZiJ2h8FryowQ9YGMusJRngZKAZ/nVXFQ1J7kc+vNl2b2tkV7KD44JI
 CPwMTVUHeyb4a48hDfPo+O+bpqen0FP2I3Yo0XPFhi1s8Je2qMEb18K7JSKNHvXg
 TLMfbNCpW+hiicQoBx4aDLQilRxpy7/VrGOU4x+fHax8co8qpRNFFX7r+bguhmYE
 fQULZKfCybdynBi5puxccuaZCbxWFjVhHSIJvbhF/qY15Gg8Q4AJVmqsazpa71Jc
 bC/TAXb+R5bNlqNBO3rhAR2j8ZDRLHbdn1NHF8S34Ck4JeI9NUNH6gJ22Bess/wi
 A91B0SADHRibzTL6iKVff8f2zf9jsWUmX4pVI5eI7N7p4Lj8/eUmb7YT56Wy5YP2
 8OQ09JWezd5Il7kPRxW+OJbMgxyVFm9LIqtoVUO5cbQabS42c4nXEzQtBXDa7QvY
 Ouh9jp/+yFXoqA1FbpBwbr6pe52Dc27byJ1QAg3zBNnB1eJ2M5pYqXREAbF2weWb
 PzvsxgU3WGM0OIzeYmSmptd0K5LHE6Tva6L0ofOd4UMMQTVB8MVSXsgW9OAgQw5B
 6VrZOQJFIM+B8sk9Nq7m
 =vy3D
 -----END PGP SIGNATURE-----

Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/dt

Merge "Two more dt related efm32 fixes" from Uwe Kleine-König:

* tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux:
  ARM: efm32: properly namespace i2c location property
  ARM: efm32: fix unit address part in USART2 device nodes' names

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:14:46 +01:00
Arnd Bergmann 8d445234dc Merge branch 'efm32/cleanup' into next/dt
Dependency for efm32/dt branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:14:20 +01:00
Olof Johansson a929478f67 Fourth Round of Renesas ARM Based SoC Clock Updates for v3.15
r8a7791 (R-Car M2) SoC
 * Correct SCIFA3-5 clocks
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIk3WAAoJENfPZGlqN0++iVIP/24REGZk8nxI1p8dZXIUcTlZ
 fpr7iJARO7U4OxSBQCfJetKfpydhQvRf6S9FgnF1+1ckzuPiSpGB39HExn0OuYlh
 CowwOENxUAHNvDg2isR1ccKUpGRncYAW/QiEzsTBFT4hvjfYdnUk5bXeYEqekGI2
 XV0zf/MaMo5XZPOADTSUMjENLfAhrC2u6E/wV0yOcyYm0PBXK0QgSVrwdBBpYvOw
 1PM07HyrY0mNquBvsQxaSmkC1K0mV2kMHJhb1rubxLmUDaBPrIoI82KpTOXPOSom
 83MVrgpkso6salIdxlhEGsWvPffoNLzD9jS3wFDVuKkdS3ZebvDl8S6bpuKBionD
 sAdBYkl63mMUVRhjzqYz7kJkM/trJ9Z2s77+wl0DXp8621QjFJvMzT4rtRHsJwA5
 tTC+RN5pqT6+Dstx7juOEtFN/o/VayG7pqVAuQKiobdUHKJ8GDq3VucHta595T/s
 VcStQB/0oha+kg4cqvJ7hekNkk8Q9JeUwrfm3jEF4HBxZLW4x5G002N7VMtfOd4E
 wAb2qojOtST2e2qkVvJH9iF6K3bjG0Ojm3b0mAMYCF+Zc4gs7dhw9WMiCohGHE4S
 crABWTXruxko87ZK08tPHA7S9zWXRSyZwL8TQ9i0OZfTTCAmqgt/sm8wpeiyoHa2
 dS63sDE/3NWbIO9RUt0P
 =jIx+
 -----END PGP SIGNATURE-----

Merge tag 'renesas-clock4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Merge "Fourth Round of Renesas ARM Based SoC Clock Updates for v3.15" from
Simon Horman:

r8a7791 (R-Car M2) SoC
* Correct SCIFA3-5 clocks

* tag 'renesas-clock4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791: Fix SCIFA3-5 clocks

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:50:41 -07:00
Olof Johansson 56f55deb6e Third Round of Renesas ARM Based SoC Updates for v3.15
Fix warnings due to improper printk formats in shared APMU code.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTHXkRAAoJENfPZGlqN0++FlsQAKZXkZaeGie3JVonRhRH7jRt
 1FwlBKvPNzwgk8u6CVnH1mhPPik090zf4khPhckfGkEtbSq/EUqvhROX0US3lc8z
 FxgJRg6FTttYYg1PfJyDEJRzicZbvfzP6x0/FISyeVuTrD6k58XwY583y2dZIGNS
 O/+pkYU0MOWNVatzror+o2hj8G+mUXDeujsjn+lx95WMSLYSF1389kEo8DVyumJL
 qERnJscmAMO+6sLAAwvxnmf9ixV1Knz72yXt9ByWlYKLG5BqgRvXUPQVv/XjhTlp
 yj5mSbffBy4U3MYKle5E4Gmy1+MGdoZGgPg/T3uSwWrDdCFYuSCGLe1frM5JRBfl
 MYwO8DpVtbQUNbJSE5l7gIT/vkWQVev7CieRvH4g7J2DWpD/Q57WQd53rQsmjz/K
 j0wWhPv8N9lMpb+kbhRAvhqeYMD8Mqg2mh7WM3zUBHLTTTt/KXBiHPKt6GPkoH1S
 AxVn/U1CMg/oLrmqms77OM3KxeR1aQUR2b0POlfUHwVsQvNYklP0v9JHs6UebZDa
 p7BM3P7+d3vjqGCwqI47NvLO9qYT7sHyEDmk/AgWEb9DG1ivwZ4AwFrYAqoUWFqU
 jqgdGFaJWp6DXf9fbwIe0O4cuf92Ib13fiDN9qCzGK40E6VwDG5IX7N9OdaEoYMz
 0pyvUybPnyI1DUsKaF/7
 =lvg7
 -----END PGP SIGNATURE-----

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

Merge "Third Round of Renesas ARM Based SoC Updates for v3.15" from Simon
Horman:

Fix warnings due to improper printk formats in shared APMU code.

* tag 'renesas-soc3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: APMU: Fix warnings due to improper printk formats

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:49:36 -07:00
Olof Johansson 5e79cc1f40 Third Round of Renesas ARM Based SoC Clock Updates for v3.15
r7s72100 (RZ/A1H) SoC
 * Correct bus clock calculation
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTHXgJAAoJENfPZGlqN0++b0QP/00XYUVKVI1LnSspxt+aJFk5
 xxqUHIRo7AfNLahHMIU0lGfjDQzeksmJME2PjrGaAXR8RGn4quR3UKUDyo0vrdyg
 TxCHDABkpxFbmoKVcFqUUEO/buvyBoKW7Rt97nAZJ3SZhdt/owse+vMhm3JlWfyw
 FVN8SLBYgp3dJeYz6hRnC7IuDIDZb5DazOeJQYMiH45ADaomYmCAafB942RLasdI
 TKPHd8/WKAlB1cXhN8RMOtEK1QqM+sgJJSPfzSgZE3iRTbAlBmXz4yGOYG3Yqozh
 6fgbV10Zjj2H78GVDtp1I5GInk6cgaAntZUy5KhTNFHA4sFQlbAmLueG36mOvLBf
 ADVJA4r8bjkYxw2EPC+zyxBSe/QYfJWzHPODq9yELW5x6QnrxsNU4gkakhHGudhY
 BmaNoM0kPY12FPpiDFlhR1Et3GVv99RjZT5AB6S4rvuBIPwO86AhFcOsDf5bG9RB
 PUohgTeS/ywM3GacuQ9A+25Vbft2iE1GZuRKNpb//pF3WA/KkS56k6Q2daAFRk/n
 S6ClUZWB8VhO+C8Myv7d+0tz8//M0rzXQzx7h6GfgmxDLM2wyCzV+reWUiBZwBHD
 tEQalhfpVOx7iF/j8811kKajYPqnxd0q5AbXzegxAk3Sft94lATbmkyl60DvuBkj
 OvoAqfcePA17M4OOFaHE
 =zqUI
 -----END PGP SIGNATURE-----

Merge tag 'renesas-clock3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Merge "Third Round of Renesas ARM Based SoC Clock Updates for v3.15" from Simon
Horman:

r7s72100 (RZ/A1H) SoC
* Correct bus clock calculation

* tag 'renesas-clock3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r7s72100: fix bus clock calculation

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:48:44 -07:00
Olof Johansson 7070008066 Second Round of Renesas ARM Based SoC Clock Updates for v3.15
r8a7790 (R-Car H2) SoC
 - Add sound SCU clock support
 
 r8a7791 (R-Car M2) SoC
 - Remove legacy clock aliases for DT devices
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGAGlAAoJENfPZGlqN0++uhYP/1MGFfSiVZds9CimAr2wlnTL
 ZxCMDlmqKzbPsHn/jvSyEOD6EqNx1Zb2SgYDzcBLhYb7gSh9FJFjzF6cDfl/tywc
 ZlxNh5auAyFHsoRkrTN06im0kATT9Vy6CcrjsBx7BC0Sy/JqOwQ99t8knDwGDw5/
 KlHzKISRU1NGADlCOrBUkdCnJA1OSk1WXpoXyOLjyVlU0Mo42uUlaLn11JtqQQ8B
 7+qdoDlScDBUUupcqg/aiOPvi4Qv1jfW1kO9IXR9t4ILWiH/ZV/WDePIOcajawv7
 R+D2NV61OVvaGm218H2oamgNCM0gjK4XXSTMNYCWc+cpoh2Co2CpHGwEARlTkJ0S
 69A6XcY0Z8pPxjwYQeD5RG3lw1dtKtTREcTvZScSVykCEzHRh40/fdjvt1qgg1DY
 icNYbOfieMfk7X2SFaB48ntoGC510wUbvjA5ysi0Y8JH4bdXce3d82kQqW0FLxo2
 V+GZXTocqzI6mqIPNDUCNDIu9oCETP/SmET7NrpfE+w6TSNa+OfHDYr1D60h5Qb8
 ZqXko4dn0gXA8H3fSa1P1iHLti9E6NamM0q+Na52E+YGCAWA1zTKf87eYX/f14Qo
 IhPhUUGJY+eQX30Zjp/gRm6KnbCHbebFkbnnasbb1XmKhwMEENpLHfMDM6XvsWBs
 H9XhU73SQlBNw177XPLu
 =dOku
 -----END PGP SIGNATURE-----

Merge tag 'renesas-clock2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Merge "Second Round of Renesas ARM Based SoC Clock Updates for v3.15" from
Simon Horman:

r8a7790 (R-Car H2) SoC
- Add sound SCU clock support

r8a7791 (R-Car M2) SoC
- Remove legacy clock aliases for DT devices

* tag 'renesas-clock2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790: add sound SCU clock support
  ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:47:52 -07:00
Olof Johansson c5d326c22b Fourth Round of Renesas ARM Based SoC DT Updates for v3.15
* r8a7791 (R-Car M2) based koelsch board
   - Add SDHI devices
   - Add ethernet
 
 * r8a7791 (R-Car M2) SoC
   - Correct clock index for i2c5
 
 * r8a7790 (R-Car H2) based lager board
   - Add ethernet
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTF/wVAAoJENfPZGlqN0++HhUP+wY2kBbinZt+hOcn5zCnWMyY
 qU/089dn0nWMVl3TiKR3508XV52jP9o2pBxt1BTMzAyVsggzvr2WVtyGqGtpZTg+
 Caw8IGqtljo4KOSdqPMVS/S3uBBxkvBm/wJREuUpTNrAfS/m/8O8IwcSpKwREPBV
 /B/MdBhhDhToKQ8Qxy9zgylhqVZkggHLjgwNteQmene5iddzh6IxXM/eX6z4QOCR
 dI8WoBAZuLMuBZ4R573rxYnhwfwl9Jbqh5BmYEDkYo7tusJfMZPuluFcwTUyjt0F
 56EmC6LR1cAqH9NCbTb+B5zWLAQCSKfdUWAjwMF57RORx9RU/nXv3HziGGii7GZg
 AfsVt5FNBhv0HU7gT8ZZK1fmfy88+4V9RSfzXmgsoapkMbc7zSq63bKfbr6/Imcl
 +ygQZUNInfWMlDIBAGs19RAz/6QDhtQRnwhAr2vg2H9/ImvWmxq3VOvqBJ+UXmhQ
 tQjeZBvJ5poUEA8d0UyilTeudozqXKApgkIAPYRd0Jhz/8qtVaqcAF+BgNWH9Kf6
 Ut3aNr0754POPz/Rv3wfnbRQm3mZbKWeVDpYjGI4Uksj9loJChh+PPMsWCZk+7Fl
 N0P/qk9mGQAOWemIBjReP4U7SEvKo4PrxYnyGZFHvO1cJbVPQW75Dn1OKQtviD6a
 lhZpq5IPD9ezJoAPGeIA
 =iKA+
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Fourth Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon
Horman:

* r8a7791 (R-Car M2) based koelsch board
  - Add SDHI devices
  - Add ethernet

* r8a7791 (R-Car M2) SoC
  - Correct clock index for i2c5

* r8a7790 (R-Car H2) based lager board
  - Add ethernet

* tag 'renesas-dt4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Add SDHI devices for Koelsch DTS
  ARM: shmobile: Add SDHI devices to r8a7791 DTSI
  ARM: shmobile: r8a7791: fix clock index for i2c5
  ARM: shmobile: koelsch: add Ether DT support
  ARM: shmobile: r8a7791: add Ether DT support
  ARM: shmobile: lager: add Ether DT support
  ARM: shmobile: r8a7790: add Ether DT support

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:46:17 -07:00
Olof Johansson 4664f3d339 Second Round of Renesas ARM Based SoC Updates for v3.15
* R-Car Gen2 SoCs: r8a7791 (R-Car M2) and r8a7790 (R-Car H2)
   - Remove __init from rcar_gen2_read_mode_pins()
 
 * r8a7791 (R-Car M2)
   - Use 64-bit dma_addr_t
 
 * r8a7790 (R-Car H2)
   - Add CA15-SCU, CA7-SCU
   - Add SYSC setup code
   - Use 64-bit dma_addr_t
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTDZnsAAoJENfPZGlqN0++X50P+wY3hzU2/pz+pJqWvUE70vzu
 WfB4y7/rJ//f3M7+fgi6spK6gdfv5DMSJrV/v23AAQaHQzUSOeqh9DIW5vvfOBM0
 1xHV8gpJxtkddk+nSw2uALniAW5AJEPEkUp4PbFzHfoE0edyrGbpQ9Db766glX2b
 et7VscJ2n1+szr43FsjVGDcomP324f9cqCM065UOrjI7PdvUm01EyGjJKpiv9HGJ
 ZOU1bRIwNRDzb5Vwts9PN0qzsnaub/6P6mRo1vj6zcZytaZxRBHbV6JyAn+9ZXo0
 ZhE+4QlA0GfhIRZzzvYWkrHkmdRkv94SqpO+tq3SeRudG6OcaUUQOkI+LhchtHtT
 CteAjdUfh/GXJ3S3k//+3wuEOxrc+knzqwxG8bufWnnfJ8jiK9/wXLv1VejaZBOp
 1GU1xxJyfW3LDpRTMVL0HLk6xPzDlub9wFT4xqg4Xc39t+uiFcbGrXbz6NhqTAIQ
 jDn5eXkNqQFN7vbJMPvMehEjOh9Huiy1Z2svJBCozoPnCtlxhwy5sdqygqaFMhZs
 9VpFVyYYeDSBYM820HDXno0xHEy1egoNLXP3pForHeOmwgEZxBH4MummNlmgxK/C
 sQgwuV789CY4xDy5UY0EKBwPl5/gJGKPVK0opHZYZKUQdZlCH9FMRUCfIgIXmFNE
 LCVSBHi173v0WT+hptMb
 =Qyw9
 -----END PGP SIGNATURE-----

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

Merge "Second Round of Renesas ARM Based SoC Updates for v3.15" from Simon
Horman:

* R-Car Gen2 SoCs: r8a7791 (R-Car M2) and r8a7790 (R-Car H2)
  - Remove __init from rcar_gen2_read_mode_pins()

* r8a7791 (R-Car M2)
  - Use 64-bit dma_addr_t

* r8a7790 (R-Car H2)
  - Add CA15-SCU, CA7-SCU
  - Add SYSC setup code
  - Use 64-bit dma_addr_t

* tag 'renesas-soc2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Move SYSC base variable to inside ifdefs
  ARM: shmobile: Remove __init from rcar_gen2_read_mode_pins()
  ARM: shmobile: r8a7790 CA15-SCU enablement
  ARM: shmobile: r8a7790 CA7-SCU enablement
  ARM: shmobile: r8a7790 SYSC setup code
  ARM: shmobile: Break out R-Car SYSC PM code
  ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:38:40 -07:00
Olof Johansson 6020dd9b01 Renesas ARM Based SoC Clock Updates for v3.15
* r7s72100 SoC (RZ/A1H)
   - Add clock for SH Ethernet
   - Add RSPI clocks
 
 * r8a7791 (R-Car M2)
   - Add QSPI and SDHI clocks
 
 * r8a7790 (R-Car H2)
   - Add audio clock
   - Remove legacy DT clocks
   - Correct SYS DMAC clock defines
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTDZ1pAAoJENfPZGlqN0++O98P/R7NOBCLZFI6w7I8eolsuaKQ
 WMxuqQbX0TUEfnLwN8B23gkEW6008Lfq0c5PTtJRMG7WDyspB1NfrHWxuGbXfe3f
 u0CBtsRVBleHj7CFyGUKW6d5aoPY04S4+296RF80dDyk95xjlGI7TIX+JCr5yg0u
 hylB15nw+KKD/UzW6MBmiq+HVqsObkJ2rKyNAWRtzwdAvgO6wOWZHUSR01dF0AaO
 n1h8GDVmGfahCHhhP1qNrMRyR8qJ6MNVJpGXXTdiyI1S3ON3CpJFvXbjIcg0tfUD
 crQw1zGR7WTY+7ga7uqdQj3YpvOxexh8YFFvPYZcerOW/bhlrancW4q15OgsNlM2
 tl2j59naW1mnqPUTKnfM0yX6qZN0ILL6/yoLmVCvHmO/cJpfajoQ5vuIk9OMiTmx
 S/zx/BGlCZ6olTiT/7+l6Jn/yctrutS43UhP1qqIPHneX1XM3PHOT3R8TlcrYgOq
 i2Ugd5QzSKZx3tfpsvu60UlAKYqprs24i/DK0UluJVdgN9Uerx/ArAUR21YIZcBT
 fJ8pjMJi471CCcstFAVWQETs3iGqPCDFZiwGCrbV/rwPLAO07k/sdf3hZibN8c/g
 yOa1ezIPcEbLCw4F+O2SVUbnX1cIeS0nPpOcAHaPZsg2hZ8mx70U1k6fO+Z+Assr
 mlM7KQJ8FMC/ZBNGQAJa
 =+nyz
 -----END PGP SIGNATURE-----

Merge tag 'renesas-clock-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Merge "Renesas ARM Based SoC Clock Updates for v3.15" from Simon Horman:

* r7s72100 SoC (RZ/A1H)
  - Add clock for SH Ethernet
  - Add RSPI clocks

* r8a7791 (R-Car M2)
  - Add QSPI and SDHI clocks

* r8a7790 (R-Car H2)
  - Add audio clock
  - Remove legacy DT clocks
  - Correct SYS DMAC clock defines

* tag 'renesas-clock-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove legacy r8a7790 DT clocks
  ARM: shmobile: Add r8a7791 legacy SDHI clocks
  ARM: shmobile: r8a7790: Correct SYS DMAC clock defines
  ARM: shmobile: r7s72100: Add clock for r7s72100-ether
  ARM: shmobile: r8a7791 clock: add QSPI clocks
  ARM: shmobile: r7s72100 clock: Add RSPI clocks for DT
  ARM: shmobile: r7s72100 clock: Add RSPI clocks
  ARM: shmobile: r8a7790: add audio clock
  ARM: shmobile: r8a7778: add audio clock in new style

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:36:37 -07:00
Olof Johansson 46d34000e3 Third Round of Renesas ARM Based SoC DT Updates for v3.15
* r7s72100 SoC (RZ/A1H)
   - Add nodes for i2c controllers to DT
 
 * r7s72100 (RZ/A1H) based Genmai board
   - genmai: adapt dts to use native i2c driver
 
 * r8a7791 SoC (R-Car M2)
   - Remove superfluous interrupt-parents
 
 * r8a7791 (R-Car M2) based Koelsch board
   - Add i2c2 bus to DT
   - Add DU device to DT
 
 * r8a7790 SoC (R-Car H2)
   - Add i2c aliases
   - Remove superfluous interrupt-parents
   - Add QSPI node
 
 * r8a7790 SoC (R-Car M2) based Lager
   - Add DU, SDHI0/1 and QSPI to DT
 
 * r8a7778 SoC (R-Car M1)
   - Remove duplicate i2c nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTBulKAAoJENfPZGlqN0++X30P/RXo2X9udCzr+bDphjoJoNiw
 m9u64qzYtKBoapJGXo2U4d9lwEWKrOrmL6ViZZlYG/kuoZae5IZE8ZO2zGG5E/fg
 4Q5g8StXytH8Q+Lxgs5dL3y5+O8uQz1dyieiWyWTfm+I1FqveSz7D7mmWx5/iR1D
 bNl2gQ3PZYDTtjaMQTs7muv8/DkOEhX72DucObcMGEQEEfyuJtHvW9kPoim9UH5n
 fI8hwKcu95EWKerjnElnuy3LR7u8IAIDLXWL+V/CCYb6sU40EggdgAKfx3ilWHpn
 rfYuD2XFxndFIUQNAGxlmR4V3QfrwSKIkEdatEa19mj6CEmSVqii93dDB7I8uD8f
 rkWU64ALtgSBQE+p71tRGZzaQ9yguW5yzctNBynXKedswXcDc7EdZtLsSSSeSLjN
 4Ao3ZollSd5CBuTmfBLnWFBpm0wJItJhR6n4BUXTR2MN5pBE4YfeyW8Z3efJdQPW
 VnTNVYUMBboRIpsvMDLTNxquq3PhNNDOZ3CGLECEPv43n/zcpJua6rw20BwyTtSj
 I0B1t5Boy2pbur87pEMtDjLVhDZ8cRxEVkvOfSqLCb+At54nMYfvvzxqKdQul8tj
 hGItX4VD4YZ13Kb5QCX4buSVFzZA9rrKQPMDBwuoAvEBSMRINXzWBPflrxbE7iUB
 bXRRxVJaqLeDrFJqAA8z
 =xQU/
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon
Horman:

* r7s72100 SoC (RZ/A1H)
  - Add nodes for i2c controllers to DT

* r7s72100 (RZ/A1H) based Genmai board
  - genmai: adapt dts to use native i2c driver

* r8a7791 SoC (R-Car M2)
  - Remove superfluous interrupt-parents

* r8a7791 (R-Car M2) based Koelsch board
  - Add i2c2 bus to DT
  - Add DU device to DT

* r8a7790 SoC (R-Car H2)
  - Add i2c aliases
  - Remove superfluous interrupt-parents
  - Add QSPI node

* r8a7790 SoC (R-Car M2) based Lager
  - Add DU, SDHI0/1 and QSPI to DT

* r8a7778 SoC (R-Car M1)
  - Remove duplicate i2c nodes

* tag 'renesas-dt3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: genmai: adapt dts to use native i2c driver
  ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi
  ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
  ARM: shmobile: r8a7791: add i2c master nodes to dtsi
  ARM: shmobile: r8a7790: add i2c aliases to dtsi
  ARM: shmobile: r8a7790: remove superfluous interrupt-parents
  ARM: shmobile: r8a7791: remove superfluous interrupt-parents
  ARM: shmobile: koelsch-reference: Add DU device to DTS
  ARM: shmobile: lager: Add DU device to DTS
  ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes
  ARM: shmobile: lager: add SDHI0/2 support on DTS
  ARM: shmobile: lager dts: Add QSPI nodes
  ARM: shmobile: r8a7790 dtsi: Add QSPI node

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:16:56 -07:00
Olof Johansson af8cdfd332 Third Round of Renesas ARM Based SoC Defconfig Updates for v3.15
* r7s72100 (RZ/A1H) based Genmai board
   - update defconfig for I2C usage
 
 * r8a7791 (R-Car M2) based Koelsch board
   - Enable SDHI, GPIO and regulators in defconfig
 
 * r8a7790 (R-Car H2) based Lager board
   - Enable RSPI and MTD_M25P80
 
 * emev2 (Emma Mobile) based KZM9D board
   - Remove legacy KZM9D defconfig
 
 * Multiplatform
   - Add defconfig for shmobile multiplatform
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTBuroAAoJENfPZGlqN0++G9sP/jkUBpMQv/SkvZ09huecUPFl
 r+okKiVZ7MBLjYpUzJF4t21qZuZf9+KcWTCLg01/xmGEyydfsO3F0Jr/GFLUzqG1
 tlf+sATp9wnteoMnMjllCAxENa9gQWKIRo5LGeeBETDqBbG9pI5z9x9RG1HvKcW1
 MXG8UIz4GsO/haMST7dBPrp1MT3pnSPCdRgj9o7Gf3PawI2JjhvEzEtuF1F0K8hA
 2kx/5yFG6s5WPvl533945xasVMQOJg8L10DifsCMKMjL5rU0+VXkkSTXHWGSlxAE
 S/Dk2lbRQbYXWggXD2YJea4jTTDo0X5swxKl6AwVHcox/4oC8cQrwThPmUvESAS3
 QBKPkz0bEgj7/xR2OtWhcZPVpU5GS2KjiI3xjkp3TF1iMTUHmWEMwnsdDxg0ZEc3
 t5DprfJr4+Umu3h+Jzpwo5/wbI7o1TNS+ala5mhoSX6KFEwKtFiszYvXR6AuEWV8
 jPGj3B/NxOzYJghzKlPLoCI8mRyUBm0C0+awx60n0Dq9P+z/wvHY/RnG4on82BUn
 kG/h9D9lNRVTeejeh3Qwro+4rBGTqCAEd0Mc53jsVxhurELJ8TY7oXR9TyFAK3Rr
 Q2AtgSgx9d4AUUJBmHMUoukI1Hhk3jNhv4wEy6zGS2i9Kf2nZy93cHkr9MfGjn1/
 93hFARA5lHe6wrjC9k81
 =xRoY
 -----END PGP SIGNATURE-----

Merge tag 'renesas-defconfig3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Third Round of Renesas ARM Based SoC Defconfig Updates for v3.15" from
Simon Horman:

* r7s72100 (RZ/A1H) based Genmai board
  - update defconfig for I2C usage

* r8a7791 (R-Car M2) based Koelsch board
  - Enable SDHI, GPIO and regulators in defconfig

* r8a7790 (R-Car H2) based Lager board
  - Enable RSPI and MTD_M25P80

* emev2 (Emma Mobile) based KZM9D board
  - Remove legacy KZM9D defconfig

* Multiplatform
  - Add defconfig for shmobile multiplatform

* tag 'renesas-defconfig3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r7s72100: update defconfig for I2C usage
  ARM: shmobile: koelsch: Enable SDHI, GPIO and regulators in defconfig
  ARM: shmobile: Get rid of legacy KZM9D defconfig
  ARM: shmobile: Add defconfig for shmobile multiplatform
  ARM: shmobile: lager defconfig: Enable RSPI and MTD_M25P80

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:02:36 -07:00
Olof Johansson d89893272a Third Round of Renesas ARM Based SoC Boards Updates for v3.15
* r7s72100 SoC (RZ/A1H) based Genmai board
   - Set proper DMA masks for Ether device
 
 * r8a7791 (R-Car M2) based Koelsch board
   - Remove Koelsch DT reference legacy clock bits
   - Set proper DMA masks for Ether device
   - Add DU device to koelsch-reference
   - Refactor clock lookup hack in koelsch-reference
   - Add SDHI devices
 
 * r8a7790 (R-Car H2) based Lager board
   - Remove Lager DT reference legacy clock bits
   - Set proper DMA masks for Ether device
   - Add internal USB PCI support
   - Add QSPI pinmux
   - Sdd SDHI0/2 support
 
 * emev2 (Emma Mobile EV2) based kzm9d board
   - Remove KZM9D board code
 
 * r8a7778 (R-Car M1) based bock-w board
   - Set proper DMA masks for Ether device
 
 * r8a7740 (R-Mobile A1) based Armadillo 800 EVA board
   - Set proper DMA masks for Ether device
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTBteKAAoJENfPZGlqN0++5V8P/RgPn+jPVPzfVqamKclf5tL/
 Zdl0vZ9tIdDB4L8Rfzbg1H1+74B/UAMWEiAA4t+n6CfnT6AjP6GfcFBqet+ekYXx
 oQ7X0xALqGpyz/KDwQCxwJV+/I/b8hXIcBO2rFhR0a4ydUCLIcl/KtTlv1ym1ZRs
 kD8WwPvsM73QtT6nkFreFdCTA7zq5CE2NuGKFc+J7e9tymzdop5dhm3/F1Lhchu8
 Dfm3pRT2s04QtQAqjIcuc1hBkK4amC5h9PBENtjHhqACp647f7k1g//Tsn5yr5jf
 zrH8o+DEPbLY3diKq+GqRoazAvKty99Q6NdtCv8nKZ+4o3Z2J3ZlJtWTn5+hcgsw
 M9G9tNX8KKJxl0pnZS4OgkrLtVxLEI09hbtjAZlXVCvAKMOB0er+brpuy7R74q8O
 vSvXWiYZetZGYp01D3LWGT6oXPHKTubOSTYpsOIZIzKC62vWkNYBPuWXNHbpdQ9F
 Xon/FMno0kAnmUDkPWw9Und1VQ2JNPdV3a6dIUdA/2i676WTokKO/njbVxWB04yj
 YOvrk6nySfvwWJxsg24iZ7VcgfGo0/kHIZnUYnHxNLvL0WEhKF6VoXXBRxIESieU
 Tz0k5lT/7GShR9rrovq3O8sR7rrfXGUvUwuzoGEZlw+Kr0eZiUiLOWwVEqHsrYY0
 mGVdAs2uVNOrs4zOr4Qt
 =r95q
 -----END PGP SIGNATURE-----

Merge tag 'renesas-boards3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Third Round of Renesas ARM Based SoC Boards Updates for v3.15" from
Simon Horman:

* r7s72100 SoC (RZ/A1H) based Genmai board
  - Set proper DMA masks for Ether device

* r8a7791 (R-Car M2) based Koelsch board
  - Remove Koelsch DT reference legacy clock bits
  - Set proper DMA masks for Ether device
  - Add DU device to koelsch-reference
  - Refactor clock lookup hack in koelsch-reference
  - Add SDHI devices

* r8a7790 (R-Car H2) based Lager board
  - Remove Lager DT reference legacy clock bits
  - Set proper DMA masks for Ether device
  - Add internal USB PCI support
  - Add QSPI pinmux
  - Sdd SDHI0/2 support

* emev2 (Emma Mobile EV2) based kzm9d board
  - Remove KZM9D board code

* r8a7778 (R-Car M1) based bock-w board
  - Set proper DMA masks for Ether device

* r8a7740 (R-Mobile A1) based Armadillo 800 EVA board
  - Set proper DMA masks for Ether device

* tag 'renesas-boards3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove Lager DT reference legacy clock bits
  ARM: shmobile: Remove Koelsch DT reference legacy clock bits
  ARM: shmobile: Remove KZM9D board code
  ARM: shmobile: Genmai: set proper DMA masks for Ether device
  ARM: shmobile: Koelsch: set proper DMA masks for Ether device
  ARM: shmobile: Lager: set proper DMA masks for Ether device
  ARM: shmobile: BOCK-W: set proper DMA masks for Ether device
  ARM: shmobile: Armadillo 800 EVA: set proper DMA masks for Ether device
  ARM: shmobile: koelsch-reference: Add DU device
  ARM: shmobile: koelsch-reference: Refactor clock lookup hack
  ARM: shmobile: lager-reference: Add DU device
  ARM: shmobile: lager-reference: Refactor clock lookup hack
  ARM: shmobile: lager: Add internal USB PCI support
  ARM: shmobile: lager legacy: Add QSPI pinmux
  ARM: shmobile: lager: add SDHI0/2 support
  ARM: shmobile: Add SDHI devices for legacy Koelsch

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:00:03 -07:00
David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/r8152.c
	drivers/net/xen-netback/netback.c

Both the r8152 and netback conflicts were simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-14 22:31:55 -04:00
Kuninori Morimoto c7a507eea1 ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags
SND_SOC_DAIFMT_CBx_CFx means "codec" side master/slave mode.
Then, FSI will be master mode if it was SND_SOC_DAIFMT_CBS_CFS.

This patch fixup platform settings too.
Then, it tidyups SND_SOC_DAIFMT_INV settings.

Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-03-14 19:30:59 +00:00
Matt Porter a97d67d1c4 ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
The BCM28155-AP board has a bootloader that expects the camldo1
regulator to be enabled on entry. Currently, the camldo1 regulator
is disabled when no longer in use as is the case during a reboot /
warm reset. This causes the early bootloader to hang upon entry. Add
regulator-always-on to the camldo1 constraint to fix reboot.

Reported-by: Alex Elder <elder@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
Tested-by: Alex Elder <elder@linaro.org>
2014-03-14 12:22:39 -04:00
Matt Porter a51b4c0199 ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
Add a dtsi to support the BCM590xx PMUs used by the BCM281xx family
of SoCs. Enable regulators for use with the dwc2 and sdhci on
bcm28155-ap.

Signed-off-by: Tim Kryger <tim.kryger@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
2014-03-14 12:22:38 -04:00
Markus Mayer 2eba905e86 ARM: dts: bcm21664: Add device tree files.
Add device tree files for the Broadcom BCM21664 SoC.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-14 12:22:37 -04:00
Florian Fainelli 7aa2077b55 ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE
Low-level debugging using the Broadcom Kona UART only makes sense on the
ARCH_BCM_MOBILE platform and would otherwise prevent ARCH_BCM_63XX from
picking up the right UART implementation by default.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-14 11:37:33 -04:00
Markus Mayer c3ceebd7ca ARM: bcm21664: Add board support.
Add support for the Broadcom BCM21664 mobile SoC. It has two Cortex-A9
cores like the BCM281xx family of chips. BCM21664 and BCM281xx share
many IP blocks in addition to the ARM cores.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-14 11:25:15 -04:00
Matt Porter 833688f4e4 ARM: mach-bcm soc updates
- add BCM5301x support
 - remove GENERIC_TIME
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTGAsEAAoJEOfTILNwq7R4hyEP/ApeGhAN6ubhui78M880ycl1
 TEjTvAA9yvbldiTF8Jp2XUIdIfxTcraCpd11TMF1kgQcnKNK9GqvkaB8Dh98WYzD
 MY8+8SMJSGsPtAT5tp0MaamZREoPm4wEZ5JWn8wQjIMTjiIPDu78Gjm0M00E3c+a
 1uOkbUrIFTECgzIeMr92p0NSYqYthz0g5EE/BTfPWCA6wqfIQ4DvqUtB9Mad6iR6
 VBN6tqjL98riz+CYSV3WhqMCaI60HEPtpVBhrVMoZHKyMcR7O83F7V91t2QZc/dM
 5DZLSdU9/1ZkIpK3gFf5CyBbO6lVv47kFpVm7hSZhqPIR6w3SfhCNxjPy5dyCb5Y
 vlMqUmakXtuqPkk6mm4x79Scxj/1ct3g7pssHzS7N8tuAtPISeBzW+GhjXjICXtR
 6shZQRJwhCDJ3pPMWsBW60VQ/ct+A9X5gXka8kthWGoLPBlZrLNR8vZmsfcbx4Ei
 nurWQGLoMfHt7KxVaTVrrwdUXkXTRc4EZrmMvVkNzJEiedyuN8E1nZEF2kVOPsgA
 aZIih6Lex4mPVakGwaQH4zPCXTfHwstIe0P1aPy+seHzbqUf64s0VkNEbctCCZOe
 7a4yj72KYXEnsD2mSHa3c/MRfQEzEatefl1QGeQw7nPsDwxOWgrCsWylXYoVCSyT
 +i6ga9T1VIwL5Jlb6fhr
 =WKwJ
 -----END PGP SIGNATURE-----

Merge tag 'armsoc/for-3.15/soc-2' into armsoc/for-3.15/soc-3

ARM: mach-bcm soc updates

- add BCM5301x support
- remove GENERIC_TIME
2014-03-14 11:20:43 -04:00
Uwe Kleine-König 35c3a9c807 ARM: efm32: properly namespace i2c location property
Wolfram Sang pointed out during review of an efm32-i2c driver that the
property to specify the set of pins has a too general name. As several
other efm32 peripherals also have a similar register bit field, add an
"efm32" namespace.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2014-03-14 16:04:30 +01:00
Uwe Kleine-König 64afb24991 ARM: efm32: fix unit address part in USART2 device nodes' names
While removing the 0x prefixes in the unit addresses in reply to a review
comment, I must somehow have messed up these two. Uups.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2014-03-14 16:04:15 +01:00
Maxime Ripard 09504a7d76 ARM: sunxi: dt: Convert to the new irq controller compatibles
Switch the device tree to the new compatibles introduced in the irqchip drivers
to have a common pattern accross all Allwinner SoCs.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-03-14 13:43:33 +01:00
Ezequiel Garcia 4de29e6369 ARM: mvebu: Enable NAND controller in Armada 385-DB
The Armada 385-DB board has a NAND flash, so enable it in the
devicetree and add the partitions as prepared in the factory images.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-6-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-13 23:37:17 +00:00
Ezequiel Garcia 93b5577e50 ARM: mvebu: Add support for NAND controller in Armada 38x SoC
The Armada 38x SoC family has a NAND controller, compatible
with the controller in Armada 370/375/XP SoCs. Add support for
it in the devicetree file.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-5-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-13 23:37:16 +00:00
Ezequiel Garcia d6bd4b4cb3 ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
The Armada 38x SoC family has a clock provider called "Core Divider",
derived from the fixed 2 GHz main PLL clock. This is similar to the
one on A370, A375 and AXP.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-4-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-13 23:37:16 +00:00
Ezequiel Garcia 5bc94c992a ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
Armada 38x SoCs have a 2 GHz fixed main PLL that is used to feed
other clocks. This commit adds a DT representation of this clock
through a fixed-clock compatible node.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-3-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-13 23:37:15 +00:00
Roger Quadros 051fc06dfa mfd: omap-usb-host: Use clock names as per function for reference clocks
Use a meaningful name for the reference clocks so that it indicates the
function.

Update the OMAP4+ USB Host node as well to be in sync with the changes.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2014-03-13 22:25:45 +00:00
Roger Quadros 775bb078e9 mfd: omap-usb-host: Use proper clock name instead of alias
Use the proper clock name 'usbhost_120m_fck' instead of the
alias 'ehci_logic_fck'

Get rid of the 'ehci_logic_fck' alias from the OMAP3 hwmod data
as well.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2014-03-13 22:25:16 +00:00
Roger Quadros 3aca446acf mfd: omap-usb-host: Get clocks based on hardware revision
Not all revisions have all the clocks so get the necessary clocks
based on hardware revision.

This should avoid un-necessary clk_get failure messages that were
observed earlier.

Also remove the dummy USB host clocks from the OMAP3 clock data.
These are no longer expected by the driver.

Acked-by: Mike Turquette <mturquette@linaro.org> [OMAP3 CLK data]
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2014-03-13 22:23:51 +00:00
Suman Anna 77319669af ARM: OMAP4: hwmod data: correct the idlemodes for spinlock
The spinlock module's SYSCONFIG register does not support
smart wakeup, so remove this flag from the idle modes in
the spinlock hwmod definition.

Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-13 14:09:57 -07:00
Mugunthan V N 8abcdd680d ARM: dts: am33xx: correcting dt node unit address for usb
DT node's unit address should be its own register offset address to make it a
unique across the system. This patch corrects the incorrect USB entries with
correct register offset for unit address.

Cc: stable@vger.kernel.org # v3.12+
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-13 13:41:51 -07:00
Florian Vaussard 7b8b6af169 ARM: dts: omap4/5: Use l3_ick for the gpmc node
The GPMC clock is derived from l3_ick. The simplest solution is
to reference directly l3_ick to provide the GPMC fck in order to
get correct timings. The real management of the clock is left to
hwmod.

Cc: stable@vger.kernel.org # v3.14+
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-13 13:41:50 -07:00
Nishanth Menon 07484ca33e ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM
Just like IS_PM34XX_ERRATUM, IS_PM44XX_ERRATUM is valid only if
CONFIG_PM is enabled, else, disabling CONFIG_PM results in build
failure complaining about the following:
arch/arm/mach-omap2/built-in.o: In function `omap4_boot_secondary':
:(.text+0x8a70): undefined reference to `pm44xx_errata'

Fixes: c962184 (ARM: OMAP4: PM: add errata support)
Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.ocm>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-13 13:41:50 -07:00
Stefan Sørensen 698b485325 ARM: OMAP2+: INTC: Acknowledge stuck active interrupts
When an interrupt has become active on the INTC it will stay active
until it is acked, even if masked or de-asserted. The
INTC_PENDING_IRQn registers are however updated and since these are
used by omap_intc_handle_irq to determine which interrupt to handle,
it will never see the active interrupt. This will result in a storm of
useless interrupts that is only stopped when another higher priority
interrupt is asserted.

Fix by sending the INTC an acknowledge if we find no interrupts to
handle.

Cc: stable@vger.kernel.org
Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-13 13:34:48 -07:00
John W. Linville 42775a34d2 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
2014-03-13 14:21:43 -04:00
Maxime Ripard 8db21ad469 ARM: sunxi: Add the new watchog compatibles to the reboot code
Now that the watchdog driver has new compatibles, we need to support them in
the machine reboot code.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-13 11:46:20 +01:00
Maxime Ripard ca5d04d908 ARM: sunxi: dt: Update the watchdog compatibles
The watchdog compatibles were following a different pattern than the one found
in the other devices. Now that the driver supports the right pattern, switch to
it in the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-13 11:28:34 +01:00