OSDN Git Service
Olof Johansson [Thu, 29 Aug 2013 19:59:11 +0000 (12:59 -0700)]
Merge branch 'socfpga/dt' into next/dt
SoCFPGA DT changes from Dinh Nguyen.
* socfpga/dt:
dts: Rename DW APB timer compatible strings
dts: Deprecate ALTR as a vendor prefix
of: add vendor prefix for Altera Corp.
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Thu, 29 Aug 2013 17:49:03 +0000 (10:49 -0700)]
Merge branch 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351 into next/dt
From Christian Daudt, DT changes for Broadcom.
* 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351:
ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
ARM: dts: add sdio blocks to bcm28155-ap board
ARM: dts: align sdio numbers to HW definition
ARM: bcm281xx: DT changes for reboot code
ARM: bcm281xx: Adding bcm28155-ap.dts
Kevin Hilman [Fri, 23 Aug 2013 19:09:38 +0000 (12:09 -0700)]
Merge tag 'mxs-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo:
It contains mxs device tree changes for 3.12.
- New board addition and hogpins cleanup for Crystalfontz
- New pinctrl entry addition for lcd, ssp2 and saif0
- Add alias and labels for various nodes
- Enable devices like LRADC and USB for a couple of imx23 boards,
and backlight for M28EVK
* tag 'mxs-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: mxs: add pin config for LCD sync and clock pins
ARM: dts: mxs: add pin config for SSP3 interface
ARM: dts: mxs: add another set of saif0_pins (without MCLK)
ARM: dts: mxs: add labels to most nodes for easier reference
ARM: dts: mxs: whitespace cleanup
ARM: dts: mxs: Add spi alias
ARM: dts: imx23-olinuxino: enable Low Resolution ADC
ARM: dts: imx23-evk: enable Low Resolution ADC
ARM: dts: imx23-evk: enable USB PHY and controller
ARM: dts: mxs: remove old DMA binding data from client nodes
ARM: mxs: Add backlight support for M28EVK
ARM: mxs: dt:
cfa10036: make hogpins grabbed by respective drivers
ARM: mxs: dt:
cfa10057: remove hogpins
ARM: mxs: dt:
cfa10055: make hogpins grabbed by respective drivers
ARM: mxs: dt:
cfa10049: make hogpins grabbed by respective drivers
ARM: mxs: dt:
cfa10037: make hogpins grabbed by respective drivers
ARM: mxs: dt: Add Crystalfontz CFA-10058 device tree
ARM: mxs: dt: Add Crystalfontz CFA-10056 device tree
Dinh Nguyen [Wed, 21 Aug 2013 20:28:49 +0000 (15:28 -0500)]
dts: Rename DW APB timer compatible strings
"dw-apb-timer-osc" and "dw-apb-timer-sp" are the same implementation of the
DW APB timer, just fed by different clocks. Thus, deprecate both
"dw-apb-timer-osc" and "dw-apb-timer-sp" in lieu of "dw-apb-timer".
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
CC: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
CC: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
CC: Jamie Iles <jamie@jamieiles.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Pavel Machek <pavel@denx.de>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Olof Johansson <olof@lixom.net>
v3:
- Split out a separate that cleans up the timer entries and clock information.
- Clearly states which binding is deprecated in the bindings doc.
v2:
- Deprecate the "dw-apb-timer-osc" and "dw-apb-timer-sp" but maintain
backwards compatibility in the driver.
Dinh Nguyen [Wed, 14 Aug 2013 20:25:19 +0000 (15:25 -0500)]
dts: Deprecate ALTR as a vendor prefix
Because most of the vendor prefixes are lower case, deprecate
the vendor prefix "ALTR" in place of "altr" for Altera Corp..
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: devicetree@vger.kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
Dinh Nguyen [Fri, 26 Jul 2013 19:36:27 +0000 (14:36 -0500)]
of: add vendor prefix for Altera Corp.
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: devicetree@vger.kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
Kevin Hilman [Thu, 22 Aug 2013 18:32:39 +0000 (11:32 -0700)]
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre:
More DT work on AT91:
- sound support for at91sam9x5 family
- at91sam9n12: touch button, i2c and gpio-keys
- adding missing pinctrl-names to MCI on at91rm9200 and at91sam9260/9g20
- adding ARM Performance Monitor Unit (PMU) on sama5d3
* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
ARM: at91/dt: sam9x5ek: add sound configuration
ARM: at91/dt: sam9x5ek: enable SSC
ARM: at91/dt: sam9x5ek: add WM8731 codec
ARM: at91/dt: sam9x5: add SSC DMA parameters
ARM: at91/dt: add at91rm9200 PQFP package version
ARM: at91: at91rm9200: set default mmc0 pinctrl-names
ARM: at91: at91sam9n12: correct pin number of gpio-key
ARM: at91: at91sam9n12: add qt1070 support
ARM: at91: at91sam9n12: add pinctrl of TWI
ARM: at91: Add PMU support for sama5d3
ARM: at91: at91sam9260: add missing pinctrl-names on mmc
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Kevin Hilman [Thu, 22 Aug 2013 16:14:04 +0000 (09:14 -0700)]
Merge tag 'nomadik-i2c-for-arm-soc' of git://git./linux/kernel/git/linusw/linux-nomadik into next/dt
From Linus Walleij:
Enables the standard Nomadik I2C driver for use
on the original Nomadik instead of using a bit-banged
driver.
* tag 'nomadik-i2c-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: nomadik: switch to use the Nomadik I2C driver
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Kevin Hilman [Thu, 22 Aug 2013 15:25:10 +0000 (08:25 -0700)]
Merge tag 'samsung-dt-1' of git://git./linux/kernel/git/kgene/linux-samsung into next/dt
From Kukjin Kim:
Samsung Exynos DT updates for v3.12
- update codec, pmic, usb hub for Arndale
- add exynos4412-trats 2 board dt
- update camera, spi, sensor for Trats2
- update fimc, sensor for Trats
- add support tmu for exynos5440
- add support g2d for exynos5250
- correct camera pinctrl for exynos4x12
- add support camera subsystem for exynos4
- add support basic pm domain, fimd, dp for exynos5420
- add support secure-firmware for OrigenQuad
- update mfc and add support mfc for exynos5420
- add usb host node for exynos4
* tag 'samsung-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (38 commits)
ARM: dts: Add USB host node for Exynos4
ARM: dts: add audio clock controller for exynos5420
ARM: dts: Correct the /include entry on exynos5420 dtsi file
ARM: dts: Add MFC node for exynos 5420
ARM: dts: Update 5250 MFC node
ARM: dts: Remove unsused MFC clock from exynos4
ARM: dts: Update clocks entry in MFC binding documentation
ARM: dts: Hook up internal PHY on Arndale
ARM: dts: Enable USB hub on Arndale
ARM: dts: Add secure-firmware boot support for OrigenQaud board
ARM: dts: Add pin state information for DP HPD support to Exynos5420
ARM: dts: Add DP controller DT node to exynos5420 SoC
ARM: dts: Update DP controller DT Node for Exynos5 based SoCs
ARM: dts: Add FIMD DT node to exynos5420 DTS files
ARM: dts: Add basic PM domains for EXYNOS5420
ARM: dts: Update FIMD DT node for Exynos5 SoCs
ARM: dts: Move display-timing information inside FIMD DT node for exynos5250
ARM: dts: Add S5K5BA sensor regulator definitions for Trats board
ARM: dts: Add Exynos4210 SoC camera port pinctrl nodes
ARM: dts: Add FIMC nodes for Exynos4210 Trats board
...
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Kevin Hilman [Wed, 21 Aug 2013 23:05:07 +0000 (16:05 -0700)]
Merge tag 'sunxi-dt-for-3.12-2' of https://github.com/mripard/linux into next/dt
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
Kevin Hilman [Wed, 21 Aug 2013 21:53:49 +0000 (14:53 -0700)]
Merge tag 'sunxi-dt-for-3.12' of https://github.com/mripard/linux into next/dt
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 <khilman@linaro.org>
Richard Genoud [Mon, 12 Aug 2013 12:31:02 +0000 (14:31 +0200)]
ARM: at91/dt: sam9x5ek: add sound configuration
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 <richard.genoud@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Richard Genoud [Mon, 12 Aug 2013 12:31:01 +0000 (14:31 +0200)]
ARM: at91/dt: sam9x5ek: enable SSC
Enable the SSC needed for the WM8731 codec
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Richard Genoud [Mon, 12 Aug 2013 12:31:00 +0000 (14:31 +0200)]
ARM: at91/dt: sam9x5ek: add WM8731 codec
The WM8731 codec on sam9x5ek board is on i2c, address 1A
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Acked-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Richard Genoud [Mon, 12 Aug 2013 12:30:59 +0000 (14:30 +0200)]
ARM: at91/dt: sam9x5: add SSC DMA parameters
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Jean-Christophe PLAGNIOL-VILLARD [Mon, 17 Jun 2013 12:38:29 +0000 (14:38 +0200)]
ARM: at91/dt: add at91rm9200 PQFP package version
The PQFP version have only 3 gpio banks (A, B & C).
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
[nicolas.ferre@atmel.com: correct typo in "status" property]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Jean-Christophe PLAGNIOL-VILLARD [Mon, 17 Jun 2013 12:38:30 +0000 (14:38 +0200)]
ARM: at91: at91rm9200: set default mmc0 pinctrl-names
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
voice [Thu, 11 Jul 2013 03:30:46 +0000 (11:30 +0800)]
ARM: at91: at91sam9n12: correct pin number of gpio-key
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 <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
voice [Thu, 11 Jul 2013 03:30:45 +0000 (11:30 +0800)]
ARM: at91: at91sam9n12: add qt1070 support
Add qt1070 support on at91sam9n12ek board.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
voice [Thu, 11 Jul 2013 03:30:44 +0000 (11:30 +0800)]
ARM: at91: at91sam9n12: add pinctrl of TWI
Add pinctrl of TWI for at91sam9n12 SoC.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Mon, 5 Aug 2013 15:26:06 +0000 (17:26 +0200)]
ARM: at91: Add PMU support for sama5d3
ARM Performance Monitor Units are available on the sama5d3, add the support in
the dtsi.
Tested with perf and oprofile on the sama5d31ek.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Jean-Christophe PLAGNIOL-VILLARD [Mon, 15 Jul 2013 10:05:19 +0000 (12:05 +0200)]
ARM: at91: at91sam9260: add missing pinctrl-names on mmc
pinctrl-names was missing causing mmc pinctrl to never be requested.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
[nicolas.ferre@atmel.com: added a commit message taken from Ludovic]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Bill Huang [Mon, 19 Aug 2013 16:44:10 +0000 (10:44 -0600)]
ARM: tegra: configure power off for Dalmore
Add DT property to tell the regulator to register pm_power_off to make
"shutdown" work.
Signed-off-by: Bill Huang <bilhuang@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Kevin Hilman [Tue, 20 Aug 2013 23:30:54 +0000 (16:30 -0700)]
Merge tag 'tegra-for-3.12-dt' of git://git./linux/kernel/git/swarren/linux-tegra into next/dt
From: Stephen Warren:
ARM: tegra: device tree changes for 3.12
This branch contains all *.dts (device tree) changes for Tegra.
New features enabled are:
* PMICs on Dalmore
* CPU power-gating on Dalmore
* HDMI output on Beaver
* LP1 system suspend mode on almost all boards
* PCIe support on numerous Tegra20/30 boards
* USB support on Tegra30/114 boards
* Audio capture on Beaver and Dalmore
* Temperature sensor on Cardhu.
... along with a few DT cleanups.
* tag 'tegra-for-3.12-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (25 commits)
ARM: tegra: add Mic Jack to Dalmore device tree
ARM: tegra: add Mic Jack to Beaver device tree
ARM: tegra: add USB DT entries for Tegra114, Dalmore
ARM: tegra: add USB DT entries for Tegra30
ARM: dts: tegra: Increase prefetchable PCI memory space
ARM: tegra: Fix Beaver's PCIe lane configuration
ARM: tegra: Enable PCIe controller on Beaver
ARM: tegra: Enable PCIe controller on Cardhu
ARM: tegra: Add Tegra30 PCIe support
ARM: tegra: trimslice: Initialize PCIe from DT
ARM: tegra: harmony: Initialize PCIe from DT
ARM: tegra: tec: Add PCIe support
ARM: tegra: tamonten: Add PCIe support
ARM: tegra: Add Tegra20 PCIe support to DT
ARM: tegra: enable LP1 suspend mode
ARM: tegra: beaver: Enable HDMI output
ARM: tegra: use TEGRA_GPIO() in a couple more places
ARM: tegra: dalmore: fix the irq trigger type of Palmas MFD device
ARM: tegra: define valid function names in DT document
ARM: tegra: dalmore: add PM configurations for PMC
...
Kevin Hilman [Tue, 20 Aug 2013 22:34:49 +0000 (15:34 -0700)]
Merge tag 'ux500-devicetree-for-v3.12-1' of git://git./linux/kernel/git/linusw/linux-stericsson into next/dt
From: Linus Walleij:
Ux500 device tree enablement base for the v3.12
development cycle:
- Various cleanups like remove non-existant hardware from
the Snowball device tree, prefix all files with "ste-*"
- External regulators
- Documentation updates
- Delete some minor dangling platform data
- Pin control settings for U8540 through DT
* tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (22 commits)
ARM: ux500: fix devicetree builds
ARM: ux500: Remove u9540.dts as it's been replaced
ARM: ux500: Apply a ste-* prefix onto dbx5x0.dtsi
ARM: ux500: Apply a ste-* prefix onto stuib.dtsi
ARM: ux500: Apply a ste-* prefix onto hrefv60plus.dts
ARM: ux500: Apply a ste-* prefix onto hrefprev60.dts Signed-off-by: Lee Jones <lee.jones@linaro.org>
ARM: ux500: Apply a ste-* prefix onto href.dtsi
ARM: ux500: Apply a ste-* prefix onto ccu9540.dts
ARM: ux500: Apply a ste-* prefix onto ccu8540.dts
ARM: ux500: Apply a ste-* prefix onto snowball.dts
ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor
ARM: ux500: Remove Snowball DTS entry for TPS61052 chip
ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip
ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS
ARM: u8540: DT: Set pinctrl mapping to i2c0,1,2,4 & 5
ARM: u8540: Add Pinctrl Device Tree settings for uart0, uart2
ARM: ux500: Stop passing MMC's platform data for Device Tree boots
Documentation: Update binding for Nomadik and DBx5x based platforms
ARM: ux500: Supply external regulator names for Snowball's DT
ARM: ux500: Provide a supply name for the AB8500 AUX regulators to use
...
Christian Daudt [Tue, 30 Jul 2013 23:27:10 +0000 (16:27 -0700)]
ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
[ this is a follow-up to this discussion:
http://archive.arm.linux.org.uk/lurker/message/
20130730.230827.
a1ceb12a.en.html ]
This patchset renames all uses of "bcm," name bindings to
"brcm," as they were done prior to knowing that brcm had
already been standardized as Broadcom vendor prefix
(in Documentation/devicetree/bindings/vendor-prefixes.txt).
This will not cause any churn on devices because none of
these bindings have made it into production yet.
Also rename the the following dt binding docs that had "bcm,"
in their name for consistency:
- bcm,kona-sdhci.txt -> kona-sdhci.txt
- bcm,kona-timer.txt -> kona-timer.txt
Signed-off-by: Christian Daudt <csd@broadcom.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Christian Daudt [Wed, 7 Aug 2013 23:57:05 +0000 (16:57 -0700)]
ARM: dts: add sdio blocks to bcm28155-ap board
Enable sdio for bcm28155 AP board
Signed-off-by: Christian Daudt <csd@broadcom.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
Christian Daudt [Thu, 8 Aug 2013 05:37:47 +0000 (22:37 -0700)]
ARM: dts: align sdio numbers to HW definition
Clean up the sdio numbering to be 1-base as defined in HW spec,
instead of the current 0-base
Signed-off-by: Christian Daudt <csd@broadcom.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Maxime Ripard [Wed, 17 Jul 2013 08:12:16 +0000 (10:12 +0200)]
ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
The Olimex A20-Olinuxino is an open-hardware board based on the
Allwinner A20 SoC, with most of the pins exported on headers, a 10/100M
ethernet port, SATA, SD and uSD slots, etc.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Maxime Ripard [Wed, 17 Jul 2013 08:07:10 +0000 (10:07 +0200)]
ARM: sun7i: Add Allwinner A20 DTSI
The Allwinner A20 SoC is based on 2 Cortex A7, an ARM Mali GPU, and is
built to be pin-compatible with the older Allwinner A10.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Dongjin Kim [Sun, 18 Aug 2013 20:07:17 +0000 (05:07 +0900)]
ARM: dts: Add USB host node for Exynos4
This patch adds EHCI and OHCI host device nodes for Exynos4.
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Andrew Bresticker [Sun, 18 Aug 2013 19:58:38 +0000 (04:58 +0900)]
ARM: dts: add audio clock controller for exynos5420
This adds device-tree bindings for the audio subsystem clock controller
on Exynos 5420.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/57712
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Padmavathi Venna [Sun, 18 Aug 2013 19:56:33 +0000 (04:56 +0900)]
ARM: dts: Correct the /include entry on exynos5420 dtsi file
This patch corrects the /include to #include on exynos5420
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Arun Kumar K [Sun, 18 Aug 2013 19:43:01 +0000 (04:43 +0900)]
ARM: dts: Add MFC node for exynos 5420
The patch adds MFC nodes for exynos 5420.
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Arun Kumar K [Sun, 18 Aug 2013 19:43:01 +0000 (04:43 +0900)]
ARM: dts: Update 5250 MFC node
The patch adds the MFC clock entry for the 5250 SoC.
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Arun Kumar K [Sun, 18 Aug 2013 19:43:00 +0000 (04:43 +0900)]
ARM: dts: Remove unsused MFC clock from exynos4
Removes the unused sclk_mfc from exynos4 dtsi file.
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Arun Kumar K [Sun, 18 Aug 2013 19:43:00 +0000 (04:43 +0900)]
ARM: dts: Update clocks entry in MFC binding documentation
MFC driver is updated to use only one clock instead of
two. Correcting this in the binding documentation.
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Mark Brown [Sun, 18 Aug 2013 19:33:28 +0000 (04:33 +0900)]
ARM: dts: Hook up internal PHY on Arndale
While the Linux driver stack is capable of figuring this out for itself
document the fact that we really do use the internal PHY even with the
directly wired hub on the board to save anyone else having to work this
out for themselves.
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Mark Brown [Sun, 18 Aug 2013 19:33:22 +0000 (04:33 +0900)]
ARM: dts: Enable USB hub on Arndale
The Arndale has a SMSC USB3503 connected in hardware only mode like a PHY,
support it using the usb-nop-xceiv binding.
Note that due to a regrettable decision to use a regulator to represent
the reset signal this uses a fixed voltage regulator to do that, there
is a plan to use the reset controller binding once that is merged so it
does not seem worthwhile to fix the usb-nop-xceiv driver at this point.
Signed-off-by: Mark Brown <broonie@linaro.org>
Tested-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Tushar Behera [Sun, 18 Aug 2013 19:30:16 +0000 (04:30 +0900)]
ARM: dts: Add secure-firmware boot support for OrigenQaud board
OrigenQuad board boots with secure firmware support. Enable support for
reading smc commands.
The binding has been updated as per the documentation provided in
Documentation/devicetree/bindings/arm/samsung-boards.txt.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Vikas Sajjan [Wed, 14 Aug 2013 08:15:10 +0000 (17:15 +0900)]
ARM: dts: Add pin state information for DP HPD support to Exynos5420
Add pin state information for DP HPD support that requires pin configuration
support using pinctrl interface.
Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Vikas Sajjan [Wed, 14 Aug 2013 08:15:06 +0000 (17:15 +0900)]
ARM: dts: Add DP controller DT node to exynos5420 SoC
Adds DP controller DT node to exynos5420 SoC
Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Vikas Sajjan [Wed, 14 Aug 2013 08:15:00 +0000 (17:15 +0900)]
ARM: dts: Update DP controller DT Node for Exynos5 based SoCs
Moves the properties of DP controller to exynos5.dtsi which are common
across exynos5 SoCs like Exynos5250 and Exynos5420.
The PHY DP Node is based on Jingoo Han's <jg1.han@samsung.com> patch
at https://patchwork.linuxtv.org/patch/19189/
Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Vikas Sajjan [Wed, 14 Aug 2013 08:08:33 +0000 (17:08 +0900)]
ARM: dts: Add FIMD DT node to exynos5420 DTS files
Adds FIMD DT node to exynos5420 based SMDK. Also adds display-timimg
information node.
Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Yadwinder Singh Brar [Wed, 14 Aug 2013 08:08:32 +0000 (17:08 +0900)]
ARM: dts: Add basic PM domains for EXYNOS5420
Add DT nodes for gsc, isp, mfc, disp, mau, g2d and msc PM domains.
Signed-off-by: Yadwinder Singh Brar <yadi.brar@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Vikas Sajjan [Wed, 14 Aug 2013 08:08:32 +0000 (17:08 +0900)]
ARM: dts: Update FIMD DT node for Exynos5 SoCs
Moves the properties of FIMD DT node which are common across Exynos5 based
SoCs like Exynos5250 and Exynos5420 to exynos5.dtsi
Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Vikas Sajjan [Wed, 14 Aug 2013 08:08:32 +0000 (17:08 +0900)]
ARM: dts: Move display-timing information inside FIMD DT node for exynos5250
As the display-timing information is parsed by FIMD driver, it makes
sense to move the display-timing DT node inside FIMD DT node for exynos5250
Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Maxime Ripard [Sat, 22 Jun 2013 18:22:14 +0000 (20:22 +0200)]
ARM: sun6i: Add WITS Colombus A31 evaluation kit support
This platform from WITS is the evaluation board for the Allwinner A31.
It features a quad-Cortex A7, 2048MB of RAM, NAND, USB, MMC, several
UART, HDMI, a 2048 x 1536 10" screen, powered by a PowerVR, etc.
Of course, most of these peripherals aren't supported yet, but support
for those will come eventually.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Maxime Ripard [Sun, 10 Mar 2013 15:09:06 +0000 (16:09 +0100)]
ARM: sunxi: Add Allwinner A31 DTSI
The Allwinner A31 SoC is a multimedia SoC powered by 4 Cortex-A7 and a
PowerVR GPU.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Lothar Waßmann [Thu, 8 Aug 2013 12:51:24 +0000 (14:51 +0200)]
ARM: dts: mxs: add pin config for LCD sync and clock pins
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Lothar Waßmann [Thu, 8 Aug 2013 12:51:23 +0000 (14:51 +0200)]
ARM: dts: mxs: add pin config for SSP3 interface
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Lothar Waßmann [Thu, 8 Aug 2013 12:51:22 +0000 (14:51 +0200)]
ARM: dts: mxs: add another set of saif0_pins (without MCLK)
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Lothar Waßmann [Thu, 8 Aug 2013 12:51:21 +0000 (14:51 +0200)]
ARM: dts: mxs: add labels to most nodes for easier reference
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Lothar Waßmann [Thu, 8 Aug 2013 12:51:20 +0000 (14:51 +0200)]
ARM: dts: mxs: whitespace cleanup
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Mon, 22 Jul 2013 20:57:01 +0000 (17:57 -0300)]
ARM: dts: mxs: Add spi alias
After providing spi alias, we can get the following message during probe:
m25p80 spi1.0: sst25vf016b (2048 Kbytes)
,which looks better than the original one:
m25p80 spi32766.0: sst25vf016b (2048 Kbytes)
While at it, keep the alias entries in alphabetical order.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Otavio Salvador [Tue, 16 Jul 2013 12:56:14 +0000 (09:56 -0300)]
ARM: dts: imx23-olinuxino: enable Low Resolution ADC
The i.MX23 has a internal Low Resolution ADC; this enables the support
for this device.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Otavio Salvador [Tue, 16 Jul 2013 12:56:13 +0000 (09:56 -0300)]
ARM: dts: imx23-evk: enable Low Resolution ADC
The i.MX23 has a internal Low Resolution ADC; this enables the support
for this device.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Otavio Salvador [Tue, 16 Jul 2013 12:56:12 +0000 (09:56 -0300)]
ARM: dts: imx23-evk: enable USB PHY and controller
The i.MX23EVK board provides a USB port so the USB PHY and controller
need to be enabled for it to be usable.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Tue, 16 Jul 2013 09:10:55 +0000 (17:10 +0800)]
ARM: dts: mxs: remove old DMA binding data from client nodes
After mxs-dma driver adopts generic DMA device tree binding, channel
interrupt number is defined in DMA controller node, and channel ID is
listed in "dmas" property. So the DMA channel interrupt number in
client nodes' "interrupts" property and fsl,<module>-dma-channel which
are used by old customized DMA binding can be removed now.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Marek Vasut [Thu, 11 Jul 2013 19:30:16 +0000 (21:30 +0200)]
ARM: mxs: Add backlight support for M28EVK
This patch adds backlight support for M28EVK.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexandre Belloni [Mon, 1 Jul 2013 13:23:29 +0000 (15:23 +0200)]
ARM: mxs: dt:
cfa10036: make hogpins grabbed by respective drivers
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexandre Belloni [Mon, 1 Jul 2013 13:23:28 +0000 (15:23 +0200)]
ARM: mxs: dt:
cfa10057: remove hogpins
Necessary pins are now grabbed by respective drivers. Unecessary hogpins are
simply removed.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexandre Belloni [Mon, 1 Jul 2013 13:23:27 +0000 (15:23 +0200)]
ARM: mxs: dt:
cfa10055: make hogpins grabbed by respective drivers
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexandre Belloni [Mon, 1 Jul 2013 13:23:26 +0000 (15:23 +0200)]
ARM: mxs: dt:
cfa10049: make hogpins grabbed by respective drivers
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexandre Belloni [Mon, 1 Jul 2013 13:23:25 +0000 (15:23 +0200)]
ARM: mxs: dt:
cfa10037: make hogpins grabbed by respective drivers
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Brian Lilly [Mon, 1 Jul 2013 13:23:24 +0000 (15:23 +0200)]
ARM: mxs: dt: Add Crystalfontz CFA-10058 device tree
The CFA-10058 is a breakout board for the CFA-10036 that has Ethernet, USB and a
5" LCD screen on it.
Signed-off-by: Brian Lilly <brian@crystalfontz.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Brian Lilly [Mon, 1 Jul 2013 13:23:23 +0000 (15:23 +0200)]
ARM: mxs: dt: Add Crystalfontz CFA-10056 device tree
The CFA-10056 is a breakout board for the CFA-10036, and is
basically a CFA-10037, with a 4.3" screen.
Signed-off-by: Brian Lilly <brian@crystalfontz.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Stephen Warren [Wed, 14 Aug 2013 20:22:19 +0000 (14:22 -0600)]
ARM: tegra: add Mic Jack to Dalmore device tree
This enables the microphone input jack, and hence allows audio to be
captured as well as played back.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Stephen Warren [Wed, 14 Aug 2013 19:54:24 +0000 (13:54 -0600)]
ARM: tegra: add Mic Jack to Beaver device tree
This enables the microphone input jack, and hence allows audio to be
captured as well as played back.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Linus Walleij [Wed, 7 Aug 2013 13:37:52 +0000 (15:37 +0200)]
ARM: ux500: fix devicetree builds
The patch set beginning with commit:
"ARM: ux500: Apply a ste-* prefix onto snowball.dts"
thru commit:
"ARM: ux500: Remove u9540.dts as it's been replaced"
altered the names of the ux500 device tree files but forgot
to:
- Rename the ccu8540-pinctrl.dtsi file
- Update #include statements from files using these
files, so the build broke.
- Update the Makefile for the device trees so the build
broke.
Fix it up so we can build them all again.
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Kevin Hilman [Wed, 14 Aug 2013 15:14:50 +0000 (08:14 -0700)]
Merge branch 'zynq/dt' into next/dt
* zynq/dt: (1054 commits)
arm: zynq: dt: Set correct L2 ram latencies
+ v3.11-rc5
Conflicts:
arch/arm/Makefile
Emilio López [Tue, 13 Aug 2013 23:18:21 +0000 (20:18 -0300)]
ARM: sunxi: dt: Add device tree for Mele A1000
This adds a device tree usable on Mele A1000 (and A2000, as it
apparently is the same device except for the case). This device features
one UART port, Ethernet, an AXP209 PMU on i2c0 and two user configurable
LEDs.
Signed-off-by: Emilio López <emilio@elopez.com.ar>
[maxime: fixed the soc node address]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Olof Johansson [Wed, 14 Aug 2013 07:46:07 +0000 (00:46 -0700)]
Merge tag 'renesas-multiplatform-for-v3.12' of git://git./linux/kernel/git/horms/renesas into next/dt
From Simon Horman:
Renesas ARM based SoC multiplatform updates for v3.12
Move Renesas ARM based SoCs a little closer to using
multiplatform by adding ARCH_SHMOBILE_MULTI and only
building clocks when COMMON_CLK=n.
* tag 'renesas-multiplatform-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Allow ARCH_SHMOBILE_MULTI timer configuration
ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI
ARM: shmobile: Introduce ARCH_SHMOBILE_MULTI
ARM: shmobile: Only build clocks when COMMON_CLK=n
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Wed, 14 Aug 2013 07:24:05 +0000 (00:24 -0700)]
Merge tag 'renesas-pinmux-for-v3.12' of git://git./linux/kernel/git/horms/renesas into next/dt
From Simon Horman:
Renesas ARM based SoC pinmux updates for v3.12
SH Mobile pinctrl DT support
* tag 'renesas-pinmux-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree
ARM: shmobile: kzm9g-reference: Move SDHI regulators to DT
ARM: shmobile: kzm9g-reference: Move pinctrl mappings to device tree
ARM: shmobile: marzen-reference: Add LED2-LED4 to the device tree
ARM: shmobile: marzen-reference: Move pinctrl mappings to device tree
ARM: shmobile: armadillo-reference: Add LED1-LED4 to the device tree
ARM: shmobile: armadillo-reference: Move st1232 reset GPIO to DT
ARM: shmobile: armadillo-reference: Add st1232 pin mappings
ARM: shmobile: armadillo-reference: Move pinctrl mappings to device tree
ARM: shmobile: sh73a0: Add pin control device to device tree
ARM: shmobile: sh7372: Add pin control device to device tree
ARM: shmobile: r8a7790: Add GPIO controller devices to device tree
ARM: shmobile: r8a7790: Add pin control device to device tree
ARM: shmobile: r8a7779: Add GPIO controller devices to device tree
ARM: shmobile: r8a7779: Add pin control device to device tree
ARM: shmobile: r8a7778: Add GPIO controller devices to device tree
ARM: shmobile: r8a7778: Add pin control device to device tree
ARM: shmobile: r8a7740: Add pin control device to device tree
ARM: shmobile: r8a73a4: Add pin control device to device tree
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/boot/dts/r8a73a4.dtsi
arch/arm/boot/dts/r8a7790.dtsi
Kevin Hilman [Tue, 13 Aug 2013 23:49:26 +0000 (16:49 -0700)]
Merge branch 'pxa/dt' into next/dt
From: Haojian Zhuang <haojian.zhuang@gmail.com>:
* pxa/dt:
ARM: pxa: DTS: override gpio node in pxa3xx.dtsi
ARM: pxa: fix DT auxdata for pxa3xx-gpio
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Daniel Mack [Thu, 11 Jul 2013 15:17:57 +0000 (17:17 +0200)]
ARM: pxa: DTS: override gpio node in pxa3xx.dtsi
The gpio controller node inherited from pxa2xx.dtsi won't work for
pxa3xx SoCs, so let's override it in pxa3xx.dtsi.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Daniel Mack [Thu, 11 Jul 2013 15:17:56 +0000 (17:17 +0200)]
ARM: pxa: fix DT auxdata for pxa3xx-gpio
Commit
f87311743 ("ARM: mmp: add more compatible names in gpio driver")
changed the DT match string for pxa3xx-gpio, but left the auxdata table
unchanged.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Mikko Perttunen [Thu, 1 Aug 2013 15:00:18 +0000 (18:00 +0300)]
ARM: tegra: add USB DT entries for Tegra114, Dalmore
Device tree entries for the three EHCI controllers on Tegra114.
Enables the the third controller (USB host) on Dalmore.
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Tuomas Tynkkynen [Thu, 1 Aug 2013 15:00:17 +0000 (18:00 +0300)]
ARM: tegra: add USB DT entries for Tegra30
Add device tree entries for the 3 USB controllers and PHYs and
enable the third controller on Cardhu and Beaver boards.
Fix VBUS regulator entries on Beaver. The GPIO pins were wrong.
Also, internal pullups need to be enabled on those pins.
Signed-off-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Soren Brinkmann [Wed, 31 Jul 2013 23:24:59 +0000 (16:24 -0700)]
arm: zynq: dt: Set correct L2 ram latencies
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Jay Agarwal [Fri, 9 Aug 2013 14:49:31 +0000 (16:49 +0200)]
ARM: dts: tegra: Increase prefetchable PCI memory space
Instead of evenly splitting the 512 MiB area between prefetchable and
non-prefetchable memory spaces, increase the prefetchable memory space
to 384 MiB while at the same time decreasing the non-prefetchable memory
space to 128 MiB. This is a more useful default as most PCIe devices
require more prefetchable than non-prefetchable memory.
Signed-off-by: Jay Agarwal <jagarwal@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Stephen Warren [Fri, 9 Aug 2013 14:49:29 +0000 (16:49 +0200)]
ARM: tegra: Fix Beaver's PCIe lane configuration
Beaver's PCIe lane configuration most closely matches x2 x2 x2 rather
than x4 x1 x1, since clocks 0 and 2 are used, and lanes 0 and 5 are used,
and the only way those align is with a x2 x2 x2 configuration.
Also, disable root port 1; there's nothing connected to it. Root port 0
is the on-board PCIe Ethernet, and port 2 is the mini-PCIe slot.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Thierry Reding [Fri, 9 Aug 2013 14:49:28 +0000 (16:49 +0200)]
ARM: tegra: Enable PCIe controller on Beaver
PCIe lane 0 is connected to an onboard Gigabit Ethernet (RTL8168evl) and
lane 4 is routed to the board's miniPCIe slot.
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Jay Agarwal [Fri, 9 Aug 2013 14:49:27 +0000 (16:49 +0200)]
ARM: tegra: Enable PCIe controller on Cardhu
Root port 2 is routed to the bottom connector on Cardhu and is used by
the development dock to provide gigabit ethernet and USB functionality.
Signed-off-by: Jay Agarwal <jagarwal@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Thierry Reding [Fri, 9 Aug 2013 14:49:26 +0000 (16:49 +0200)]
ARM: tegra: Add Tegra30 PCIe support
Add the top-level pcie-controller node for the Tegra30 SoC. Tegra30 has
three root ports that can use different lane layouts.
Signed-off-by: Jay Agarwal <jagarwal@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Thierry Reding [Fri, 9 Aug 2013 14:49:23 +0000 (16:49 +0200)]
ARM: tegra: trimslice: Initialize PCIe from DT
With the device tree support in place, probe the PCIe controller from
the device tree and remove the corresponding workaround in the board
file.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Thierry Reding [Fri, 9 Aug 2013 14:49:22 +0000 (16:49 +0200)]
ARM: tegra: harmony: Initialize PCIe from DT
With the device tree support in place, probe the PCIe controller from
the device tree and remove the corresponding workaround in the board
file.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Thierry Reding [Fri, 9 Aug 2013 14:49:21 +0000 (16:49 +0200)]
ARM: tegra: tec: Add PCIe support
Enable the first PCIe root port which is connected to an FPGA on the
Tamonten Evaluation Carrier and add device nodes for each of the PCI
endpoints available in the standard configuration.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Thierry Reding [Fri, 9 Aug 2013 14:49:20 +0000 (16:49 +0200)]
ARM: tegra: tamonten: Add PCIe support
Add properties common to all Tamonten-derived boards to the Tamonten
DTSI and add the fixed 1.05 V regulator.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Thierry Reding [Fri, 9 Aug 2013 14:49:19 +0000 (16:49 +0200)]
ARM: tegra: Add Tegra20 PCIe support to DT
Add the top-level pcie-controller node for the Tegra20 SoC. Tegra20 has
two root ports that can use different lane layouts.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
[swarren: split DT changes into a separate patch from the main driver]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Joseph Lo [Mon, 12 Aug 2013 09:40:07 +0000 (17:40 +0800)]
ARM: tegra: enable LP1 suspend mode
Enabling the LP1 suspend mode for Tegra devices.
Tested-by: Marc Dietrich <marvin24@gmx.de> # paz00 board
Signed-off-by: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Thierry Reding [Mon, 12 Aug 2013 15:49:03 +0000 (17:49 +0200)]
ARM: tegra: beaver: Enable HDMI output
Enable the HDMI output as well as DDC and hotplug detection on Beaver.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Linus Torvalds [Mon, 12 Aug 2013 01:04:20 +0000 (18:04 -0700)]
Linux 3.11-rc5
Linus Torvalds [Sun, 11 Aug 2013 23:32:26 +0000 (16:32 -0700)]
Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is three bug fixes: An fnic warning caused by sleeping under a
lock, a major regression with our updated WRITE SAME/UNMAP logic which
caused tons of USB devices (and one RAID card) to cease to function
and a megaraid_sas firmware initialisation problem which causes kdump
failures"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
[SCSI] Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
[SCSI] fnic: BUG: sleeping function called from invalid context during probe
[SCSI] megaraid_sas: megaraid_sas driver init fails in kdump kernel
Linus Torvalds [Sun, 11 Aug 2013 19:12:39 +0000 (12:12 -0700)]
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc
Pull powerpc fixes from Ben Herrenschmidt:
"This includes small series from Michael Neuling to fix a couple of
nasty remaining problems with the new Power8 support, also targeted at
stable 3.10, without which some new userspace accessible registers
aren't properly context switched, and in some case, can be clobbered
by the user of transactional memory.
Along with that, a few slightly more minor things, such as a missing
Kconfig option to enable handling of denorm exceptions when not
running under a hypervisor (or userspace will randomly crash when
hitting denorms with the vector unit), some nasty bugs in the new
pstore oops code, and other simple bug fixes worth having in now.
Note: I picked up the two powerpc KVM fixes as Alex Graf asked me to
handle KVM bits while he is on vacation. However I'll let him decide
whether they should go to -stable or not when he is back"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/tm: Fix context switching TAR, PPR and DSCR SPRs
powerpc: Save the TAR register earlier
powerpc: Fix context switch DSCR on POWER8
powerpc: Rework setting up H/FSCR bit definitions
powerpc: Fix hypervisor facility unavaliable vector number
powerpc/kvm/book3s_pr: Return appropriate error when allocation fails
powerpc/kvm: Add signed type cast for comparation
powerpc/eeh: Add missing procfs entry for PowerNV
powerpc/pseries: Add backward compatibilty to read old kernel oops-log
powerpc/pseries: Fix buffer overflow when reading from pstore
powerpc: On POWERNV enable PPC_DENORMALISATION by default
Linus Torvalds [Sun, 11 Aug 2013 19:11:33 +0000 (12:11 -0700)]
Merge tag 'for-linus' of git://git./virt/kvm/kvm
Pull s390 kvm fixes from Paolo Bonzini:
"Two fixes for s390"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: s390: fix pfmf non-quiescing control handling
KVM: s390: move kvm_guest_enter,exit closer to sie
Linus Torvalds [Sun, 11 Aug 2013 19:10:47 +0000 (12:10 -0700)]
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Some driver bugfixes for the I2C subsystem"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: mv64xxx: Document the newly introduced allwinner compatible
i2c: Fix Kontron PLD prescaler calculation
i2c: i2c-mxs: Use DMA mode even for small transfers
Linus Torvalds [Sat, 10 Aug 2013 22:21:47 +0000 (15:21 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"These are assorted fixes, mostly from Josef nailing down xfstests
runs. Zach also has a long standing fix for problems with readdir
wrapping f_pos (or ctx->pos)
These patches were spread out over different bases, so I rebased
things on top of rc4 and retested overnight"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: don't loop on large offsets in readdir
Btrfs: check to see if root_list is empty before adding it to dead roots
Btrfs: release both paths before logging dir/changed extents
Btrfs: allow splitting of hole em's when dropping extent cache
Btrfs: make sure the backref walker catches all refs to our extent
Btrfs: fix backref walking when we hit a compressed extent
Btrfs: do not offset physical if we're compressed
Btrfs: fix extent buffer leak after backref walking
Btrfs: fix a bug of snapshot-aware defrag to make it work on partial extents
btrfs: fix file truncation if FALLOC_FL_KEEP_SIZE is specified
Linus Torvalds [Sat, 10 Aug 2013 22:20:37 +0000 (15:20 -0700)]
Merge tag 'nfs-for-3.11-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust:
- Stable patch for lockd to fix Oopses due to inappropriate calls to
utsname()->nodename
- Stable patches for sunrpc to fix Oopses on shutdown when using
AF_LOCAL sockets with rpcbind
- Fix memory leak and error checking issues in nfs4_proc_lookup_mountpoint
- Fix a regression with the sync mount option failing to work for nfs4
mounts
- Fix a writeback performance issue when doing cache invalidation
- Remove an incorrect call to nfs_setsecurity in nfs_fhget
* tag 'nfs-for-3.11-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFSv4: Fix up nfs4_proc_lookup_mountpoint
NFS: Remove unnecessary call to nfs_setsecurity in nfs_fhget()
NFSv4: Fix the sync mount option for nfs4 mounts
NFS: Fix writeback performance issue on cache invalidation
SUNRPC: If the rpcbind channel is disconnected, fail the call to unregister
SUNRPC: Don't auto-disconnect from the local rpcbind socket
LOCKD: Don't call utsname()->nodename from nlmclnt_setlockargs
Linus Torvalds [Sat, 10 Aug 2013 22:19:58 +0000 (15:19 -0700)]
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
Pull nfsd fixes from Bruce Fields:
"Some fixes for a 4.1 feature that in retrospect probably should have
waited for 3.12.... But it appears to be working now"
* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID
nfsd4: Fix MACH_CRED NULL dereference