Kevin Hilman [Thu, 11 Jun 2015 21:37:45 +0000 (14:37 -0700)]
Merge tag 'v4.1-rc6' into next/dt
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.
Kevin Hilman [Thu, 11 Jun 2015 21:31:55 +0000 (14:31 -0700)]
Merge tag 'samsung-dt-3' of git://git./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
Linus Walleij [Fri, 5 Jun 2015 07:42:25 +0000 (09:42 +0200)]
ARM: nomadik: set proper compatible for accelerometer
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>
Linus Walleij [Thu, 4 Jun 2015 11:41:12 +0000 (13:41 +0200)]
ARM64: juno: add GPIO keys
The Juno board has two keys connected to a PL061 GPIO block,
in accordance to DDI0524B "ARM Versatile Express Juno Development
Platform" revision 1.0, table 2-4 "GPIO (0) and GPIO (1) used
for additional user key entry". By trial-and-error I found that
these are connected to the two keys named "power" and "home"
on the motherboard.
Register the GPIO block and these two keys in the device tree
using the PL061 GPIO driver and the generic gpio keys.
- Map POWER, HOME, VOL+ and VOL- to the obvious input events.
- Map RLOCK to KEY_SCREENLOCK/KEY_COFFEE unless someone can
explain better what this is for.
- Map the NMI button to KEY_SYSREQ as this is used like so
in the SYSREQ debugging hack.
Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
ludovic.desroches@atmel.com [Mon, 8 Jun 2015 13:55:48 +0000 (15:55 +0200)]
ARM: at91/dt: sama5d4: fix dma conf for aes, sha and tdes nodes
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>
Kevin Hilman [Thu, 11 Jun 2015 00:05:33 +0000 (17:05 -0700)]
Merge tag 'hi6620-dt-for-4.2' of git://github.com/hisilicon/linux-hisi into next/dt
ARM64: DT: Hisilicon hi6220 soc and hikey board updates for 4.2
- Added the devicetree bindings document for hi6220 SoC
- Added the devicetree bindings document for hi6220 clock
- Added dts files for hi6220 SoC and hikey board
* tag 'hi6620-dt-for-4.2' of git://github.com/hisilicon/linux-hisi:
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
Kevin Hilman [Thu, 11 Jun 2015 00:03:07 +0000 (17:03 -0700)]
Merge tag 'at91-dt4' of git://git./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
Kevin Hilman [Thu, 11 Jun 2015 00:01:25 +0000 (17:01 -0700)]
Merge tag 'imx-dt-4.2' of git://git./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
...
Kevin Hilman [Wed, 10 Jun 2015 23:11:41 +0000 (16:11 -0700)]
Merge tag 'keystone-dts-for-4.2' of git://git./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
Kevin Hilman [Wed, 10 Jun 2015 23:07:41 +0000 (16:07 -0700)]
Merge tag 'arm-soc/for-4.2/dts-part3' of 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
Maxime Coquelin [Wed, 3 Jun 2015 14:54:02 +0000 (16:54 +0200)]
ARM: dts: Introduce STM32F429 MCU
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>
Kevin Hilman [Wed, 10 Jun 2015 22:47:21 +0000 (15:47 -0700)]
Merge tag 'sunxi-dt-for-4.2-2' of https://git./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
Dinh Nguyen [Wed, 3 Jun 2015 02:31:00 +0000 (21:31 -0500)]
ARM: socfpga: dts: enable ethernet for Arria10 devkit
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>
Murali Karicheri [Mon, 11 May 2015 19:20:11 +0000 (12:20 -0700)]
ARM: dts: k2l: fix the netcp range size
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>
Murali Karicheri [Mon, 11 May 2015 19:20:07 +0000 (12:20 -0700)]
ARM: dts: k2e: fix the netcp range size
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>
Murali Karicheri [Mon, 11 May 2015 19:20:03 +0000 (12:20 -0700)]
ARM: dts: k2hk: fix the netcp range size
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>
Murali Karicheri [Thu, 23 Apr 2015 21:02:13 +0000 (14:02 -0700)]
ARM: dts: k2l-evm: Add device bindings for netcp driver
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>
Murali Karicheri [Thu, 23 Apr 2015 21:02:13 +0000 (14:02 -0700)]
ARM: dts: k2e-evm: Add device bindings for netcp driver
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>
Murali Karicheri [Thu, 23 Apr 2015 21:02:13 +0000 (14:02 -0700)]
ARM: dts: k2hk-evm: Add device bindings for netcp driver
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>
Kevin Hilman [Wed, 10 Jun 2015 22:40:59 +0000 (15:40 -0700)]
Merge tag 'socfpga_dts_for_v4.2_part_3' of git://git./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
Rafał Miłecki [Sat, 16 May 2015 14:55:39 +0000 (16:55 +0200)]
ARM: BCM5301X: Add DT for Asus RT-AC87U
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>
Hauke Mehrtens [Sun, 24 May 2015 19:08:14 +0000 (21:08 +0200)]
ARM: BCM5301X: add IRQ numbers for PCIe controller
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>
Hauke Mehrtens [Fri, 29 May 2015 21:39:47 +0000 (23:39 +0200)]
ARM: BCM5301X: add NAND flash chip description
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>
Bintian Wang [Sat, 7 Feb 2015 06:57:52 +0000 (14:57 +0800)]
arm64: dts: Add dts files for Hisilicon Hi6220 SoC
Add initial dtsi file to support Hisilicon Hi6220 SoC with
support of Octal core CPUs in two clusters and each cluster
has quard Cortex-A53.
Also add dts file to support HiKey development board which
based on Hi6220 SoC.
Signed-off-by: Bintian Wang <bintian.wang@huawei.com>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Reviewed-by: Yiping Xu <xuyiping@hisilicon.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Tested-by: Tyler Baker <tyler.baker@linaro.org>
Tested-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Bintian Wang [Sat, 7 Feb 2015 06:48:13 +0000 (14:48 +0800)]
clk: hi6220: Document devicetree bindings for hi6220 clock
Document DT files bindings for Hisilicon hi6220 clock.
Signed-off-by: Bintian Wang <bintian.wang@huawei.com>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Michael Turquette <mturquette@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Bintian Wang [Wed, 25 Feb 2015 07:23:11 +0000 (15:23 +0800)]
arm64: hi6220: Document devicetree bindings for Hisilicon hi6220 SoC
This patch adds documentation for the devicetree bindings used by the
DT files of Hisilicon hi6220 SoC mobile platform.
Signed-off-by: Bintian Wang <bintian.wang@huawei.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Ludovic Desroches [Thu, 28 May 2015 09:55:16 +0000 (11:55 +0200)]
ARM: at91/dt: sama5d4ek: mci0 uses slot 0
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>
Gaël PORTAY [Wed, 3 Jun 2015 09:44:23 +0000 (11:44 +0200)]
ARM: at91/dt: kizbox: fix mismatch LED PWM device
The network_red LED uses the 4th PWM device.
Signed-off-by: Gaël PORTAY <g.portay@overkiz.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:18 +0000 (14:24 +0200)]
ARM: at91/dt: Add Acme Arietta G25
Add a minimum Device Tree for Acme Arietta G25.
http://acme.systems/arietta
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Sergio Tanzilli <tanzilli@acmesystems.it>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:17 +0000 (14:24 +0200)]
ARM: at91/dt: sama5d4 xplained: use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:16 +0000 (14:24 +0200)]
ARM: at91/dt: sama5d4ek: use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:15 +0000 (14:24 +0200)]
ARM: at91/dt: sama5d3 xplained: use stdout-path
Use stdout-path to specify the console and remove the bootargs.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:14 +0000 (14:24 +0200)]
ARM: at91/dt: sama5d3xek: use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:13 +0000 (14:24 +0200)]
ARM: at91/dt: at91sam9x5ek: use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:12 +0000 (14:24 +0200)]
ARM: at91/dt: at91sam9rlek: use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:11 +0000 (14:24 +0200)]
ARM: at91/dt: at91sam9n12ek: use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:10 +0000 (14:24 +0200)]
ARM: at91/dt: at91sam9m10g45ek use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:09 +0000 (14:24 +0200)]
ARM: at91/dt: at91sam9g20ek: use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:08 +0000 (14:24 +0200)]
ARM: at91/dt: at91sam9263ek: use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:07 +0000 (14:24 +0200)]
ARM: at91/dt: at91sam9261ek: use stdout-path
Use stdout-path to specify the console and remove the console argument from
the kernel command line.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:06 +0000 (14:24 +0200)]
ARM: at91/dt: at91rm9200ek: use stdout-path
Use stdout-path to specify the console.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:05 +0000 (14:24 +0200)]
ARM: at91/dt: kizbox: use stdout-path
The kizbox dts are using the deprecated linux,stdout-path. Replace those by
stdout-path.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Gaël PORTAY <g.portay@overkiz.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:04 +0000 (14:24 +0200)]
ARM: at91/dt: at91sam9rlek: add RTC
Add RTC support to the at91sam9rlek.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni [Wed, 3 Jun 2015 12:24:03 +0000 (14:24 +0200)]
ARM: at91/dt: at91sam9rl: fix rtc node
The RTC lives at 0xfffffe00. Also reorder the node properly.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Shawn Guo [Wed, 3 Jun 2015 07:27:39 +0000 (15:27 +0800)]
ARM: dts: imx6dl: add imx6dl gpt specific compatible string
The i.MX6DL/S GPT has a different programming model from i.MX6Q one.
Add the compatible string "fsl,imx6dl-gpt" for it, and leave
"fsl,imx6q-gpt" there to keep the existing/old kernel happy.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Heiko Schocher [Tue, 26 May 2015 04:06:26 +0000 (06:06 +0200)]
ARM: dts: imx6: add DT for aristainetos2 board
This patch adds support for the imx6dl based aristainetos2 board
with following configuration:
CPU: Freescale i.MX6DL rev1.1 at 792 MHz
MReset cause: POR
MBoard: aristaitenos2
DRAM: 1 GiB
NAND: 1024 MiB
MMC: FSL_SDHC: 0, FSL_SDHC: 1
SF: Detected N25Q128A with page size 256 Bytes, erase size 64 KiB, total 16 MiB
Display: lb07wv8 (800x480)
As this board can be used with 2 different display types, the
differences between them are extracted into 2 DTS files, and
the common settings are collected in a common file.
Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Fabio Estevam [Wed, 20 May 2015 18:57:02 +0000 (15:57 -0300)]
ARM: dts: cubox-i/hummingboard: Fix the license text
Arrange the license text a bit to make it clear.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Eric Nelson [Tue, 19 May 2015 15:50:16 +0000 (08:50 -0700)]
ARM: dts: sabrelite: use simple-panel instead of display-timings for LVDS0
Also add label for backlight_lvds and connect it to the LVDS display.
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Eric Nelson [Tue, 19 May 2015 15:50:15 +0000 (08:50 -0700)]
ARM: dts: nitrogen6x: use simple-panel instead of display-timings for LVDS0
Also add label for backlight_lvds and connect it to the display.
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Frank Li [Mon, 18 May 2015 18:45:05 +0000 (02:45 +0800)]
ARM: dts: add imx7d-sdb support
add imx7d sdb board support
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Frank Li [Mon, 18 May 2015 18:45:04 +0000 (02:45 +0800)]
ARM: dts: add imx7d soc dtsi file
imx7d intergrates the unique display controller for EPD panel, pixel engines
and graphics engines to make it a ideal solution for EPD based devices such
as eReader, Signage, as well as any application rely on the bistable charactersic
of the EPD panel.
imx7d include two ARM Cortex A7 Core and one Cortex-M4 core.
Included Main Peripheral
- DDR3\LP-DDR2
- GPMI\BCH\APBH DMA(NAND flash support)
- QSPI
- WEIM Nor
- LCDIF\MIPI DSI
- CSI\MIPI CSI
- EPDC
- PCIe RC\EP
- USB OTG\Host
- CAN x2
- I2C x4
- SIMv2 x2
- ENET -x2
- uSDHC x3
- eCSPI x1
- PWM x4
- OCOTP (fuse)
- GPT x4
- WDOG x4
- Flex Timer x2
Signed-off-by: Anson Huang <b20788@freescale.com>
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Sébastien Szymanski [Fri, 15 May 2015 13:44:27 +0000 (15:44 +0200)]
ARM: dts: Armadeus Systems APF6 family support (i.MX6)
Add support to the Armadeus Systems APF6 Solo / Dual / Quad SoM and
the Armadeus Systems APF6Dev carrier board.
For more details see:
http://www.armadeus.com/english/products-processor_boards-apf6.html
http://www.armadeus.com/english/products-development_boards-apf6_dev.html
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cory Tusar [Thu, 14 May 2015 03:11:38 +0000 (23:11 -0400)]
ARM: dts: vf610: Nomenclature fixup for PTC12 pin used in RMII mode.
This commit includes a minor nomenclature fixup for boards based on the
Freescale VF610 SoC and which make use of the alternate "RMII1_RXD1"
functionality for pin PTC12. This brings the macro name in-line with
both the datasheet and other similar macros.
Signed-off-by: Cory Tusar <cory.tusar@pid1solutions.com>
Acked-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Mon, 11 May 2015 15:38:33 +0000 (12:38 -0300)]
ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
Add DT support for the Broadcom Wifi/Bluetooth devices found on the
microsom board.
[Modified original Russell King's patch to use mmc-pwrseq]
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Jon Nettleton <jon@solid-run.com>
Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Frank Li [Thu, 7 May 2015 17:35:53 +0000 (01:35 +0800)]
Document: dt: binding: imx: update document for imx7d support
This part just add necessary change to boot imx7d.
Update clock, pinctrl and gpt for imx7d
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Philipp Zabel [Thu, 7 May 2015 13:24:16 +0000 (15:24 +0200)]
ARM: dts: imx6qdl: Add power-domain phandle to CODA device node
The CODA960 VPU is part of the PU power domain. Add power-domains
phandle so it can be associated with the PU generic pm domain for
power gating.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Tim Harvey [Thu, 7 May 2015 15:38:00 +0000 (08:38 -0700)]
ARM: dts: Gateworks GW5510 support (i.MX6)
Add support for the Gateworks GW5510 board featuring:
* i.MX6 SoC
* up to 512MB DDR3
* up to 2GB NAND flash
* 1x miniPCIe socket (with USB)
* HDMI out (micro-HDMI)
* HDMI in (micro-HDMI) (currently supported by only vendor kernel)
* TTL level I/O (supported by GW16111 breakout board):
* I2C
* 2x UART
* CAN
* 2x DIO (GPIO/PWM)
* USB OTG
For more details see:
http://www.gateworks.com/product/item/ventana-gw5510-single-board-computer
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Thu, 30 Apr 2015 22:55:30 +0000 (19:55 -0300)]
ARM: dts: imx6sl-warp: Fix OTG roles
USBOTG1 always work on peripheral mode and USBOTG in host mode, so fix
their roles accordingly.
Tested by mounting the MMC card as a storage device:
modprobe g_mass_storage file=/dev/mmcblk0p2
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Thu, 30 Apr 2015 22:55:29 +0000 (19:55 -0300)]
ARM: dts: imx6sl-warp: Remove USB regulators
According to the warp schematics there are no regulators for the USB OTG
ports, so let's remove them.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Thu, 30 Apr 2015 22:55:28 +0000 (19:55 -0300)]
ARM: dts: imx6sl-warp: Remove unused regulator
The 'reg_1p8v' regulator is not used anywhere, so let's remove it.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Frank Li [Wed, 29 Apr 2015 14:20:01 +0000 (22:20 +0800)]
ARM: dts: add pinfunc include file to support imx7d
Addi i.MX7D support:
pinfunc part except GPIO1
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Thomas Niederprüm [Tue, 31 Mar 2015 18:27:11 +0000 (20:27 +0200)]
ARM: mxs: fix in tree users of ssd1306
This patch updates the in tree-users of the SSD1306 controller for using
the newly introduced DT properties.
Signed-off-by: Thomas Niederprüm <niederp@physik.uni-kl.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Thu, 9 Apr 2015 00:41:53 +0000 (21:41 -0300)]
ARM: dts: imx6qdl-hummingboard: Add PCIe support
Add PCIe support. Based on a patch from Rabeeh Khoury from the solid-run
tree.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Harald Geyer [Fri, 17 Apr 2015 14:43:25 +0000 (14:43 +0000)]
ARM: dts: imx23-olinuxino: Add i2c support
The imx23-olinuxino board has an i2c interface exposed on UEXT connector.
This patch enables i2c and selects the pin group used on UEXT connector.
Tested with MOD-LCD1x9 from Olimex.
This patch is based on work by Fadil Berisha with his permission. However
all bugs are mine.
Signed-off-by: Harald Geyer <harald@ccbib.org>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Harald Geyer [Fri, 17 Apr 2015 14:43:24 +0000 (14:43 +0000)]
ARM: dts: imx23: Add i2c support
The imx23-olinuxino board has an i2c interface exposed on UEXT connector.
This patch provides the generic devicetree infrastructure for a follow-up
patch to add support to the actual board files.
Tested all three possible pin groups with MOD-LCD1x9 from Olimex.
This patch is based on work by Fadil Berisha with his permission. However
all bugs are mine.
Signed-off-by: Harald Geyer <harald@ccbib.org>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Wed, 1 Apr 2015 12:03:45 +0000 (09:03 -0300)]
ARM: dts: hummingboard: Remove unneeded 'fsl,mode' property
imx6qdl-hummingboard boards use sgtl5000 codec and the machine file
(imx-sgtl5000) already sets SSI in slave mode and codec in master mode, so there
is no need for having the 'fsl,mode' property.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Lucas Stach [Wed, 1 Apr 2015 09:26:54 +0000 (11:26 +0200)]
ARM: dts: imx6qdl: move HDMI controller to right location in DT
Currently the HDMI controller is a child device of the AIPS bus in the
DT which is clearly wrong. Move it to the right location.
This introduces no functional change it just aligns the DT representation
with reality.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Frank Li [Wed, 3 Jun 2015 06:41:29 +0000 (14:41 +0800)]
dt-bindings: add imx7d clock ID definitions
It adds the imx7d clock ID definitions which will be used by both imx7d
clock driver and device tree.
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Krzysztof Kozlowski [Sat, 23 May 2015 03:25:17 +0000 (12:25 +0900)]
ARM: dts: Add syscon property to the MIPI DPHY for exynos4415
Since
e4b3d38088df ("phy: exynos-video-mipi: Fix regression by adding
support for PMU regmap") the Exynos PMU driver provides regmap to access
the MIPI DPHY registers. The MIPI DPHY driver accesses this regmap
through syscon phandle.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Krzysztof Kozlowski [Sat, 23 May 2015 03:24:43 +0000 (12:24 +0900)]
ARM: dts: Remove obsolete MIPI DPHY 'reg' property for exynos4
Since
e4b3d38088df ("phy: exynos-video-mipi: Fix regression by
adding support for PMU regmap") the Exynos PMU driver provides
regmap to access the MIPI DPHY registers. The MIPI DPHY node uses
a phandle to syscon to get this regmap. The 'reg' field is obsolete.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Krzysztof Kozlowski [Fri, 3 Apr 2015 09:28:01 +0000 (11:28 +0200)]
ARM: dts: Use last parent for clocks during power domain on/off
Replace fixed parent with last parent (obtained with clk_get_parent())
of clocks for devices in mfc and disp power domains. This should improve
behavior if such clocks were reparented by the drivers and new parents
are different than those specified in DTS.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Tested-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Hans de Goede [Mon, 1 Jun 2015 15:02:59 +0000 (17:02 +0200)]
ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using
the same dts for both models. Unfortunately this does not work for the otg
controller, on the M9 this is routed to a micro-usb connector on the outside,
while as on the A1000G-quad it is connected to an usb to sata bridge
(which is not populated on the M9 pcb).
This commit adds a new dts for the Mele-A1000G-quad to allow using
different otg controller settings on the 2 boards.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Hans de Goede [Tue, 2 Jun 2015 20:08:02 +0000 (22:08 +0200)]
ARM: dts: sun8i: Add dts file for the GA10H-A33 tablet
The ga10h is an 10" tablet with an A33 or A23 soc, 1G RAM, 8G or 16G nand,
sdio wifi, 2 micro usb ports, 1 otg and 1 host and 1 micro sd slot.
This commit adds a dts file for the v1.1 pcb with an a33 soc.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Chen-Yu Tsai [Tue, 2 Jun 2015 10:04:03 +0000 (18:04 +0800)]
ARM: dts: sun8i-a33: Add dts for Sinlinx SinA33 development board.
The SinA33 is a core/SDK development board by Sinlinx. The core board
does not have any connectors or pads, other than the pads used to connect
it to the SDK board.
The core board only has the A33 SoC, 2 RAM chips, an eMMC flash chip,
the AXP223 PMIC, and supporting discrete components. eMMC is optional.
The SDK board has a USB host, USB OTG, volume control and home buttons,
audio input/output jacks, a micro-SD slot, camera and SDIO expansion
headers, an LCD connector, and a GPIO expansion header, which has
UARTs, MIPI DSI and I2C available. Only UART0 is enabled though.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Chen-Yu Tsai [Tue, 2 Jun 2015 10:04:02 +0000 (18:04 +0800)]
ARM: dts: sun8i-a33: Add pinmux setting for uart0 on PB pins
The A33 adds an additional pinmux option for uart0 on the PB pins.
This was not present on the A23. Nor is it available on the H3,
which does not have the PB pingroup.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Chen-Yu Tsai [Tue, 2 Jun 2015 10:04:01 +0000 (18:04 +0800)]
ARM: dts: sun8i: Add pinmux setting for 8bit mmc2
mmc2 is mostly used with eMMC flash chips, as an alternative to
raw NAND flash chips. 8 bit mmc is commonly used.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Steffen Trumtrar [Fri, 29 May 2015 14:33:03 +0000 (14:33 +0000)]
ARM: socfpga: socrates: add gpio-leds
The SOCrates has three HPS LEDs that can be turned on/off via gpio.
Use the first one has heartbeat and add the other two as free LEDs.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Steffen Trumtrar [Fri, 29 May 2015 14:33:02 +0000 (14:33 +0000)]
ARM: socfpga: socrates: enable gpio0/1
Enable the gpio0+1 controller.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Alan Tull [Tue, 2 Jun 2015 18:35:39 +0000 (18:35 +0000)]
ARM: socfpga: dts: add sdram controller dt binding doc
Add binding doc for Altera SOCFPGA SDRAM controller.
Signed-off-by: Alan Tull <atull@opensource.altera.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Dinh Nguyen [Sat, 23 May 2015 04:00:10 +0000 (23:00 -0500)]
ARM: socfpga: dts: add enable-method property for cpu nodes
Add the enable-method property for the cpu node on socfpga.dtsi and
socfpga_arria10.dtsi. This is for CPU_METHOD_OF_DECLARE to use to enable
the secondary core.
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Dinh Nguyen [Thu, 14 May 2015 14:49:14 +0000 (09:49 -0500)]
ARM: socfpga: dts: add the a9-scu node for arria10
Add a dts node for the A9 SCU on the Arria10 platform.
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Hans de Goede [Mon, 1 Jun 2015 18:23:28 +0000 (20:23 +0200)]
ARM: dts: sun8i: Add usb_clk node for a23/a33
Add an usb_clk node for a23/a33.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Vishnu Patekar [Sat, 30 May 2015 14:55:05 +0000 (16:55 +0200)]
ARM: dts: sun8i: Add ET-Q8 A33 support
ET-Q8_A33 is A33 based cheap tablet in common Q8 format.
It has 512MB RAM, 4GB Nand, 7" Display, RDA5900P wifi, GSL1680 touch, etc.
Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Chen-Yu Tsai <wens@csie.org>
Vishnu Patekar [Sat, 30 May 2015 14:55:04 +0000 (16:55 +0200)]
ARM: dts: sun8i: Add sun8i-a33 dtsi
Add a dtsi file for use with a33 based boards based on the new
sun8i-a23-a33.dtsi file.
Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Chen-Yu Tsai <wens@csie.org>
Vishnu Patekar [Sat, 30 May 2015 14:55:03 +0000 (16:55 +0200)]
ARM: dts: sun8i: Add sun8i-a23-a33 dtsi
Rename sun8i-a23.dtsi to sun8i-a23-a33.dtsi as the base dtsi for the A33
is 99% the same and add a new sun8i-a23.dtsi including sun8i-a23-a33.dtsi
and setting the few things not shared with the A33 (mbus-clk, pio
compatible and interrupts).
Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Chen-Yu Tsai <wens@csie.org>
Arnd Bergmann [Mon, 1 Jun 2015 16:02:44 +0000 (18:02 +0200)]
Merge tag 'dt-for-armsoc' of git://git./linux/kernel/git/linusw/linux-stericsson into next/dt
Merge "Device Tree changes for Ux500 and ARM SOC" from Linus Walleij:
- Document Snoop Control Unit (SCU) bindings
- Document Ux500 board bindings
- Define the backup RAM in the DBx500 device tree
* tag 'dt-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: define the backupram in the device tree
ARM: ux500: add board documentation
ARM: scu: document Snoop Control Unit DT bindings
Arnd Bergmann [Mon, 1 Jun 2015 15:58:53 +0000 (17:58 +0200)]
Merge tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek into next/dt
Merge "ARM: mediatek: arm64 updates for v4.2" from Matthias Brugger:
- dts: mt8173: fix style convention for pinctrl node
- dts: mt8173: fix indentation for some nodes
* tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek:
arm64: dts: mt8173: fix some indentation
arm64: dts: mt8173: Fixup pinctrl nodes
Arnd Bergmann [Mon, 1 Jun 2015 15:41:46 +0000 (17:41 +0200)]
Merge tag 'arm-soc/for-4.2/dts-fixes' of github.com/broadcom/stblinux into next/dt
Merge "This pull request contains a single change" from Florian Fainelli:
- fix the NAND controller node on bcm63138, the original change was a mis-merge that
did not properly parent it to the "ubus" node
* tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux:
ARM: dts: BCM63xx: re-parent NAND controller node
Arnd Bergmann [Mon, 1 Jun 2015 15:38:07 +0000 (17:38 +0200)]
Merge tag 'mvebu-dt-4.2-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v4.2 (part #2)" from Gregory CLEMENT:
Add 2 new set boards:
- Armada 385 based Linksys boards
- DLink DNS-327L
Update the spi-nor flash compatible strings
Use improved armada spi device tree compatible name for each mvebu SoC
* tag 'mvebu-dt-4.2-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: use improved armada spi device tree compatible name for each SoC
ARM: mvebu: dts: Add dts file for DLink DNS-327L
ARM: mvebu: add "jedec,spi-nor" flash compatible binding
ARM: kirkwood: add "jedec,spi-nor" flash compatible binding
ARM: mvebu: add support for the new Armada 385 based Linksys boards
Maxime Ripard [Thu, 26 Mar 2015 14:53:44 +0000 (15:53 +0100)]
ARM: dts: sun7i: Add A20 SRAM and SRAM controller
The A20 has a few SRAM that can be mapped either to a device or to the CPU,
with the mapping being controlled by a SRAM controller.
Add the SRAM controller, the SRAM that it drives and the section that can
be used by the various devices.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Maxime Ripard [Thu, 26 Mar 2015 14:53:44 +0000 (15:53 +0100)]
ARM: dts: sun5i: Add A10s and A13 SRAM and SRAM controller
The A10s and A13 have a few SRAM that can be mapped either to a device or
to the CPU, with the mapping being controlled by a SRAM controller.
Add the SRAM controller, the SRAM that it drives and the section that can
be used by the various devices.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Maxime Ripard [Thu, 26 Mar 2015 14:53:44 +0000 (15:53 +0100)]
ARM: dts: sun4i: Add A10 SRAM and SRAM controller
The A10 has a few SRAM that can be mapped either to a device or to the CPU,
with the mapping being controlled by a SRAM controller.
Add the SRAM controller, the SRAM that it drives and the section that can
be used by the various devices.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Maxime Ripard [Mon, 1 Jun 2015 09:10:14 +0000 (11:10 +0200)]
ARM: dts: sunxi: Revert SRAM controller drivers patches
This patch reverts commit
ccb4ada2f193 ("ARM: dts: sun7i: Add A20 SRAM and
SRAM controller"), commit
e6f51e4bd2a5 ("ARM: dts: sun5i: Add A13 and A10s
SRAM and SRAM controller") and commit
6d92b80f356f ("ARM: dts: sun4i: Add
A10 SRAM and SRAM controller").
The bindings have been changed in the SRAM driver, and we need to
change the DT accordingly.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Chen-Yu Tsai [Tue, 26 May 2015 16:54:16 +0000 (00:54 +0800)]
ARM: dts: sun9i: Add device node for watchdog
On A80 there are 2 watchdogs, one in the main block, and one in the
R (special) block. We do not have information on the R block watchdog,
other than the register layout is the same, and the interrupt number.
Both are able to reset the whole system.
Add the main watchdog, in case the R block is used for special purposes
like running an RTOS.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Michael Ring [Fri, 22 May 2015 14:33:04 +0000 (16:33 +0200)]
ARM: dts: sun7i: Add uart4 support for BananaPro, disable uart2
The BananaPro uses uart4 for the default rx/tx pins on the 40 pins connector,
so enable uart4.
Uart2 is also available at the bananapro io-pins, but like on the bananapi
the primary function of the pins is to act as gpios, see:
http://forum.lemaker.org/forum.php?mod=viewthread&tid=10852
Remove the uart2 node, people who want to use uart2 can do so with a
devicetree-overlay.
Signed-off-by: Michael Ring <mail@michael-ring.org>
[hdegoede@redhat.com: Remove uart2 node]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Michael Ring [Thu, 21 May 2015 12:32:33 +0000 (14:32 +0200)]
ARM: dts: sun7i: Add uart4_pins_b definition
Some boards (e.g. the BananaPro) use alternative pins for uart4, add a pinmux
entry for these.
Signed-off-by: Michael Ring <mail@michael-ring.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Maxime Ripard [Thu, 7 May 2015 20:46:53 +0000 (22:46 +0200)]
ARM: sun8i: Introduce A23 Evaluation Board Support
The A23 Evaluation Board has an MMC slot, two UARTs, NAND, a few display
connectors (RGB, MIPI, LVDS), a mini-PCIE slot, USB host and OTG and a
bunch of embedded sensors.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Daniel Kurtz [Wed, 20 May 2015 10:20:07 +0000 (18:20 +0800)]
arm64: dts: mt8173: fix some indentation
Fix indentation nits to make mt8173.dtsi more consistent.
Signed-off-by: Eddie Huang <eddie.huang@mediatek.com>
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Linus Torvalds [Mon, 1 Jun 2015 02:01:07 +0000 (19:01 -0700)]
Linux 4.1-rc6
Linus Torvalds [Sun, 31 May 2015 23:00:34 +0000 (16:00 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs
Pull vfs fix from Al Viro:
"Off-by-one in d_walk()/__dentry_kill() race fix.
It's very hard to hit; possible in the same conditions as the original
bug, except that you need the skipped branch to contain all the
remaining evictables, so that the d_walk()-calling loop in
d_invalidate() decides there's nothing more to do and doesn't go for
another pass - otherwise that next pass will sweep the sucker.
So it's not too urgent, but seeing that the fix is obvious and the
original commit has spread into all -stable branches..."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
d_walk() might skip too much
This page took 0.048086 seconds and 5 git commands to generate.