aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2015-01-23Merge tag 'tegra-for-3.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/socOlof Johansson2-0/+11
Merge "ARM: tegra: Core code changes for v3.20" from Thierry Reding: This contains a couple of preparatory patches for 64-bit support. A new feature is implemented in the power-management controller which allows it to switch off the SoC if it overheats. * tag 'tegra-for-3.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: soc: tegra: Add thermal reset (thermtrip) support to PMC ARM: tegra: Add PMC thermtrip programming to Jetson TK1 device tree of: Add descriptions of thermtrip properties to Tegra PMC bindings soc/tegra: pmc: Add Tegra132 support soc/tegra: fuse: Add Tegra132 support soc/tegra: fuse: Constify tegra_fuse_info structures soc/tegra: Add Tegra132 support clocksource: Build Tegra timer on 32-bit ARM only soc/tegra: pmc: restrict compilation of suspend-related support to ARM Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'tegra-for-3.20-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfigOlof Johansson1-2/+0
Merge "ARM: tegra: Default configuration changes for v3.20" from Thierry Reding: This is merely a regeneration of the default configuration to get rid of two symbols that are now enabled by default or removed. * tag 'tegra-for-3.20-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: Regenerate defconfig based on v3.19-rc1 Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'tegra-for-3.20-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dtOlof Johansson4-7/+9
Merge "ARM: tegra: Device tree changes for v3.20" from Thierry Reding: A couple of unit addresses fixes in device trees, addition of microphone detection on Chromebook 13 and a vendor prefix update. * tag 'tegra-for-3.20-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: Update isl29028 compatible string to use isil vendor prefix ARM: tegra: Fix unit address for Cortex-A9 TWD timer ARM: dts: tegra20: fix GR3D, DSI unit and reg base addresses ARM: tegra: Enable the mic-detect gpio on Acer Chromebook 13 Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'imx-defconfig-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfigOlof Johansson1-4/+35
Merge "ARM: imx: defconfig update for 3.20" from Shawn Guo: The i.MX defconfig update for 3.20: - Eneable FB_MXS, SPI_FSL_QUADSPI, POWER_RESET_SYSCON and module build for a bunch of USB functions * tag 'imx-defconfig-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: enable more USB functions ARM: imx_v6_v7_defconfig: Select CONFIG_FB_MXS ARM: imx_v6_v7_defconfig: Select SPI_FSL_QUADSPI by default ARM: imx_v6_v7_defconfig: add POWER_RESET_SYSCON Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23ARM: dts: imx6q: sort dtbs in makefileOlof Johansson1-4/+4
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'imx-dt-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dtOlof Johansson32-169/+663
Merge "ARM: imx: device tree changes for 3.20" from Shawn Guo: The i.MX device tree update for 3.20: - Update i.MX6 operating-points setting in device tree to match the latest i.MX6 data sheet - Add i.MX6SX sabreauto board support - Add imx6dl-udoo board support based off imx6q-udoo - Update sabrelite board to include I2C and HDMI support - Update the VPU compatible strings to also use cnm,coda<model> - Remove the ocram clock from the VPU node, as the clock is already provided inside the ocram node - Add system reset controller and syscon-reboot for VF610 - Update VF610 device tree to use zero based naming for GPIO nodes, so that the number scheme matches hardware manual - A number of random device additions like watchdog for VF610, sahara for i.MX53, QSPI for imx6sx-sdb board, etc. Note: the branch imx/soc was merged into imx/dt because the SNVS device tree node needs to refer to the new clock ID added by the imx/soc patch. * tag 'imx-dt-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (28 commits) ARM: dts: imx28-evk: remove duplicate property ARM: vf610: use zero based naming for GPIO nodes ARM: dts: imx6q: enable dma for ecspi5 ARM: dts: vfxxx: Add SNVS node ARM: imx: clk-vf610: Add clock for SNVS ARM: imx: clk-vf610: Add clock for UART4 and UART5 ARM: imx: drop CPUIDLE_FLAG_TIME_VALID from cpuidle-imx6sx ARM: dts: imx6dl-udoo: Add board support based off imx6q-udoo ARM: imx: support arm power off in cpuidle for i.mx6sx ARM: imx: remove unnecessary setting for DSM ARM: dts: imx6sx: add i.mx6sx sabreauto board support ARM: dts: imx6sx-sdb: Add QSPI support ARM: dts: imx6qdl: Remove OCRAM clock from VPU node ARM: imx: apf51dev: add gpio-backlight support ARM: imx: correct the hardware clock gate setting for shared nodes ARM: imx: pllv3: add shift for frequency multiplier ARM vf610: add compatibilty strings of supported Vybrid SoC's ARM: i.MX53: dts: add sahara module ARM: dts: imx6dl: correct cpufreq volt/freq table ARM: dts: imx6q: update cpufreq volt/freq table ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'imx-soc-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/socOlof Johansson14-21/+181
Merge "ARM: imx: soc changes for 3.20" from Shawn Guo: The i.MX SoC changes for 3.20: - Add .disable_unused function hook for shared gate clock to ensure the clock tree use count matches the hardware state - Add a deeper idle state for i.MX6SX cpuidle driver powering off the ARM core - One correction on i.MX6Q esai_ipg parent clock setting - Add a missing iounmap call for imx6q_opp_check_speed_grading() - Add missing clocks for VF610 UART4, UART5 and SNVS blocks - Expand VF610 device tree compatible matching table to cover more Vybrid family SoCs - Expand i.MX clk-pllv3 a bit with the shift for frequency multiplier to support Vybrid's USB PLL oddity * tag 'imx-soc-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: clk-imx6q: refine esai_ipg's parent ARM i.MX6q: unmap memory mapped at imx6q_opp_check_speed_grading() ARM: imx: clk-vf610: Add clock for SNVS ARM: imx: clk-vf610: Add clock for UART4 and UART5 ARM: imx: drop CPUIDLE_FLAG_TIME_VALID from cpuidle-imx6sx ARM: imx: support arm power off in cpuidle for i.mx6sx ARM: imx: remove unnecessary setting for DSM ARM: imx: correct the hardware clock gate setting for shared nodes ARM: imx: pllv3: add shift for frequency multiplier ARM vf610: add compatibilty strings of supported Vybrid SoC's Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixesOlof Johansson1-4/+4
Merge "ARM: imx: fixes for 3.19, 2nd round" from Shawn Guo: The i.MX fixes for 3.19, 2nd round: - Correct pwm clock assignment in i.MX25 device tree to fix the broken pwm support on i.MX25 * tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx25: Fix PWM "per" clocks Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'v3.20-next-soc1' of https://github.com/mbgg/linux-mediatek into next/socOlof Johansson2-2/+22
Merge "ARM: mediatek: soc changes for v3.20" from Matthias Brugger: This adds config options for the different Mediatek SoC. We need this so that the pinctrl driver does not bloat the kernel binary. Apart we change the Kconfig description and add the config option for mt6592 low-level debug option. * tag 'v3.20-next-soc1' of https://github.com/mbgg/linux-mediatek: ARM: mediatek: Low-level-debug for mt6592 ARM: mediatek: Add config options for mediatek SoCs. Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'v3.20-next-dts2' of https://github.com/mbgg/linux-mediatek into next/dtOlof Johansson1-0/+38
Merge "ARM: mediatek: DT changes for v3.20 (round 2)" from Matthias Brugger: This adds uart support for mt6592 SoC. * tag 'v3.20-next-dts2' of https://github.com/mbgg/linux-mediatek: ARM: mediatek: dts: Add uart to mt6592 Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'mvebu-dt-3.20-2' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson6-5/+267
Merge "mvebu/dt #2" from Andrew Lunn: Second set of dt patches for mvebu for v3.20. * tag 'mvebu-dt-3.20-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: make DTS comments reflect DEBUG_LL changes ARM: mvebu: Armada 385 GP: Add regulators to the SATA port ARM: Kirkwood: Added support for pogoplug e02 (pink/gray) ARM: mvebu: fix compatible strings of MBus on Armada 375 and Armada 38x dt: bindings: update mvebu-mbus DT binding with new compatible properties Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'mvebu-soc-3.20-2' of git://git.infradead.org/linux-mvebu into next/socOlof Johansson1-49/+2
Merge "mvebu/soc #2" from Andrew Lunn: Soc patches for mvebu for v3.20, part #2. * tag 'mvebu-soc-3.20-2' of git://git.infradead.org/linux-mvebu: bus: mvebu-mbus: make sure SDRAM CS for DMA don't overlap the MBus bridge window bus: mvebu-mbus: fix support of MBus window 13 on Armada XP/375/38x ARM: mvebu: use arm_coherent_dma_ops and re-enable hardware I/O coherency bus: mvebu-mbus: use automatic I/O synchronization barriers bus: mvebu-mbus: fix support of MBus window 13 ARM: mvebu: completely disable hardware I/O coherency Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'v3.20-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dtOlof Johansson2-1/+79
Merge "ARM: rockchip: soc updates for 3.20" [sic!] from Heiko Stübner: dts part of core suspend support and limiting of rk3288 sd-card clockspeed to 150mhz * tag 'v3.20-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add suspend settings for rk3288-evb-rk808 ARM: dts: rockchip: add RK3288 suspend support ARM: dts: rockchip: set dw_mmc max-freq 150Mhz Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'v3.20-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/socOlof Johansson5-1/+436
Merge "ARM: rockchip: soc updates for v3.20" from Heiko Stübner: SoC parts of basic suspend support and removal of Cortex-A9 reference from the machine name. * tag 'v3.20-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: rockchip: remove cpu-core name from machine name ARM: rockchip: Add pmu-sram binding ARM: rockchip: add suspend and resume for RK3288 Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'bcm5301x-dt-2015-01-20' of https://github.com/hauke/linux into next/dtOlof Johansson8-6/+234
Merge "ARM: BCM5301X: DT changes for v3.20" from Hauke Mehrtens: bcm5301x-dt-2015-01-20: ARM: BCM5301X: dts updates for 3.20 * tag 'bcm5301x-dt-2015-01-20' of https://github.com/hauke/linux: ARM: BCM5301X: Add DT for Buffalo WZR-900DHP ARM: BCM5301X: Add LEDs for Buffalo devices ARM: BCM5301X: Drop unused poll-interval from gpio-keys ARM: BCM5301X: Add DT for Luxul XWC-1000 Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-24Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds3-10/+20
Pull ARM fixes from Russell King: "Another round of small ARM fixes. restore_user_regs early stack deallocation is buggy in the presence of FIQs which switch to SVC mode, and could lead to corrupted registers being returned to a user process given an inopportune FIQ event. Another bug was spotted in the ARM perf code where it could lose track of perf counter overflows, leading to incorrect perf results. Lastly, a bug in arm_add_memory() was spotted where the memory sizes aren't properly rounded. As most people pass properly rounded sizes, this hasn't been noticed" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8292/1: mm: fix size rounding-down of arm_add_memory() function ARM: 8255/1: perf: Prevent wraparound during overflow ARM: 8266/1: Remove early stack deallocation from restore_user_regs
2015-01-23Merge tag 'pxa-for-3.20' of https://github.com/rjarzmik/linux into next/fixes-non-criticalOlof Johansson6-13/+11
Merge "pxa for v3.20" from Robert Jarzmik: arm: pxa: pxa for v3.20 This update deals mostly with regulator updates for fixing all the cases where a default regulator is needed, with non device-tree platforms. There's also a kconfig fix for device-tree pxa. It should be noticed that all interrupts numbers were shifted by 16 (number of legacy interrupts). * tag 'pxa-for-3.20' of https://github.com/rjarzmik/linux: hx4700: regulator: declare full constraints ARM: pxa: add regulator_has_full_constraints to spitz board file ARM: pxa: add regulator_has_full_constraints to poodle board file ARM: pxa: add regulator_has_full_constraints to corgi board file ARM: pxa: arbitrarily set first interrupt number arm: pxa: fix pxa27x device-tree support kconfig Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'omap-for-v3.20/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dtOlof Johansson5-0/+845
Merge "omap device tree changes for v3.20, part 2" from Tony Lindgren: More changes for omap dts files mostly to add support for dm816x devices and clocks. Also adds a qspi device for dra72x-evm. * tag 'omap-for-v3.20/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: dra72-evm: Add qspi device ARM: dts: Add minimal support for dm8168-evm ARM: dts: Add basic clocks for dm816x ARM: dts: Add basic dm816x device tree configuration Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'omap-for-v3.20/defconfig-modular' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfigOlof Johansson1-44/+84
Merge "omap defconfig changes for v3.20" from Tony Lindgren: Defconfig changes for omap2plus_defconfig to make it more modular, and to add few more drivers found on various boards. * tag 'omap-for-v3.20/defconfig-modular' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2plus_defconfig: Enable OHCI & EHCI HCD support ARM: omap2plus_defconfig: Enable misc options for BeagleBoard-X15 platform ARM: omap2plus_defconfig: Enable pcf857x ARM: omap2plus_defconfig: Add NOR flash support ARM: omap2plus_defconfig: Enable support for davinci_emac ARM: omap2plus_defconfig: enable TPS65218 power button ARM: omap2plus_defconfig: reduce zImage size on omap2plus_defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23Merge tag 'omap-for-v3.20/drop-legacy-3517-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanupOlof Johansson10-1085/+2
Merge "drop legacy booting for omap3517" from Tony Lindgren: We have had omap3517 booting in device tree mode for quite some time now and we have at least a minimal dts file for the 3517 based boards. Also almost all the drivers are usable in device tree mode. And if there are any drivers not yet supported in device tree mode, those can be enabled using pdata quirks. This leaves omap3430 to omap3730 as the only remaining mach-omap2 platforms still booting in legacy mode also. For those were are printing a warning during the boot to get people to update their systems to boot in device tree mode and slowly converting them over to device tree based booting. * tag 'omap-for-v3.20/drop-legacy-3517-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3: Add back Kconfig option MACH_OMAP3517EVM for ASoC ARM: OMAP3: Remove legacy support for am35xx-emac ARM: OMAP3: Remove cm-t3517 legacy support ARM: OMAP3: Remove legacy support for am3517crane ARM: OMAP3: Remove legacy support for am3517-evm Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-23ARM: dts: sun4i: Add Hyundau A7HD boardHans de Goede2-0/+106
The Hyundai A7HD is a 7" 16:9 A10 powered tablet featuring 1G RAM, 8G nand, 1024x600 IPS screen, a mini hdmi port, mini usb receptacle and a headphones port for details see: http://linux-sunxi.org/Hyundai_A7HD Cc: Mark Janssen <maniac@maniac.nl> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-01-23ARM: qcom: Drop unnecessary selects from ARCH_QCOMStephen Boyd1-2/+0
We don't need to force gpiolib on everyone given that it isn't required to actually boot the device and the multiplatform Kconfig already selects ARCH_WANT_OPTIONAL_GPIOLIB. CLKSRC_OF is already selected by CONFIG_ARCH_MULTIPLATFORM too, so we can drop that here. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Kumar Gala <galak@codeaurora.org>
2015-01-23ARM: qcom: Fix SCM interface for big-endian kernelsStephen Boyd2-18/+20
The secure environment only runs in little-endian mode, so any buffers shared with the secure environment should have their contents converted to little-endian. We also mark such elements with __le32 to allow sparse to catch such problems. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Kumar Gala <galak@codeaurora.org>
2015-01-23ARM: qcom: scm: Clarify boot interfaceStephen Boyd2-3/+3
The secure world only knows about 32-bit wide physical addresses for the boot API. Clarify the kernel interface by explicitly stating a u32 instead of phys_addr_t which could be 32 or 64 bits depending on LPAE or not. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Kumar Gala <galak@codeaurora.org>
2015-01-23ARM: tegra: Add PMC thermtrip programming to Jetson TK1 device treeMikko Perttunen1-0/+7
This adds the required information to reset the board during an overheating situation to the Jetson TK1 device tree. The thermal reset is handled by the PMC by sending an I2C message to the PMIC. The entries specify the I2C message to be sent. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-01-23Merge tag 'kvm-s390-next-20150122' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-nextPaolo Bonzini1-2/+1
KVM: s390: fixes and features for kvm/next (3.20) 1. Generic - sparse warning (make function static) - optimize locking - bugfixes for interrupt injection - fix MVPG addressing modes 2. hrtimer/wakeup fun A recent change can cause KVM hangs if adjtime is used in the host. The hrtimer might wake up too early or too late. Too early is fatal as vcpu_block will see that the wakeup condition is not met and sleep again. This CPU might never wake up again. This series addresses this problem. adjclock slowing down the host clock will result in too late wakeups. This will require more work. In addition to that we also change the hrtimer from REALTIME to MONOTONIC to avoid similar problems with timedatectl set-time. 3. sigp rework We will move all "slow" sigps to QEMU (protected with a capability that can be enabled) to avoid several races between concurrent SIGP orders. 4. Optimize the shadow page table Provide an interface to announce the maximum guest size. The kernel will use that to make the pagetable 2,3,4 (or theoretically) 5 levels. 5. Provide an interface to set the guest TOD We now use two vm attributes instead of two oneregs, as oneregs are vcpu ioctl and we don't want to call them from other threads. 6. Protected key functions The real HMC allows to enable/disable protected key CPACF functions. Lets provide an implementation + an interface for QEMU to activate this the protected key instructions.
2015-01-23KVM: remove unneeded return value of vcpu_postcreateDominik Dingel1-2/+1
The return value of kvm_arch_vcpu_postcreate is not checked in its caller. This is okay, because only x86 provides vcpu_postcreate right now and it could only fail if vcpu_load failed. But that is not possible during KVM_CREATE_VCPU (kvm_arch_vcpu_load is void, too), so just get rid of the unchecked return value. Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
2015-01-23arm/arm64: KVM: Fixup incorrect config symbol in commentChristoffer Dall1-2/+2
A comment in the dirty page logging patch series mentioned incorrectly spelled config symbols, just fix them up to match the real thing. Reported-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-01-23ARM: at91/dt: sama5d4: add pioD controllerLudovic Desroches1-0/+13
PioD controller was not described in the device tree since we don't use it. As pinctrl-at91 allows disabled gpio controllers in the device tree, we can add it to complete the device description. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-22ARM: dts: rockchip: add rk3288 hdmi nodesAndy Yan1-0/+37
Add an hdmi node, and also add hdmi endpoints to vopb and vopl output port nodes. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Signed-off-by: Yakir Yang <ykk@rock-chips.com> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> Tested-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-01-22ARM: dts: rockchip: Add rk3288 vop and display-subsystemDaniel Kurtz1-0/+39
Add devicetree nodes for rk3288 VOP (Video Output Processors), and the top level display-subsystem root node. Later patches add endpoints (eDP, HDMI, LVDS, etc) that attach to the VOPs' output ports. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Mark yao <mark.yao@rock-chips.com> Reviewed-by: Stephane Marchesin <marcheu@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-01-22ARM: cns3xxx: Convert PCI to use generic config accessorsRob Herring1-42/+10
Convert the cns3xxx PCI driver to use the generic config access functions. This changes accesses from __raw_readl/__raw_writel to readl/writel. [arnd: remove extra open parenthesis] Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Krzysztof Hałasa <khalasa@piap.pl> CC: Russell King <linux@arm.linux.org.uk> CC: linux-arm-kernel@lists.infradead.org
2015-01-22ARM: qcom: Add SCM warmboot flags for quad core targets.Lina Iyer1-0/+2
Quad core targets like APQ8074, APQ8064, APQ8084 need SCM support set up warm boot addresses in the Secure Monitor. Extend the SCM flags to support warmboot addresses for secondary cores. Signed-off-by: Lina Iyer <lina.iyer@linaro.org> Signed-off-by: Kumar Gala <galak@codeaurora.org>
2015-01-21Merge tag 'davinci-for-v3.20/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/cleanupOlof Johansson5-356/+1
Merge "DaVinci cleanups for v3.20" from Sekhar Nori: Removes an unused function and the unused support for CDCE949 clock generator. * tag 'davinci-for-v3.20/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: Remove CDCE949 driver ARM: davinci: serial.c: remove unused serial_read_reg() Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'renesas-soc3-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/socOlof Johansson1-58/+97
Merge "Third Round of Renesas ARM Based SoC Updates for v3.20" from Simon Horman: * Special-case PM domains with memory-controllers * tag 'renesas-soc3-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: R-Mobile: Special-case PM domains with memory-controllers ARM: shmobile: R-Mobile: Generalize adding/looking up special PM domains ARM: shmobile: R-Mobile: Consolidate rmobile_pd_suspend_*() Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'renesas-soc-fixes2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixesOlof Johansson2-2/+16
Merge "Second Round of Renesas ARM Based SoC Fixes for v3.19" from Simon Horman: * Instantiate GIC from C board code in legacy builds on r8a7778 and r8a7779 * tag 'renesas-soc-fixes2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7779: Instantiate GIC from C board code in legacy builds ARM: shmobile: r8a7778: Instantiate GIC from C board code in legacy builds Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'qcom-dt-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dtOlof Johansson2-1/+13
Merge "qcom DT changes for v3.20" from Kumar Gala: Qualcomm ARM Based Device Tree Updates for v3.20 * Correct IPQ8064 tlmm interrupt * Add Support for SD Card Detect for ifc6410 board * tag 'qcom-dt-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: ARM: dts: qcom: Correct IPQ8064 tlmm interrupt ARM: dts: qcom: Add Support for SD Card Detect for ifc6410 board Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'renesas-soc2-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/socOlof Johansson5-17/+289
Merge "Second Round of Renesas ARM Based SoC Updates for v3.20" from Simon Horman: * Add DT support for PM domains * tag 'renesas-soc2-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: R-Mobile: Add DT support for PM domains ARM: shmobile: R-Mobile: Store SYSC base address in rmobile_pm_domain ARM: shmobile: R-Mobile: Use generic_pm_domain.attach_dev() for pm_clk setup Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'renesas-dt2-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dtOlof Johansson5-22/+153
Merge "Second Round of Renesas ARM Based SoC DT Updates for v3.20" from Simon Horman: * Support Renesas memory controllers * Add SRC interrupt number on r8a779~ and r8a7791 SoCs * Fix MSTP8 input clocks on r8a7791 SoC * Add PM domain support to r8a7740 * Add DT bindings for the R-Mobile System Controller * Use Add sh73a0-specific FSI2 compatible property * tag 'renesas-dt2-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: PM / Domains: R-Mobile SYSC: Document SH-Mobile AG5 (sh73a0) binding ARM: shmobile: sh73a0 dtsi: Add memory-controller nodes ARM: shmobile: r8a7740 dtsi: Add memory-controller node ARM: shmobile: r8a73a4 dtsi: Add memory-controller nodes ARM: shmobile: Add DT bindings for Renesas memory controllers ARM: shmobile: r8a7791: add SRC interrupt number on DTSI ARM: shmobile: r8a7790: add SRC interrupt number on DTSI ARM: shmobile: r8a7791: fix MSTP8 input clocks ARM: shmobile: r8a7740 dtsi: Add PM domain support PM / Domains: Add DT bindings for the R-Mobile System Controller ARM: shmobile: sh73a0 dtsi: Add SoC-specific FSI2 compatible property Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'for-v3.20/omap-hwmod-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.20/fixes-not-urgentTony Lindgren3-4/+7
ARM: OMAP2+: hwmod: first set of patches for v3.20 First set of OMAP2+ hwmod patches for Linux v3.20. These are mostly fixes for warnings, although there's one DRA7xx patch that fixes CONFIG_DEBUG_LL for AM572x/DRA7xx SoCs that use UART3 for console, such as the BeagleBoard-X15. These patches entered Linux-next starting with the next-20150121 tag. Basic build, boot, and PM test results can be found here: http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v3.20/20150121142621/
2015-01-21Merge tag 'omap-for-v3.20/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dtOlof Johansson16-78/+979
Merge "omap device tree changes for v3.20" from Tony Lindgren: Device tree changes for omaps. Mostly to add support for new am437x-idk and update am437x-sk boards. Also enabling new devices for multiple boards. * tag 'omap-for-v3.20/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits) ARM: dts: omap3-gta04: Add handling for tv output ARM: dts: cm-t3x: add NAND support ARM: dts: am57xx-beagle-x15: Add GPIO controlled fan node ARM: dts: am437x-idk: add gpio-based power key ARM: dts: N950/N9: add twl_power ARM: dts: am437x-sk: add power button binding ARM: dts: add support for AM437x IDK ARM: dts: am437x-gp-evm: add VPFE device tree data ARM: dts: am437x-sk-evm: add VPFE device tree data ARM: dts: am43x-epos-evm: add VPFE device tree data ARM: dts: am4372: add VPFE DT node entries ARM: dts: DRA7X: drop id property in pcie_phy ARM: dts: omap3-n900: cleanup english ARM: dts: am57xx-beagle-x15: Add dual ethernet ARM: dts: am437x-sk: remove DSS pulls ARM: dts: am437x-sk: remove internal i2c pullups ARM: dts: am437x-sk: add explicit pinmux for both USB instances ARM: dts: am437x-sk: remove ethernet pulls ARM: dts: am437x-sk: add explicit MMC0 pinmux ARM: dts: am437x-sk: remove internal pulls from QSPI ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'omap-for-v3.20/cleanup-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanupOlof Johansson25-1126/+3
Merge "omap clean-up for v3.20" from Tony Lindgren: Clean-up for omaps to remove dead code found with cppcheck after we've made several SoCs to boot in device tree only mode. * tag 'omap-for-v3.20/cleanup-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Remove unused ti81xx platform init code ARM: OMAP3+: PRM: remove prm_get_reset_sources declaration from headers ARM: OMAP2: CM: remove unused PLL functions ARM: OMAP2: clock: remove unused apll code ARM: OMAP: dma.c: Remove unused function ARM: OMAP1: timer32k.c: Remove unused function ARM: OMAP1: irq.c: Remove unused function ARM: OMAP2+: omap-pm-noop.c: Remove some unused functions ARM: OMAP2+: voltage: Remove some unused functions ARM: OMAP2+: powerdomain.c: Remove some unused functions ARM: OMAP2+: omap_hwmod.c: Remove some unused functions ARM: OMAP2+: dpll44xx.c: Remove unused function ARM: OMAP2+: cm33xx.c: Remove some unused functions ARM: OMAP2+: clkt2xxx_apll.c: Remove some unused functions Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'omap-for-v3.20/fixes-not-urgent-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-criticalOlof Johansson11-9/+84
Merge "omap non-urgent fixes for v3.20" from Tony Lindgren: Non-urgent fixes for omap variant dm816x that has been in a sorry broken half merged state for a few years now. This gets us to the point where we can boot it properly once the related SoC data is added. Note that we've already made dm816x device tree only by removing the known broken board file. * tag 'omap-for-v3.20/fixes-not-urgent-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Disable omap3 PM init for ti81xx ARM: OMAP2+: Fix reboot for 81xx ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init ARM: OMAP2+: Fix ti81xx class type ARM: OMAP2+: Fix ti81xx devtype ARM: OMAP2+: Fix error handling for omap2_clk_enable_init_clocks Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'sti-defconfig-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/defconfigOlof Johansson1-0/+2
Merge "STi defconfig for v3.20, round 1" from Maxime Coquelin: Highlights: ----------- - Enable STiH407 USB PicoPHY in multi_v7_defconfig - Enable MiPHY28lp driver in multi_v7_defconfig * tag 'sti-defconfig-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti: ARM: multi_v7_defconfig: Enable MiPHY28lp - ST's Generic (SATA, PCIe & USB3) PHY ARM: multi_v7_defconfig: Enable stih407 usb picophy Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21ARM: mvebu: make DTS comments reflect DEBUG_LL changesPaul Bolle1-2/+4
The Kconfig symbol DEBUG_MVEBU_UART_ALTERNATE was renamed to DEBUG_MVEBU_UART0_ALTERNATE. And the symbol DEBUG_MVEBU_UART1_ALTERNATE was added to allow UART1 as a DEBUG_LL target. Make the comment at the top of this DTS reflect those changes. Since we're touching this DTS add comments to show which blocks describe UART0 and UART1. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2015-01-21ARM: mvebu: Armada 385 GP: Add regulators to the SATA portGregory CLEMENT1-0/+126
Add the regulators to each SATA port. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-01-21ARM: Kirkwood: Added support for pogoplug e02 (pink/gray)Christoph Junghans2-0/+135
The pogoplug differs from the SheevaPlug only by a few details, but especially in the led assignments. This patch was tested under Gentoo Linux and is based on dts files from Arch Linux ARM and OpenWrt. Suggested-by: Felix Kaechele <heffer@fedoraproject.org> Suggested-by: Oleg Rakhmanov <moonman.ca@gmail.com> Signed-off-by: Christoph Junghans <ottxor@gentoo.org> [Andrew Lunn <andrew@lunn.ch>: Fixed subject line] Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2015-01-21Merge tag 'sti-dt-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/dtOlof Johansson9-4/+961
Merge "STi DT updates for v3.20, round 1" from Maxime Coquelin: Highlights: ----------- - Add USB support for STiH410 & STiH407 - Add DRM DT nodes for STiH410 & STiH407 - Add STiH418 SoC support - Add DT nodes for MiPHY28lp PHY * tag 'sti-dt-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti: ARM: DT: STi: STiH407: Add DT node for MiPHY28lp ARM: dts: STiH418: Add B2199 board support ARM: dts: Add STiH418 SoC support ARM: DT: STiH410: Add DRM dt nodes ARM: DT: STiH407: Add DRM dt nodes ARM: STi: DT: STiH410: Add DT nodes for the ehci and ohci usb controllers. ARM: STi: DT: STiH410: Add usb2 picophy dt nodes ARM: STi: DT: STiH407: Add usb2 picophy dt nodes Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'sti-soc-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/socOlof Johansson1-0/+1
Merge "ARM: STi: SoC changes for v3.20, round 1" from Maxime Coquelin: Highlights: ----------- - Add support for STiH418 SoC * tag 'sti-soc-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti: ARM: STi: Add STiH418 SoC support Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-21Merge tag 'at91-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/socOlof Johansson40-462/+368
Merge "at91: cleanup for 3.20 #2" from Nicolas Ferre: Second batch of cleanup for 3.20: - By reworking the PM code, we can remove the AT91 more specific initialization - We are using DT for SRAM initialization now, so we can remove its explicit mapping - The PMC clock driver now hosts IDLE function for at91rm9200 with other SoCs ones. * tag 'at91-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (37 commits) ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c ARM: at91: remove unused at91_init_sram ARM: at91: sama5d4: remove useless call to at91_init_sram ARM: at91: remove useless map_io ARM: at91: pm: prepare for multiplatform ARM: at91: pm: add UDP and UHP checks to newer SoCs ARM: at91: pm: use the mmio-sram pool to access SRAM ARM: at91: pm: rework cpu detection ARM: at91: dts: sama5d3: add ov2640 camera sensor support ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset} ARM: at91: dts: sama5d3: move the isi mck pin to mb ARM: at91: dts: sama5d3: add missing pins of isi ARM: at91: dts: sama5d3: split isi pinctrl ARM: at91: dts: sama5d3: add isi clock ARM: at91/dt: ethernut5: use at91sam9xe.dtsi ARM: at91/dt: Add a dtsi for at91sam9xe ARM: at91/dt: add SRAM nodes ARM: at91/dt: at91rm9200ek: enable RTC ARM: at91/dt: rm9200: add RTC node ... Signed-off-by: Olof Johansson <olof@lixom.net>