summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
AgeCommit message (Collapse)AuthorFilesLines
2015-07-02Merge tag 'armsoc-late' of ↵Linus Torvalds5-5/+5
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC late fixes and dependencies from Kevin Hilman: "This is a collection of a few late fixes and other misc stuff that had dependencies on things being merged from other trees. Other than the fixes, the primary feature being added is the conversion of some OMAP drivers to the new generic wakeirq interface" * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: multi_v7_defconfig: Enable BRCMNAND driver ARM: BCM: Do not select CONFIG_MTD_NAND_BRCMNAND ARM: at91/dt: update udc compatible strings ARM: at91/dt: trivial: fix USB udc compatible string arm64: dts: Add APM X-Gene standby GPIO controller DTS entries soc: qcom: spm: Fix idle on THUMB2 kernels ARM: dove: fix legacy dove IRQ numbers ARM: mvebu: fix suspend to RAM on big-endian configurations ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename serial: 8250_omap: Move wake-up interrupt to generic wakeirq serial: omap: Switch wake-up interrupt to generic wakeirq mmc: omap_hsmmc: Change wake-up interrupt to use generic wakeirq
2015-07-01Merge tag 'clk-for-linus-4.2' of ↵Linus Torvalds1-0/+15
git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux Pull clock framework updates from Michael Turquette: "The changes to the common clock framework for 4.2 are dominated by new drivers and updates to existing ones, as usual. There are some fixes to the framework itself and several cleanups for sparse warnings, etc" * tag 'clk-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (135 commits) clk: stm32: Add clock driver for STM32F4[23]xxx devices dt-bindings: Document the STM32F4 clock bindings cpufreq: exynos: remove Exynos4210 specific cpufreq driver support ARM: Exynos: switch to using generic cpufreq driver for Exynos4210 clk: samsung: exynos4: add cpu clock configuration data and instantiate cpu clock clk: samsung: add infrastructure to register cpu clocks clk: add CLK_RECALC_NEW_RATES clock flag for Exynos cpu clock support doc: dt: add documentation for lpc1850-ccu clk driver clk: add lpc18xx ccu clk driver doc: dt: add documentation for lpc1850-cgu clk driver clk: add lpc18xx cgu clk driver clk: keystone: add support for post divider register for main pll clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED clk: cygnus: remove Cygnus dummy clock binding clk: cygnus: add clock support for Broadcom Cygnus clk: Change bcm clocks build dependency clk: iproc: add initial common clock support clk: iproc: define Broadcom iProc clock binding MAINTAINERS: update email for Michael Turquette clk: meson: add some error handling in meson_clk_register_cpu() ...
2015-07-01Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds5-5/+19
Pull networking fixes from David Miller: 1) mlx4 driver bug fixes (TX queue wakeups, csum complete indications) from Ido Shamay, Eran Ben Elisha, and Or Gerlitz. 2) Missing unlock in error path of PTP support in renesas driver, from Dan Carpenter. 3) Add Vitesse 8641 phy IDs to vitesse PHY driver, from Shaohui Xie. 4) Bnx2x driver bug fixes (linearization of encap packets, scratchpad parity error notifications, flow-control and speed settings) from Yuval Mintz, Manish Chopra, Shahed Shaikh, and Ariel Elior. 5) ipv6 extension header parsing in the igb chip has a HW errata, disable it. Frm Todd Fujinaka. 6) Fix PCI link state locking issue in e1000e driver, from Yanir Lubetkin. 7) Cure panics during MTU change in i40e, from Mitch Williams. 8) Don't leak promisc refs in DSA slave driver, from Gilad Ben-Yossef. 9) Add missing HAS_DMA dep to VIA Rhine driver, from Geery Uytterhoeven. 10) Make sure DMA map/unmap calls are symmetric in bnx2x driver, from Michal Schmidt. 11) Workaround for MDIO access problems in bcm7xxx devices, from FLorian Fainelli. 12) Fix races in SCTP protocol between OTTB responses and route removals, from Alexander Sverdlin. 13) Fix jumbo frame checksum issue with some mvneta devices, from Simon Guinot. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (58 commits) sock_diag: don't broadcast kernel sockets net: mvneta: disable IP checksum with jumbo frames for Armada 370 ARM: mvebu: update Ethernet compatible string for Armada XP net: mvneta: introduce compatible string "marvell, armada-xp-neta" api: fix compatibility of linux/in.h with netinet/in.h net: icplus: fix typo in constant name sis900: Trivial: Fix typos in enums stmmac: Trivial: fix typo in constant name sctp: Fix race between OOTB responce and route removal net-Liquidio: Delete unnecessary checks before the function call "vfree" vmxnet3: Bump up driver version number amd-xgbe: Add the __GFP_NOWARN flag to Rx buffer allocation net: phy: mdio-bcm-unimac: workaround initial read failures for integrated PHYs net: bcmgenet: workaround initial read failures for integrated PHYs net: phy: bcm7xxx: workaround MDIO management controller initial read bnx2x: fix DMA API usage net: via: VIA_RHINE and VIA_VELOCITY should depend on HAS_DMA net/phy: tune get_phy_c45_ids to support more c45 phy bnx2x: fix lockdep splat net: fec: don't access RACC register when not available ...
2015-07-01Merge tag 'mvebu-dt-4.2-3' of git://git.infradead.org/linux-mvebu into next/lateKevin Hilman1-1/+1
Merge "ARM: mvebu: dt changes for v4.2" from Gregory Clement mvebu dt changes for v4.2 (part #3) Update Armada XP DT spi muxing after pinctrl function rename which was merged in the pinctrl subsystem for 4.2. Without it the spi muxing will be broken in 4.2-rc1 for Armada XP. * tag 'mvebu-dt-4.2-3' of git://git.infradead.org/linux-mvebu: ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename
2015-07-01ARM: at91/dt: update udc compatible stringsBoris Brezillon4-4/+4
at91sam9g45, at91sam9x5 and sama5 SoCs should not use "atmel,at91sam9rl-udc" for their USB device compatible property since this compatible is attached to a specific hardware bug fix. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Tested-by: Bo Shen <voice.shen@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: <stable@vger.kernel.org> #4.0+ Signed-off-by: Kevin Hilman <khilman@linaro.org>
2015-06-30ARM: mvebu: update Ethernet compatible string for Armada XPSimon Guinot5-5/+19
This patch updates the Ethernet DT nodes for Armada XP SoCs with the compatible string "marvell,armada-xp-neta". Signed-off-by: Simon Guinot <simon.guinot@sequanux.org> Fixes: 77916519cba3 ("arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces") Cc: <stable@vger.kernel.org> # v3.8+ Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-26Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds1-1/+1
Pull drm updates from Dave Airlie: "This is the main drm pull request for v4.2. I've one other new driver from freescale on my radar, it's been posted and reviewed, I'd just like to get someone to give it a last look, so maybe I'll send it or maybe I'll leave it. There is no major nouveau changes in here, Ben was working on something big, and we agreed it was a bit late, there wasn't anything else he considered urgent to merge. There might be another msm pull for some bits that are waiting on arm-soc, I'll see how we time it. This touches some "of" stuff, acks are in place except for the fixes to the build in various configs,t hat I just applied. Summary: New drivers: - virtio-gpu: KMS only pieces of driver for virtio-gpu in qemu. This is just the first part of this driver, enough to run unaccelerated userspace on. As qemu merges more we'll start adding the 3D features for the virgl 3d work. - amdgpu: a new driver from AMD to driver their newer GPUs. (VI+) It contains a new cleaner userspace API, and is a clean break from radeon moving forward, that AMD are going to concentrate on. It also contains a set of register headers auto generated from AMD internal database. core: - atomic modesetting API completed, enabled by default now. - Add support for mode_id blob to atomic ioctl to complete interface. - bunch of Displayport MST fixes - lots of misc fixes. panel: - new simple panels - fix some long-standing build issues with bridge drivers radeon: - VCE1 support - add a GPU reset counter for userspace - lots of fixes. amdkfd: - H/W debugger support module - static user-mode queues - support killing all the waves when a process terminates - use standard DECLARE_BITMAP i915: - Add Broxton support - S3, rotation support for Skylake - RPS booting tuning - CPT modeset sequence fixes - ns2501 dither support - enable cmd parser on haswell - cdclk handling fixes - gen8 dynamic pte allocation - lots of atomic conversion work exynos: - Add atomic modesetting support - Add iommu support - Consolidate drm driver initialization - and MIC, DECON and MIPI-DSI support for exynos5433 omapdrm: - atomic modesetting support (fixes lots of things in rewrite) tegra: - DP aux transaction fixes - iommu support fix msm: - adreno a306 support - various dsi bits - various 64-bit fixes - NV12MT support rcar-du: - atomic and misc fixes sti: - fix HDMI timing complaince tilcdc: - use drm component API to access tda998x driver - fix module unloading qxl: - stability fixes" * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (872 commits) drm/nouveau: Pause between setting gpu to D3hot and cutting the power drm/dp/mst: close deadlock in connector destruction. drm: Always enable atomic API drm/vgem: Set unique to "vgem" of: fix a build error to of_graph_get_endpoint_by_regs function drm/dp/mst: take lock around looking up the branch device on hpd irq drm/dp/mst: make sure mst_primary mstb is valid in work function of: add EXPORT_SYMBOL for of_graph_get_endpoint_by_regs ARM: dts: rename the clock of MIPI DSI 'pll_clk' to 'sclk_mipi' drm/atomic: Don't set crtc_state->enable manually drm/exynos: dsi: do not set TE GPIO direction by input drm/exynos: dsi: add support for MIC driver as a bridge drm/exynos: dsi: add support for Exynos5433 drm/exynos: dsi: make use of array for clock access drm/exynos: dsi: make use of driver data for static values drm/exynos: dsi: add macros for register access drm/exynos: dsi: rename pll_clk to sclk_clk drm/exynos: mic: add MIC driver of: add helper for getting endpoint node of specific identifiers drm/exynos: add Exynos5433 decon driver ...
2015-06-26Merge tag 'armsoc-drivers' of ↵Linus Torvalds5-115/+167
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC driver updates from Kevin Hilman: "Some of these are for drivers/soc, where we're now putting SoC-specific drivers these days. Some are for other driver subsystems where we have received acks from the appropriate maintainers. Some highlights: - simple-mfd: document DT bindings and misc updates - migrate mach-berlin to simple-mfd for clock, pinctrl and reset - memory: support for Tegra132 SoC - memory: introduce tegra EMC driver for scaling memory frequency - misc. updates for ARM CCI and CCN busses" * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits) drivers: soc: sunxi: Introduce SoC driver to map SRAMs arm-cci: Add aliases for PMU events arm-cci: Add CCI-500 PMU support arm-cci: Sanitise CCI400 PMU driver specific code arm-cci: Abstract handling for CCI events arm-cci: Abstract out the PMU counter details arm-cci: Cleanup PMU driver code arm-cci: Do not enable CCI-400 PMU by default firmware: qcom: scm: Add HDCP Support ARM: berlin: add an ADC node for the BG2Q ARM: berlin: remove useless chip and system ctrl compatibles clk: berlin: drop direct of_iomap of nodes reg property ARM: berlin: move BG2Q clock node ARM: berlin: move BG2CD clock node ARM: berlin: move BG2 clock node clk: berlin: prepare simple-mfd conversion pinctrl: berlin: drop SoC stub provided regmap ARM: berlin: move pinctrl to simple-mfd nodes pinctrl: berlin: prepare to use regmap provided by syscon reset: berlin: drop arch_initcall initialization ...
2015-06-26Merge tag 'armsoc-dt' of ↵Linus Torvalds351-9005/+27959
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC DT updates from Kevin Hilman: "As usual, quite a few device-tree updates in ARM land. There was one minor churn in DTs due to relicensing under a dual-license, and lots of little additions of new peripherals, features etc, but nothing really exciting to call to your attention. Some higlights, focsuing on support for new SoCs and boards: - AT91: new boards: Overkiz, Acme Systems' Arietta G25 - tegra: HDA support - bcm: new platforms: Buffalo WXR-1900DHP, SmartRG SR400ac, ASUS RT-AC87U - mvebu: new platforms: Compulab CM-A510, Armada 385-based Linksys boards, DLink DNS-327L - OMAP: new platforms: Baltos IR5221, LogicPD Torpedo, Toby-Churchill SL50 - ARM: added support for Juno r1 board - sunxi: A33 SoC support; new boards: A23 EVB, SinA33, GA10H-A33, Mele A1000G - imx: i.MX7D SoC support; new boards: Armadeus Systems APF6, Gateworks GW5510, and aristainetos2 boards - hisilicon: hi6220 SoC support; new boards: 96boards hikey" * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (462 commits) ARM: hisi: revert changes from hisi/hip04-dt branch ARM: nomadik: set proper compatible for accelerometer ARM64: juno: add GPIO keys ARM: at91/dt: sama5d4: fix dma conf for aes, sha and tdes nodes ARM: dts: Introduce STM32F429 MCU ARM: socfpga: dts: enable ethernet for Arria10 devkit ARM: dts: k2l: fix the netcp range size ARM: dts: k2e: fix the netcp range size ARM: dts: k2hk: fix the netcp range size ARM: dts: k2l-evm: Add device bindings for netcp driver ARM: dts: k2e-evm: Add device bindings for netcp driver ARM: dts: k2hk-evm: Add device bindings for netcp driver ARM: BCM5301X: Add DT for Asus RT-AC87U ARM: BCM5301X: add IRQ numbers for PCIe controller ARM: BCM5301X: add NAND flash chip description arm64: dts: Add dts files for Hisilicon Hi6220 SoC clk: hi6220: Document devicetree bindings for hi6220 clock arm64: hi6220: Document devicetree bindings for Hisilicon hi6220 SoC ARM: at91/dt: sama5d4ek: mci0 uses slot 0 ARM: at91/dt: kizbox: fix mismatch LED PWM device ...
2015-06-26Merge tag 'armsoc-soc' of ↵Linus Torvalds3-0/+188
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform support updates from Kevin Hilman: "Our SoC branch usually contains expanded support for new SoCs and other core platform code. Some highlights from this round: - sunxi: SMP support for A23 SoC - socpga: big-endian support - pxa: conversion to common clock framework - bcm: SMP support for BCM63138 - imx: support new I.MX7D SoC - zte: basic support for ZX296702 SoC" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (134 commits) ARM: zx: Add basic defconfig support for ZX296702 ARM: dts: zx: add an initial zx296702 dts and doc clk: zx: add clock support to zx296702 dt-bindings: Add #defines for ZTE ZX296702 clocks ARM: socfpga: fix build error due to secondary_startup MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS ARM: ep93xx: simone: support for SPI-based MMC/SD cards MAINTAINERS: update Shawn's email to use kernel.org one ARM: socfpga: support suspend to ram ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10 ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5 ARM: EXYNOS: register power domain driver from core_initcall ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs ARM: SAMSUNG: Constify platform_device_id ARM: EXYNOS: Constify irq_domain_ops ARM: EXYNOS: add coupled cpuidle support for Exynos3250 ARM: EXYNOS: add exynos_get_boot_addr() helper ARM: EXYNOS: add exynos_set_boot_addr() helper ARM: EXYNOS: make exynos_core_restart() less verbose ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout ...
2015-06-26Merge tag 'armsoc-cleanup' of ↵Linus Torvalds5-5/+5
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC cleanups from Kevin Hilman: "A relatively small setup of cleanups this time around, and similar to last time the bulk of it is removal of legacy board support: - OMAP: removal of legacy (non-DT) booting for several platforms - i.MX: remove some legacy board files" * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits) ARM: fix EFM32 build breakage caused by cpu_resume_arm ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state ARM: v7 setup function should invalidate L1 cache mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c ARM: OMAP2+: Remove calls to deprecacted marco,PTR_RET in the files,fb.c and pmu.c ARM: OMAP2+: Constify irq_domain_ops ARM: OMAP2+: use symbolic defines for console loglevels instead of numbers ARM: at91: remove useless Makefile.boot ARM: at91: remove at91rm9200_sdramc.h ARM: at91: remove mach/at91_ramc.h and mach/at91rm9200_mc.h ARM: at91/pm: use the atmel-mc syscon defines pcmcia: at91_cf: Use syscon to configure the MC/smc ARM: at91: declare the at91rm9200 memory controller as a syscon mfd: syscon: Add Atmel MC (Memory Controller) registers definition ARM: at91: drop sam9_smc.c ata: at91: use syscon to configure the smc ARM: ux500: delete static resource defines ARM: ux500: rename ux500_map_io ARM: ux500: look up PRCMU resource from DT ARM: ux500: kill off L2CC static map ...
2015-06-24Merge tag 'armsoc-drivers' into test-mergeKevin Hilman5-115/+167
ARM: SoC: driver updates for v4.2 Some of these are for drivers/soc, where we're now putting SoC-specific drivers these days. Some are for other driver subsystems where we have received acks from the appropriate maintainers. Some highlights: - simple-mfd: document DT bindings and misc updates - migrate mach-berlin to simple-mfd for clock, pinctrl and reset - memory: support for Tegra132 SoC - memory: introduce tegra EMC driver for scaling memory frequency - misc. updates for ARM CCI and CCN busses Conflicts: arch/arm64/boot/dts/arm/juno-motherboard.dtsi Trivial add/add conflict with our dt branch. Resolution: take both sides. # gpg: Signature made Wed Jun 24 21:32:17 2015 PDT using RSA key ID D3FBC665 # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>" # gpg: aka "Kevin Hilman <khilman@linaro.org>" # gpg: aka "Kevin Hilman <khilman@kernel.org>" # Conflicts: # arch/arm64/boot/dts/arm/juno-motherboard.dtsi
2015-06-24Merge tag 'armsoc-dt' into test-mergeKevin Hilman352-9005/+27962
ARM: SoC: DT updates for v4.2 As usual, quite a few device-tree updates in ARM land. There was ome minor churn in DTs due to relicensing under a dual-license, and lots of little additions of new peripherals, features etc, but nothing really exciting to call to your attention. Some higlights, focsuing on support for new SoCs and boards: - AT91: new boards: Overkiz, Acme Systems' Arietta G25 - tegra: HDA support - bcm: new platforms: Buffalo WXR-1900DHP, SmartRG SR400ac, ASUS RT-AC87U - mvebu: new platforms: Compulab CM-A510, Armada 385-based Linksys boards, DLink DNS-327L - OMAP: new platforms: Baltos IR5221, LogicPD Torpedo, Toby-Churchill SL50 - ARM: added support for Juno r1 board - sunxi: A33 SoC support; new boards: A23 EVB, SinA33, GA10H-A33, Mele A1000G - imx: i.MX7D SoC support; new boards: Armadeus Systems APF6, Gateworks GW5510, and aristainetos2 boards - hisilicon: hi6220 SoC support; new boards: 96boards hikey Conflicts: None # gpg: Signature made Wed Jun 24 21:32:14 2015 PDT using RSA key ID D3FBC665 # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>" # gpg: aka "Kevin Hilman <khilman@linaro.org>" # gpg: aka "Kevin Hilman <khilman@kernel.org>"
2015-06-24Merge tag 'armsoc-soc' into test-mergeKevin Hilman3-0/+188
ARM: SoC: platform support for v4.2 Our SoC branch usually contains expanded support for new SoCs and other core platform code. Some highlights from this round: - sunxi: SMP support for A23 SoC - socpga: big-endian support - pxa: conversion to common clock framework - bcm: SMP support for BCM63138 - imx: support new I.MX7D SoC - zte: basic support for ZX296702 SoC Conflicts: arch/arm/mach-socfpga/core.h Trivial remove/remove conflict with our cleanup branch. Resolution: remove both sides # gpg: Signature made Wed Jun 24 21:32:12 2015 PDT using RSA key ID D3FBC665 # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>" # gpg: aka "Kevin Hilman <khilman@linaro.org>" # gpg: aka "Kevin Hilman <khilman@kernel.org>" # Conflicts: # arch/arm/mach-socfpga/core.h
2015-06-24Merge tag 'armsoc-cleanup' into test-mergeKevin Hilman5-5/+5
ARM: SoC cleanups for v4.2 A relatively small setup of cleanups this time around, and similar to last time the bulk of it is removal of legacy board support: - OMAP: removal of legacy (non-DT) booting for several platforms - i.MX: remove some legacy board files Conflicts: None # gpg: Signature made Wed Jun 24 21:32:09 2015 PDT using RSA key ID D3FBC665 # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>" # gpg: aka "Kevin Hilman <khilman@linaro.org>" # gpg: aka "Kevin Hilman <khilman@kernel.org>"
2015-06-24Merge tag 'edac_for_4.2_2' of ↵Linus Torvalds1-0/+11
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp Pull EDAC updates from Borislav Petkov: - New APM X-Gene SoC EDAC driver (Loc Ho) - AMD error injection module improvements (Aravind Gopalakrishnan) - Altera Arria 10 support (Thor Thayer) - misc fixes and cleanups all over the place * tag 'edac_for_4.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (28 commits) EDAC: Update Documentation/edac.txt EDAC: Fix typos in Documentation/edac.txt EDAC, mce_amd_inj: Set MISCV on injection EDAC, mce_amd_inj: Move bit preparations before the injection EDAC, mce_amd_inj: Cleanup and simplify README EDAC, altera: Do not allow suspend when EDAC is enabled EDAC, mce_amd_inj: Make inj_type static arm: socfpga: dts: Add Arria10 SDRAM EDAC DTS support EDAC, altera: Add Arria10 EDAC support EDAC, altera: Refactor for Altera CycloneV SoC EDAC, altera: Generalize driver to use DT Memory size EDAC, mce_amd_inj: Add README file EDAC, mce_amd_inj: Add individual permissions field to dfs_node EDAC, mce_amd_inj: Modify flags attribute to use string arguments EDAC, mce_amd_inj: Read out number of MCE banks from the hardware EDAC, mce_amd_inj: Use MCE_INJECT_GET macro for bank node too EDAC, xgene: Fix cpuid abuse EDAC, mpc85xx: Extend error address to 64 bit EDAC, mpc8xxx: Adapt for FSL SoC EDAC, edac_stub: Drop arch-specific include ...
2015-06-24ARM: hisi: revert changes from hisi/hip04-dt branchArnd Bergmann2-160/+0
This backs out all changes that were added in the hip04-dt branch after various boot problems were discovered in UEFI booting. Reported-by: Tyler Baker <tyler.baker@linaro.org> Cc: Wei Xu <xuwei5@hisilicon.com> [khilman: minor changelog updates] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kevin Hilman <khilman@linaro.org>
2015-06-24arm: socfpga: dts: Add Arria10 SDRAM EDAC DTS supportThor Thayer1-0/+11
Add support for the Arria10 SDRAM EDAC. Update the bindings document for the new match string. Signed-off-by: Thor Thayer <tthayer@opensource.altera.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: devicetree@vger.kernel.org Cc: dinguyen@opensource.altera.com Cc: galak@codeaurora.org Cc: grant.likely@linaro.org Cc: ijc+devicetree@hellion.org.uk Cc: linux-arm-kernel@lists.infradead.org Cc: linux-edac <linux-edac@vger.kernel.org> Cc: m.chehab@samsung.com Cc: mark.rutland@arm.com Cc: pawel.moll@arm.com Cc: robh+dt@kernel.org Cc: tthayer.linux@gmail.com Link: http://lkml.kernel.org/r/1433428128-7292-5-git-send-email-tthayer@opensource.altera.com Signed-off-by: Borislav Petkov <bp@suse.de>
2015-06-23Merge tag 'fbdev-4.2' of ↵Linus Torvalds7-0/+274
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux Pull fbdev updates from Tomi Valkeinen: - ssd1307fb: various fixes and improvements, SSD1305 support - use architecture agnostic functions instead of MTRR functions in various fbdev drivers - TI DRA7xx SoC display support (arch/arm/ side) - OMAPDSS componentization to fix probing order issues - OMAPDSS scaling fixes - msm_fb: remove obsoleted driver * tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (77 commits) msm: msm_fb: Remove dead code OMAPDSS: HDMI: wait for framedone when stopping video OMAPDSS: HDMI4: fix error handling OMAPDSS: DISPC: scaler debug print OMAPDSS: DISPC: do only y decimation on OMAP3 OMAPDSS: DISPC: check if scaling setup failed OMAPDSS: DISPC: fix 64 bit issue in 5-tap OMAPDSS: DISPC: fix row_inc for OMAP3 OMAPDSS: DISPC: add check for scaling limits OMAPDSS: DISPC: fix check_horiz_timing_omap3 args OMAPDSS: DISPC: fix predecimation for YUV modes OMAPDSS: DISPC: work-around for errata i631 OMAPDSS: simplify submodule reg/unreg code OMAPDSS: componentize omapdss OMAPDSS: reorder uninit calls OMAPDSS: remove uses of __init/__exit OMAPDSS: fix dss_init_ports error handling OMAPDSS: refactor dss probe function OMAPDSS: move 'dss_initialized' to dss driver fbdev: propagate result of fb_videomode_from_videomode() ...
2015-06-22ARM: dts: rename the clock of MIPI DSI 'pll_clk' to 'sclk_mipi'Hyungwon Hwang1-1/+1
The clock which was named as 'pll_clk' is actually not the clock source of PLL in MIPI DSI. This patch fixes this disagreement. Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com> Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
2015-06-17Merge remote-tracking branch 'clk/clk-next' into clk-nextMichael Turquette1-0/+15
2015-06-17ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function renameThomas Petazzoni1-1/+1
Following the merge of "pinctrl: mvebu: armada-xp: rename spi to spi0" by Linus Walleij, we need to adjust the Armada XP Device Tree accordingly, by adjusting the pinctrl configuration for SPI pins. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-06-11Merge tag 'omap-for-v4.2/dt-pt2' of ↵Kevin Hilman3-0/+524
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Few more omap device tree changes for v4.2 merge window: - Add dm9000 Ethernet support to omap3-devkit8000 - Add Toby-Churchill SL50 board support - Add vendor prefix for Toby Churchill Ltd * tag 'omap-for-v4.2/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am335x-sl50: Add Toby-Churchill SL50 board support. of: Add vendor prefix for Toby Churchill Ltd. ARM: dts: omap3-devkit8000: Add dm9000 support
2015-06-11Merge branch 'zte/soc' into next/socKevin Hilman3-0/+188
* zte/soc: ARM: zx: Add basic defconfig support for ZX296702 ARM: dts: zx: add an initial zx296702 dts and doc clk: zx: add clock support to zx296702 dt-bindings: Add #defines for ZTE ZX296702 clocks
2015-06-11ARM: dts: zx: add an initial zx296702 dts and docJun Nie3-0/+188
Add initial dts file and document for ZX296702 and board ZX296702-AD1. More peripherals will be added later. Signed-off-by: Jun Nie <jun.nie@linaro.org> Signed-off-by: Kevin Hilman <khilman@linaro.org>
2015-06-11Merge tag 'samsung-dt-4' of ↵Kevin Hilman34-3703/+4490
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Samsung another DT udpates for v4.2 - use labels for overriding nodes for all of exynos stuff (by Krzysztof Kozlowski) - add sysmmu nodes for exynos SoCs (by Marek Szyprowski) - for exynos5422-odroidxu3 : enalbe wake alarm of S2MPS11 RTC : Hook up PWM and use it for LEDs : add support for Odroid XU3 Lite - remove duplicated i2c7 for exynos5250-snow - add JPEG codec nodes for exynos5420 - add vendor prefix for Hardkernel * tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (33 commits) ARM: dts: add sysmmu nodes for exynos5420 ARM: dts: add sysmmu nodes for exynos5250 ARM: dts: add sysmmu nodes for exynos4415 ARM: dts: add sysmmu nodes for exynos3250 ARM: dts: add sysmmu nodes for exynos4 ARM: dts: Add Odroid XU3 Lite support of: Add vendor prefix for Hardkernel ARM: dts: odroidxu3: Enable wake alarm of S2MPS11 RTC ARM: dts: exynos5420: add nodes for jpeg codec ARM: dts: s3c2416: Use labels for overriding nodes in SMDK2416 ARM: dts: s3c2416: Add labels to S3C2416 nodes ARM: dts: Use labels for overriding nodes in exynos5422-odroidxu3 ARM: dts: Use labels for overriding nodes in exynos5440 boards ARM: dts: Use labels for overriding nodes in exynos5420-smdk5420 ARM: dts: Use labels for overriding nodes in exynos542x ARM: dts: Use labels for overriding nodes in exynos5420-arndale-octa ARM: dts: Remove duplicated I2C7 nodes in exynos5250-snow ARM: dts: Use labels for overriding nodes in exynos5250 ARM: dts: Add labels to exynos5 nodes ARM: dts: exynos5422-odroidxu3: Hook up PWM and use it for LEDs ...
2015-06-11Merge tag 'v4.1-rc6' into next/dtKevin Hilman14-15/+20
Linux 4.1-rc6 Conflicts: arch/arm/boot/dts/zynq-7000.dtsi Resolution summary: Mainline had an earlier version of the commit, resolve in favor of the newer patch in next/dt branch.
2015-06-11Merge tag 'samsung-dt-3' of ↵Kevin Hilman11-27/+186
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Samsung DT updates for v4.2 - for exyos3250 : use s3c6410-rtc instead of exynos3250-rtc : add JPEG codec node and support it on exynos3250-rinato : use s3c-rtc clock id for exynos3250-rinato and monk boards - for exynos4 : add JPEG codec node and syscon property to MIPI DPHY : remove obsolete MIPI DPHY reg property : enable s3c-rtc on exynos4412-trats2 - for exynos5 : add syscon property to MIPI DPHY for exynos5420 : enable s3c-rtc on exynos5420-arndale-octa : add missing irq pinctrl for max77686 on exynos5250-smdk5250 : clk: add bindings for 32kHz clocks from s2mps11 : fix pinctrl for s2mps11-irq on exynos5420-arndale-octa - for exynos5422-odroidxu3 : add mmc detect gpio and LEDs : add HS400 support, simple-audio-card and rtc_src clock * tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add syscon property to the MIPI DPHY for exynos4415 ARM: dts: Remove obsolete MIPI DPHY 'reg' property for exynos4 ARM: dts: Use last parent for clocks during power domain on/off ARM: dts: add support JPEG codec for exynos3250-rinato ARM: dts: support simple-audio-card for exynos5420 and exynos5422-odroidxu3 ARM: dts: add jpeg-codec node for exynos4 and exynos4x12 ARM: dts: Enable S3C RTC on exynos4412-trats2 and exynos5420-arndale-octa ARM: dts: Use define for s3c-rtc clock id for exynos3250-monk ARM: dts: Use define for s3c-rtc clock id for exynos3250-rinato ARM: dts: Use s3c6410-rtc instead of exynos3250-rtc for exynos3250/4415 ARM: dts: add 'rtc_src' clock to rtc node for exynos5422-odroidxu3 clk: samsung: Add bindings for 32kHz clocks from s2mps11 ARM: dts: fix pinctrl for s2mps11-irq on exynos5420-arndale-octa ARM: dts: Add syscon property to the MIPI phy in exynos5420 ARM: dts: Add HS400 support for exynos5422-odroidxu3 ARM: dts: Add LEDs for exynos5422-odroidxu3 ARM: dts: add mmc detect gpio for exynos5422-odroidxu3 ARM: dts: add JPEG codec device node for exynos3250 ARM: dts: Add missing irq pinctrl for max77686 on smdk5250
2015-06-11ARM: nomadik: set proper compatible for accelerometerLinus Walleij1-2/+3
Adjust device tree entry to the proper registered compatible string for LIS3LV02DL. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Kevin Hilman <khilman@linaro.org>
2015-06-10ARM: at91/dt: sama5d4: fix dma conf for aes, sha and tdes nodesludovic.desroches@atmel.com1-10/+10
The xdmac channel configuration is done in one cell not two. This error prevents from probing devices correctly. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Fixes: 83906783b766 ("ARM: at91/dt: sama5d4: add aes, sha and tdes nodes") Cc: stable@vger.kernel.org # 4.1 Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Kevin Hilman <khilman@linaro.org>
2015-06-10Merge tag 'at91-dt4' of ↵Kevin Hilman18-24/+123
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt Fourth batch of DT changes for 4.2: - rtc node for at91sam9rl/at91sam9rlek - move to stdout-path for console on kizbox and all Atmel's boards - Addition of the Acme Systems' Arietta G25 - two little fixes for Kizbox and sama5d4ek * tag 'at91-dt4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/dt: sama5d4ek: mci0 uses slot 0 ARM: at91/dt: kizbox: fix mismatch LED PWM device ARM: at91/dt: Add Acme Arietta G25 ARM: at91/dt: sama5d4 xplained: use stdout-path ARM: at91/dt: sama5d4ek: use stdout-path ARM: at91/dt: sama5d3 xplained: use stdout-path ARM: at91/dt: sama5d3xek: use stdout-path ARM: at91/dt: at91sam9x5ek: use stdout-path ARM: at91/dt: at91sam9rlek: use stdout-path ARM: at91/dt: at91sam9n12ek: use stdout-path ARM: at91/dt: at91sam9m10g45ek use stdout-path ARM: at91/dt: at91sam9g20ek: use stdout-path ARM: at91/dt: at91sam9263ek: use stdout-path ARM: at91/dt: at91sam9261ek: use stdout-path ARM: at91/dt: at91rm9200ek: use stdout-path ARM: at91/dt: kizbox: use stdout-path ARM: at91/dt: at91sam9rlek: add RTC ARM: at91/dt: at91sam9rl: fix rtc node
2015-06-10Merge tag 'imx-dt-4.2' of ↵Kevin Hilman34-121/+4267
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt The i.MX device tree changes for 4.2: - Add device tree for i.MX7D SoC and imx7d-sdb board - New i.MX6 board support: Armadeus Systems APF6, Gateworks GW5510, and aristainetos2 boards - Change LVDS to use simple-panel for nitrogen6x and sabrelite boards - Add Wifi/Bluetooth devices support for cubox-i board - Remove unused regulators and correct OTG roles setting for imx6sl-warp board - Add I2C support for imx23-olinuxino board - Move imx6qdl HDMI device to a better place - Add power-domain for imx6qdl CODA device * tag 'imx-dt-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (24 commits) ARM: dts: imx6dl: add imx6dl gpt specific compatible string ARM: dts: imx6: add DT for aristainetos2 board ARM: dts: cubox-i/hummingboard: Fix the license text ARM: dts: sabrelite: use simple-panel instead of display-timings for LVDS0 ARM: dts: nitrogen6x: use simple-panel instead of display-timings for LVDS0 ARM: dts: add imx7d-sdb support ARM: dts: add imx7d soc dtsi file ARM: dts: Armadeus Systems APF6 family support (i.MX6) ARM: dts: vf610: Nomenclature fixup for PTC12 pin used in RMII mode. ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices Document: dt: binding: imx: update document for imx7d support ARM: dts: imx6qdl: Add power-domain phandle to CODA device node ARM: dts: Gateworks GW5510 support (i.MX6) ARM: dts: imx6sl-warp: Fix OTG roles ARM: dts: imx6sl-warp: Remove USB regulators ARM: dts: imx6sl-warp: Remove unused regulator ARM: dts: add pinfunc include file to support imx7d ARM: mxs: fix in tree users of ssd1306 ARM: dts: imx6qdl-hummingboard: Add PCIe support ARM: dts: imx23-olinuxino: Add i2c support ...
2015-06-10Merge tag 'keystone-dts-for-4.2' of ↵Kevin Hilman9-0/+609
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt Keystone DTS update for 4.2 - Includes NETCP related EVM updates * tag 'keystone-dts-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: dts: k2l: fix the netcp range size ARM: dts: k2e: fix the netcp range size ARM: dts: k2hk: fix the netcp range size ARM: dts: k2l-evm: Add device bindings for netcp driver ARM: dts: k2e-evm: Add device bindings for netcp driver ARM: dts: k2hk-evm: Add device bindings for netcp driver
2015-06-10Merge tag 'arm-soc/for-4.2/dts-part3' of ↵Kevin Hilman16-6/+140
https://github.com/Broadcom/stblinux into next/dt This pull request contains Broadcom BCM5301x related changes: - Hauke adds the interrupt mapping for the BCM5301x PCIe controller - Haule adds support for NAND flash using the standard Broadcom NAND controller iProc specific binding on BCM4708/5301x - Rafal adds support for the Asus RT-AC87U router * tag 'arm-soc/for-4.2/dts-part3' of https://github.com/Broadcom/stblinux: ARM: BCM5301X: Add DT for Asus RT-AC87U ARM: BCM5301X: add IRQ numbers for PCIe controller ARM: BCM5301X: add NAND flash chip description
2015-06-10ARM: dts: Introduce STM32F429 MCUMaxime Coquelin3-0/+286
The STMicrolectornics's STM32F429 MCU has the following main features: - Cortex-M4 core running up to @180MHz - 2MB internal flash, 256KBytes internal RAM - FMC controller to connect SDRAM, NOR and NAND memories - SD/MMC/SDIO support - Ethernet controller - USB OTFG FS & HS controllers - I2C, SPI, CAN busses support - Several 16 & 32 bits general purpose timers - Serial Audio interface - LCD controller Tested-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com> Signed-off-by: Kevin Hilman <khilman@linaro.org>
2015-06-10Merge tag 'sunxi-dt-for-4.2-2' of ↵Kevin Hilman25-661/+1522
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt Allwinner DT changes for 4.2, take 2 A bunch of new DT changes for the 4.2 merge window, among which: - Enable the SRAM controller on the A10/A10s/A13/A20 - A33 support - New boards: A23 EVB, SinA33, GA10H-A33, Mele A1000G * tag 'sunxi-dt-for-4.2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box ARM: dts: sun8i: Add dts file for the GA10H-A33 tablet ARM: dts: sun8i-a33: Add dts for Sinlinx SinA33 development board. ARM: dts: sun8i-a33: Add pinmux setting for uart0 on PB pins ARM: dts: sun8i: Add pinmux setting for 8bit mmc2 ARM: dts: sun8i: Add usb_clk node for a23/a33 ARM: dts: sun8i: Add ET-Q8 A33 support ARM: dts: sun8i: Add sun8i-a33 dtsi ARM: dts: sun8i: Add sun8i-a23-a33 dtsi ARM: dts: sun7i: Add A20 SRAM and SRAM controller ARM: dts: sun5i: Add A10s and A13 SRAM and SRAM controller ARM: dts: sun4i: Add A10 SRAM and SRAM controller ARM: dts: sunxi: Revert SRAM controller drivers patches ARM: dts: sun9i: Add device node for watchdog ARM: dts: sun7i: Add uart4 support for BananaPro, disable uart2 ARM: dts: sun7i: Add uart4_pins_b definition ARM: sun8i: Introduce A23 Evaluation Board Support
2015-06-10ARM: socfpga: dts: enable ethernet for Arria10 devkitDinh Nguyen2-0/+39
Update the arria10 gmac nodes with all the necessary properties for ethernet to function on the Arria10 devkit. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Kevin Hilman <khilman@linaro.org>
2015-06-10ARM: dts: k2l: fix the netcp range sizeMurali Karicheri1-2/+2
k2l netcp range size is 16M (0x1000000) and not 0xffffff. This patch fixes this. Similarly fix the size of switch module register space to 0x20000. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2e: fix the netcp range sizeMurali Karicheri1-2/+2
k2e netcp range size is 16M (0x1000000) and not 0xffffff. This patch fixes this. Similarly fix the size of switch module register space to 0x20000. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2hk: fix the netcp range sizeMurali Karicheri1-1/+1
k2hk netcp range size is 1M (0x100000) and not 0xfffff. This patch fixes this. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2l-evm: Add device bindings for netcp driverMurali Karicheri3-0/+191
This patch enables networking on k2l evm by providing device bindings for netcp, knav, and qmss. See device binding documentation at Documentation/devicetree/bindings/net/keystone-netcp.txt Signed-off-by: WingMan Kwok <w-kwok2@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2e-evm: Add device bindings for netcp driverMurali Karicheri3-0/+208
This patch enables networking on k2e evm by adding device bindings for netcp, knav and qmss. See device binding documentation below for details. Documentation/devicetree/bindings/net/keystone-netcp.txt Signed-off-by: WingMan Kwok <w-kwok2@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2hk-evm: Add device bindings for netcp driverMurali Karicheri3-0/+210
This patch enables networking on k2hk evm by adding device bindings for netcp, knav and qmss. See device binding documentation below for details. Documentation/devicetree/bindings/net/keystone-netcp.txt Signed-off-by: WingMan Kwok <w-kwok2@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10Merge tag 'socfpga_dts_for_v4.2_part_3' of ↵Kevin Hilman3-0/+38
git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt SoCFPGA updates for v4.2 part 3 - Add SCU node for Arria 10 - Add enable-method for cpu nodes - Add SDRAM controller binding doc - Enable gpio-leds on SoCFPGA Socrates board * tag 'socfpga_dts_for_v4.2_part_3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: ARM: socfpga: socrates: add gpio-leds ARM: socfpga: socrates: enable gpio0/1 ARM: socfpga: dts: add sdram controller dt binding doc ARM: socfpga: dts: add enable-method property for cpu nodes ARM: socfpga: dts: add the a9-scu node for arria10
2015-06-08Merge tag 'omap-for-v4.1/fixes-rc6' of ↵Kevin Hilman4-11/+30
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Merge omap fixes for v4.1, urgent fix to avoid potential hardware damage From Tony Lindgren: Omap fixes for the -rc cycle, including a fix for potential hardware breakage on BeagleBones: - BeagleBones don't support RTC-only mode, it can cause hardware damage if system-power-controller is specified without ti,pmic-shutdown-controller - Fix a recent regression to am3517 SoCs caused by the recent clock move that was not noticed until now despite automated boot testing - Fix a regression for n900 touchscreen triggered by recent recent input changes - Fix compatible property for dm816x USB to avoid errors with USB Ethernet - Fix oops for omap3 when built with CONFIG_THUMB2_KERNEL * tag 'omap-for-v4.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage ARM: dts: AM35xx: fix system control module clocks ARM: dts: Fix n900 dts file to work around 4.1 touchscreen regression on n900 ARM: dts: Fix dm816x to use right compatible flag for MUSB ARM: OMAP3: Fix booting with thumb2 kernel
2015-06-06ARM: BCM5301X: Add DT for Asus RT-AC87URafał Miłecki2-0/+66
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-06-06ARM: BCM5301X: add IRQ numbers for PCIe controllerHauke Mehrtens1-0/+24
The driver for the PCIe controller was just added, this adds the missing definition of the IRQ numbers to device tree. The driver itself will be automatically detected by bcma. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-06-06ARM: BCM5301X: add NAND flash chip descriptionHauke Mehrtens14-6/+50
This adds the NAND flash chip description for a standard chip found connected to this SoC. This makes use of generic Broadcom NAND driver with the iProc interface. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-06-05Merge branch 'ti-dra7-dss' into 4.2/fbdevTomi Valkeinen41-57/+364
Merge arch/ changes for TI's DRA7 SoC Display Subsystem.
2015-06-04ARM: at91/dt: sama5d4ek: mci0 uses slot 0Ludovic Desroches1-2/+2
Mci0 uses slot 0 not 1. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Fixes: 7a4752677c44 ("ARM: at91: dt: add device tree file for SAMA5D4ek board") Cc: stable@vger.kernel.org Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>