summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2014-11-07ARM: mvebu: update mvebu_v7_defconfig for Armada 370 audioThomas Petazzoni
Now that the Armada 370 DB audio complex is represented fully in Device Tree using the simple-card DT binding, this commit updates mvebu_v7_defconfig to no longer select the Armada 370 DB audio machine driver, and instead select the appropriate audio controller and codec drivers. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1414512524-24466-7-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-07ARM: mvebu: use simple-card DT binding for audio on Armada 370 DBThomas Petazzoni
This commit modifies the Armada 370 and Armada 370 DB Device Tree descriptions to use the simple-card DT binding to describe the audio complex of the Armada 370 DB instead of a custom audio machine driver. To do so, it: - Adds the sound-dai-cells properties to the CS42L51 node, the audio controller node and the SPDIF in/out nodes. - Completely changes the description of the sound complex to use the "simple-audio-card" DT binding instead of the "marvell,a370db-audio" DT binding. - Fixes the indentation to properly use tabs instead of spaces. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1414512524-24466-6-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-07ARM: mvebu: remove conflicting muxing on Armada 370 DBThomas Petazzoni
Back when audio was enabled, the muxing of some MPP pins was causing problems. However, since commit fea038ed55ae ("ARM: mvebu: Add proper pin muxing on the Armada 370 DB board"), those problematic MPP pins have been assigned a proper muxing for the Ethernet interfaces. This proper muxing is now conflicting with the hog pins muxing that had been added as part of 249f3822509b ("ARM: mvebu: add audio support to Armada 370 DB"). Therefore, this commit simply removes the hog pins muxing, which solves a warning a boot time due to the conflicting muxing requirements. Fixes: fea038ed55ae ("ARM: mvebu: Add proper pin muxing on the Armada 370 DB board") Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1414512524-24466-5-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-07ARM: mvebu: add missing of_node_put() call in coherency.cThomas Petazzoni
There is a missing of_node_put() to decrement the device_node reference counter after a of_find_matching_node() in coherency_init(). Fixes: 501f928e0097 ("ARM: mvebu: add a coherency_available() call") Cc: <stable@vger.kernel.org> # v3.16+ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Link: https://lkml.kernel.org/r/1414423955-5933-4-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-07ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"Pankaj Dubey
This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe" by making it "exynos5_list_disable_wfi_wfe" which is more meaningful. Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-07ARM: dts: Add micro SD card SDHCI node for exynos4412-tratsKrzysztof Kozlowski
Add SDHCI node for supporting the micro SD card. On Trats2 board the SDHCI does not use sd2_cd pins (gpk2-2) for card detect but gpx3-4 instead. Power is supplied from LDO21 regulator which in off state is controlled by external GPIO pin. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-07ARM: dts: Add dts files for exynos4415 SoCChanwoo Choi
This patch adds new exynos4415.dtsi to support Exynos4415 SoC based on Cortex-A9 quad cores and includes following dt nodes: - GIC interrupt controller (GIC-400) - Pinctrl to control three GPIO parts - CMU (Clock Management Unit) for CMU/CMU_DMC/AUDSS - CPU information (Cortex-A9 quad cores) - UART to support serial port - MCT (Multi Core Timer) - ADC (Analog Digital Converter) - RTC (Real Time Clock) - I2C/SPI busses - Power domains (CAM, TV, MFC, G3D, LCD0, ISP0/1) - PMU (Performance Monitoring Unit) - MSHC (Mobile Storage Host Controller) - EHCI (Enhanced Host Controller Interface) - OHIC (Open Host Controller Interface) - USB 2.0 device with hsotg - PWM (Pluse Width Modulation) Timer - AMBA bus for PDMA0/1 - SYSRAM node for memory mapping - SYSREG node for memory mapping - PMU (Power Management Unit) node for memory mapping Cc: Ben Dooks <ben-linux@fluff.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> [m.szyprowski: Add OHCI node and correct EHCI node] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> [yj44.cho: Add mipi-phy node] Signed-off-by: YoungJun Cho <yj44.cho@samsung.com> [jaewon02: Add EHCI and SPI_2 node] Signed-off-by: Jaewon Kim <jaewon02.kim@samsung.com> [ideal.song: Add I2S0 node for audio interface] Signed-off-by: Inha Song <ideal.song@samsung.com> [tomasz.figa: Add L2 cache node] Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-07ARM: dts: Add sleep mode of regulator for exynos3250-rinatoChanwoo Choi
This patch adds sleep mode of regulator for exynos3250-rinato board to optimize power-consumption in sleep state. Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-07ARM: dts: Add sleep mode pin configuration for exynos3250-rinatoChanwoo Choi
This patch add sleep mode pin configuration using pinctrl subsystem to reduce leakage power-consumption of gpio pin in sleep state. Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-07ARM: dts: Add board dts file for exynos3250-rinatoChanwoo Choi
This patch adds support for device tree source for Samsung Rinato board (Gear 2) based on Exynos3250 SoC. This dts file support following features: - eMMC - Main PMIC (Samsung S2MPS14) - Interface PMIC (Maxim MAX77836, MUIC, fuel-gauge, charger) - RTC of Exynos3250 - ADC of Exynos3250 with NTC thermistor - I2S of Exynos3250 - TMU of Exynos3250 - MFC of Exynos3250 - Secure firmware for Exynos3250 secondary cpu boot - Serial ports of Exynos3250 - gpio-key for power key Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-06ARM: OMAP2+: Remove unnecesary include in GPMC driverJavier Martinez Canillas
The GPMC driver includes arch/arm/mach-omap2/common.h but does not use anything on that header so it can be removed. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-06ARM: dts: am335x-evm: Fix 5th NAND partition's nameRoger Quadros
The 5th NAND partition should be named "NAND.u-boot-spl-os" instead of "NAND.u-boot-spl". This is to be consistent with other TI boards as well as u-boot. Fixes: 91994facdd2d ("ARM: dts: am335x-evm: NAND: update MTD partition table") Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-06ARM: OMAP2: Remove unnecessary KERN_* in omap_phy_internal.cMasanari Iida
This patch remove unnecessary KERN_INFO and KERN_ERR from omap_phy_internal.c. Add pr_fmt. Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-06ARM: nomadik: configure in STMPE supportLinus Walleij
This enables the STMPE MFD, GPIO and keypad support by default on the Nomadik builds. This expander is used on the NDK 15 board. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-11-06ARM: update Nomadik configLinus Walleij
This updates the Nomadik (NHK8815) defconfig to what saveconfig produces after some recent changes to Kconfig fragments here and there. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-11-05dma: edma: move device registration to platform codeArnd Bergmann
The horrible split between the low-level part of the edma support and the dmaengine front-end driver causes problems on multiplatform kernels. This is an attempt to improve the situation slightly by only registering the dmaengine devices that are actually present. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: add missing include of linux/dma-mapping.h] Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-05ARM: rockchip: add basic smp support for rk3288Kever Yang
This patch add basic rk3288 smp support. Only cortex-A9 need invalid L1, A7/A12/A15/A17 should not invalid L1, since for A7/A12/A15, the invalidation would be taken as clean and invalidate. If you use the software manual invalidation instead of hardware invalidation (assert l1/l2rstdisable during reset) after reset, there is tiny change that some cachelines would be in dirty and valid state after reset(since the ram content would be random value after reset), then the unexpected clean might lead to system crash. It is a known issue for the A12/A17 MPCore multiprocessor that the active processors might be stalled when the individual processor is powered down, we can avoid this prolbem by softreset the processor before power it down. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Tested-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-11-05ARM: rockchip: add option to access the pmu via a phandle in smp_operationsHeiko Stuebner
Makes it possible to define a rockchip,pmu phandle in the cpus node directly referencing the pmu syscon instead of searching for specific compatible. The old way of finding the pmu stays of course available. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Tested-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-11-05ARM: rockchip: convert to regmap and use pmu syscon if availableHeiko Stuebner
The pmu register space is - like the GRF - shared by quite some peripherals. On the rk3188 and rk3288 even parts of the pinctrl are living there. Therefore we normally shouldn't map it a second time when the syscon does this already. Therefore convert the cpu power-domain handling to access the pmu via a regmap and at first try to get it via the syscon interface. Getting this syscon will only fail if the pmu node does not have the "syscon" compatible and thus does not get shared with other drivers. In this case we map it like before and create the necessary regmap on top of it. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Tested-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-11-05ARM: dts: rk3288: add VOP iommu nodesDaniel Kurtz
Add device nodes for the VOP iommus. Device nodes for other iommus will be added in later patches. The iommu nodes use the #iommu-cells property as described in: Documentation/devicetree/bindings/iommu/iommu.txt Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Simon Xue <xxm@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-11-05ARM: OMAP4+: Remove unused omap_l3_noc platform initTony Lindgren
Omap4 and later have been booting in device tree only mode for quite some time now. This initcall is no longer needed. Note that omap3 uses a different driver omap_l3_smx, and the initcall for that one is still needed until omap3 boots in device tree only mode. Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-05ARM: dts: Add twl keypad map for omap3 EVMTony Lindgren
Looks like we're still missing the keypad map for EVM. Let's add it since we have the binding now available for the twl4030_keypad as otherwise we get the following errors during the boot: twl4030_keypad keypad.31: OF: linux,keymap property not defined in /ocp/i2c@48070000/twl@48/keypad twl4030_keypad keypad.31: Failed to build keymap twl4030_keypad: probe of keypad.31 failed with error -2 Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-05ARM: dts: Add twl keypad map for LDPTony Lindgren
Looks like we're still missing the keypad map for LDP. Let's add it since we have the binding now available for the twl4030_keypad as otherwise we get the following errors during the boot: twl4030_keypad keypad.31: OF: linux,keymap property not defined in /ocp/i2c@48070000/twl@48/keypad twl4030_keypad keypad.31: Failed to build keymap twl4030_keypad: probe of keypad.31 failed with error -2 Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-05ARM: dts: Fix NAND last partition size on LDPTony Lindgren
Fix the following warning during the boot: mtd: partition "Filesystem" extends beyond the end of device "omap2-nand.0" -- size truncated to 0x6000000 Looks like I got the last partition size wrong while setting up the .dts file. Note that this does not affect the partition as the size has been getting truncated to the right size. Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-05Merge tag 'iio-for-3.19a' of ↵Greg Kroah-Hartman
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next Jonathan writes: First round of new drivers, features and cleanups for IIO in the 3.19 cycle. New drivers / supported parts * rockchip - rk3066-tsadc variant * si7020 humidity and temperature sensor * mcp320x - add mcp3001, mcp3002, mcp3004, mcp3008, mcp3201, mcp3202 * bmp280 pressure and temperature sensor * Qualcomm SPMI PMIC current ADC driver * Exynos_adc - support exynos7 New features * vf610-adc - add temperature sensor support * Documentation of current attributes, scaled pressure, offset and scaled humidity, RGBC intensity gain factor and scale applied to differential voltage channels. * Bring iio_event_monitor up to date with newer modifiers. * Add of_xlate function to allow for complex channel mappings from the device tree. * Add -g parameter to generic_buffer example to allow for devices with directly fed (no trigger) buffers. * Move exynos driver over to syscon for PMU register access. Cleanups, fixes for new drivers * lis3l02dq drop an unneeded else. * st sensors - renam st_sensors to st_sensor_settings (for clarity) * st sensors - drop an unused parameter from all the probe utility functions. * vf610 better error handling and tidy up. * si7020 - cleanups following merge * as3935 - drop some unnecessary semicolons. * bmp280 - fix the pressure calculation.
2014-11-05ARM: dts: vf610: add SD node to cosmic dtsOlof Johansson
Driver has been there since a while back, but the dts never seems to have been updated with the node (nor pinctrl). Do so now. Cc: Matt Porter <mporter@linaro.org> Acked-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-05ARM: OMAP3: Fix errors for omap_l3_smx when booted with device treeTony Lindgren
When booting omap3 in device tree mode, we're currently getting the following errors: omap_l3_smx omap_l3_smx.0: couldn't request debug irq omap_l3_smx: probe of omap_l3_smx.0 failed with error -22 This is because we don't have handling in the driver for the compatible property and instead assume platform data being passed. Note that this binding is already documented, and implemented for the related omap_l3_noc driver for omap4 and later. Looks like the binding somehow never got never implemented for this omap_l3_smx driver though. Let's also remove __exit_p to allow binding and unbinding of the driver while at it. Reported-by: Pavel Machek <pavel@ucw.cz> Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-05ARM: dts: exynos: Add sysreg phandle to ADC nodeNaveen Krishna Chatradhi
Instead of using the ADC_PHY register base address, use sysreg phandle in ADC node to control ADC_PHY configuration register. This patch adds syscon node for Exynos3250, Exynos4x12, Exynos5250, and Exynos5420, Exynos5800. Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com> To: linux-samsung-soc@vger.kernel.org Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2014-11-05ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11Maxime Ripard
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Zoltan HERPAI <wigyori@uid0.hu>
2014-11-05ARM: sun4i: pcduino: Relicense the device tree under GPLv2/X11Maxime Ripard
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Carlo Caione <carlo@caione.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Zoltan HERPAI <wigyori@uid0.hu>
2014-11-05ARM: shmobile: alt dts: Drop console= bootargs parameterSimon Horman
Alt is booted from DT, so chosen/stdout-path is always used, and we can drop the "console=" parameter from chosen/bootargs. This change has a side-effect of changing the console speed from 38400 to 115200. This is intentional as 115200 is consistently used on all other shmobile boards. Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-05ARM: shmobile: r8a73a4: fix scifb* namingUlrich Hecht
Ports are named scifb0-3, not scifb2-5. Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-05ARM: shmobile: Enable PCI domains for R-Car Gen2 devicesPhil Edworthy
The PCI core will soon automatically handle the PCI domain number, allowing the internal PCI and external PCIe bridges work at the same time. In order for that to work, we need to enable PCI_DOMAINS. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-05ARM: shmobile: multiplatform: add AK4642 support on defconfigKuninori Morimoto
AK4642 is well used audio codec on Renesas reference board Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-05ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfigKuninori Morimoto
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-05ARM: shmobile: multiplatform: add R-Car DMAC support on defconfigKuninori Morimoto
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-11-04Merge tag 'imx-fixes-3.18-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes Merge "ARM: imx: fixes for 3.18, 2nd round" from Shawn Guo: "This is the second round of i.MX fixes for 3.18. The clk-vf610 fix is relatively big, because it needs some adaption to the change made by offending commit dc4805c2e78b (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver). And it should have been sent to you for earlier -rc inclusion, but unfortunately it got delayed for some time because Stefan wasn't aware of my email address change." The i.MX fixes for 3.18, 2nd round: - Fix a regression on Vybrid platform which is caused by commit dc4805c2e78b (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver), and results in a missing configuration on PLL clocks. - Fix a regression with i.MX defconfig files where CONFIG_SPI option gets lost accidentally. * tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (460 commits) ARM: imx: Fix the removal of CONFIG_SPI option ARM: imx: clk-vf610: define PLL's clock tree + Linux 3.18-rc3 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04Merge tag 'renesas-cleanup-for-v3.19' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup Merge "Renesas ARM Based SoC Cleanup for v3.19" from Simon Horman: * Remove FSF address from copyright headers * tag 'renesas-cleanup-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Remove FSF address from copyright headers Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04Merge tag 'v3.19-rockchip-dts1' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "first bunch on Rockchip dt changes" from Heiko Stübner: First hunk of rockchip devicetree patches, containing: - cpu operating points and supplies - dma support for spi controllers - i2s on rk3066 and rk3188 - default core clock settings for rk3288 * tag 'v3.19-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: Add SPI DMA into rk3288.dtsi ARM: dts: rockchip: enable init rate for clock ARM: dts: rockchip: add I2S controllers for rk3066 and rk3188 ARM: dts: rockchip: enable DMA on SPI for rk3066 and rk3188 ARM: dts: rockchip: add cpu supplies to boards ARM: dts: rockchip: add operating points and armclk references Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04Merge tag 'renesas-soc-cleanups-for-v3.19' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup Merge "Renesas ARM Based SoC Soc Cleanups for v3.19" from Simon Horman: * Remove sh73a0_init_delay and r8a7778_init_delay wrappers * tag 'renesas-soc-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay() ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay() Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04Merge tag 'renesas-r8a73a4-dt-timers-for-v3.19' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19" from Simon Horman: * Initialise CMT1 timer using DT * tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT ARM: shmobile: r8a73a4: Rename cmt registration helper ARM: shmobile: r8a73a4: Add CMT1 node Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04Merge tag 'renesas-boards-cleanups-for-v3.19' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup Merge "Renesas ARM Based SoC Boards Cleanups for v3.19" from Simon Horman: * Sort armadillo800eva includes * tag 'renesas-boards-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: armadillo800eva: Sort includes Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04Merge tag 'renesas-dt-cleanups-for-v3.19' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman: * Add chosen/stdout-path to DTS files for shmobile boards * Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY - The corresponding board file has already been removed * Sort dts nodes by address * Sort SHMOBILE dtbs alphabetically in Makefile * tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: kzm9d dts: Add chosen/stdout-path ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path ARM: shmobile: alt dts: Add chosen/stdout-path ARM: shmobile: koelsch dts: Add chosen/stdout-path ARM: shmobile: henninger dts: Add chosen/stdout-path ARM: shmobile: lager dts: Add chosen/stdout-path ARM: shmobile: marzen dts: Add chosen/stdout-path ARM: shmobile: bockw-reference dts: Add chosen/stdout-path ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path ARM: shmobile: genmai dts: Add chosen/stdout-path ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing ARM: shmobile: emev2 dtsi: Use generic names for device nodes ARM: shmobile: r7s72100: Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY ARM: shmobile: r8a73a4: sort dtsi file by address ARM: shmobile: kzm9d: sort dts file by address ARM: shmobile: r7s72100: sort dtsi file by address ARM: shmobile: r8a73a4: Remove spurious dma-multiplexer base addresses ARM: dts: Sort SHMOBILE dtbs alphabetically Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04Merge tag 'renesas-kconfig-cleanups-for-v3.19' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup Renesas ARM Based SoC Kconfig Cleanups for v3.19 * Remove reference to ARCH_HAS_OPP, it has been removed * tag 'renesas-kconfig-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Remove ARCH_HAS_OPP completely Signed-off-by: Olof Johansson <olof@lixom.net>
2014-11-04leds: leds-gpio: Convert gpio_blink_set() to use GPIO descriptorsMika Westerberg
Commit 21f2aae91e902aad ("leds: leds-gpio: Add support for GPIO descriptors") already converted most of the driver to use GPIO descriptors. What is still missing is the platform specific hook gpio_blink_set() and board files which pass legacy GPIO numbers to this driver in platform data. In this patch we handle the former and convert gpio_blink_set() to take GPIO descriptor instead. In order to do this we convert the existing four users to accept GPIO descriptor and translate it to legacy GPIO number in the platform code. This effectively "pushes" legacy GPIO number usage from the driver to platforms. Also add comment to the remaining block describing that it is legacy code path and we are getting rid of it eventually. Suggested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2014-11-04ARM: keystone: defconfig: add options to enable PCI controllerMurali Karicheri
This patch enables PCI controller driver for Keystone SoCs by default. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04ARM: keystone: add pcie related optionsMurali Karicheri
Now that Keystone PCI controller is merged, add pcie related options by default for keystone architecture so that driver can be enabled in the build. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04ARM: keystone_defconfig: enable mdio and marvell eth physGrygorii Strashko
Enable MDIO support for Keystone 2 SoCs and also enable Marvell Ethernet PHYs support for Keystone 2 K2H EVM which has two 1G Marvell 88E1111-B2 PHYs installed. For more information see: - http://www.advantech.com/Support/TI-EVM/EVMK2HX.aspx Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04ARM: keystone_defconfig: enable dsp irq and gpio supportGrygorii Strashko
Enable DSP IRQ controller and GPIOs support for Keystone 2. Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2014-11-04ARM: dts: keystone-k2e: add DT bindings for PCI controller for port 1Murali Karicheri
K2E SoC has a second PCI port based on Synopsis Designware PCIe h/w. Add DT bindings to support PCI controller for port 1 for this SoC. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>