summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2014-05-31ARM: multi_v7_defconfig: Enable Exynos platformSachin Kamat1-0/+12
Enable Exynos platform and its related IPs for multi_v7_defconfig. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-31Merge tag 'qcom-defconfig-for-3.16-2' of ↵Olof Johansson1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/defconfig Merge "Qualcomm ARM Based defconfig Updates for v3.16-2" from Kumar Gala: * Enable qcom GSBI driver * tag 'qcom-defconfig-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: ARM: qcom: Enable GSBI driver in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-30ARM: configs: update Allwinner optionsMaxime Ripard2-9/+53
Update sunxi_defconfig and multi_v7 with all the latest Allwinner additions. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-30Merge tag 'v3.15-rc6' into next/defconfigOlof Johansson38-180/+172
Linux 3.15-rc6
2014-05-29ARM: qcom: Enable GSBI driver in defconfigKumar Gala1-0/+1
Signed-off-by: Kumar Gala <galak@codeaurora.org>
2014-05-27ARM: multi_v7_defconfig: Enable Zynq peripheral driversSoren Brinkmann1-0/+3
A few drivers for Zynq peripherals made it into mainline recently. Enable them in the defconfig. The following devices are enabled: - Cadence Macb Ethernet controller - Cadence I2C controller - Arasan SDHCI Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-27ARM: at91/defconfig: sama5_defconfig: updatedWenyou Yang1-0/+2
due to enabling -- CONFIG_REGULATOR -- CONFIG_REGULATOR_ACT8865 Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> [nicolas.ferre@atmel.com: move added entries to proper location within file] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-24ARM: add drivers for Colibri T30 to multi_v7_defconfigStefan Agner1-0/+6
Toradex Colibri Evaluation Board uses the DS1307 RTC and the MCP251x CAN controller. The NVIDIA Tegra 3 based Colibri T30 module can be used on this carrier board, hence enable those drivers in tegra_defonfig and multi_v7_defconfig. Furthermore the NVIDIA Tegra 3 based Apalis T30 module too contains two MCP251x CAN controller. Signed-off-by: Stefan Agner <stefan@agner.ch> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfigThomas Petazzoni1-0/+1
The Marvell Armada 38x platform has a SDHCI interface managed by the sdhci-pxav3 MMC host driver. It therefore makes sense to enable this driver in multi_v7_defconfig, which supports the Armada 38x platform. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24ARM: configs: enable XHCI mvebu support in multi_v7_defconfigGregory CLEMENT1-0/+1
The Marvell Armada 38x platform needs the xhci_mvebu driver enabled for the xHCI USB hosts, so this commit enables the corresponding Kconfig option in multi_v7_defconfig. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: arm@kernel.org Cc: Kevin Hilman <khilman@linaro.org> Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24Merge prior defconfig changes into next/defconfigArnd Bergmann102-230/+585
These are from the next/boards branch, and we decided to split out the defconfig changes now. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24Merge tag 'qcom-defconfig-for-3.16' of ↵Arnd Bergmann2-22/+167
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/defconfig Merge "Qualcomm ARM Based defconfig Updates for v3.16" from Kumar Gala: * Add a new qcom_defconfig for mach-qcom * Update msm_defconfig for handling building the old mach-msm * tag 'qcom-defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: ARM: config: Update msm_defconfig ARM: config: Add qcom_defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24Merge tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux ↵Arnd Bergmann2-1/+5
into next/defconfig Merge "Allwinner defconfig changes, take 2" from Maxime Ripard: Add the A31 reset driver to the sunxi-related defconfigs * tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux: ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig ARM: sunxi: Add A31 reset driver to sunxi_defconfig ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-24Merge tag 'mvebu-defconfig-3.16-2' of git://git.infradead.org/linux-mvebu ↵Arnd Bergmann5-3/+19
into next/defconfig Merge "mvebu defconfig changes for v3.16 (incremental #2)" from Jason Cooper: - mvebu - enable MSI and XHCI in mvebu_v7_defconfig * tag 'mvebu-defconfig-3.16-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: enable MSI support in mvebu_v7_defconfig ARM: configs: enable XHCI mvebu support in mvebu_v7_defconfig ARM: multi_v5_defconfig: Enable sound modules needed for t5325 ARM: mvebu_v5_defconfig: Enable sound modules needed for t5325 ARM: mvebu: defconfig: add MTD_SPI_NOR (new dependency for M25P80) ARM: configs: add ahci_mvebu to mvebu_v7_defconfig ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the mvebu_v7_defconfig ARM: mvebu: enable fhandle in the defconfigs ARM: mvebu: Enable nfsroot in the defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfigMaxime Ripard1-0/+2
Now that the reset code are part of drivers of their own, we need those in the defconfig. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-05-23ARM: sunxi: Add A31 reset driver to sunxi_defconfigMaxime Ripard1-0/+3
Now that the A31 reset code is a driver of its own, we need it in the defconfig. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-05-22ARM: config: Update msm_defconfigStephen Boyd1-22/+3
Now that DT based platforms are split out of mach-msm into mach-qcom, put back a non-DT based SoC into the msm_defconfig and stop selecting unsupported drivers. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: David Brown <davidb@codeaurora.org> Signed-off-by: Kumar Gala <galak@codeaurora.org>
2014-05-22ARM: mvebu: enable MSI support in mvebu_v7_defconfigThomas Petazzoni1-0/+1
Since Armada 370, XP, 375 and 38x have PCI MSI support, it makes sense to enable CONFIG_PCI_MSI in mvebu_v7_defconfig. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1400598964-2062-1-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-21Merge tag 'staging-3.15-rc6' of ↵Linus Torvalds1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver fixes from Greg KH: "Here are five staging driver fixes for 3.15-rc6 that resolve some reported issues. They are for the imx and rtl8723au drivers" * tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: rtl8723au: Do not reset wdev->iftype in netdev_close() staging: rtl8723au: Use correct pipe type for USB interrupts imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus' imx-drm: imx-drm-core: skip components whose parent device is disabled imx-drm: imx-drm-core: fix imx_drm_encoder_get_mux_id
2014-05-16ARM: config: Add qcom_defconfigStephen Boyd1-0/+164
Add a defconfig for mach-qcom platforms (copied from msm_defconfig). Although these platforms are part of the multi-platform kernel, it's useful to have a stripped down version of the defconfig that just selects the DT based Qualcomm platforms and drivers. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Kumar Gala <galak@codeaurora.org>
2014-05-16arm: dts: Fix missing device_type="memory" for ste-ccu8540Leif Lindholm1-0/+1
The current .dts for ste-ccu8540 lacks a 'device_type = "memory"' for its memory node, relying on an old ppc quirk in order to discover its memory. Fix the data so that all parsing code can handle it correctly. Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Acked-by: Lee Jones <lee.jones@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Cc: Mark Rutland <mark.rutland@arm.com> Cc: <stable@vger.kernel.org> Signed-off-by: Grant Likely <grant.likely@linaro.org>
2014-05-16ARM: configs: enable XHCI mvebu support in mvebu_v7_defconfigGregory CLEMENT1-0/+1
The Marvell Armada 38x platform needs the xhci_mvebu driver enabled for the xHCI USB hosts, so this commit enables the corresponding Kconfig option in mvebu_v7_defconfig. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Link: https://lkml.kernel.org/r/1400149062-32661-13-git-send-email-gregory.clement@free-electrons.com Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1400149062-32661-13-git-send-email-gregory.clement@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-14ARM: tegra: tegra_defconfig updatesStephen Warren1-0/+10
AT24C EEPROM: This is used for the board ID EEPROM on Jetson TK1, as well as likely a whole slew of other NVIDIA reference boards; we simply haven't added enabled the EEPROM in the DT files until now. MTD_SPI_NOR: This defconfig contains the CONFIG_M25P80 symbol, which is now dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy the new dependency. FRAMEBUFFER_CONSOLE_ROTATION: Needed for devices like Tegra Note 7 and NVIDIA SHIELD to get the boot console in the expected orientation. CAN*, RTC_DRV_DS1307: Toradex Colibri Evaluation Board uses the DS1307 RTC and the MCP251x CAN controller. The NVIDIA Tegra 3 based Colibri T30 module can be used on this carrier board. Furthermore the NVIDIA Tegra 3 based Apalis T30 module too contains two MCP251x CAN controllers. INPUT_JOYDEV: NVIDIA SHIELD embeds a USB joystick device. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-05-13Merge tag 'stable/for-linus-3.15-rc5-tag' of ↵Linus Torvalds1-1/+0
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip Pull xen bug fixes from David Vrabel: - Fix arm64 crash on boot. - Quiet a noisy arm build warning (virt_to_pfn() redefined). * tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: arm64: introduce virt_to_pfn xen/events/fifo: correctly align bitops arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h
2014-05-13Merge tag 'fixes-for-linus' of ↵Linus Torvalds35-178/+170
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "Seems like we've had more fixes than usual this release cycle, but there's nothing in particular that we're doing differently. Perhaps it's just one of those cycles where more people are finding more regressions (and/or that the latency of when people actually test what's been in the tree for a while is catching up so that we get the bug reports now). The bigger changes here are are for TI and Marvell platforms: * Timing changes for GPMC (generic localbus) on OMAP causing some largeish DTS deltas. * Fixes to window allocation on PCI for mvebu touching drivers/ stuff. Patches have acks from subsystem maintainers where needed. * A fix from Thomas for a botched DT conversion in drivers/edma. There's a handful of other fixes for the above platforms as well as sunxi, at91, i.MX. I also included a MAINTAINER update for Broadcom, and a trivial move of a binding doc. I know you said you'd be offline this week, but I might as well post it for when you return. :)" I'm not quite offline yet. Doing a few pulls in the last hour before my internet goes away.. * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits) MAINTAINERS: update Broadcom ARM tree location and add an SoC family ARM: dts: i.MX53: Fix ipu register space size ARM: dts: kirkwood: fix mislocated pcie-controller nodes ARM: sunxi: Enable GMAC in sunxi_defconfig ARM: common: edma: Fix xbar mapping ARM: sun7i: Fix i2c4 base address ARM: Kirkwood: T5325: Fix double probe of Codec ARM: mvebu: enable the SATA interface on Armada 375 DB ARM: mvebu: specify I2C bus frequency on Armada 370 DB ARM: mvebu: use qsgmii phy-mode for Armada XP GP interfaces ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree ARM: dts: AM3517: Disable absent IPs inherited from OMAP3 ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox ARM: dts: OMAP5: Add mailbox dt node to fix boot warning ARM: OMAP5: Switch to THUMB mode if needed on secondary CPU ARM: dts: am437x-gp-evm: Do not reset gpio5 ARM: dts: omap3-igep0020: use SMSC9221 timings PCI: mvebu: split PCIe BARs into multiple MBus windows when needed ...
2014-05-11Merge tag 'davinci-fixes-for-v3.15-rc4' of ↵Olof Johansson2-34/+16
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes Pull "DaVinci fixes for v3.15" from Sekhar Nori: The patch fixes EDMA crossbar mapping to actually make it work. The patch has been tagged for stable. * tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: common: edma: Fix xbar mapping Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-11Merge tag 'sunxi-fixes-for-3.15' of https://github.com/mripard/linux into fixesOlof Johansson2-4/+12
Merge 'Allwinner fixes for 3.15' from Maxime Ripard: Set of fixes for the Allwinner support for 3.15 Some minor things, the major thing being the enabling of the GMAC driver in sunxi_defconfig that will un-break Olof's autobooters. * tag 'sunxi-fixes-for-3.15' of https://github.com/mripard/linux: ARM: sunxi: Enable GMAC in sunxi_defconfig ARM: sun7i: Fix i2c4 base address ARM: sun7i: fix PLL4 clock and add PLL8 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-11Merge tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu ↵Olof Johansson2-16/+20
into fixes Merge 'ARM: mvebu: DT fixes for v3.15 (incr #2)' from Jason Cooper: mvebu DT fixes for v3.15 (incremental #2) - kirkwood: fix mis-located pcie controller nodes * tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu: ARM: dts: kirkwood: fix mislocated pcie-controller nodes Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-11ARM: dts: i.MX53: Fix ipu register space sizeSascha Hauer1-1/+1
The IPU register space is 128MB, not 2GB. Fixes: abed9a6bf2bb 'ARM i.MX53: Add IPU support' Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Shawn Guo <shawn.guo@freescale.com> Cc: <stable@vger.kernel.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-10ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUGLad, Prabhakar1-1/+0
this patch drops CONFIG_COMMON_CLK_DEBUG option as this config option is now obsolete. CC: Maxime Ripard <maxime.ripard@free-electrons.com> CC: Olof Johansson <olof@lixom.net> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-05-06Merge branch 'imx-drm-fixes-urgent' of ↵Greg Kroah-Hartman1-1/+1
git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-linus imx drm fixes from Russell
2014-05-06ARM: multi_v7_defconfig: Select CONFIG_MACH_BERLIN_BG2QAlexandre Belloni1-0/+1
Now that we support Berlin BG2Q, select CONFIG_MACH_BERLIN_BG2Q so that we can boot BG2Q based boards like the BG2Q DMP. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-06ARM: multi_v7_defconfig: select CONFIG_GPIO_DWAPBAntoine Ténart1-0/+1
The newly integrated dwapb gpio driver handles the Berlin SoCs GPIOs. Add this driver to the multi_v7_defconfig. Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-06ARM: multi_v7: enable AT24C EEPROM driverStephen Warren1-0/+1
This is used for the board ID EEPROM on Jetson TK1, as well as likely a whole slew of other NVIDIA reference boards; we simply haven't added enabled the EEPROM in the DT files until now. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-06Merge tag 'renesas-defconfig-for-v3.16' of ↵Olof Johansson1-0/+14
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards Merge "Renesas ARM Based SoC Defconfig Updates for v3.16" from Simon Horman: SH Mobile Multi-Platform * Enable USB [EO]HCI HCD, VSP1, HIGHMEM, USBHS, I2C_SH_MOBILE, EEPROM_AT24 and MSIOF * tag 'renesas-defconfig-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Enable USB [EO]HCI HCD support in shmobile_defconfig ARM: shmobile: Enable VSP1 in shmobile_defconfig ARM: shmobile: Enable HIGHMEM in shmobile_defconfig ARM: shmobile: Enable USBHS gadget support in shmobile_defconfig ARM: shmobile: Include at24.c in shmobile_defconfig ARM: shmobile: Include i2c-shmobile.c in shmobile_defconfig ARM: shmobile: multiplatform: Enable MSIOF in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-05Merge tag 'mvebu-dt-fixes-3.15' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson6-12/+13
fixes From Jason Cooper: mvebu DT fixes for v3.15 - mvebu - fix NOR bus width on Armada XP boards - use qsgmii on Armada XP GP board - add i2c bus freq for Armada 370 DB board - add SATA interface for Armada 375 DB - kirkwood - fix double probe of audio codec for T5325 * tag 'mvebu-dt-fixes-3.15' of git://git.infradead.org/linux-mvebu: ARM: Kirkwood: T5325: Fix double probe of Codec ARM: mvebu: enable the SATA interface on Armada 375 DB ARM: mvebu: specify I2C bus frequency on Armada 370 DB ARM: mvebu: use qsgmii phy-mode for Armada XP GP interfaces ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-05Merge tag 'mvebu-fixes-3.15' of git://git.infradead.org/linux-mvebu into fixesOlof Johansson1-1/+1
From Jason Cooper: mvebu fixes for v3.15 - devbus: fix bus-width conversion - orion5x: fix target ID for crypto SRAM window * tag 'mvebu-fixes-3.15' of git://git.infradead.org/linux-mvebu: ARM: orion5x: fix target ID for crypto SRAM window memory: mvebu-devbus: fix the conversion of the bus width Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-05Merge tag 'omap-for-v3.15/fixes-gpmc' of ↵Olof Johansson14-102/+99
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Merge fixes from Tony Lindgren: Mostly fixes for occasional memory corruption caused by bad timings for smc911x LAN9220 (and potentially LAN9221) devices that were noted on a cm-t3730 system. Also fix THUMB mode for SMP, and mailbox related warnings when booted with device tree. * tag 'omap-for-v3.15/fixes-gpmc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: AM3517: Disable absent IPs inherited from OMAP3 ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox ARM: dts: OMAP5: Add mailbox dt node to fix boot warning ARM: OMAP5: Switch to THUMB mode if needed on secondary CPU ARM: dts: am437x-gp-evm: Do not reset gpio5 ARM: dts: omap3-igep0020: use SMSC9221 timings ARM: dts: Fix GPMC timings for LAN9220 ARM: dts: Fix GPMC Ethernet timings for omap cm-t sbc-t boards for device tree ARM: dts: Fix bad OTG muxing for cm-t boards Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-05ARM: multi_v5_defconfig: Enable sound modules needed for t5325Andrew Lunn1-1/+2
Enable simple-card and the CODEC. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1399141819-23924-10-git-send-email-andrew@lunn.ch Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-05ARM: mvebu_v5_defconfig: Enable sound modules needed for t5325Andrew Lunn1-1/+2
Enable simple-card and the CODEC. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1399141819-23924-9-git-send-email-andrew@lunn.ch Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-05ARM: mvebu: defconfig: add MTD_SPI_NOR (new dependency for M25P80)Brian Norris4-1/+4
These defconfigs contain the CONFIG_M25P80 symbol, which is now dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy the new dependency. At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Link: https://lkml.kernel.org/r/1398925607-7482-9-git-send-email-computersforpeace@gmail.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-05ARM: dts: kirkwood: fix mislocated pcie-controller nodesSebastian Hesselbarth2-16/+20
Commit 54397d85349f ("ARM: kirkwood: Relocate PCIe device tree nodes") moved the pcie-controller nodes for the Kirkwood SoCs to the mbus bus node. For some reason, two boards were not properly converted and have their pci-controller nodes still in the ocp bus node. As the corresponding SoC pcie-controller does not exist anymore, it is likely that pcie is broken on those boards since above commit. Fix it by moving the pcie related nodes to the correct location. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Fixes: 54397d85349f ("ARM: kirkwood: Relocate PCIe device tree nodes") Cc: <stable@vger.kernel.org> # v3.12+ Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1398862602-29595-2-git-send-email-sebastian.hesselbarth@gmail.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-02Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2-7/+10
Pull KVM fixes from Paolo Bonzini: - Fix for a Haswell regression in nested virtualization, introduced during the merge window. - A fix from Oleg to async page faults. - A bunch of small ARM changes. - A trivial patch to use the new MSI-X API introduced during the merge window. * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address. KVM: arm/arm64: vgic: fix GICD_ICFGR register accesses KVM: async_pf: mm->mm_users can not pin apf->mm KVM: ARM: vgic: Fix sgi dispatch problem MAINTAINERS: co-maintainance of KVM/{arm,arm64} arm: KVM: fix possible misalignment of PGDs and bounce page KVM: x86: Check for host supported fields in shadow vmcs kvm: Use pci_enable_msix_exact() instead of pci_enable_msix() ARM: KVM: disable KVM in Kconfig on big-endian systems
2014-05-02ARM: sunxi: Enable GMAC in sunxi_defconfigMaxime Ripard1-1/+1
Since the support of the GMAC has been merged, we're using it as the ethernet controller on the A20 devices. However, sunxi_defconfig wasn't selecting it hence breaking the NFS boot. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-04-29ARM: common: edma: Fix xbar mappingThomas Gleixner2-34/+16
This is another great example of trainwreck engineering: commit 2646a0e529 (ARM: edma: Add EDMA crossbar event mux support) added support for using EDMA on peripherals which have no direct EDMA event mapping. The code compiles and does not explode in your face, but that's it. 1) Reading an u16 array from an u32 device tree array simply does not work. Even if the function is named "edma_of_read_u32_to_s16_array". It merily calls of_property_read_u16_array. So the resulting 16bit array will have every other entry = 0. 2) The DT entry for the xbar registers related to xbar has length 0x10 instead of the real length: 0xfd0 - 0xf90 = 0x40. Not a real problem as it does not cross a page boundary, but wrong nevertheless. 3) But none of this matters as the mapping never happens: After reading nonsense edma_of_read_u32_to_s16_array() invalidates the first array entry pair, so nobody can ever notice the braindamage by immediate explosion. Seems the QA criteria for this code was solely not to explode when someone adds edma-xbar-event-map entries to the DT. Goal achieved, congratulations! Not really helpful if someone wants to use edma on a device which requires a xbar mapping. Fix the issues by: - annotating the device tree entry with "/bits/ 16" as documented in the of_property_read_u16_array kernel doc - make the size of the xbar register mapping correct - invalidating the end of the array and not the start This convoluted mess wants to be completely rewritten as there is no point to keep the xbar_chan array memory and the iomapping of the xbar regs around forever. Marking the xbar mapped channels as used should be done right there. But that's a different issue and this patch is small enough to make it work and allows a simple backport for stable. Cc: stable@vger.kernel.org # v3.12+ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2014-04-29Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linuxLinus Torvalds4-14/+14
Pull devicetree bug fixes from Grant Likely: "These are some important bug fixes that need to get into v3.15. This branch contains a pair of important bug fixes for the DT code: - Fix some incorrect binding property names before they enter common usage - Fix bug where some platform devices will be unable to get their interrupt number when they depend on an interrupt controller that is not available at device creation time. This is a problem causing mainline to fail on a number of ARM platforms" * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: of/irq: do irq resolution in platform_get_irq of: selftest: add deferred probe interrupt test dt: Fix binding typos in clock-names and interrupt-names
2014-04-28ARM: sun7i: Fix i2c4 base addressMaxime Ripard1-2/+2
For some reason, the base address of the fifth I2C adapter in the A20 was incorrect. Change this to the actual base address. Reported-by: Marcus Cooper <codekipper@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-04-28arm: KVM: fix possible misalignment of PGDs and bounce pageMark Salter1-6/+9
The kvm/mmu code shared by arm and arm64 uses kalloc() to allocate a bounce page (if hypervisor init code crosses page boundary) and hypervisor PGDs. The problem is that kalloc() does not guarantee the proper alignment. In the case of the bounce page, the page sized buffer allocated may also cross a page boundary negating the purpose and leading to a hang during kvm initialization. Likewise the PGDs allocated may not meet the minimum alignment requirements of the underlying MMU. This patch uses __get_free_page() to guarantee the worst case alignment needs of the bounce page and PGDs on both arm and arm64. Cc: <stable@vger.kernel.org> # 3.10+ Signed-off-by: Mark Salter <msalter@redhat.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2014-04-28arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.hJulien Grall1-1/+0
virt_to_pfn has been defined in asm/memory.h by the commit e26a9e0 "ARM: Better virt_to_page() handling" This will result of a compilation warning when CONFIG_XEN is enabled. arch/arm/include/asm/xen/page.h:80:0: warning: "virt_to_pfn" redefined [enabled by default] #define virt_to_pfn(v) (PFN_DOWN(__pa(v))) ^ In file included from arch/arm/include/asm/page.h:163:0, from arch/arm/include/asm/xen/page.h:4, from include/xen/page.h:4, from arch/arm/xen/grant-table.c:33: The definition in memory.h is nearly the same (it directly expand PFN_DOWN), so we can safely drop virt_to_pfn in xen include. Signed-off-by: Julien Grall <julien.grall@linaro.org> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
2014-04-28Merge commit 'e26a9e0' into stable/for-linus-3.15David Vrabel61-381/+490
generated by cgit v1.2.3 (git 2.39.0) at 2024-11-08 05:58:08 +0300