summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
AgeCommit message (Collapse)Author
2014-11-30Merge 3.18-rc7 into usb-nextGreg Kroah-Hartman
We need the xhci fixes here and this resolves a merge issue with drivers/usb/dwc3/ep0.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-12-01ARM: dts: rockchip: set FIFO size for SDMMC, SDIO and EMMC on rk3066 and rk3188Julien CHAUVEAU
The SDMMC, SDIO and EMMC controllers use an external FIFO whose size is 256x32bit. This patch set the corresponding fifo-depth properties for both RK3066 and RK3188. Signed-off-by: Julien CHAUVEAU <julien.chauveau@neo-technologies.fr> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-12-01ARM: dts: rockchip: add label property for leds on Radxa RockRomain Perier
The leds-gpio driver recently switched to the device property API. The device_node name is no longer retrieved if the "label" devicetree property is not found. In this case the driver tries to create entries with (null) name in /sys/class/leds, which is wrong and generates backtrace as several gpio_leds have the same name. Also renamed subnode "yellow" to "blue" to match the last schematics updates. Signed-off-by: Romain Perier <romain.perier@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-11-30ARM: mvebu: add SDRAM controller description for Armada XPThomas Petazzoni
The suspend/resume sequence on Armada XP needs to modify a number of registers in the SDRAM controller. Therefore, this commit updates the Armada XP Device Tree description to include the SDRAM controller Device Tree node. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Link: https://lkml.kernel.org/r/1416585613-2113-17-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-30ARM: mvebu: adjust mbus controller description on Armada 370/XPThomas Petazzoni
In order to support suspend/resume on Armada XP, an additional set of registers need to be described at the MBus controller level. This commit therefore adjusts the Device Tree of the Armada 370/XP SoC to include those registers in the MBus controller description; Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Link: https://lkml.kernel.org/r/1416585613-2113-16-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-30ARM: mvebu: add suspend/resume DT information for Armada XP GPThomas Petazzoni
This commit improves the Armada XP GP Device Tree description to describe the 3 GPIOs that are used to connect the SoC to the PIC micro-controller that we talk to shutdown the SoC when entering suspend to RAM. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Link: https://lkml.kernel.org/r/1416585613-2113-15-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-28Merge tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux into ↵Arnd Bergmann
next/dt Pull "ARM: BCM5301X: Add some more devices to device tree" from Hauke Mehrtens: The most important part is adding the axi bus to the SoC dtsi file, this is the main bus on the SoC. These patches were all send to the arm list and I haven't got any negative responses. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux: ARM: BCM5301X: Add LEDs for Netgear R6250 V1 ARM: BCM5301X: Add Broadcom's bus-axi to the DTS file Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'mvebu-dt-usb-phy-3.19-3' of git://git.infradead.org/linux-mvebu ↵Arnd Bergmann
into next/dt2 Pull "mvebu DT changes for v3.19 (round 3)" from Jason Cooper: - Armada 375 - Add PHY and USB cluster controller support * tag 'mvebu-dt-usb-phy-3.19-3' of git://git.infradead.org/linux-mvebu: ARM: mvebu: add PHY support to the dts for the USB controllers on Armada 375 ARM: mvebu: add Device Tree description of USB cluster controller on Armada 375 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'v3.18-rc4' into next/dt2Arnd Bergmann
Linux 3.18-rc4 is a dependency for the phy-dt-header branch that is needed for the final mvebu DT changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'mvebu-dt-3.19-2' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Pull "mvebu DT changes for v3.19 (round 2)" from Jason Cooper: - mvebu - Use simple-card audio on Armada 370 DB - Add DSA node for Armada 370 DB - Add SDHCI to Armada 38x - Armada 370/XP rework to support new Synology boards - Add Synology DS213j and DS414 - Various pinctrl and uart and alias fixes to help bootloaders * tag 'mvebu-dt-3.19-2' of git://git.infradead.org/linux-mvebu: arm: mvebu: normalize pinctrl entries for Armada SoCs arm: mvebu: fix wrongly named DS414 pinctrl entries arm: mvebu: add .dts file for Synology DS414 arm: mvebu: add .dts file for Synology DS213j arm: mvebu: define and use common Armada XP SPI pinctrl setting arm: mvebu: define and use common Armada XP UART2/3 pinctrl settings arm: mvebu: define and use common Armada 370 UART pinctrl settings arm: mvebu: define and use common Armada 370 SPI pinctrl settings arm: mvebu: move Armada 370/XP pinctrl node definition armada-370-xp.dtsi arm: mvebu: use recently introduced uart label for stdout-path arm: mvebu: add uartX labels for Armada SoC serial nodes arm: mvebu: fix vendor prefix typo in kirkwood-synology.dtsi ARM: mvebu: fix ordering in Armada 370 .dtsi ARM: mvebu: adjust ethernet aliases according to U-Boot requirements for A38x ARM: mvebu: remove clock-frequency from Armada 38x SDHCI Device Tree node ARM: mvebu: enable no-1-8-v flag for Armada 385 DB SDHCI interface mvebu: 370 RD: Add support for the switch ARM: mvebu: use simple-card DT binding for audio on Armada 370 DB ARM: mvebu: remove conflicting muxing on Armada 370 DB Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'sirf-dts-for-3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt Pull "change pinmux pingroup and add some lost node/prop" from Barry Song: 1. add resets properity for some nodes; 2. change pinctrl groups for audio 3. add PMU node * tag 'sirf-dts-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: ARM: dts: atlas6: add resets property for SPI nodes ARM: dts: atlas6: add resets property for VPP nodes ARM: dts: prima2: add resets property for VPP nodes ARM: dts: prima2: add resets property for GPS nodes ARM: dts: prima2: add node for Performance Monitor Unit ARM: dts: atlas6: Add I2S external clock input pingroup ARM: dts: atlas6: add a separate pingroup for i2s mclk output ARM: dts: prima2: add I2S 2ch, 6ch, nodin, mclk groups Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'sunxi-simplefb-for-3.19' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt Pull "Allwinner simple frambuffer support" from Maxime Ripard: This enables the simple framebuffer on all the supported Allwinner SoCs (but the A80). That allows to have at last a video display usable by using the framebuffer the firmware might have set up. * tag 'sunxi-simplefb-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (55 commits) ARM: dts: sunxi: Update simplefb nodes so that u-boot can find them ARM: dts: sunxi: Add de_be0 clk parent pll to simplefb node ARM: dts: sun7i: Add simplefb node ARM: dts: sun6i: Add simplefb node ARM: dts: sun5i: Add simplefb node ARM: dts: sun4i: Add simplefb node ARM: dts: sun6i: Add ethernet support to M9 board ARM: sun6i: DT: Add PLL6 multiple outputs ARM: dts: sun6i: Add support for the status led ARM: dts: sun6i: Add EHCI support for the M9 board ARM: dts: sunxi: Add regulator-boot-on property to ahci-5v regulator ARM: dts: sun7i: Cubietruck: add power supply regulator for USB OTG VBUS ARM: dts: sun7i: Cubietruck: override regulator pin ARM: sun7i: dtsi: add support for usbphy0 ARM: dtsi: sunxi: add common VBUS regulator ARM: dts: sunxi: Banana Pi: increase startup-delay for the GMAC PHY regulator ARM: sun5i: olinuxino: Relicense the device tree under GPLv2/X11 ARM: sun4i: cubieboard: Relicense the device tree under GPLv2/X11 ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11 ARM: sun4i: pcduino: Relicense the device tree under GPLv2/X11 ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'imx-dt-3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt Pull "The i.MX device tree changes for 3.19" from Shawn Guo: - Device additions for board vf610-colibri, pwm, backlight, I2C, RTC, ADC etc. - Update i.MX6 phyFLEX board to include PCIe, CAN and audio support - Improve SSI clocks description for i.MX5 platforms - Add ENET2 support for imx6sx-sdb board - Add device tree source for LS1021A SoC, board QDS and TWR - Enable cpufreq support for i.MX53 - Enable VPU device support for i.MX6QDL - Enable poweroff support for i.MX6 SoCs - Add support for TBS2910 Matrix ARM mini PC which is built on i.MX6Q - Create generic base device trees for Vybrid and add support for Colibri VF50 Note: the change set is built on top of imx-soc-3.19 to resolve the dependency that "ARM: dts: imx53: add cpufreq-dt support" uses the clock define IMX5_CLK_ARM that is added by "ARM: imx53: clk: add ARM clock". * tag 'imx-dt-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (51 commits) ARM: dts: imx6q-tbs2910: Enable snvs-poweroff ARM: dts: imx6: add pm_power_off support for i.mx6 chips ARM: dts: vf-colibri: add USB regulators ARM: dts: imx6: phyFLEX: Add CAN support ARM: dts: imx6: phyFLEX: Add PCIe ARM: dts: imx6: phyFLEX: Set correct interrupt for pmic ARM: dts: imx6: phyFLEX: Enable gpmi in module file ARM: dts: imx6: phyFLEX: set nodes in alphabetical order ARM: dts: vf-colibri-eval-v3.dts: Enable ST-M41T0M6 RTC ARM: dts: vf-colibri: Add I2C support ARM: dts: imx6qdl: Enable CODA960 VPU ARM: dts: imx6q-tbs2910: Remove unneeded 'fsl,mode' property ARM: dts: vf610: enable USB misc/phy nodes where necessary ARM: dts: vf610: use new GPIO support ARM: dts: pbab01: enable I2S audio on phyFLEX-i.MX6 boards ARM: dts: pbab01: move i2c pins and frequency configuration into pfla02 ARM: dts: vf500-colibri: add Colibri VF50 support ARM: dts: vf610: create generic base device trees ARM: dts: vf610: assign oscillator to clock module dt-bindings: arm: add Freescale LS1021A SoC device tree binding ... Signed-off-by; Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'imx-cleanup-3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup Pull "The i.MX cleanup for 3.19" from Shawn Guo: - Clean up reset handler for DT machines, since reset has been handled in watchdog driver - Remove unneeded .map_io hook for a couple of i.MX6 machines - A few small i.MX6 device tree source cleanups - Some random iomuxc and pllv3 code cleanup * tag 'imx-cleanup-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx: Remove unneeded .map_io initialization ARM: dts: imx6qdl-sabresd: Fix the microphone route ARM: imx: refactor mxc_iomux_mode() ARM: imx: simplify clk_pllv3_prepare() ARM: imx6q: drop unnecessary semicolon ARM: imx: clean up machine mxc_arch_reset_init_dt reset init ARM: dts: imx6qdl-rex: Remove unneeded 'fsl,mode' property ARM: dts: imx6qdl-gw5x: Remove unneeded 'fsl,mode' property ARM: dts: imx6qdl-sabresd: Use IMX6QDL_CLK_CKO define Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'omap-for-v3.19/dt-part2-updated' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Pull "More dts changes for omaps to add support for new devices" from Tony Lindgren: - Add DCAN support am335x, am437x and dra7 - Add devices for sb-t3x computers - Add support for NovaTech OrionLXm - Add n900 battery and si4713 support * tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (26 commits) ARM: dts: am335x-evm: Add DCAN1 details ARM: dts: am33xx: Update DCAN nodes ARM: dts: am33xx: Add control module syscon node ARM: dts: am437x-gp: Add dcan support ARM: dts: am4372: Add DCAN nodes ARM: dts: am4372: Add control module syscon node ARM: dts: dra72-evm: Add CAN support ARM: dts: dra7-evm: Add CAN support ARM: dts: DRA7: Add DCAN nodes ARM: dts: dra7: Add syscon regmap for CORE CONTROL area ARM: dts: sbc-t3x30: add audio support ARM: dts: sbc-t3x: add TV out display alias ARM: dts: cm-t3x: add TV out support ARM: dts: cm-t3x: add I2C1 pinmux ARM: dts: AM43xx: add tscadc DT entries for am437x-evm and am43x-epos-evm ARM: dts: cm-t3x30: add keypad support ARM: dts: sb-t35: add EEPROM support ARM: dts: cm-t3x: add EEPROM support ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk ARM: dts: cm-t3x: add ADS7846 touchscreen support ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge (part of) tag 'omap-for-v3.19/hwmod-and-defconfig' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc SoC related changes for omaps including hwmod clean-up for DSS, and hwmod data for more UARTs and ADC. Also few defconfig changes to enable devices found on am335x and am437x. [arnd: I removed the defconfig changes from the branch in order to cherry-pick them onto the next/defconfig branch, but I did not change the other commits] * commit '29c4ce17bcad': ARM: dts: cm-t3x30: add keypad support ARM: OMAP2+: hwmod: AM43x: add hwmod support for ADC on AM43xx ARM: DRA7: hwmod data: Add missing UART hwmod data ARM: dts: omap4.dtsi: remove dss_fck ARM: OMAP4: fix RFBI iclk ARM: OMAP4: hwmod: use MODULEMODE properly ARM: OMAP4: hwmod: set DSS submodule parent hwmods ARM: OMAP5: hwmod: set DSS submodule parent hwmods ARM: OMAP2+: hwmod: add parent_hwmod support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'samsung-dt-3' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Pull "Samsung 3rd DT updates for v3.19" from Kukjin Kim: - exynos3250 : remove unused bootargs on exynos3250-rinato : add new board dt file for exynos3250-monk - exynos4 : add missing clock for MFC : specify default clocks for camera - exynos4x12 : add TMU related DT nodes - exynos4412-trats2 : add max77693-haptic and pwm nodes, enable TMU support - exynos4412-odroid : specify audio clock parents and rates - exynos5250 and exynos5420 : add syscon based phandle to i2c device nodes - exynos5250-spring : add trackpad, temperature sensor and usb3505 pinctrl Note: based on previous tags/samsung-dt-2 for v3.19 * tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: add sysreg phandle to i2c device nodes for exynos ARM: dts: Remove unused bootargs from exynos3250-rinato ARM: dts: add board dts file for Exynos3250-based Monk board Documentation: devicetree: Add Exynos-based boards compatible string ARM: dts: add missing clock to MFC device for exynos4 ARM: dts: Specify audio clock parents and rates for exynos4412-odroid-common ARM: dts: Add trackpad to exynos5250-spring ARM: dts: Add temperature sensor to exynos5250-spring ARM: dts: Add usb3503 pinctrl to exynos5250-spring ARM: dts: Add max77693-haptic node for exynos4412-trats2 ARM: dts: add pwm node for exynos4412-trats2 ARM: dts: Specify default clocks for Exynos4 camera devices ARM: dts: Enable TMU support for exynos4412-trats2 ARM: dts: Device tree node definition for TMU on exynos4x12 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'samsung-dt-2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Pull "Samsung 2nd DT updates for v3.19" from Kukjin Kim: - add micro SD card SDHCI node for exynos4412-trats - add exynos4415 DT - add exynos3250-rinato DT and sleep mode support Note: based on previous tags/samsung-dt for v3.19 * tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add micro SD card SDHCI node for exynos4412-trats ARM: dts: Add dts files for exynos4415 SoC ARM: dts: Add sleep mode of regulator for exynos3250-rinato ARM: dts: Add sleep mode pin configuration for exynos3250-rinato ARM: dts: Add board dts file for exynos3250-rinato Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'v3.19-rockchip-dts3' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Pull "temporarily disable rk3288-smp" from Heiko Stuebner: Disable smp again on rk3288 temporarily to make Olof's boottest run again, until the patches for using the physical architected timers got accepted. * tag 'v3.19-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: temporarily disable smp on rk3288 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-27ARM: BCM5301X: Add LEDs for Netgear R6250 V1Rafał Miłecki
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2014-11-27ARM: BCM5301X: Add Broadcom's bus-axi to the DTS fileRafał Miłecki
This has been successfully tested on Netgear R6250 and two other development (unnamed) devices, all of them BCM4708 based. We also got a possitive feedback from R7000 (BCM4709) tester. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2014-11-27Merge branch 'sunxi/dt' into next/dtArnd Bergmann
This avoids a boot regression * sunxi/dt: Revert "ARM: dts: sunxi: unify APB1 clock" Revert "ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks." Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-27Merge tag 'samsung-fixes-v3.18' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes Pull "Samsung fixes for v3.18" from Kukjin Kim: - explicitly set dr_mode on exynos5250-snow this is required when kernel is built with USB gadget support. * tag 'samsung-fixes-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Explicitly set dr_mode on exynos5250-snow Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-27ARM: dts: add sysreg phandle to i2c device nodes for exynosPankaj Dubey
This patch adds syscon based phandle to i2c device nodes of exynos5250 and exynos5420. These phandles will be used to save restore i2c sysreg configuration register during s2r from i2c driver. CC: Rob Herring <robh+dt@kernel.org> CC: Randy Dunlap <rdunlap@infradead.org> CC: Russell King <linux@arm.linux.org.uk> CC: devicetree@vger.kernel.org CC: linux-doc@vger.kernel.org Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-27ARM: dts: Remove unused bootargs from exynos3250-rinatoChanwoo Choi
This patch removes unused dt node of command line from Exynos3250-based Rinato board because kernel use the command line from bootloader. Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-27ARM: dts: add board dts file for Exynos3250-based Monk boardYoungjun Cho
This patch adds new board dts file to support Samsung Monk board which is based on Exynos3250 SoC and has different H/W configuration from Rinato. This dts file support following features: - eMMC - Main PMIC (Samsung S2MPS14) - Interface PMIC (Maxim MAX77836, MUIC, fuel-gauge, charger) - RTC of Exynos3250 - ADC of Exynos3250 with NTC thermistor - I2S of Exynos3250 - TMU of Exynos3250 - Secure firmware for Exynos3250 secondary cpu boot - Serial ports of Exynos3250 - gpio-key for power key Signed-off-by: Youngjun Cho <yj44.cho@samsung.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-26[media] ARM: dts: meson: add IR receiver nodeBeniamino Galvani
This adds a node for the IR remote control receiver to the Amlogic Meson DTS. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
2014-11-26arm: mvebu: normalize pinctrl entries for Armada SoCsArnaud Ebalard
There are currently 2 differents naming conventions used between the existing Armada SoC DT files for pinctrl entries (*_pin(s): *-pin(s) and pmx_*: pmx-*) with a vast majority of files using the former: $ grep _pin arch/arm/boot/dts/armada-*.dts* | wc -l 155 $ grep pmx arch/arm/boot/dts/armada-*.dts* | wc -l 13 In fact, only some Armada XP files are using the second variant. This patch normalizes those files (mainly ge0/1 entries) to use the first variant. Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Link: https://lkml.kernel.org/r/00114c3169e1d93259ff4150ed46ee36eae16b1e.1416670812.git.arno@natisbad.org Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-26arm: mvebu: fix wrongly named DS414 pinctrl entriesArnaud Ebalard
While renaming pinctrl entries during reviews of Synology DS414 support series, I missed three entries, as reported by Ben. This patch fixes those. Reported-by: Ben Peddell <klightspeed@killerwolves.net> Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Link: https://lkml.kernel.org/r/608e4fd6e06e9c5289a84b9c38e81b2456dbcd79.1416670812.git.arno@natisbad.org Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-26ARM: mvebu: add PHY support to the dts for the USB controllers on Armada 375Gregory CLEMENT
Now that the USB cluster node has been added, use it as a PHY provider for the USB controller linked to it: the first EHCI and the xHCI. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Link: https://lkml.kernel.org/r/1415879269-29711-7-git-send-email-gregory.clement@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-26ARM: mvebu: add Device Tree description of USB cluster controller on Armada 375Gregory CLEMENT
On Armada 375, the USB cluster allows to control the cluster composed of the USB2 and USB3 host controllers. Acked-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Link: https://lkml.kernel.org/r/1415879269-29711-6-git-send-email-gregory.clement@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-26Merge tag 'tags/phy-dt-header' into mvebu/dt-usb_phyJason Cooper
shared header file which will be referenced from both PHY driver and its associated Device Tree node(s)
2014-11-25Merge tag 'usb-for-v3.19' of ↵Greg Kroah-Hartman
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next Felipe writes: usb: patches for v3.19 merge window This time, a very pull request with 216 non-merge commits. Most of the commits contained here are sparse or coccinelle fixes ranging from missing 'static' to returning 0 in case of errors. More importantly, we have the removal the now unnecessary 'driver' argument to ->udc_stop(). DWC2 learned about Dual-Role builds. Users of this IP can now have a single driver built for host and device roles. DWC3 got support for two new HW platforms: Exynos7 and AMD. The Broadcom USB 3.0 Device Controller IP is now supported and so is PLX USB338x, which means DWC3 has lost is badge as the only USB 3.0 peripheral IP supported on Linux. Thanks for Tony Lindgren's work, we can now have a distro-like kernel where all MUSB glue layers can be built into the same kernel (statically or dynamically linked) and it'll work in PIO (DMA will come probably on v3.20). Other than these, the usual set of cleanups and non-critical fixes. Signed-off-by: Felipe Balbi <balbi@ti.com>
2014-11-25ARM: dts: atlas6: add resets property for SPI nodesQipan Li
this patch adds missed resets property for CSR SiRFatlasVI SPI nodes. Signed-off-by: Qipan Li <Qipan.Li@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-11-25ARM: dts: atlas6: add resets property for VPP nodesRenwei Wu
this patch adds missed resets property for CSR SiRFatlasVI Video Post Processor(VPP) node. Signed-off-by: Renwei Wu <renwei.wu@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-11-25ARM: dts: prima2: add resets property for VPP nodesRenwei Wu
this patch adds missed resets property for CSR SiRFprimaII Video Post Processor(VPP) node. Signed-off-by: Renwei Wu <renwei.wu@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-11-25ARM: dts: prima2: add resets property for GPS nodesTao Huang
this patch adds missed resets property for CSR SiRFprimaII GPS related nodes. Signed-off-by: Tao Huang <Tao.Huang@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-11-25ARM: dts: prima2: add node for Performance Monitor UnitYe He
It enables Performance Monitor Unit on CSR SiRFprimaII. Signed-off-by: Ye He <ye.he@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-11-25ARM: dts: atlas6: Add I2S external clock input pingroupRongjun Ying
The I2S controller can use the external clock as reference clock with master mode. But based on different hardware or software design, this external clock might be needed or not needed. So the external input pin can be an independent pinctrl group, and the card driver can decice to get it or not. Signed-off-by: Rongjun Ying <rongjun.ying@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2014-11-25ARM: dts: atlas6: add a separate pingroup for i2s mclk outputRongjun Ying
The I2S controller can output mclk to external audio codec. But by hardware design, some codecs need mclk and some codecs do not need mclk. So the mclk pin can be an independent pinctrl group, and the card driver can get it or not based on boards. Signed-off-by: Rongjun Ying <rongjun.ying@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2014-11-25ARM: dts: prima2: add I2S 2ch, 6ch, nodin, mclk groupsRongjun Ying
we have done that for atlas6 in commit ed36c1a, 086b8904 etc. here we do same things for prima2. Signed-off-by: Rongjun Ying <rongjun.ying@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2014-11-24Merge tag 'sunxi-clocks-for-3.19' of ↵Michael Turquette
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next Allwinner Clocks additions for 3.19 A few patches that should go through the clock tree, mostly fixes, cleanups, and new clocks additions to start to support the A80.
2014-11-25ARM: dts: rockchip: enable thermal on rk3288-evb boardCaesar Wang
When a thermal temperature is invoked use the CRU to reset the chip on rk3288-evb boards. TSHUT is low active on these boards. Signed-off-by: Caesar Wang <caesar.wang@rock-chips.com> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-11-25ARM: dts: rockchip: add main thermal info to rk3288Caesar Wang
If for some reason we are unable to shut it down in orderly fashion (kernel is stuck holding a lock or similar), then hardware TSHUT will reset it. If the temperature is over 95C over a period of time the thermal shutdown of the tsadc is invoked with can either reset the entire chip via the CRU, or notify the PMIC via a GPIO. This should be set in the specific board. Signed-off-by: Caesar Wang <caesar.wang@rock-chips.com> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-11-25ARM: dts: rockchip: add RK3288 Thermal dataCaesar Wang
This patch changes a dtsi file to contain the thermal data on RK3288 and later SoCs. This data will enable a thermal shutdown over 90C. Signed-off-by: Caesar Wang <caesar.wang@rock-chips.com> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-11-24Revert "ARM: dts: sunxi: unify APB1 clock"Arnd Bergmann
This reverts commit e883d67285e9267c73f8d2b9d32aa9e712ad00a4. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Link: http://lkml.kernel.org/r/7h1toxr0ku.fsf@deeprootsystems.com
2014-11-24Revert "ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks."Arnd Bergmann
This reverts commit 338302ae32b7be73da97b746f660b283642cfc5c. This is one of two commits that resulted in a boot regression. Conflicts: arch/arm/boot/dts/sun6i-a31.dtsi Signed-off-by: Arnd Bergmann <arnd@arndb.de> Link: http://lkml.kernel.org/r/7h1toxr0ku.fsf@deeprootsystems.com
2014-11-24ARM: dts: am335x-evm: Add DCAN1 detailsRoger Quadros
DCAN1 is routed to CAN port (J11) when Profile 1 is selected on the profile selection switch. Provide information for DCAN1 pins and node but keep it disabled by default. User has to manually enable it if Profile 1 is chosen. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-24ARM: dts: am33xx: Update DCAN nodesRoger Quadros
Add "raminit-syscon" property to specify the RAMINIT register. Add clock information. Rename can nodes from "d_can" to "can" to be compliant with the ePAPR specs. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-24ARM: dts: am33xx: Add control module syscon nodeRoger Quadros
Use syscon regmap to expose the Control module register space. This register space is shared between many users e.g. DCAN, USB, display, etc. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>