summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2014-07-30Merge tag 'v3.17-rockchip-rk3xxx-dts-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "two more dts changes for Rockchip Cortex-A9 SoCs" from Heiko Stübner: Watchdog nodes and a duplicate pinctrl property. * tag 'v3.17-rockchip-rk3xxx-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add watchdog node ARM: dts: rockchip: remove pinctrl setting from radxarock uart2 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-30Merge tag 'v3.17-rockchip-rk3288-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "Basic rk3288 usb support" from Heiko Stübner: Add support for rk3288 ehci controllers. * tag 'v3.17-rockchip-rk3288-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: Enable USB host0 (EHCI) on rk3288-evb ARM: dts: add rk3288 ehci usb devices ARM: dts: Turn on USB host vbus on rk3288-evb Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-31ARM: dts: Enable USB host0 (EHCI) on rk3288-evbDoug Anderson
This is the top USB port on the evb (the one closest to the Ethernet connector). Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-31ARM: dts: add rk3288 ehci usb devicesKever Yang
rk3288 has two kind of usb controller; this adds the ehci variant for host0 and hsic. At the moment we don't add any phys for these controllers, but the default settings seem to work OK. There is a hardware problem in ohci controller which make it unavailable and host0 controller can only support high-speed devices. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-31ARM: dts: Turn on USB host vbus on rk3288-evbDoug Anderson
There is no phy driver that works on the Rockchip board for either USB host port yet. For now just hardcode the vbus signal to be on all the time which makes both the dwc2 host and the EHCI port work. Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-30Merge tag 'zynq-dt-for-3.17-3' of git://git.xilinx.com/linux-xlnx into next/dtOlof Johansson
Merge "Xilinx Zynq dt changes for v3.17 - third pull request" from Michal Simek: arm: Xilinx Zynq dt patches for v3.17 third pull request - Add Adapteva Parallella board/DT - Add SPI nodes - Add CAN nodes - Clean Zynq description * tag 'zynq-dt-for-3.17-3' of git://git.xilinx.com/linux-xlnx: ARM: zynq: DT: Clarify Xilinx Zynq platform ARM: zynq: DT: Remove DMA from board DTs ARM: zynq: DT: Add CAN node ARM: dts: zynq: Add SPI ARM: dts: zynq: Add DMAC for Parallella ARM: dts: zynq: Add Parallella device tree Documentation: devicetree: Adapteva boards Documentation: devicetree: Adapteva vendor prefix Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-30ARM: tegra: apalis t30: fix device tree compatible nodeMarcel Ziswiler
Working on sound support I noticed the Apalis T30 Evaluation board device tree missing the more generic Apalis T30 compatible string. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-30ARM: tegra: paz00: Fix some indentation inconsistenciesThierry Reding
Indentation of the clock property used a hodgepodge of tabs and spaces. Make them more consistent (tabs for indentation followed by spaces for alignment). Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-30Merge tag 'renesas-clock3-for-v3.17' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Third Round of Renesas ARM Based SoC Clock Updates for v3.17" from Simon Horman: Third Round of Renesas ARM Based SoC Clock Updates for v3.17 * Add legacy clocks for SCI for SoCs that do not yet have CCF support. This is to allow timer devices to be enabled using DT and will be removed after CCF support is added for each SoC. This is in keeping with the approach taken for enabling SCI (serial) devices using DT on these SoCs. * tag 'renesas-clock3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: sh73a0: add CMT1 clock support for DT ARM: shmobile: r8a7740: add CMT1 clock support for DT ARM: shmobile: r8a73a4: add CMT1 clock support for DT ARM: shmobile: r8a7740: add TMU clock support for DT ARM: shmobile: r8a7778: add TMU clock support for DT Signed-off-by: Olof Johansson <olof@lixom.net>
2014-07-30ARM: dts: rockchip: add watchdog nodeHeiko Stuebner
This adds the Designware compatible watchdog found on RK3xxx Cortex-A9 SoCs. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-30ARM: dts: rockchip: remove pinctrl setting from radxarock uart2Heiko Stuebner
We set default pinctrl settings for the uarts in rk3188.dtsi already, so remove forgotten duplicate. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-29ARM: zynq: DT: Remove DMA from board DTsSoren Brinkmann
The DMA engine is enabled for all DTs that derive from zynq-7000.dtsi. There is no need to override the 'status' property in board DTs. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-07-29ARM: zynq: DT: Add CAN nodeMichal Simek
Add node describing Zynq's CAN controller. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
2014-07-28Merge tag 'for-3.17/bcm-dt' of git://github.com/broadcom/mach-bcm into next/dtArnd Bergmann
Merge "ARM: mach-bcm: dt updatees for 3.17" from Matt Porter: - BCM Mobile SMP support - BRCM STB platform support * tag 'for-3.17/bcm-dt' of git://github.com/broadcom/mach-bcm: ARM: brcmstb: dts: add a reference DTS for Broadcom 7445 ARM: brcmstb: gic: add compatible string for Broadcom Brahma15 ARM: brcmstb: add misc. DT bindings for brcmstb ARM: brcmstb: add CPU binding for Broadcom Brahma15 ARM: dts: enable SMP support for bcm21664 ARM: dts: enable SMP support for bcm28155 devicetree: bindings: document Broadcom CPU enable method Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28Merge tag 'v3.16-rc6' into next/dtArnd Bergmann
Update to Linux 3.16-rc6 as a dependency for the broadcom changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28Merge tag 'mvebu-dt-3.17-4' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Merge "mvebu DT changes for v3.17 (round 4)" from Jason Cooper" - Armada XP - New board, Lenovo ix4-300d NAS - Add Lenovo to vendor-prefixes - Dove - Add LCD controllers * tag 'mvebu-dt-3.17-4' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Add dts definition for Lenovo Iomega ix4-300d NAS of: Add Lenovo Group Ltd. to the vendor-prefixes list. ARM: dts: dove: add DT LCD controllers Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28ARM: brcmstb: dts: add a reference DTS for Broadcom 7445Marc Carino
Add a sample DTS which will allow bootup of a board populated with the BCM7445 chip. Signed-off-by: Marc Carino <marc.ceeeee@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Matt Porter <mporter@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
2014-07-28ARM: mvebu: Add dts definition for Lenovo Iomega ix4-300d NASBenoit Masson
The Lenovo Iomega ix4-300d is a 4-Bay sata NAS with dual Gb, USB2.0 & 3.0, powered by a Marvell Armada XP MV78230 dual core CPU. http://shop.lenovo.com/us/en/servers/network-storage/lenovoemc/ix4-300d/ Signed-off-by: Benoit Masson <yahoo@perenite.com> Link: https://lkml.kernel.org/r/1406503839-4662-1-git-send-email-yahoo@perenite.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-07-28ARM: dts: enable SMP support for bcm21664Alex Elder
Define nodes representing the two Cortex A9 CPUs in a bcm21644 SoC. Signed-off-by: Alex Elder <elder@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
2014-07-28ARM: dts: enable SMP support for bcm28155Alex Elder
Define nodes representing the two Cortex A9 CPUs in a bcm28155 SoC. Signed-off-by: Ray Jui <rjui@broadcom.com> Signed-off-by: Alex Elder <elder@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
2014-07-28Merge tag 'v3.17-rockchip-rk3xxx-dts' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "ARM: dts: changes for existing rockchip boards" from Heiko Stuebner: Collected changes for existing Rockchip boards - convert to new clock driver - bring structure in line with recent rk3288 comments (no soc-nodes, using phandles when adding changes, sorted by address) - i2c, board-pmic and pwm nodes nodes - sd card slot and ir receiver on radxa rock * tag 'v3.17-rockchip-rk3xxx-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rk3188-radxarock: add GPIO IR receiver node ARM: dts: rockchip: add pwm nodes ARM: dts: rockchip: add both clocks to uart nodes ARM: dts: rk3188-radxarock: enable sd-card slot ARM: dts: add i2c and regulator nodes to rk3188-radxarock ARM: dts: rockchip: add tps65910 regulator for bqcurie2 ARM: dts: add rk3066 and rk3188 i2c device nodes and pinctrl settings ARM: dts: rockchip: oder nodes by register address ARM: dts: rockchip: remove address from pinctrl nodes ARM: dts: uses handles to reference nodes for changes ARM: dts: rockchip: add handles for shared nodes that don't have one yet ARM: dts: rockchip: remove soc subnodes arm: dts: rockchip: remove obsolete clock gate definitions ARM: dts: rockchip: move oscillator input clock into main dtsi ARM: dts: rockchip: add cru nodes and update device clocks to use it Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28Merge tag 'v3.17-rockchip-rk3288' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "Initial support for Rockchip RK3288 SoCs" from Heiko Stuebner: * tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: Build dtbs for Rockchip boards ARM: dts: add rk3288 evaluation board ARM: dts: rockchip: add core rk3288 dtsi ARM: rockchip: enable support for RK3288 SoCs ARM: Kconfig: set default gpio number for rockchip SoCs ARM: rockchip: add debug uart used by rk3288 ARM: rockchip: clarify usability of DEBUG_RK3X_UART debug_ll options dt-bindings: arm: add cortex-a12 and cortex-a17 cpu compatible properties Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28Merge branch 'clk-rockchip' of ↵Arnd Bergmann
git://git.linaro.org/people/mike.turquette/linux into next/soc This is a dependency for the rk3288 DT updates, the branch should first get merged through Mike's clk git. * 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux: ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER clk: rockchip: add clock controller for rk3288 dt-bindings: add documentation for rk3288 cru clk: rockchip: add clock driver for rk3188 and rk3066 clocks dt-bindings: add documentation for rk3188 clock and reset unit clk: rockchip: add reset controller clk: rockchip: add clock type for pll clocks and pll used on rk3066 clk: rockchip: add basic infrastructure for clock branches clk: composite: improve rate_hw sanity check logic clk: composite: allow read-only clocks clk: composite: support determine_rate using rate_ops->round_rate + mux_ops->set_parent Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-28ARM: dts: zynq: Add SPIAndreas Färber
Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-07-27ARM: dts: rk3188-radxarock: add GPIO IR receiver nodeBeniamino Galvani
This adds a device tree node for the infrared receiver connected to a GPIO pin on the Radxa Rock. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-27ARM: dts: rockchip: add pwm nodesBeniamino Galvani
This adds the necessary nodex and pinctrl settings for the Rockchip PWM-driver. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Modified to use the new clock defines and added rk3066 pins. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: rockchip: add both clocks to uart nodesHeiko Stuebner
Use the newly ammended dw_8250 clock binding to define both the baudclk as well as the pclk supplying the ip. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: rk3188-radxarock: enable sd-card slotHeiko Stuebner
The Radxa Rock contains one sd-card slot. Add the supplying regulator and enable its dw_mmc node. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: add i2c and regulator nodes to rk3188-radxarockBeniamino Galvani
This enables the 2nd i2c bus and adds the act8846 pmic as device. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: rockchip: add tps65910 regulator for bqcurie2Heiko Stuebner
The Curie2 uses a tps659102 as its main pmic, so add the i2c1 and tps65910 node as well as define the used voltages and regulator-names according to the schematics. Also fix the supply of the sd0 regulator, as it is supplied by the vio reg. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: add rk3066 and rk3188 i2c device nodes and pinctrl settingsHeiko Stuebner
The core controller settings themself are identical, only the compatible and pinctrl settings differ. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: rockchip: oder nodes by register addressHeiko Stuebner
To create some sort of ordering of nodes, they are suggested to be ordered by their register address. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: rockchip: remove address from pinctrl nodesHeiko Stuebner
The pincontroller uses the GRF and PMU syscons nowadays, so should not contain an address in its device node. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: uses handles to reference nodes for changesHeiko Stuebner
Use the handles for subsequent changes to nodes, similar to like the rk3288 submission does it. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: rockchip: add handles for shared nodes that don't have one yetHeiko Stuebner
Some nodes that are changed in the dtsi hierarchy do not have handles yet. As it was suggested in the rk3288 submission to do subsequent nodes changes through such handle-references, add the missing ones. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26ARM: dts: rockchip: remove soc subnodesHeiko Stuebner
Comments received from the rk3288 submission indicated that a generic subnode to group soc components should not be used. So to keep all rockchip devicetree files similar, remove it from rk3066 and rk3188. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-07-26arm: dts: rockchip: remove obsolete clock gate definitionsHeiko Stuebner
The clock and reset unit is now provided by the rk3188-cru clock driver and thus the old style definitions of the gate clocks can go away. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-By: Max Schwarz <max.schwarz@online.de> Tested-By: Max Schwarz <max.schwarz@online.de>
2014-07-26ARM: dts: rockchip: move oscillator input clock into main dtsiHeiko Stuebner
The clock definitions get a lot shorter due to the soc clocks being handled by rk3188-cru and only the input clock remains. These can now simply live in the main rk3xxx.dtsi without affecting readability. At the same time, rename the node to oscillator, adding a clock-output-names property to match how the rk3288 handles this. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-By: Max Schwarz <max.schwarz@online.de> Tested-By: Max Schwarz <max.schwarz@online.de>
2014-07-26ARM: dts: rockchip: add cru nodes and update device clocks to use itHeiko Stuebner
This adds a node for the clock and reset unit on rk3188 and rk3066 SoCs and also updates the device nodes retrieve their clocks from there, instead of the previous gate clock nodes. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-By: Max Schwarz <max.schwarz@online.de> Tested-By: Max Schwarz <max.schwarz@online.de>
2014-07-26ARM: dts: Build dtbs for Rockchip boardsDoug Anderson
This allows the "make dtbs" target to work. Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: dts: add rk3288 evaluation boardHeiko Stuebner
There exist 2 variants using either the act8846 or rk808 as pmic, while the rest of the board stays the same. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: dts: rockchip: add core rk3288 dtsiHeiko Stuebner
Node definitions shared by all rk3288 based boards. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Will Deacon <will.deacon@arm.com> Tested-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: rockchip: enable support for RK3288 SoCsHeiko Stuebner
Enable HAVE_ARM_ARCH_TIMER and add a rockchip,rk3288 compatible. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: Kconfig: set default gpio number for rockchip SoCsHeiko Stuebner
The new rk3288 needs a bigger gpio space, as it has 9 gpio banks. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Tested-by: Will Deacon <will.deacon@arm.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: rockchip: add debug uart used by rk3288Heiko Stuebner
The uarts on rk3288 are still compatible with the dw_8250, but located at a different position and need DEBUG_UART_8250_WORD enabled. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Tested-by: Will Deacon <will.deacon@arm.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26ARM: rockchip: clarify usability of DEBUG_RK3X_UART debug_ll optionsHeiko Stuebner
The debug uart settings from the DEBUG_RK3X_UART options are usable on all Rockchip SoCs from the rk30xx and rk31xx series but not on the new rk3288 SoCs. Thus clarify their use to prevent confusion. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-07-25ARM: dts: zynq: Add DMAC for ParallellaAndreas Färber
Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-07-25ARM: dts: zynq: Add Parallella device treeAndreas Färber
This allows to boot the Adapteva Parallella board to serial console. Cc: Andreas Olofsson <andreas@adapteva.com> Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-07-25ARM: dts: dove: add DT LCD controllersRussell King
Add the DT fragment for the Marvell Dove LCD controllers. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Link: https://lkml.kernel.org/r/E1XAKGS-0004WE-8h@rmk-PC.arm.linux.org.uk Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-07-23Merge tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx into next/dtArnd Bergmann
Merge "arm: Xilinx Zynq dt patches for v3.17 second pull request" from Michal Simek: - Add GPIO and XADC node to dtsi * tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx: ARM: zynq: DT: Add GPIO node ARM: zynq: DT: Add XADC node Signed-off-by: Arnd Bergmann <arnd@arndb.de>