Hans Ulli Kroll [Tue, 11 Aug 2015 20:09:05 +0000 (22:09 +0200)]
ARM: gemini: Setup timer3 as free running timer
In the original driver it is missed to setup a free running driver.
This timer is needed for the scheduler.
So setup it.
Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Hans Ulli Kroll [Tue, 11 Aug 2015 20:09:04 +0000 (22:09 +0200)]
ARM: gemini: Use timer1 for clockevent
Use timer1 as clockevent timer.
The old driver uses timer2, which has some issues to setup
Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Hans Ulli Kroll [Tue, 11 Aug 2015 20:09:03 +0000 (22:09 +0200)]
ARM: gemini: Add missing register definitions for gemini timer
Add missing register defintions for the gemini clocksource
Also do some #define' cleanup to make the code more readable.
Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Viresh Kumar [Thu, 6 Aug 2015 09:11:13 +0000 (14:41 +0530)]
ARM: ep93xx/timer: Migrate to new 'set-state' interface
Migrate EP93xx driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij [Tue, 28 Jul 2015 00:11:36 +0000 (02:11 +0200)]
ARM: nomadik: push accelerometer down to boards
The two Nomadik variants have the accelerometer mounted on
different I2C lines. Push the definition down to the top-level
board DTS files to get things right.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij [Mon, 27 Jul 2015 20:40:53 +0000 (22:40 +0200)]
ARM: nomadik: move l2x0 setup to device tree
The cache setup magic value in the Nomadik machine is plain wrong,
the correct settings can be done using device tree in accordance
with the settings from ST's own port.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij [Thu, 23 Jul 2015 21:14:20 +0000 (23:14 +0200)]
ARM: nomadik: selectively enable UART0 on boards
The S8815 board is using RX/TX on UART0, and the NHK8815 is
using RX/TX and CTS/RTS (the latter connected to a Bluetooth
chip). Activate the right groups with the u0 UART0 function
on each board and undisable it. Get rid of the old erroneous
default definition from the SoC file.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij [Sat, 30 May 2015 15:30:26 +0000 (17:30 +0200)]
ARM: nomadik: move hog code to use DT hogs
Instead of introducing a board-specific DT node for biasing the
MMC/SD and SATA ports, use the new device tree hogs.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 11 Aug 2015 12:59:02 +0000 (14:59 +0200)]
Merge tag 'samsung-cleanup' of git://git./linux/kernel/git/kgene/linux-samsung into next/cleanup
Samsung cleanup for v4.3
- make the following headers local
watchdog-reset, onenand-core, irq-uart, backlight,
ata-core, regs-usb-hsotg-phy, spi-core, nand-core,
fb-core and regs-srom headers
- make the following c file local
s5p-dev-mfc, dev-backlight and setup-camif c file
- remove keypad-core.h file
- drop owner assignment in pmu.c
- remove duplicated define of SLEEP_MAGIC
- make exynos5420_powerdown_conf() staic
* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: remove keypad-core header in plat-samsung
ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx
ARM: SAMSUNG: local onenand-core header in mach-s3c64xx
ARM: SAMSUNG: local irq-uart header in mach-s3c64xx
ARM: SAMSUNG: local backlight header in mach-s3c64xx
ARM: SAMSUNG: local ata-core header in mach-s3c64xx
ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx
ARM: SAMSUNG: local spi-core header in mach-s3c24xx
ARM: SAMSUNG: local nand-core header in mach-s3c24xx
ARM: SAMSUNG: local fb-core header in mach-s3c24xx
ARM: SAMSUNG: local regs-srom header in mach-exynos
ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos
ARM: SAMSUNG: make local dev-backlight in mach-s3c64xx
ARM: SAMSUNG: make local setup-camif in mach-s3c24xx
ARM: EXYNOS: Drop owner assignment in pmu.c
ARM: EXYNOS: Remove duplicated define of SLEEP_MAGIC
ARM: EXYNOS: Make local function static
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 11 Aug 2015 12:43:05 +0000 (14:43 +0200)]
ARM: shmobile: Fix mismerges
Turns out I fumbled a couple of the merge resolutions for marzen board removal.
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij [Mon, 3 Aug 2015 07:26:52 +0000 (09:26 +0200)]
ARM: ux500: simplify secondary CPU boot
This removes a lot of ancient cruft from the Ux500 SMP boot.
Instead of the pen grab/release, just point the ROM to
secondary_boot() and start the second CPU there, then send
the IPI.
Use our own SMP enable method. This enables us to remove the
last static mapping and get both CPUs booting properly.
Tested this and it just works.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Thu, 6 Aug 2015 08:11:36 +0000 (10:11 +0200)]
Merge branch 'fixes' into next/cleanup
* fixes: (28 commits)
ARM: ux500: add an SMP enablement type and move cpu nodes
ARM: dts: keystone: fix dt bindings to use post div register for mainpll
ARM: nomadik: disable UART0 on Nomadik boards
ARM: dts: i.MX35: Fix can support.
ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc
ARM: dts: add CPU OPP and regulator supply property for exynos4210
ARM: dts: Update video-phy node with syscon phandle for exynos3250
ARM: keystone: dts: rename pcie nodes to help override status
ARM: keystone: dts: fix dt bindings for PCIe
ARM: pxa: fix dm9000 platform data regression
ARM: DRA7: hwmod: fix gpmc hwmod
ARM: dts: Correct audio input route & set mic bias for am335x-pepper
ARM: OMAP2+: Add HAVE_ARM_SCU for AM43XX
MAINTAINERS: digicolor: add dts files
ARM: ux500: fix MMC/SD card regression
ARM: ux500: define serial port aliases
ARM: dts: OMAP5: Add #iommu-cells property to IOMMUs
ARM: dts: OMAP4: Add #iommu-cells property to IOMMUs
ARM: dts: Fix frequency scaling on Gumstix Pepper
ARM: dts: configure regulators for Gumstix Pepper
...
Linus Walleij [Mon, 3 Aug 2015 07:26:41 +0000 (09:26 +0200)]
ARM: ux500: add an SMP enablement type and move cpu nodes
The "cpus" node cannot be inside the "soc" node, while this
works for the CoreSight blocks, the early boot code will look
for "cpus" directly under the root node, so this is a hard
convention. So move the CPU nodes.
Augment the "reg" property to match what is actually in the
hardware: 0x300 and 0x301 respectively.
Then add an SMP enablement type to be used by the SMP init
code, "ste,dbx500-smp".
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Thu, 6 Aug 2015 08:09:08 +0000 (10:09 +0200)]
Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git./linux/kernel/git/horms/renesas into next/cleanup
Renesas ARM Based SoC Marzen Board Removal for v4.3
* Remove legacy r8a7779 SoC code
* Remove legacy marzen board code
* tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Remove legacy SoC code
ARM: shmobile: marzen: Remove legacy board code
ARM: shmobile: r8a7779: Cleanup header file
ARM: shmobile: marzen-reference: Remove C board code
ARM: shmobile: r8a7779: Generic SMP ops
ARM: shmobile: r8a7779: Generic CCF and timer support
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Wed, 5 Aug 2015 15:24:11 +0000 (17:24 +0200)]
Merge branch 'queue/irq/arm' of git://git./linux/kernel/git/tip/tip into next/cleanup
Merge "ARM: Interrupt cleanups and API change preparation" from Thomas
Gleixner:
The following patch series contains the following changes:
- Consolidation of chained interrupt handler setup/removal
- Switch to functions which avoid a redundant interrupt
descriptor lookup
- Preparation of interrupt flow handlers for the 'irq' argument
removal
* 'queue/irq/arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
ARM/orion/gpio: Prepare gpio_irq_handler for irq argument removal
ARM/pxa: Prepare balloon3_irq_handler for irq argument removal
ARM/pxa: Prepare *_irq_handler for irq argument removal
ARM/dove: Prepare pmu_irq_handler for irq argument removal
ARM/sa1111: Prepare sa1111_irq_handler for irq argument removal
ARM/locomo: Prepare locomo_handler for irq argument removal
ARM, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
ARM/LPC32xx: Use irq_set_handler_locked()
ARM/irq: Use access helper irq_data_get_affinity_mask()
ARM/locomo: Consolidate chained IRQ handler install/remove
ARM/orion: Consolidate chained IRQ handler install/remove
Signed-off-by: Olof Johansson <olof@lixom.net>
Murali Karicheri [Fri, 29 May 2015 16:04:13 +0000 (12:04 -0400)]
ARM: dts: keystone: fix dt bindings to use post div register for mainpll
All of the keystone devices have a separate register to hold post
divider value for main pll clock. Currently the fixed-postdiv
value used for k2hk/l/e SoCs works by sheer luck as u-boot happens to
use a value of 2 for this. Now that we have fixed this in the pll
clock driver change the dt bindings for the same.
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Kukjin Kim [Wed, 29 Jul 2015 17:02:06 +0000 (02:02 +0900)]
ARM: SAMSUNG: remove keypad-core header in plat-samsung
Since keypad-core header is not used, this patch removes it.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:52 +0000 (02:00 +0900)]
ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx
This patch moves watchdog-reset header file into mach-s3c64xx.
Because it is not used for others except mach-s3c64xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:47 +0000 (02:00 +0900)]
ARM: SAMSUNG: local onenand-core header in mach-s3c64xx
This patch moves onenand-core header file into mach-s3c64xx.
Because it is not used for others except mach-s3c64xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:38 +0000 (02:00 +0900)]
ARM: SAMSUNG: local irq-uart header in mach-s3c64xx
This patch moves irq-uart header file into mach-s3c64xx.
Because it is not used for others except mach-s3c64xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:36 +0000 (02:00 +0900)]
ARM: SAMSUNG: local backlight header in mach-s3c64xx
This patch moves backlight header file into mach-s3c64xx.
Because it is not used for others except mach-s3c64xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:36 +0000 (02:00 +0900)]
ARM: SAMSUNG: local ata-core header in mach-s3c64xx
This patch moves ata-core header file into mach-s3c64xx.
Because it is not used for others except mach-s3c64xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:36 +0000 (02:00 +0900)]
ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx
This patch moves regs-usb-hsotg-phy header file into mach-s3c64xx.
Because it is not used for others except mach-s3c64xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:35 +0000 (02:00 +0900)]
ARM: SAMSUNG: local spi-core header in mach-s3c24xx
This patch moves spi-core header file into mach-s3c24xx.
Because it is not used for others except mach-s3c24xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:35 +0000 (02:00 +0900)]
ARM: SAMSUNG: local nand-core header in mach-s3c24xx
This patch moves nand-core header file into mach-s3c24xx.
Because it is not used for others except mach-s3c24xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:35 +0000 (02:00 +0900)]
ARM: SAMSUNG: local fb-core header in mach-s3c24xx
This patch moves fb-core header file into mach-s3c24xx.
Because it is not used for others except mach-s3c24xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 17:00:35 +0000 (02:00 +0900)]
ARM: SAMSUNG: local regs-srom header in mach-exynos
This patch moves regs-srom header file into mach-exynos.
Because it is not used for others except mach-exynos.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 16:48:17 +0000 (01:48 +0900)]
ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos
This patch moves s5p-dev-mfc from plat-samsung into mach-exynos
because it is used for only exynos no other platforms.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 16:48:17 +0000 (01:48 +0900)]
ARM: SAMSUNG: make local dev-backlight in mach-s3c64xx
This patch moves dev-backlight from plat-samsung into mach-s3c64xx
because it is used for only s3c64xx no other platforms.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim [Wed, 29 Jul 2015 16:48:17 +0000 (01:48 +0900)]
ARM: SAMSUNG: make local setup-camif in mach-s3c24xx
This patch moves setup-camif from plat-samsung into mach-s3c24xx
because it can be used only for s3c24xx no other platforms.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Rob Herring [Mon, 27 Jul 2015 20:55:13 +0000 (15:55 -0500)]
ARM: kill off set_irq_flags usage
set_irq_flags is ARM specific with custom flags which have genirq
equivalents. Convert drivers to use the genirq interfaces directly, so we
can kill off set_irq_flags. The translation of flags is as follows:
IRQF_VALID -> !IRQ_NOREQUEST
IRQF_PROBE -> !IRQ_NOPROBE
IRQF_NOAUTOEN -> IRQ_NOAUTOEN
For IRQs managed by an irqdomain, the irqdomain core code handles clearing
and setting IRQ_NOREQUEST already, so there is no need to do this in
.map() functions and we can simply remove the set_irq_flags calls. Some
users also modify IRQ_NOPROBE and this has been maintained although it
is not clear that is really needed. There appears to be a great deal of
blind copy and paste of this code.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Imre Kaloz <kaloz@openwrt.org>
Acked-by: Krzysztof Halasa <khalasa@piap.pl>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Roland Stigge <stigge@antcom.de>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Simtec Linux Team <linux@simtec.co.uk>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org
Tested-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Nicolas Pitre [Mon, 27 Jul 2015 22:27:52 +0000 (18:27 -0400)]
ARM: appropriate __init annotation for const data
Init data marked const should be annotated with __initconst for
correctness and not __initdata. In some cases the array gathering
references to that data has to be marked const as well. This fixes
LTO builds that otherwise fail with section mismatch errors.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 28 Jul 2015 10:32:24 +0000 (12:32 +0200)]
Merge tag 'imx-fixes-4.2-2' of git://git./linux/kernel/git/shawnguo/linux into fixes
The i.MX fixes for 4.2, 2nd round:
- Add the required second clock for i.MX35 FlexCAN in device tree,
so that the device can be probed by kernel successfully.
* tag 'imx-fixes-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: i.MX35: Fix can support.
Signed-off-by: Olof Johansson <olof@lixom.net>
Magnus Damm [Thu, 16 Jul 2015 07:54:03 +0000 (16:54 +0900)]
ARM: shmobile: r8a7779: Remove legacy SoC code
Now when the Marzen legacy board code is gone this patch
removes the unused r8a7779 legacy SoC code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Thu, 16 Jul 2015 07:53:52 +0000 (16:53 +0900)]
ARM: shmobile: marzen: Remove legacy board code
Remove Marzen legacy board code written in C. Instead
board support expressed in DT shall be used together
with Multiplatform and shmobile_defconfig.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Mon, 13 Jul 2015 06:15:33 +0000 (15:15 +0900)]
ARM: shmobile: r8a7779: Cleanup header file
Remove unused function prototypes from r8a7779.h and
make the functions static.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Mon, 13 Jul 2015 06:15:12 +0000 (15:15 +0900)]
ARM: shmobile: marzen-reference: Remove C board code
The generic r8a7779 machine vector is now feature-wise equivalent
to the Marzen-reference case, so simply remove the Marzen C board
code to fall over on the generic r8a7779 machine vector.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Olof Johansson [Mon, 27 Jul 2015 12:27:13 +0000 (14:27 +0200)]
Merge tag 'renesas-cleanup2-for-v4.3' of git://git./linux/kernel/git/horms/renesas into next/cleanup
Second Round of Renesas ARM Based SoC Cleanup for v4.3
* Silence APMU build warnings
* tag 'renesas-cleanup2-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: apmu: silence build warnings
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij [Sat, 25 Jul 2015 09:22:03 +0000 (11:22 +0200)]
ARM: nomadik: disable UART0 on Nomadik boards
The UART0 is not used on these boards, yet active and blocking
other use. Fix this by disabling UART0 and setting port aliases
to maintain port enumeration to userspace.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Sun, 26 Jul 2015 18:52:03 +0000 (20:52 +0200)]
Merge tag 'for-v4.2-rc/omap-fixes-a' of git://git./linux/kernel/git/pjw/omap-pending into fixes
Merge "ARM: OMAP2+: hwmod fixes for v4.2-rc" from Paul Walmsley:
ARM: OMAP2+: hwmod fixes for v4.2-rc
Two fixes against v4.2-rc1. The first, for DRA7xx platforms,
corrects some incorrect GPMC hardware description data. The
second one will ensure that the hwmod code will wait for any
module with CPU-accessible registers to become ready before
attempting to access it.
Basic build, boot, and PM test logs are available here:
http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v4.2-rc/
20150723065408/
Note that I do not have a DRA7xx or AM43xx board, and therefore
cannot test on those platforms.
* tag 'for-v4.2-rc/omap-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc
ARM: DRA7: hwmod: fix gpmc hwmod
Signed-off-by: Olof Johansson <olof@lixom.net>
Denis Carikli [Thu, 23 Jul 2015 08:31:12 +0000 (10:31 +0200)]
ARM: dts: i.MX35: Fix can support.
Since commit
3d42a379b6fa5b46058e3302b1802b29f64865bb
("can: flexcan: add 2nd clock to support imx53 and newer")
the can driver requires a dt nodes to have a second clock.
Add them to imx35 to fix probing the flex can driver on the
respective platforms.
Signed-off-by: Denis Carikli <denis@eukrea.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Roger Quadros [Thu, 16 Jul 2015 13:16:44 +0000 (16:16 +0300)]
ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc
For hwmods without sysc, _init_mpu_rt_base(oh) won't be called and so
_find_mpu_rt_port(oh) will return NULL thus preventing ready state check
on those modules after the module is enabled.
This can potentially cause a bus access error if the module is accessed
before the module is ready.
Fix this by unconditionally calling _init_mpu_rt_base() during hwmod
_init(). Do ioremap only if we need SYSC access.
Eventhough _wait_target_ready() check doesn't really need MPU RT port but
just the PRCM registers, we still mandate that the hwmod must have an
MPU RT port if ready state check needs to be done. Else it would mean that
the module is not accessible by MPU so there is no point in waiting
for target to be ready.
e.g. this fixes the below DCAN bus access error on AM437x-gp-evm.
[ 16.672978] ------------[ cut here ]------------
[ 16.677885] WARNING: CPU: 0 PID: 1580 at drivers/bus/omap_l3_noc.c:147 l3_interrupt_handler+0x234/0x35c()
[ 16.687946]
44000000.ocp:L3 Custom Error: MASTER M2 (64-bit) TARGET L4_PER_0 (Read): Data Access in User mode during Functional access
[ 16.700654] Modules linked in: xhci_hcd btwilink ti_vpfe dwc3 videobuf2_core ov2659 bluetooth v4l2_common videodev ti_am335x_adc kfifo_buf industrialio c_can_platform videobuf2_dma_contig media snd_soc_tlv320aic3x pixcir_i2c_ts c_can dc
[ 16.731144] CPU: 0 PID: 1580 Comm: rpc.statd Not tainted
3.14.26-02561-gf733aa036398 #180
[ 16.739747] Backtrace:
[ 16.742336] [<
c0011108>] (dump_backtrace) from [<
c00112a4>] (show_stack+0x18/0x1c)
[ 16.750285] r6:
00000093 r5:
00000009 r4:
eab5b8a8 r3:
00000000
[ 16.756252] [<
c001128c>] (show_stack) from [<
c05a4418>] (dump_stack+0x20/0x28)
[ 16.763870] [<
c05a43f8>] (dump_stack) from [<
c0037120>] (warn_slowpath_common+0x6c/0x8c)
[ 16.772408] [<
c00370b4>] (warn_slowpath_common) from [<
c00371e4>] (warn_slowpath_fmt+0x38/0x40)
[ 16.781550] r8:
c05d1f90 r7:
c0730844 r6:
c0730448 r5:
80080003 r4:
ed0cd210
[ 16.788626] [<
c00371b0>] (warn_slowpath_fmt) from [<
c027fa94>] (l3_interrupt_handler+0x234/0x35c)
[ 16.797968] r3:
ed0cd480 r2:
c0730508
[ 16.801747] [<
c027f860>] (l3_interrupt_handler) from [<
c0063758>] (handle_irq_event_percpu+0x54/0x1bc)
[ 16.811533] r10:
ed005600 r9:
c084855b r8:
0000002a r7:
00000000 r6:
00000000 r5:
0000002a
[ 16.819780] r4:
ed0e6d80
[ 16.822453] [<
c0063704>] (handle_irq_event_percpu) from [<
c00638f0>] (handle_irq_event+0x30/0x40)
[ 16.831789] r10:
eb2b6938 r9:
eb2b6960 r8:
bf011420 r7:
fa240100 r6:
00000000 r5:
0000002a
[ 16.840052] r4:
ed005600
[ 16.842744] [<
c00638c0>] (handle_irq_event) from [<
c00661d8>] (handle_fasteoi_irq+0x74/0x128)
[ 16.851702] r4:
ed005600 r3:
00000000
[ 16.855479] [<
c0066164>] (handle_fasteoi_irq) from [<
c0063068>] (generic_handle_irq+0x28/0x38)
[ 16.864523] r4:
0000002a r3:
c0066164
[ 16.868294] [<
c0063040>] (generic_handle_irq) from [<
c000ef60>] (handle_IRQ+0x38/0x8c)
[ 16.876612] r4:
c081c640 r3:
00000202
[ 16.880380] [<
c000ef28>] (handle_IRQ) from [<
c00084f0>] (gic_handle_irq+0x30/0x5c)
[ 16.888328] r6:
eab5ba38 r5:
c0804460 r4:
fa24010c r3:
00000100
[ 16.894303] [<
c00084c0>] (gic_handle_irq) from [<
c05a8d80>] (__irq_svc+0x40/0x50)
[ 16.902193] Exception stack(0xeab5ba38 to 0xeab5ba80)
[ 16.907499] ba20:
00000000 00000006
[ 16.916108] ba40:
fa1d0000 fa1d0008 ed3d3000 eab5bab4 ed3d3460 c0842af4 bf011420 eb2b6960
[ 16.924716] ba60:
eb2b6938 eab5ba8c eab5ba90 eab5ba80 bf035220 bf07702c 600f0013 ffffffff
[ 16.933317] r7:
eab5ba6c r6:
ffffffff r5:
600f0013 r4:
bf07702c
[ 16.939317] [<
bf077000>] (c_can_plat_read_reg_aligned_to_16bit [c_can_platform]) from [<
bf035220>] (c_can_get_berr_counter+0x38/0x64 [c_can])
[ 16.952696] [<
bf0351e8>] (c_can_get_berr_counter [c_can]) from [<
bf010294>] (can_fill_info+0x124/0x15c [can_dev])
[ 16.963480] r5:
ec8c9740 r4:
ed3d3000
[ 16.967253] [<
bf010170>] (can_fill_info [can_dev]) from [<
c0502fa8>] (rtnl_fill_ifinfo+0x58c/0x8fc)
[ 16.976749] r6:
ec8c9740 r5:
ed3d3000 r4:
eb2b6780
[ 16.981613] [<
c0502a1c>] (rtnl_fill_ifinfo) from [<
c0503408>] (rtnl_dump_ifinfo+0xf0/0x1dc)
[ 16.990401] r10:
ec8c9740 r9:
00000000 r8:
00000000 r7:
00000000 r6:
ebd4d1b4 r5:
ed3d3000
[ 16.998671] r4:
00000000
[ 17.001342] [<
c0503318>] (rtnl_dump_ifinfo) from [<
c050e6e4>] (netlink_dump+0xa8/0x1e0)
[ 17.009772] r10:
00000000 r9:
00000000 r8:
c0503318 r7:
ebf3e6c0 r6:
ebd4d1b4 r5:
ec8c9740
[ 17.018050] r4:
ebd4d000
[ 17.020714] [<
c050e63c>] (netlink_dump) from [<
c050ec10>] (__netlink_dump_start+0x104/0x154)
[ 17.029591] r6:
eab5bd34 r5:
ec8c9980 r4:
ebd4d000
[ 17.034454] [<
c050eb0c>] (__netlink_dump_start) from [<
c0505604>] (rtnetlink_rcv_msg+0x110/0x1f4)
[ 17.043778] r7:
00000000 r6:
ec8c9980 r5:
00000f40 r4:
ebf3e6c0
[ 17.049743] [<
c05054f4>] (rtnetlink_rcv_msg) from [<
c05108e8>] (netlink_rcv_skb+0xb4/0xc8)
[ 17.058449] r8:
eab5bdac r7:
ec8c9980 r6:
c05054f4 r5:
ec8c9980 r4:
ebf3e6c0
[ 17.065534] [<
c0510834>] (netlink_rcv_skb) from [<
c0504134>] (rtnetlink_rcv+0x24/0x2c)
[ 17.073854] r6:
ebd4d000 r5:
00000014 r4:
ec8c9980 r3:
c0504110
[ 17.079846] [<
c0504110>] (rtnetlink_rcv) from [<
c05102ac>] (netlink_unicast+0x180/0x1ec)
[ 17.088363] r4:
ed0c6800 r3:
c0504110
[ 17.092113] [<
c051012c>] (netlink_unicast) from [<
c0510670>] (netlink_sendmsg+0x2ac/0x380)
[ 17.100813] r10:
00000000 r8:
00000008 r7:
ec8c9980 r6:
ebd4d000 r5:
eab5be70 r4:
eab5bee4
[ 17.109083] [<
c05103c4>] (netlink_sendmsg) from [<
c04dfdb4>] (sock_sendmsg+0x90/0xb0)
[ 17.117305] r10:
00000000 r9:
eab5a000 r8:
becdda3c r7:
0000000c r6:
ea978400 r5:
eab5be70
[ 17.125563] r4:
c05103c4
[ 17.128225] [<
c04dfd24>] (sock_sendmsg) from [<
c04e1c28>] (SyS_sendto+0xb8/0xdc)
[ 17.136001] r6:
becdda5c r5:
00000014 r4:
ecd37040
[ 17.140876] [<
c04e1b70>] (SyS_sendto) from [<
c000e680>] (ret_fast_syscall+0x0/0x30)
[ 17.148923] r10:
00000000 r8:
c000e804 r7:
00000122 r6:
becdda5c r5:
0000000c r4:
becdda5c
[ 17.157169] ---[ end trace
2b71e15b38f58bad ]---
Fixes: 6423d6df1440 ("ARM: OMAP2+: hwmod: check for module address space during init")
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: <stable@vger.kernel.org>
Olof Johansson [Wed, 22 Jul 2015 23:26:03 +0000 (16:26 -0700)]
Merge tag 'omap-for-v4.3/legacy-v2-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup
Merge "drop few more legacy boards for v4.3" from Tony Lindgren:
Drop more omap3 legacy board-*.c files for v4.3. This time we're
dropping the board files for omap3logic and omap3pandora.
The reason for dropping these now rather than later is that now
we can simply revert the patches in case of unexpected issues as
we are not dropping any platform data at this point.
This leaves us with only the following board-*.c files:
BOARD REASON NEEDED
board-ldp.c Still used in RMKs boot test system
board-rx51-*.c Needs /proc/atags support for user space
Once we have the n900 legacy user space issues sorted out for
/proc/atags and system_rev, we can drop the remaining two
board-*.c files. And then one merge window after that we can
drop the legacy booting support assuming no unexpected issues
are found.
* tag 'omap-for-v4.3/legacy-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Remove legacy booting support for Pandora
ARM: OMAP2+: Remove legacy booting support for LogicPD Torpedo
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 21 Jul 2015 21:05:48 +0000 (14:05 -0700)]
Merge tag 'samsung-fixes-1' of git://git./linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung fixes for v4.2" from Kukjin Kim:
From Krzysztof Kozlowski:
1. Fix exynos3250 MIPI DSI display and MIPI CSIS-2 camera sensorx
after adding support for PMU regmap in exynos-video-mipi driver
(issue introduced in v4.0).
2. Bring back cpufreq for exynos4210 after incomplete switch to
cpufreq-dt driver in 4.2 merge window. The necessary DT changes
for exynos4210 cpufreq was not applied to the same tree as rest
of patchset because of multiple conflicts between clk and arm-soc
trees. Unfortunately without the change the exynos4210 boards
loose cpufreq feature.
* tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: add CPU OPP and regulator supply property for exynos4210
ARM: dts: Update video-phy node with syscon phandle for exynos3250
Signed-off-by: Olof Johansson <olof@lixom.net>
Krzysztof Kozlowski [Fri, 10 Jul 2015 05:04:28 +0000 (14:04 +0900)]
ARM: EXYNOS: Drop owner assignment in pmu.c
platform_driver does not need to set an owner because
platform_driver_register() will set it.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Krzysztof Kozlowski [Sun, 14 Jun 2015 04:38:23 +0000 (13:38 +0900)]
ARM: EXYNOS: Remove duplicated define of SLEEP_MAGIC
The magic cookie for entering sleep state was defined and used in
two different places: firmware.c and suspend.c. Move it to one common
place to reduce duplication.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Krzysztof Kozlowski [Sat, 30 May 2015 06:54:03 +0000 (15:54 +0900)]
ARM: EXYNOS: Make local function static
Function is not used outside of this unit, make it static.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Thomas Abraham [Fri, 3 Apr 2015 16:43:47 +0000 (18:43 +0200)]
ARM: dts: add CPU OPP and regulator supply property for exynos4210
For Exynos4210 platforms, add CPU operating points and CPU regulator
supply properties for migrating from Exynos specific cpufreq driver
to using generic cpufreq driver.
Cc: Doug Anderson <dianders@chromium.org>
Cc: Andreas Faerber <afaerber@suse.de>
Cc: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Andreas Farber <afaerber@suse.de>
Cc: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
[b.zolnierkie: removed exynos5250 and exynos5420 support for now]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
[k.kozlowski: Rebased, moved cpu nodes to alphabetical position]
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Beata Michalska [Mon, 15 Jun 2015 08:12:46 +0000 (10:12 +0200)]
ARM: dts: Update video-phy node with syscon phandle for exynos3250
As a follow-up to recent changes to Exynos mipi video phy driver,
introducing support for PMU regmap in commit
e4b3d38088df ("phy:
exynos-video-mipi: Fix regression by adding support for PMU regmap")
add a syscon phandle to video-phy node to bring back to life both
MIPI DSI display and MIPI CSIS-2 camera sensor on Exynos3250.
Signed-off-by: Beata Michalska <b.michalska@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Olof Johansson [Sun, 19 Jul 2015 04:06:10 +0000 (21:06 -0700)]
Merge tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux into fixesD
Merge "pxa fixes for v4.2" from Robert Jarzmik:
ARM: pxa: fixes for v4.2-rc2
This single fix reenables ethernet cards for several pxa boards,
broken by regulator addition to dm9000 driver.
* tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux:
ARM: pxa: fix dm9000 platform data regression
Olof Johansson [Fri, 17 Jul 2015 17:20:46 +0000 (10:20 -0700)]
Merge tag 'ep93xx-cleanup' of git://git./linux/kernel/git/linusw/linux-integrator into next/cleanup
Merge "EP93xx cleanups for v4.3" from Linus Walleij:
EP93xx cleanup and completing developments. This switches
EP93xx to generic time and brings in a few out-of-tree small
patches that were stalled for ages.
It also removes the need for memory config options and instead moves over to
using PATCH_PHYS_VIRT.
* tag 'ep93xx-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: ep93xx: simone: enable DMA on the SPI host
ARM: ep93xx: vision_ep9307: add audio support
ARM: ep93xx: vision_ep9307: enable DMA for SPI
ARM: ep93xx: toss the device ID into the entropy pool
ARM: ep93xx: remove memory configuration options
ARM: ep93xx: update comment on timer usage
ARM: ep93xx: switch clockevent to timer 3
ARM: ep93xx: use non-raw accessors for timer
ARM: ep93xx: switch to GENERIC_CLOCKEVENTS
ARM: ep93xx: move timer to its own file
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Fri, 17 Jul 2015 17:19:04 +0000 (10:19 -0700)]
Merge tag 'arm-soc/for-4.3/soc' of github.com/broadcom/stblinux into next/cleanup
Merge "Broadcom SoC changes for 4.3 (part 1)" from Florian Fainelli:
This pull request contains two fixes for the Broadcom BCM63xx SMP code:
- Sudeep removes an invalid use of cpu_logical_map() which turned to be a no-op
since we always boot from physical CPU 0 = logical CPU 0
- Florian removes the custom secondary_startup function and replaces it with
the generic one
* tag 'arm-soc/for-4.3/soc' of http://github.com/broadcom/stblinux:
ARM: BCM63xx: Remove custom secondary_startup function
ARM: BCM63xx: fix parameter to of_get_cpu_node in bcm63138_smp_boot_secondary
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Fri, 17 Jul 2015 17:10:22 +0000 (10:10 -0700)]
Merge tag 'keystone-dts-fixes' of git://git./linux/kernel/git/ssantosh/linux-keystone into fixes
Merge "ARM: Couple of dts fixes for v4.2-rcx" from Santosh Shilimkar:
Couple of DTS fixes 4.2-rcx for Keystone EVMs:
K2E EVM boot hangs because of missing serdes driver which is needed to bring up
PCIe on K2E. These couple of fixes makes the PCIE disabled on common default and
let the specific board DTS to enable it.
* tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: keystone: dts: rename pcie nodes to help override status
ARM: keystone: dts: fix dt bindings for PCIe
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Fri, 17 Jul 2015 17:01:34 +0000 (10:01 -0700)]
Merge tag 'mvebu-cleanup-4.3-1' of git://git.infradead.org/linux-mvebu into next/cleanup
Merge "ARM: mvebu: cleanup changes for v4.3" from Gregory Clement:
mvebu cleanup changes for v4.3 (part #1)
- Use vsprintf %pM extension on orion5x board to format mac address
- Add missing newline at end of messages on pr_warn when CPU Idle on
Armada 38x is disabled
* tag 'mvebu-cleanup-4.3-1' of git://git.infradead.org/linux-mvebu:
ARM: orion5x: Use vsprintf %pM extension
ARM: mvebu: add missing newline at end of messages
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Fri, 17 Jul 2015 16:58:32 +0000 (09:58 -0700)]
Merge branch 'ARM/clkevt/set-state-4.3' of git://git./linux/kernel/git/vireshk/linux into next/cleanup
Merge "ARM: clockevents: Migrate to 'set-state' callbacks" from Viresh Kumar:
This series migrates ARM clockevent drivers (present in arch/arm/
directory), to the new set-state interface. This would enable these
drivers to use new states (like: ONESHOT_STOPPED, etc.) of a clockevent
device (if required), as the set-mode interface is marked obsolete now
and wouldn't be expanded to handle new states.
* 'ARM/clkevt/set-state-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux:
ARM/orion/time: Migrate to new 'set-state' interface
ARM/iop/time: Migrate to new 'set-state' interface
ARM/w90x900/time: Migrate to new 'set-state' interface
ARM/SPEAr/time: Migrate to new 'set-state' interface
ARM/omap2/timer: Migrate to new 'set-state' interface
ARM/omap1/timer32: Migrate to new 'set-state' interface
ARM/omap1/time: Migrate to new 'set-state' interface
ARM/netx/time: Migrate to new 'set-state' interface
ARM/mmp/time: Migrate to new 'set-state' interface
ARM/lpc32xx/timer: Migrate to new 'set-state' interface
ARM/ks8695/time: Migrate to new 'set-state' interface
ARM/ixp4xx/timer: Migrate to new 'set-state' interface
ARM/imx/epit: Migrate to new 'set-state' interface
ARM/gemini/time: Migrate to new 'set-state' interface
ARM/
dc21285-timer: Migrate to new 'set-state' interface
ARM/davinci/time: Migrate to new 'set-state' interface
ARM/cns3xxx/timer: Migrate to new 'set-state' interface
ARM/smp_twd: Migrate to new 'set-state' interface
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij [Thu, 9 Jul 2015 14:56:40 +0000 (16:56 +0200)]
ARM: ep93xx: simone: enable DMA on the SPI host
The SPI host on the SIM.ONE is used for the MMC/SD card and
will badly need this turbo boost.
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
H Hartley Sweeten [Tue, 16 Jun 2015 16:52:47 +0000 (09:52 -0700)]
ARM: ep93xx: vision_ep9307: add audio support
Add I2S audio support to the vision_ep9307 system.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
H Hartley Sweeten [Tue, 16 Jun 2015 16:52:46 +0000 (09:52 -0700)]
ARM: ep93xx: vision_ep9307: enable DMA for SPI
Enable the 'use_dma' flag in the SPI platform data to improve the speed
of the mmc_spi driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Thu, 18 Jun 2015 14:46:34 +0000 (16:46 +0200)]
ARM: ep93xx: toss the device ID into the entropy pool
It doesn't hurt to add this random stuff into the entropy pool
as is custom to do with device-unique numbers.
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
H Hartley Sweeten [Mon, 15 Jun 2015 17:35:06 +0000 (10:35 -0700)]
ARM: ep93xx: remove memory configuration options
The ARM_PATCH_PHYS_VIRT option makes the ep93xx memory configuration
options obsolete.
This allows support for all the ep93xx variations to be built into a
single kernel.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Tue, 16 Jun 2015 07:00:44 +0000 (09:00 +0200)]
ARM: ep93xx: update comment on timer usage
When refactoring the EP93xx timer some of the documentation
git out of date. Update it.
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/orion/time: Migrate to new 'set-state' interface
Migrate orion driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/iop/time: Migrate to new 'set-state' interface
Migrate iop driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/w90x900/time: Migrate to new 'set-state' interface
Migrate w90x900 driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Cc: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/SPEAr/time: Migrate to new 'set-state' interface
Migrate SPEAr driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Also kill the unnecessary forward declaration of set-mode routine by
moving 'struct clock_event_device clkevt' towards the bottom of the file.
Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/omap2/timer: Migrate to new 'set-state' interface
Migrate omap2 driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/omap1/timer32: Migrate to new 'set-state' interface
Migrate omap timer32 driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/omap1/time: Migrate to new 'set-state' interface
Migrate omap driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/netx/time: Migrate to new 'set-state' interface
Migrate netx driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
We aren't writing zero twice on the control register for shutdown or
resume state now.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/mmp/time: Migrate to new 'set-state' interface
Migrate mmp driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
We weren't doing anything in set_mode(RESUME) except of
local_irq_{save|restore}(), which isn't required and so ->tick_resume
isn't implemented.
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/lpc32xx/timer: Migrate to new 'set-state' interface
Migrate lpc32xx driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Cc: Roland Stigge <stigge@antcom.de>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/ks8695/time: Migrate to new 'set-state' interface
Migrate ks8695 driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
There is nothing to be done for oneshot or shutdown states and so are
not implemented.
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/ixp4xx/timer: Migrate to new 'set-state' interface
Migrate ixp4xx driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
NOTE: ixp4xx_set_{oneshot|periodic} don't perform read operation on
'IXP4XX_OSRT1' register anymore.
Cc: Imre Kaloz <kaloz@openwrt.org>
Acked-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/imx/epit: Migrate to new 'set-state' interface
Migrate imx driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Also drop 'clockevent_mode': It was caching the last state of the
clockevent device. The same behavior can be achieved by using
clockevents state helpers. These helpers are only required for oneshot
mode as shutdown/resume wouldn't be done twice by the core.
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/gemini/time: Migrate to new 'set-state' interface
Migrate gemini driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/
dc21285-timer: Migrate to new 'set-state' interface
Migrate footbridge driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/davinci/time: Migrate to new 'set-state' interface
Migrate davinci driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
We weren't doing anything in set_mode(RESUME) and so .tick_resume()
isn't implemented.
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/cns3xxx/timer: Migrate to new 'set-state' interface
Migrate cns3xxx driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
NOTE: We don't read TIMER1_2_CONTROL_OFFSET register on shutdown
anymore.
Acked-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Viresh Kumar [Fri, 27 Feb 2015 08:09:52 +0000 (13:39 +0530)]
ARM/smp_twd: Migrate to new 'set-state' interface
Migrate smp_twd driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Murali Karicheri [Thu, 16 Jul 2015 22:13:03 +0000 (18:13 -0400)]
ARM: keystone: dts: rename pcie nodes to help override status
Now that PCIe DT binding is disabled in SoC specific DTS,
we need a way to override it in a board specific DTS. So
rename the PCIe nodes accordingly.
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
Murali Karicheri [Thu, 16 Jul 2015 22:12:57 +0000 (18:12 -0400)]
ARM: keystone: dts: fix dt bindings for PCIe
Currently PCIe DT bindings are broken. PCIe driver can't function
without having a SerDes driver that provide the phy configuration.
On K2E EVM, this causes problem since the EVM has Marvell SATA
controller present and with default values in the SerDes register,
it seems to pass the PCIe link check, but causes issues since
the configuration is not correct. The manifestation is that when
EVM is booted with NFS rootfs, the boot hangs. We shouldn't enable
PCIe on this EVM since to work, SerDes driver has to be present as
well. So by default, the PCIe DT binding should be disabled in SoC
specific DTS. It can be enabled in the board specific DTS when the
SerDes device driver is also present.
So fix the status of PCIe DT bindings in the SoC specific DTS to
"disabled". To enable PCIe, the status should be set to "ok" in
the EVM DTS file when SerDes driver support becomes available in
the upstream tree.
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
Robert Jarzmik [Sat, 11 Jul 2015 19:33:06 +0000 (21:33 +0200)]
ARM: pxa: fix dm9000 platform data regression
Since dm9000 driver added support for a vcc regulator, platform data
based platforms have their ethernet broken, as the regulator claiming
returns -EPROBE_DEFER and prevents dm9000 loading.
This patch fixes this for all pxa boards using dm9000, by using the
specific regulator_has_full_constraints() function.
This was discovered and tested on the cm-x300 board.
Fixes: 7994fe55a4a2 ("dm9000: Add regulator and reset support to dm9000")
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Tony Lindgren [Mon, 13 Jul 2015 07:53:22 +0000 (00:53 -0700)]
ARM: OMAP2+: Remove legacy booting support for Pandora
We've been moving all omap2+ based systems to boot in device tree only
mode for a few years now. Only omap3 has legacy booting support
remaining. Most omap3 boards already have related arch/arm/boot/*.dts*
files for booting with device tree.
This board has support for device tree based booting, and we've been
printing warnings about the legacy booting being deprecated for a
few merge cycles now. Let's attempt to remove the legacy booting
for it.
The reason for removing the legacy booting support now rather than
later is we can simply revert this patch if necessary if we run
into some unexpected issues that are not trivial to fix for the
device tree based booting.
Cc: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Roger Quadros [Wed, 8 Jul 2015 14:34:43 +0000 (17:34 +0300)]
ARM: DRA7: hwmod: fix gpmc hwmod
GPMC smart idle is not really broken but it does not support
smart idle with wakeup.
Fixes: 556708fe8718 ("ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken")
Signed-off-by: Roger Quadros <rogerq@ti.com>
Reviewed-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Olof Johansson [Wed, 15 Jul 2015 11:02:33 +0000 (07:02 -0400)]
Merge tag 'omap-for-v4.2/fixes-rc2-v2' of git://git./linux/kernel/git/tmlind/linux-omap into fixes
Fixes for omaps, all dts changes except for one:
- Fix up LCD panel name for overo boards
- Three fixes for pepper board for regulators, freqeuncy
scaling and audio input. Note that there is still one
issue being worked on for booting with multi_v7_defconfig
- Add missing #iommu-cells for omap4 and 5
- Add missing HAVE_ARM_SCU for am43xx
* tag 'omap-for-v4.2/fixes-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (210 commits)
ARM: dts: Correct audio input route & set mic bias for am335x-pepper
ARM: OMAP2+: Add HAVE_ARM_SCU for AM43XX
ARM: dts: OMAP5: Add #iommu-cells property to IOMMUs
ARM: dts: OMAP4: Add #iommu-cells property to IOMMUs
ARM: dts: Fix frequency scaling on Gumstix Pepper
ARM: dts: configure regulators for Gumstix Pepper
ARM: dts: omap3: overo: Update LCD panel names
+ Linux 4.2-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Adam YH Lee [Tue, 14 Jul 2015 18:17:24 +0000 (11:17 -0700)]
ARM: dts: Correct audio input route & set mic bias for am335x-pepper
Audio-in was incorrectly routed to Line In. It should be Mic3L as per
schematic.
Using mic-bias voltage at 2.0v (<0x1>) does not work for some reason. There
is no voltage seen on micbias (R127). Mic-bias voltage of 2.5v (<0x2>) works.
I see voltage of 2.475v across GND and micbias.
With these changes, I can record audio with a pair of proliferate TRRS earbuds.
Signed-off-by: Adam YH Lee <adam.yh.lee@gmail.com>
Acked-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Dave Gerlach [Fri, 10 Jul 2015 21:05:48 +0000 (16:05 -0500)]
ARM: OMAP2+: Add HAVE_ARM_SCU for AM43XX
CONFIG_HAVE_ARM_SCU only gets selected if CONFIG_SMP is selected in an OMAP
system, however AM43XX needs this option regardless of CONFIG_SMP and also
for an AM43XX only build as it is important for controlling power in the SoC.
Without this we cannot suspend the CPU for SoC suspend or cpuidle. The
ARM Cortex A9 needs SCU CPU Power Status bits to be set to off mode in order
for the PRCM to transition the MPU to low power modes.
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Olof Johansson [Wed, 15 Jul 2015 09:29:22 +0000 (05:29 -0400)]
Merge tag 'imx-fixes-4.2' of git://git./linux/kernel/git/shawnguo/linux into fixes
Merge "ARM: imx: fixes for 4.2" from Shawn Guo:
The i.MX fixes for 4.2:
- Correct compatible string for i.MX27 GPT which actually shares the
same programming model as i.MX21 GPT rather than i.MX1 one.
- Add missing #io-channel-cells property for i.MX23 LRADC device, which
is required for the device to be an IIO provider.
- Correct HSYNC/VSYNC pins and add ddc-i2c-bus property for TVE device
on imx53-qsb to work properly.
- Always enable PU domain if CONFIG_PM is not set. This fixes a couple
of failure scenarios which will hang the system if one of the devices
in the PU domain is accessed.
* tag 'imx-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx6: gpc: always enable PU domain if CONFIG_PM is not set
ARM: dts: imx53-qsb: fix TVE entry
ARM: dts: mx23: fix iio-hwmon support
ARM: dts: imx27: Adjust the GPT compatible string
Signed-off-by: Olof Johansson <olof@lixom.net>
Magnus Damm [Mon, 13 Jul 2015 06:15:02 +0000 (15:15 +0900)]
ARM: shmobile: r8a7779: Generic SMP ops
Add a r8a7779-specific SMP operation pointer to support
all 4 CPU cores through SMP on r8a7779 without C board code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Thu, 25 Jun 2015 08:57:39 +0000 (17:57 +0900)]
ARM: shmobile: r8a7779: Generic CCF and timer support
Add a r8a7779-specific callback to initialize CCF and
clocksources. With this in place we are one step closer
to be able to use r8a7779 without C board code.
Also add a multiplatform wrapper to avoid breaking the
r8a7779 marzen legacy case.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Olof Johansson [Tue, 14 Jul 2015 09:50:12 +0000 (11:50 +0200)]
Merge tag 'renesas-pm-domain-for-v4.3' of git://git./linux/kernel/git/horms/renesas into next/cleanup
Merge "Renesas ARM Based SoC PM Domain Updates for v4.3" from Simon Horman:
* Make rcar_sysc_ch const for r8a779[09] SoCs
* Get rid of on_off_fn() function pointer
* Use BIT() macro instead of open coding
* Make struct rcar_sysc_ch * parameters const
* Break infinite loop
* Shrink rcar_sysc_ch size
* Improve documentation
* tag 'renesas-pm-domain-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7790: Make struct rcar_sysc_ch const
ARM: shmobile: r8a7779: Make struct rcar_sysc_ch const
ARM: shmobile: R-Car: Get rid of on_off_fn() function pointer
ARM: shmobile: R-Car: Use BIT() macro instead of open coding
ARM: shmobile: R-Car: Make struct rcar_sysc_ch * parameters const
ARM: shmobile: R-Car: Break infinite loop
ARM: shmobile: R-Car: Shrink rcar_sysc_ch size
ARM: shmobile: R-Car: Improve documentation
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 14 Jul 2015 09:48:31 +0000 (11:48 +0200)]
Merge tag 'renesas-cleanup-for-v4.3' of git://git./linux/kernel/git/horms/renesas into next/cleanup
Merge "Renesas ARM Based SoC Cleanup for v4.3" from Simon Horman:
* Remove non-multiplatform code from timer
* Remove CONFIG_ARCH_SHMOBILE_MULTI check in setup-rcar-gen2.c
as it is always true
* Remove legacy (non-multiplatform) support for both sh73a0/kzm9g and
r8a7740/armadillo800eva
* Move to_rmobile_pd from header to source file where it is used
* Use BIT() macro instead of open coding in r-mobile PM code
* r8a7779: Remove usage of GENPD_FLAG_PM_CLK flag which has no effect
* tag 'renesas-cleanup-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: timer: r8a73a4 and r8a7790 are multi-platform only
ARM: shmobile: R-Car Gen2: CONFIG_ARCH_SHMOBILE_MULTI is always set
ARM: shmobile: Remove obsolete zboot support
ARM: shmobile: R-Mobile: Remove legacy PM Domain code
ARM: shmobile: Remove unused dma-register.h
ARM: shmobile: Remove legacy SoC code for R-Mobile A1
ARM: shmobile: Drop r8a7740-armadillo800eva.dtb for legacy builds
ARM: shmobile: Remove legacy armadillo800eva_defconfig
ARM: shmobile: Remove legacy board code for Armadillo-800 EVA
ARM: shmobile: Remove legacy SoC code for SH-Mobile AG5
ARM: shmobile: Drop sh73a0-kzm9g.dtb for legacy builds
ARM: shmobile: Remove legacy kzm9g_defconfig
ARM: shmobile: Remove legacy board code for KZM-A9-GT
ARM: shmobile: r8a7779: Remove GENPD_FLAG_PM_CLK flag
ARM: shmobile: R-Mobile: Use BIT() macro instead of open coding
ARM: shmobile: R-Mobile: Move to_rmobile_pd from header to source file
Signed-off-by: Olof Johansson <olof@lixom.net>
Baruch Siach [Mon, 6 Jul 2015 11:41:46 +0000 (14:41 +0300)]
MAINTAINERS: digicolor: add dts files
The 'digicolor' regexp doesn't cover the dts files. Add a glob pattern for
them.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 14 Jul 2015 09:16:55 +0000 (11:16 +0200)]
Merge tag 'socfpga_fixes_for_v4.2-rc1' of git://git./linux/kernel/git/dinguyen/linux into fixes
Merge "SoCFPGA fixes for v4.2-rc1" from Dinh Nguyen:
SoCFPGA fixes against v4.2-rc1
- Update compatible "adxl345x" compatible string
- Alphabetize the DTS nodes for the C5 sockit board file
* tag 'socfpga_fixes_for_v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga: dts: Fix entries order
ARM: socfpga: dts: Fix adxl34x formating and compatible string
Linus Walleij [Wed, 8 Jul 2015 13:15:22 +0000 (15:15 +0200)]
ARM: ux500: fix MMC/SD card regression
Ux500 is regressing due to commit
a21763a0b1e5a5ab8310f581886d04beadc16616
"pinctrl: nomadik: activate strict mux mode" which disallows
Nomadik GPIO 5 to be muxed in as a level shifter voltage select
pin, as it is currently described as being used for RX on UART1.
The behaviour is correct, instead the hardware config has been
incorrecly specified: UART1 is indeed unused on HREFv60plus and
Snowball and that is why HREFv60plus can use the pins it would
normally occupy as the voltage select line for the MMC/SD
levelshifter (Snowball uses it for I2C4).
The reason UART1 was anyway enabled on these platforms was
probably to secure the port enumeration to userspace. This
can be solved by using aliases (done in a separate patch) so
we can now deactivate UART1 and let MMC/SD use it properly
on HREFv60plus. We explicitly activate it only for the
older HREFprev60 board.
To complete, we set up the pin configuration for these pins
properly in the sdi0 node.
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij [Fri, 10 Jul 2015 09:32:15 +0000 (11:32 +0200)]
ARM: ux500: define serial port aliases
This enumerates the PL011 serial ports on the Ux500. This is
necessary to do if we want to remove one of the serial ports,
since userspace depends on console to be present on ttyAMA2
and we must not break userspace.
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Wolfram Sang [Fri, 10 Jul 2015 20:48:16 +0000 (22:48 +0200)]
ARM: shmobile: apmu: silence build warnings
With shmobile_defconfig but SMP=n && SUSPEND=n, I get:
arch/arm/mach-shmobile/platsmp-apmu.c:49:12: warning: 'apmu_power_off' defined but not used [-Wunused-function]
arch/arm/mach-shmobile/platsmp-apmu.c:70:12: warning: 'apmu_wrap' defined but not used [-Wunused-function]
Annotate those functions like the functions around it.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Suman Anna [Fri, 10 Jul 2015 17:28:56 +0000 (12:28 -0500)]
ARM: dts: OMAP5: Add #iommu-cells property to IOMMUs
Add missing #iommu-cells property to the DSP and IPU IOMMU nodes
for OMAP5 platforms. This property is required as per the generic
iommu binding.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Suman Anna [Fri, 10 Jul 2015 17:28:55 +0000 (12:28 -0500)]
ARM: dts: OMAP4: Add #iommu-cells property to IOMMUs
Add missing #iommu-cells property to the DSP and IPU IOMMU nodes
for OMAP4 platforms. This property is required as per the generic
iommu binding.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Arun Bharadwaj [Thu, 4 Jun 2015 18:08:19 +0000 (11:08 -0700)]
ARM: dts: Fix frequency scaling on Gumstix Pepper
The device tree for Gumstix Pepper has DCDC2 and
DCDC3 correctly labelled but the upper limit values
are wrong. The confusion is due to the hardware
quirk where the DCDC2 and DCDC3 wires are flipped
in Pepper.
Signed-off-by: Arun Bharadwaj <arun@gumstix.com>
Tested-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>