aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2013-08-22ARM: imx6q: add vdoa gate clockShawn Guo1-1/+2
Add the missing vdoa gate clock for imx6q. Signed-off-by: Shawn Guo <[email protected]>
2013-08-22ARM: imx6q: add the missing cko output selectionShawn Guo1-1/+3
The clock output on imx6q CCM_CLKO1 pad is not always cko1 clock, and there is a multiplexer to select between cko1 and cko2. Add this missing selection as the clock cko. Signed-off-by: Shawn Guo <[email protected]>
2013-08-22ARM: imx6q: add cko2 clocksShawn Guo1-1/+14
It adds the missing cko2 clocks, including multiplexer, divider and gate. Signed-off-by: Shawn Guo <[email protected]>
2013-08-22ARM: imx6q: add spdif gate clockShawn Guo1-1/+3
It adds the missing spdif gate clock into imx6q clock driver. Signed-off-by: Shawn Guo <[email protected]>
2013-08-22Merge tag 'samsung-cleanup-1' of ↵Kevin Hilman7-92/+11
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup From Kukjin Kim: samsung cleanup for v3.12 - cleanup non-dt stuff in exynos - remove 0x from exynos dt files - remove unused codes * tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*() ARM: dts: Remove '0x's from Exynos5440 DTS file ARM: dts: Remove '0x's from Exynos5420 DTS file ARM: dts: Remove '0x's from Exynos5250 DTS file ARM: dts: Remove '0x's from Exynos4x12 DTSI file ARM: dts: Remove '0x's from Exynos4210 DTSI file ARM: EXYNOS: Cleanup common.h file irqchip: exynos: cleanup non-DT stuff in exynos-combiner Signed-off-by: Kevin Hilman <[email protected]>
2013-08-22Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown1-6/+3
2013-08-22Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown1-57/+114
2013-08-22Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown2-17/+11
2013-08-22ARM: at91: sam9n12: enable kernel uncompress info outputBo Shen1-0/+1
The sam9n12 use the same array usart as sam9x5, add it which will enable output kernel uncompress info: ---8>--- Uncompressing Linux... done, booting the kernel. ---<8--- Signed-off-by: Bo Shen <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-22ARM: at91: sama5: enable kernel uncompress info outputBo Shen1-0/+12
Enable kernel uncompress info output, which will show as following: ---8>--- Uncompressing Linux... done, booting the kernel. ---<8--- Signed-off-by: Bo Shen <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-22ARM: at91: include sama5d3.h into hardware.hBo Shen1-0/+1
Signed-off-by: Bo Shen <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-22ARM: at91: sama5d3: add definition for usart base addressBo Shen1-0/+8
Signed-off-by: Bo Shen <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-22ARM: OMAP2: use 'int' instead of 'unsigned' for variable 'gpmc_irq_start'Chen Gang1-1/+1
'gpmc_irq_start' is mostly used as 'int', and for a variable, do not suggest to only use 'unsigned' as its type, so use 'int' instead of 'unsigned' for variable 'gpmc_irq_start'. Also it will fix the related issue (dummy the real world failure): arch/arm/mach-omap2/gpmc.c:728:2: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] Signed-off-by: Chen Gang <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-08-22ARM: OMAP2: remove useless variable 'ret'Chen Gang1-2/+0
Remove useless variable 'ret', the related warning: arch/arm/mach-omap2/board-am3517crane.c:113:6: warning: unused variable ‘ret’ -Wunused-variable] Signed-off-by: Chen Gang <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-08-21ARM: tegra: always enable USB VBUS regulatorsStephen Warren3-0/+8
This fixes a regression exposed during the merge window by commit 9f310de "ARM: tegra: fix VBUS regulator GPIO polarity in DT"; namely that USB VBUS doesn't get turned on, so USB devices are not detected. This affects the internal USB port on TrimSlice (i.e. the USB->SATA bridge, to which the SSD is connected) and the external port(s) on Seaboard/ Springbank and Whistler. The Tegra DT as written in v3.11 allows two paths to enable USB VBUS: 1) Via the legacy DT binding for the USB controller; it can directly acquire a VBUS GPIO and activate it. 2) Via a regulator for VBUS, which is referenced by the new DT binding for the USB controller. Those two methods both use the same GPIO, and hence whichever of the USB controller and regulator gets probed first ends up owning the GPIO. In practice, the USB driver only supports path (1) above, since the patches to support the new USB binding are not present until v3.12:-( In practice, the regulator ends up being probed first and owning the GPIO. Since nothing enables the regulator (the USB driver code is not yet present), the regulator ends up being turned off. This originally caused no problem, because the polarity in the regulator definition was incorrect, so attempting to turn off the regulator actually turned it on, and everything worked:-( However, when testing the new USB driver code in v3.12, I noticed the incorrect polarity and fixed it in commit 9f310de "ARM: tegra: fix VBUS regulator GPIO polarity in DT". In the context of v3.11, this patch then caused the USB VBUS to actually turn off, which broke USB ports with VBUS control. I got this patch included in v3.11-rc1 since it fixed a bug in device tree (incorrect polarity specification), and hence was suitable to be included early in the rc series. I evidently did not test the patch at all, or correctly, in the context of v3.11, and hence did not notice the issue that I have explained above:-( Fix this by making the USB VBUS regulators always enabled. This way, if the regulator owns the GPIO, it will always be turned on, even if there is no USB driver code to request the regulator be turned on. Even ignoring this bug, this is a reasonable way to configure the HW anyway. If this patch is applied to v3.11, it will cause a couple pretty trivial conflicts in tegra20-{trimslice,seaboard}.dts when creating v3.12, since the context right above the added lines changed in patches destined for v3.12. Reported-by: Kyle McMartin <[email protected]> Signed-off-by: Stephen Warren <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2013-08-21Merge tag 'stable/for-linus-3.11-rc6-tag' of ↵Linus Torvalds1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip Pull Xen bug-fixes from Konrad Rzeszutek Wilk: - On ARM did not have balanced calls to get/put_cpu. - Fix to make tboot + Xen + Linux correctly. - Fix events VCPU binding issues. - Fix a vCPU online race where IPIs are sent to not-yet-online vCPU. * tag 'stable/for-linus-3.11-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/smp: initialize IPI vectors before marking CPU online xen/events: mask events when changing their VCPU binding xen/events: initialize local per-cpu mask for all possible events x86/xen: do not identity map UNUSABLE regions in the machine E820 xen/arm: missing put_cpu in xen_percpu_init
2013-08-21Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds5-30/+44
Pull kvm fixes from Paolo Bonzini: "Fixes for ARM and aarch64. This pull request is coming a bit later than I would have preferred, because I and Gleb happened to have holidays around the same weeks of August... sorry about that" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: ARM: Squash len warning arm64: KVM: use 'int' instead of 'u32' for variable 'target' in kvm_host.h. arm64: KVM: add missing dsb before invalidating Stage-2 TLBs arm64: KVM: perform save/restore of PAR_EL1 arm64: KVM: fix 2-level page tables unmapping ARM: KVM: Fix unaligned unmap_range leak ARM: KVM: Fix 64-bit coprocessor handling
2013-08-21Merge tag 'sunxi-core-for-3.12-2' of https://github.com/mripard/linux into ↵Kevin Hilman2-3/+44
next/soc Allwinner sunXi core additions for 3.12, take 2 These patches add machine support for the Allwinner A20 and A31 SoCs * tag 'sunxi-core-for-3.12-2' of https://github.com/mripard/linux: ARM: sunxi: Introduce Allwinner A20 support ARM: sun6i: Add restart code for the A31 ARM: sunxi: Add the Allwinner A31 compatible to the machine definition
2013-08-21Merge tag 'sunxi-dt-for-3.12-2' of https://github.com/mripard/linux into next/dtKevin Hilman5-1/+395
Allwinner sunXi DT additions for 3.12, take 2 These patches add basic support for: - Allwinner A31 and A20 SoCs - The Olimex A20-Olinuxino board - The Olimex A10s-Olinuxino board * tag 'sunxi-dt-for-3.12-2' of https://github.com/mripard/linux: ARM: sun7i: Add Olimex A20-Olinuxino-Micro support ARM: sun7i: Add Allwinner A20 DTSI ARM: sun6i: Add WITS Colombus A31 evaluation kit support ARM: sunxi: Add Allwinner A31 DTSI
2013-08-22ARM: sun7i: Add Cubieboard2 Device TreeMaxime Ripard2-0/+54
The Cubieboard2 is the successor of the first Cubieboard, and shares the same hardware, except that the Allwinner A10 found initially has been replaced by an Allwinner A20. Signed-off-by: Maxime Ripard <[email protected]>
2013-08-22ARM: sun7i: a20-olinuxino: Enable the user LEDMaxime Ripard1-0/+21
The A20-olinuxino Micro has a LED connected to the PH2 pin. Use the gpio-led driver to enable the control over this LED. Signed-off-by: Maxime Ripard <[email protected]>
2013-08-22ARM: sun7i: a20-olinuxino: Enable UARTs muxingMaxime Ripard1-0/+6
Instead of relying on the bootloader to mux the UART pins properly, do it on our own and register the rightful pins for the A20-olinuxino in the DT using pinctrl. Signed-off-by: Maxime Ripard <[email protected]>
2013-08-22ARM: sun7i: DT: Add UART muxing options to the DTSIMaxime Ripard1-0/+21
The UARTs on the A20 can be muxed to several pins. Add a few options to the DTSI so that we can start using them in the boards' DT. Signed-off-by: Maxime Ripard <[email protected]>
2013-08-22ARM: sun7i: Add the PIO controller node to the DTSIMaxime Ripard1-0/+12
The PIO controller is responsible for the GPIO/muxing/external interrupts handling. Now that we have support for the A20 pin set in the pinctrl driver, we can start using it in the DTSI. Signed-off-by: Maxime Ripard <[email protected]>
2013-08-22ARM: sun6i: colombus: Add uart0 muxingMaxime Ripard1-0/+2
Signed-off-by: Maxime Ripard <[email protected]>
2013-08-22ARM: sun6i: Add UART0 muxing optionsMaxime Ripard1-0/+7
Signed-off-by: Maxime Ripard <[email protected]>
2013-08-22ARM: sunxi: dt: Add PIO controller to A31 DTSIMaxime Ripard1-0/+12
The A31 has a different set of pins than the one found on the A10 and A13. Now that we have support for the A31 pin set in the pinctrl driver, we can enable it in the DTSI with its own compatible. Signed-off-by: Maxime Ripard <[email protected]>
2013-08-22ARM: timer-sp: Set dynamic irq affinityViresh Kumar1-1/+2
When a cpu goes to a deep idle state where its local timer is shutdown, it notifies the time frame work to use the broadcast timer instead. Unfortunately, the broadcast device could wake up any CPU, including an idle one which is not concerned by the wake up at all. This implies, in the worst case, an idle CPU will wake up to send an IPI to another idle cpu. This patch fixes this for ARM platforms using timer-sp, by setting CLOCK_EVT_FEAT_DYNIRQ feature. Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Daniel Lezcano <[email protected]>
2013-08-21Merge tag 'sunxi-dt-for-3.12' of https://github.com/mripard/linux into next/dtKevin Hilman10-13/+191
Allwinner sunXi DT additions for 3.12 - Cleanups and few fixes to the DTSI - A few additions to the A10s olinuxino board * tag 'sunxi-dt-for-3.12' of https://github.com/mripard/linux: ARM: sunxi: dt: Add device tree for Mele A1000 ARM: sun5i: dt: Fix A13 SoC bus base address ARM: sun5i: a13: Remove useless simple-bus reg property ARM: sun5i: dt: Fix A10s SoC bus base address ARM: sun5i: a10s: Remove useless simple-bus reg property ARM: sun4i: dt: Fix A10 SoC bus base address ARM: sun4i: a10: Remove useless simple-bus reg property ARM: sunxi: make the leds' names conform to the current naming convention ARM: sun5i: dt: Add AT24 device on A10S-OLinuXino-Micro ARM: sun5i: dt: Enable I2C controllers on A10S-OLinuXino-Micro ARM: sun5i: dt: Add I2C controller nodes to the A10S dtsi ARM: sun5i: dt: Add I2C muxings for sun5i A10S Signed-off-by: Kevin Hilman <[email protected]>
2013-08-21Merge tag 'sunxi-core-for-3.12' of https://github.com/mripard/linux into ↵Kevin Hilman1-1/+0
next/soc Allwinner sunXi core additions for 3.12 There's not much in this pull request, only a patch removing some dead code. * tag 'sunxi-core-for-3.12' of https://github.com/mripard/linux: ARM: sunxi: Remove Makefile.boot file Signed-off-by: Kevin Hilman <[email protected]>
2013-08-22ARM: davinci: da850: do not specify clock_frequency for UART DT nodeManjunathappa, Prakash1-3/+0
DT kernel on da850-evm comes up with garbled UART logs. This is because of mismatch in actual module clock rate and rate specified(clock-frequency) in DT blob. kernel should not assume or depend on bootloaders clock configuration, instead let it find the clock rate at runtime. Issue discussed here before arriving on this implementation: "ARM: davinci: da850 evm: update clock rate for UART 1/2 DT nodes" https://patchwork.kernel.org/patch/2162271/ Signed-off-by: Manjunathappa, Prakash <[email protected]> Signed-off-by: Sekhar Nori <[email protected]>
2013-08-22ARM: davinci: da850: add DT node for ethernetLad, Prabhakar2-0/+35
Add ethernet device tree node information and pinmux for mii to da850 by providing interrupt details and local mac address. Signed-off-by: Lad, Prabhakar <[email protected]> Signed-off-by: Sekhar Nori <[email protected]>
2013-08-22ARM: davinci: da850: add OF_DEV_AUXDATA entry for davinci_emacLad, Prabhakar1-0/+2
Add OF_DEV_AUXDATA for ethernet davinci_emac driver in da850 board dt file to use emac clock. Signed-off-by: Lad, Prabhakar <[email protected]> Signed-off-by: Sekhar Nori <[email protected]>
2013-08-22ARM: davinci: da850: add OF_DEV_AUXDATA entry for mdio.Lad, Prabhakar1-0/+1
Add OF_DEV_AUXDATA for mdio driver in da850 board dt file to use mdio clock. Signed-off-by: Lad, Prabhakar <[email protected]> Signed-off-by: Sekhar Nori <[email protected]>
2013-08-22ARM: davinci: da850: add DT node for mdio deviceLad, Prabhakar2-0/+19
Add mdio device tree node information to da850 by providing register details and bus frequency of mdio. Signed-off-by: Lad, Prabhakar <[email protected]> Signed-off-by: Sekhar Nori <[email protected]>
2013-08-22ARM: davinci: fix clock lookup for mdio deviceLad, Prabhakar6-12/+7
This patch removes the clock alias for mdio device and adds a entry in clock lookup table, this entry can now be used by both DT and non-DT case. Signed-off-by: Lad, Prabhakar <[email protected]> Signed-off-by: Sekhar Nori <[email protected]>
2013-08-22ARM: davinci: da8xx: remove hard coding of rtc device wakeupHebbar Gururaja1-8/+1
Since now rtc-omap driver itself calls deice_init_wakeup(dev, true), duplicate call from the rtc device registration can be removed. This is basically a partial revert of the prev commit commit 75c99bb0006ee065b4e2995078d779418b0fab54 Author: Sekhar Nori <[email protected]> davinci: da8xx/omap-l1: mark RTC as a wakeup source Signed-off-by: Hebbar Gururaja <[email protected]> Acked-by: Kevin Hilman <[email protected]> Acked-by: Sekhar Nori <[email protected]> Cc: Russell King <[email protected]> Signed-off-by: Sekhar Nori <[email protected]>
2013-08-22ARM: davinci: serial: remove davinci_serial_setup_clk()Manjunathappa, Prakash9-32/+10
Get rid of davinci_serial_setup_clk() since its not called from multiple places now. Instead initialize clock in davinci_serial_init() itself. This also helps get rid of "serial_dev" member of struct davinci_soc_info. Signed-off-by: Manjunathappa, Prakash <[email protected]> Suggested-by: Sekhar Nori <[email protected]> [[email protected]: split removal of davinci_serial_setup_clk() into a separate patch.] Signed-off-by: Sekhar Nori <[email protected]>
2013-08-22ARM: davinci: serial: get rid of davinci_uart_configManjunathappa, Prakash20-74/+28
"struct davinci_uart_config" was introduced to specify UART ports brought out or enabled on the board. But none of the boards use it for that purpose and we are not going to add anymore board files, so remove the structure. Signed-off-by: Manjunathappa, Prakash <[email protected]> Suggested-by: Sekhar Nori <[email protected]> [[email protected]: split patch to remove davinci_serial_setup_clk() changes.] Signed-off-by: Sekhar Nori <[email protected]>
2013-08-22ARM: davinci: da8xx: remove da8xx_uart_clk_enableManjunathappa, Prakash1-8/+0
Serial clocks are enabled from of_platform_serial_setup:of_serial.c, so remove davinci_serial_setup_clk from here. Signed-off-by: Manjunathappa, Prakash <[email protected]> Signed-off-by: Sekhar Nori <[email protected]>
2013-08-21Merge tag 'tegra-for-3.12-soc' of ↵Kevin Hilman34-1070/+1422
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc From: Stephen Warren: ARM: tegra: core SoC enhancements for 3.12 This branch includes a number of enhancements to core SoC support for Tegra devices. The major new features are: * Adds a new CPU-power-gated cpuidle state for Tegra114. * Adds initial system suspend support for Tegra114, initially supporting just CPU-power-gating during suspend. * Adds "LP1" suspend mode support for all of Tegra20/30/114. This mode both gates CPU power, and places the DRAM into self-refresh mode. * A new DT-driven PCIe driver to Tegra20/30. The driver is also moved from arch/arm/mach-tegra/ to drivers/pci/host/. The PCIe driver work depends on the following tag from Thomas Petazzoni: git://git.infradead.org/linux-mvebu.git mis-3.12.2 ... which is merged into the middle of this pull request. * tag 'tegra-for-3.12-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (33 commits) ARM: tegra: disable LP2 cpuidle state if PCIe is enabled MAINTAINERS: Add myself as Tegra PCIe maintainer PCI: tegra: set up PADS_REFCLK_CFG1 PCI: tegra: Add Tegra 30 PCIe support PCI: tegra: Move PCIe driver to drivers/pci/host PCI: msi: add default MSI operations for !HAVE_GENERIC_HARDIRQS platforms ARM: tegra: add LP1 suspend support for Tegra114 ARM: tegra: add LP1 suspend support for Tegra20 ARM: tegra: add LP1 suspend support for Tegra30 ARM: tegra: add common LP1 suspend support clk: tegra114: add LP1 suspend/resume support ARM: tegra: config the polarity of the request of sys clock ARM: tegra: add common resume handling code for LP1 resuming ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci of: pci: add registry of MSI chips PCI: Introduce new MSI chip infrastructure PCI: remove ARCH_SUPPORTS_MSI kconfig option PCI: use weak functions for MSI arch-specific functions ARM: tegra: unify Tegra's Kconfig a bit more ARM: tegra: remove the limitation that Tegra114 can't support suspend ... Signed-off-by: Kevin Hilman <[email protected]>
2013-08-21Merge branch 'timers/clockevents-next' of ↵Thomas Gleixner1-8/+6
git://git.linaro.org/people/dlezcano/clockevents into timers/core * Support for memory mapped arch_timers * Trivial fixes to the moxart timer code * Documentation updates Trivial conflicts in drivers/clocksource/arm_arch_timer.c. Fixed up the newly added __cpuinit annotations as well. Signed-off-by: Thomas Gleixner <[email protected]>
2013-08-21ARM: at91/dt: sam9x5ek: add sound configurationRichard Genoud1-0/+15
The sam9x5ek board has 2 jacks: headphone wired on RHPOUT/LHPOUT of the wm8731 line in wired on LLINEIN/RLINEIN of the wm8731 Signed-off-by: Richard Genoud <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-21ARM: at91/dt: sam9x5ek: enable SSCRichard Genoud1-0/+4
Enable the SSC needed for the WM8731 codec Signed-off-by: Richard Genoud <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-21ARM: at91/dt: sam9x5ek: add WM8731 codecRichard Genoud1-0/+5
The WM8731 codec on sam9x5ek board is on i2c, address 1A Signed-off-by: Richard Genoud <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-21ARM: at91/dt: sam9x5: add SSC DMA parametersRichard Genoud1-0/+3
Signed-off-by: Richard Genoud <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-21ARM: at91/dt: add at91rm9200 PQFP package versionJean-Christophe PLAGNIOL-VILLARD1-0/+17
The PQFP version have only 3 gpio banks (A, B & C). Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> [[email protected]: correct typo in "status" property] Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-21ARM: at91: at91rm9200: set default mmc0 pinctrl-namesJean-Christophe PLAGNIOL-VILLARD1-0/+1
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-21ARM: at91: at91sam9n12: correct pin number of gpio-keyvoice1-1/+1
Correct pin number of gpio-key for at91sam9n12ek board. The pioB4 is connect to LED, the pioB3 use as gpio-key. Signed-off-by: Bo Shen <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2013-08-21cpufreq: imx6q-cpufreq: remove device tree parsing for cpu nodesSudeep KarkadaNagesha1-2/+1
Now that the cpu device registration initialises the of_node(if available) appropriately for all the cpus, parsing here is redundant. This patch removes all DT parsing and uses cpu->of_node instead. Acked-by: Shawn Guo <[email protected]> Acked-by: Viresh Kumar <[email protected]> Signed-off-by: Sudeep KarkadaNagesha <[email protected]>