summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-02-06Merge tag 'samsung-dt-4' of ↵Olof Johansson8-53/+458
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Merge "Samsung 4th DT updates for v3.20" from Kukjin Kim: - For exynos4 SoCs : add PPMU node : add syscon phandle for video-phy node - For exynos4415 SoC : add mipi dsi and fimd device nodes - For exynos3250-monk and exynos3250-rinato boards : add PPMU node - For exynos4412-trats2 board : add maxim77693 fuel gauge and battery charger nodes : fix regarding CLK_MOUT_CAMn parent and CLK_UART_ISP_SCLK clocks : switch max77686 regulators to GPIO control : add suspend configuration for max77686 regulators : add PPMU node and sound nodes * tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add PPMU node for exynos4412-trats2 ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato ARM: dts: Add PPMU dt node for exynos4 and exynos4210 ARM: dts: Add PPMU dt node for exynos3250 ARM: dts: add mipi dsi device node for exynos4415 ARM: dts: add fimd device node for exynos4415 ARM: dts: Add syscon phandle to the video-phy node for Exynos4 ARM: dts: Add sound nodes for exynos4412-trats2 ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2 ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi ARM: dts: Add max77693 charger node for exynos4412-trats2 ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2 ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2 ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2 Signed-off-by: Olof Johansson <olof@lixom.net>
2015-02-06Merge tag 'mvebu-dt-3.20-3' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson27-87/+999
Merge "ARM: mvebu: DT changes for v3.20 (round 2)" from Gregory CLEMENT: Relicense all Armada dts{i} files under dual license of GPLv2+ and X11. This should make it easier to reuse these files with other operating systems and boot loaders. * tag 'mvebu-dt-3.20-3' of git://git.infradead.org/linux-mvebu: (27 commits) ARM: mvebu: armada-xp-synology-ds414: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-openblocks-ax3-4: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-netgear-rn2120: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-mv78460: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-mv78260: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-mv78230: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-matrix: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-lenovo-ix4-300d: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-gp: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-db: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-xp-axpwifiap: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-38x: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-388-rd: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-385: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-388-db: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-380: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-375: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-375-db: Relicense the device tree under GPLv2+/X11 ARM: mvebu: armada-370-xp: Relicense the device tree under GPLv2+/X11 ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-02-06Merge tag 'omap-for-v3.20/dt-pt3-v2' of ↵Olof Johansson5-30/+154
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Merge "omap device tree changes for v3.20, part 3" from Tony Lindgren: Device tree related chages for omaps to fix dm816x syscon, fix various devices for gta04, and add USB nodes for am57xx and dra7. * tag 'omap-for-v3.20/dt-pt3-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am57xx-beagle-x15: Fix USB2 mode ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB ARM: dts: dra72-evm: Add extcon nodes for USB ARM: dts: dra7-evm: Add extcon nodes for USB ARM: dts: Fix dm816x pinctrl and syscon so they are children of SCM ARM: dts: omap3-gta04: Disable keypad ARM: dts: omap3-gta04: only power DSS when necessary. ARM: dts: omap3-gta04: add gyroscope ARM: dts: omap3-gta04: enable power-off for wifi card. ARM: dts: omap3-gta04: add comments about gpios ARM: dts: omap3-gta04: Add ramp value for twl4030 audio ARM: dts: omap3-gta04: Enable power-off using twl4030 ARM: dts: omap3-gta04: Fix a GPIO line for bma180 node ARM: dts: omap3-gta04: Enable twl audio vibra support ARM: dts: omap3-gta04: Enable mcbps2 necessary for audio ARM: dts: omap3-gta04: Fix audio node malformatting ARM: dts: omap3-gta04: Fix backup-battery charging in devicetree file. Signed-off-by: Olof Johansson <olof@lixom.net>
2015-02-06Merge tag 'v3.20-rockchip-dts3' of ↵Olof Johansson6-2/+80
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "ARM: rockchip: third (and last) batch of dts updates for 3.20" from Heiko Stübner: Change are regulator nodes for the cpu and gpu regulators on the act8846 variant of the rk3288-evb and the setting of a clock for the watchdog. Also the lcd and hdmi controllers on both the firefly and the evb get enabled and let us now boot into fbcon console sucessfully. * tag 'v3.20-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb ARM: dts: rockchip: housekeeping off i2c0 on rk3288-evb boards ARM: dts: rockchip: add cpu and gpu regulators to rk3288-evb-act8846 ARM: dts: rockchip: add rk3288 watchdog clock clk: rockchip: add id for watchdog pclk on rk3288 clk: rockchip: add clock IDs for the PVTM clocks clk: rockchip: add clock ID for usbphy480m_src Signed-off-by: Olof Johansson <olof@lixom.net>
2015-02-04ARM: dts: Add PPMU node for exynos4412-trats2Chanwoo Choi1-0/+40
This patch add dt node for PPMU_{DMC0|DMC1|LEFTBUS|RIGHTBUS} for exynos4412-trats2 board. Each PPMU dt node includes one event of 'PPMU Count3'. Cc: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinatoChanwoo Choi2-0/+80
This patch adds PPMU dt node for Exynos3250 based Rinato and Monk boards. The PPMU node is used to get the utilization of DMC0/DMC1/ LEFTBUS/RIGHTBUS Block. Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add PPMU dt node for exynos4 and exynos4210Chanwoo Choi2-0/+116
This patch add PPMUs (Platform Performance Monitoring Unit) dt node for Exynos4 (Exynos4210/4212/4412) SoCs. PPMU dt node is used for monitor the utilization of each IP. The Exynos4210/Exynos4212/Exynos4412 SoC includes following PPMUs: - PPMU_DMC0 0x106A_0000 - PPMU_DMC1 0x106B_0000 - PPMU_CPU 0x106C_0000 - PPMU_ACP 0x10AE_0000 - PPMU_RIGHT_BUS 0x112A_0000 - PPMU_LEFT_BUS 0x116A_0000 - PPMU_FSYS 0x1263_0000 - PPMU_LCD0 0x11E4_0000 - PPMU_CAMIF 0x11AC_0000 - PPMU_IMAGE 0x12AA_0000 - PPMU_TV 0x12E4_0000 - PPMU_3D 0x1322_0000 - PPMU_MFC_LEFT 0x1366_0000 - PPMU_MFC_RIGHT 0x1367_0000 Additionally, the Exynos4210 SoC includes following PPMUs: - PPMU_LCD1 0x1224_0000 Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add PPMU dt node for exynos3250Chanwoo Choi1-0/+74
This patch adds PPMU (Platform Performance Monitoring Unit) dt node to estimate the utilization of each IP in Exynos SoC through DEVFREQ Event subsystem. This patch adds following PPMU dt nodes: - PPMU_DMC0 0x106a0000 - PPMU_DMC1 0x106b0000 - PPMU_RIGHTBUS 0x112A0000 - PPMU_LEFTBUS 0x116A0000 - PPMU_CAMIF 0x11AC0000 - PPMU_LCD0 0x11E40000 - PPMU_FSYS 0x12630000 - PPMU_3D 0x13220000 - PPMU_MFC 0x13660000 - PPMU_CPU 0x106c0000 Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: add mipi dsi device node for exynos4415YoungJun Cho1-0/+15
This patch adds mipi dsi device node to exynos4415.dtsi. Signed-off-by: YoungJun Cho <yj44.cho@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: add fimd device node for exynos4415YoungJun Cho1-0/+12
This patch adds fimd device node to exynos4415.dtsi. Signed-off-by: YoungJun Cho <yj44.cho@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add syscon phandle to the video-phy node for Exynos4Sylwester Nawrocki1-0/+1
This is required to fix regression after introducing the PMU device nodes required for the PMU driver modified in commit 14fc8b93d473 ("ARM: EXYNOS: Add platform driver support for Exynos PMU"). This change is needed to make MIPI DSI displays and MIPI CSI-2 camera sensors working again on Exynos4 boards. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add sound nodes for exynos4412-trats2Inha Song1-0/+42
This patch add WM1811 audio codec, I2S interface and the sound machine nodes to enable audio on exynos4412-trats2 board. Signed-off-by: Inha Song <ideal.song@samsung.com> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2Sylwester Nawrocki1-2/+2
In order to get exact 24MHz clock frequency value for the camera sensor and avoid rounding errors the parent clock must be CLK_XUSBXTI, not CLK_MOUT_MPLL_USER_T. Currently the sensor's master clock frequency is too high and the sensor doesn't work properly. This fixes commit 0357a4438d531ef3cf529e80ffcd208eb8e35f55 ("ARM: dts: Specify default clocks for Exynos4 camera devices"). Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsiSylwester Nawrocki1-1/+1
Assign proper FIMC-IS UART gate clock in the device DT node and not use the SRC_MASK gate. This fixes regression introduced in commit a37c82a3b3c0910019abfd22a97be1f ("clk: samsung: exynos4: Remove SRC_MASK_ISP gates"). Without this change exynos4 fimc-is driver fails to probe with an error log: [ 1.842447] ERROR: could not get clock /camera/fimc-is@12000000:uart(13) [ 1.848529] exynos4-fimc-is 12000000.fimc-is: failed to get clock: uart [ 1.855275] exynos4-fimc-is: probe of 12000000.fimc-is failed with error -2 Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add max77693 charger node for exynos4412-trats2Krzysztof Kozlowski1-0/+10
Add to Trats2 DTS new node for configuring the max77693 charger driver. Only the maxim,constant-microvolt differs from default value but set all of the optional properties anyway. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2Krzysztof Kozlowski1-20/+5
Remove fixed regulators (duplicating what max77686 provides) and add GPIO enable control to max77686 regulators. This gives the system full control over those regulators. Previously the state of such regulators was a mixture of what max77686 driver set over I2C and what regulator-fixed set through GPIO. Removal of 'regulator-always-on' from CAM_ISP_CORE_1.2V (buck9) allows disabling it when it is not used. Previously this regulator was always enabled because its enable state is a OR of: - ENB9 GPIO (turned always on by regulator-fixed), - BUCK9EN field in BUCK9CTRL register (off by max77686 through I2C). Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add suspend configuration for max77686 regulators for ↵Krzysztof Kozlowski1-30/+42
exynos4412-trats2 Add suspend to RAM configuration for max77686 regulators. Some LDOs and bucks are disabled. This reduces energy consumption during S2R, approximately from 17 mA to 9 mA. Additionally remove old and not supported bindings: - regulator-mem-off - regulator-mem-idle - regulator-mem-on The max77686 driver does not parse them and they are not documented anywere. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2Krzysztof Kozlowski1-0/+18
Add node for fuel gauge present in Maxim 77693 PMIC. This allows control over battery charging state on Trats2 board. The fuel gauge is compatible with max17042 battery driver (Maxim 17042/17047/17050). Although datasheet rev 2.2 for MAX77693 describes fuel gauge as Maxim 17042-like, the chip on Trats2 board identifies itself as Maxim 17047-like. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-01-31ARM: dts: am57xx-beagle-x15: Fix USB2 modeRoger Quadros1-0/+4
On this board USB2 is meant to be used as peripheral only. The ID pin for USB2 is hardwired HIGH. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-31ARM: dts: am57xx-beagle-x15: Add extcon nodes for USBRoger Quadros1-0/+33
On this EVM, the USB cable state has to be determined via the ID pin tied to a GPIO line. We use the gpio-usb-extcon driver to read the ID pin and the extcon framework to forward the USB cable state information to the USB driver so the controller can be configured in the right mode (host/peripheral). NOTE: the ports on this board cannot switch roles. They are configured either host or peripheral by hardwiring the respective ID pins. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-31ARM: dts: dra72-evm: Add extcon nodes for USBRoger Quadros1-0/+31
On this EVM, the USB cable state has to be determined via the ID pin tied to a GPIO line. We use the gpio-usb-extcon driver to read the ID pin and the extcon framework to forward the USB cable state information to the USB driver so the controller can be configured in the right mode (host/peripheral). Gets USB peripheral mode to work on this EVM. Signed-off-by: Roger Quadros <rogerq@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-31ARM: dts: dra7-evm: Add extcon nodes for USBRoger Quadros1-0/+31
On this EVM, the USB cable state has to be determined via the ID pin tied to a GPIO line. We use the gpio-usb-extcon driver to read the ID pin and the extcon framework to forward the USB cable state information to the USB driver so the controller can be configured in the right mode (host/peripheral). Gets USB peripheral mode to work on this EVM. Signed-off-by: Roger Quadros <rogerq@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-30ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boardsHeiko Stuebner3-1/+2
Currently the hdmi driver is using one of the soc i2c busses for ddc probing and while documentation always specifies i2c5 as hdmi-i2c it could very well be any other bus as well. Therefore this is a property of the board and should be specified there. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-01-30ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evbHeiko Stuebner2-0/+46
This enables the recently added display nodes on the firefly and evb, letting the boards output graphic data over the hdmi port. This includes enabling of i2c5 on the evb that is used for ddc probing and setting the lcd-regulators to always on until the hdmi driver learns about using them. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-01-30ARM: dts: rockchip: housekeeping off i2c0 on rk3288-evb boardsHeiko Stuebner2-1/+2
Use the same transfer speed on both the rk808 and act8846 variants and remove the status=okay from the rk808 one which is already set in the shared rk3288-evb.dtsi . Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-01-30ARM: dts: rockchip: add cpu and gpu regulators to rk3288-evb-act8846Heiko Stuebner1-0/+25
The evaluation board using the act8846 as main pmic uses two additional regulators to provide the cpu and gpu voltage. Add these and also add the link to cpu supply from vdd_cpu. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2015-01-30Merge tag 'zynq-dt-for-3.20' of https://github.com/Xilinx/linux-xlnx into ↵Olof Johansson4-4/+461
next/dt Merge "Zync DT for v3.20" from Michal Simek: arm: Xilinx Zynq dt patches for v3.20 - Add USB chipidea driver to DT - Add pincontrol - Add aliases node - Fix WDT node * tag 'zynq-dt-for-3.20' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: DT: Add aliases node ARM: zynq: DT: Fix binding for cadence WDT ARM: zynq: DT: Add pinctrl information to USB nodes ARM: zynq: DT: Remove bogus value from 'bias-disable' property ARM: zynq: DT: Add pinctrl information ARM: zynq: DT: Add USB to device tree Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-30Merge tag 'samsung-dt-3' of ↵Olof Johansson3-11/+35
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Merge "Samsung 3rd DT updates for v3.20" from Kukjin Kim: - add DISP1 power domain for support HDMI support on exynos5420/5422/5800 and the power domain node including FIMD1, MIXER and HDMI modules (tested on exynos5420 Peach Pit and exynos5800 Peach Pi Chromebooks and exynos5422 Odroid XU3 by Javier Martinez Canillas) Note this is including a patch for adding clock IDs for the DISP1 power domain with Mike and Sylwester's acks so that could be handled together to avoid non-working. * tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add DISP1 power domain for exynos5420 clk: exynos5420: Add IDs for clocks used in DISP1 power domain Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-30Merge tag 'samsung-dt-2' of ↵Olof Johansson22-34/+123
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Merge "Samsung 2nd DT updates for v3.20" from Kukjin Kim: - for all of Samsung SoCs : use generic power domain bindings : add 'dr_mode' property for hsotg/dwc2 devices - exynos3250-rinato and exynos3250-monk : add regulator-haptic - exynos5422-odroidxu3 : reduce total RAM by 22 MiB because last 22 MiB for secure monitor cannot be accessed by kernel : add on-board INA231 sensors and LDO26 of PMIC for the sensors * tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: reduce total RAM by 22 MiB for exynos5422-odroidxu3 ARM: dts: add on-board INA231 sensors for exynos5422-odroidxu3 ARM: dts: Add regulator-haptic node for exynos3250-monk ARM: dts: Add regulator-haptic node for exynos3250-rinato ARM: dts: add 'dr_mode' property to hsotg devices for exynos boards ARM: dts: convert to generic power domain bindings for exynos DT Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-30ARM: digicolor: add minimal device tree descriptionBaruch Siach3-0/+189
cx92755.dtsi describes CX92755 on chip peripherals. cx92755_equinox.dts describes the Equinox evaluation board for the CX92755 SoC. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-29ARM: dts: Add DISP1 power domain for exynos5420Javier Martinez Canillas1-0/+17
The DISP1 power domain on Exynos5420 SoC includes the FIMD1, MIXER and HDMI modules. Add a device node for this power domain and mark these modules as consumer of the DISP1 power domain. When a power domain is powered on and off, the input clocks of the devices attached to it are reparented. So a reference to the input and parent clocks of the devices are needed to manage that. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-01-29clk: exynos5420: Add IDs for clocks used in DISP1 power domainJavier Martinez Canillas2-11/+18
When a power domain is powered off on Exynos5420 SoC, the input clocks of the devices attached to this power domain are re-parented to oscclk and restored to the original parent after powering on the power domain. So a reference to the input and parent clocks for the devices attached to a power domain are needed to be able to do the re-parenting. The DISP1 pd includes modules which uses the following clocks: ACLK_200_DISP1 (MIXER and HDMILINK) ACLK_300_DISP1 (FIMD1) ACLK_400_DISP1 (Internal Buses) Each of these clocks are generated as the output of a clock mux so add an ID for all of these clock muxes and their parents to be referenced in the DISP1 power domain device node. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Michael Turquette <mturquette@linaro.org> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-01-28ARM: dts: Fix dm816x pinctrl and syscon so they are children of SCMTony Lindgren1-15/+20
Looks like I only got half done with moving pinctrl and syscon to be children of the SCM. I've set up the FAPLL clocks that way already, but did not complete the job as I copied the syscon values from am33xx.dtsi. To make sure the syscon mapping works, I've verfified that we can set up davinci_emac mac address the same way as cpsw already does with the syscon mapping. So let's add that too. Cc: Brian Hutchinson <b.hutchman@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-28ARM: zynq: DT: Add aliases nodeMichal Simek3-0/+17
Add aliases node to DTs. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-01-28ARM: zynq: DT: Fix binding for cadence WDTMichal Simek1-3/+1
Based on: "devicetree: Add Cadence WDT devicetree bindings documentation" (sha1: 191891c0378f44aec8e06e889a08d0b76fe6c5cb) - compatible string is cdns,wdt-r1p2 - remove device_type property - remove int reset property (reset-on-timeout is bool) Signed-off-by: Michal Simek <michal.simek@xilinx.com> Series-to: arm-soc Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-01-28ARM: zynq: DT: Add pinctrl information to USB nodesSoren Brinkmann2-0/+52
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-01-28ARM: zynq: DT: Remove bogus value from 'bias-disable' propertySoren Brinkmann1-1/+1
In one pinctrl node, a 'bias-disable' property is erroneously assigned a value. Fixes: ARM: zynq: DT: Add pinctrl information 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>
2015-01-28ARM: dts: rockchip: add rk3288 watchdog clockHeiko Stuebner1-0/+1
Add the clock property for the watchdog on rk3288 socs. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org>
2015-01-28Merge branch 'v3.20-clk/new-ids' into v3.20-armsoc/dtsHeiko Stuebner1-0/+4
2015-01-28Merge tag 'v3.20-rockchip-dts2' of ↵Olof Johansson8-1/+1177
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "ARM: rockchip: second batch of dts updates for 3.20" from Heiko Stübner: Basic display nodes for crtcs and hdmi encoder, timer node for the broadcast timer going through the clocksource tree and two new boards, the rk3288-based Firefly and the PX2-based Rayeager board (the PX2 is identical to the rk3066 but made for industrial users). * tag 'v3.20-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add dts for ChipSPARK Rayeager PX2 board ARM: dts: rockchip: add dts for Firefly Firefly-RK3288 boards dt-bindings: add vendor prefix and root compatible property for Rockchip boards ARM: dts: rockchip: Add rockchip timer node for rk3288 ARM: dts: rockchip: add rk3288 hdmi nodes ARM: dts: rockchip: Add rk3288 vop and display-subsystem Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-28Documentation: DT: Add entry for FSL Management ComplexBhupesh Sharma1-0/+40
This patch adds a devicetree binding documentation for FSL's Management Complex. Management Complex is a hardware resource manager that manages specialized hardware objects used in network-oriented packet processing applications Signed-off-by: Bhupesh Sharma <bhupesh.sharma@freescale.com> Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com> Signed-off-by: J. German Rivera <German.Rivera@freescale.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-28Documentation: DT: Add entry for FSL LS2085A SoC and Simulator modelBhupesh Sharma1-0/+8
This patch adds a devicetree binding documentation for FSL's LS2085A SoC and Simulator model. Signed-off-by: Bhupesh Sharma <bhupesh.sharma@freescale.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-28Documentation: DT: Add bindings for FSL NS16550A UARTBhupesh Sharma1-0/+12
This patch addss the device-tree documentation for Freescale's NS16550 UART (also called DUART). There is a specific errata fix required in FSL NS16550 UART which ensures that an random interrupt storm is not observed when a break is provided as an input to the UART. Signed-off-by: Bhupesh Sharma <bhupesh.sharma@freescale.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-28ARM: devicetree: document supported Conexant Digicolor SoCBaruch Siach1-0/+6
Of the Digicolor SoCs series only CX92755 is currently supported. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-27Merge tag 'at91-dt2' of ↵Olof Johansson6-3/+66
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt Merge "at91: dt for 3.20 #2" from Nicolas Ferre: Second DT batch for 3.20: - correct some pin configuration for at91sam9x5ek - add pioD on sama5d4 following a modification of pinctrl driver - add more precise nand compatibility string for sama5d4 - audio modifications for wm8904 or ac97 * tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/dt: sam9263: Add ac97 device node dt: atmel_ac97c: Add device tree documentation ARM: at91: at91sam9n12ek/dt: use dt ids for wm8904 ARM: at91: sama5d3xek/dt: use dt ids for wm8904 ARM: at91: sama5d4: dts: change the nand compatible string ARM: at91/dt: sama5d4: add pioD controller ARM: at91/dt: disable pull-up on vbus-gpio (PB16) to reduce power consumption Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-27Merge tag 'sunxi-dt-for-3.20' of ↵Olof Johansson51-779/+3330
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt Merge "Allwinner device tree changes for 3.20" from Maxime Ripard: A lot of changes to the device tree for the 3.20 merge window, mostly with: - More DT license convertions, only two DTS and two DTSI are still uncertain and have not been converted yet - Use the C-preprocessor includes in the device trees. - Add support for the A31s SoC and improve the A80 support - Add IR receiver, lradc, PS/2 support - Add cpufreq support for all SoCs but the A23 and A80. - And a lot of new boards * tag 'sunxi-dt-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (64 commits) ARM: dts: sun5i: Enable axp209 support on A13-OLinuxIno ARM: sunxi: dts: Add A10/A20 PS2 pin muxing options ARM: sunxi: dts: Add PS2 nodes to dtsi for A10,A20 ARM: dts: sun6i: Add resistive touchscreen controller node to dtsi ARM: dts: sun4i: Add Hyundau A7HD board ARM: dts: sun4i: Add Marsboard A10 board ARM: dts: sun9i: Enable mmc2 on A80 Optimus Board ARM: dts: sun9i: Add 8 bit mmc pinmux setting for mmc2 ARM: dts: sun9i: Enable mmc0 on A80 Optimus Board ARM: dts: sun9i: Convert a80 optimus board dts to label referencing ARM: dts: sun9i: Add mmc controller nodes to the A80 dtsi ARM: dts: sun9i: Add mmc config clock nodes ARM: dts: sunxi: Add missing mdio label ARM: dts: sun5i: Add mk802_a10s board ARM: dts: sun4i: Add mk802ii board ARM: dts: sun4i: Add mk802 board ARM: dts: sun4i: Add dts file for Chuwi V7 CW0825 tablet ARM: dts: sun7i: Add dts file for Bananapro board ARM: sun6i: Enable ARM arch timers ARM: dts: sun6i: Convert hummingbird a31 dts to label references ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-27Merge tag 'samsung-dt' of ↵Olof Johansson9-8/+675
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Merge "Samsung DT updates for v3.20" from Kukjin Kim: - exynos3250 : add exynos_usbphy node and hsotg nodes - exynos3250-rinato : enable usb : cleanup and use macro for gpio-keys : add fimd and Panel devices support - exynos3250-monk : enable usb : cleanup and use macro for gpio-keys - exynos5250-snow : add power and lid gpio-keys pinctrl - exynos5420-peach-pit and exynos5800-peach-pi : configure regulators for suspend : set always on for USB webCam regulators : add lid GPIO key device - exynos5422 : add support new board Odroid XU3 - dt-bindings : add exynos-chipid * tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Configure regulators for suspend on exynos Peach boards ARM: dts: Set Peach boards USB WebCam regulators to always on ARM: dts: Add lid GPIO key device node for Peach boards ARM: dts: Add power and lid GPIO keys pinctrl for exynos5250-snow Documentation: dt-bindings: add exynos-chipid binding information ARM: dts: add Panel device support for exynos3250-rinato ARM: dts: add fimd device support for exynos3250-rinato ARM: dts: use macro in gpio keys for exynos3250 boards ARM: dts: remove unnecessary gpio-key nodes for exynos3250 boards ARM: dts: Enable USB node for exynos3250-monk ARM: dts: Enable USB node for exynos3250-rinato ARM: dts: Add hsotg node for exynos3250 ARM: dts: Add exynos_usbphy node for exynos3250 ARM: dts: Add dts file for Odroid XU3 board Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-27ARM: dts: re-fromat AT91 part to match other entriesNicolas Ferre1-50/+40
The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config options may be removed in the near future. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-27ARM: mvebu: armada-xp-synology-ds414: Relicense the device tree under GPLv2+/X11Gregory CLEMENT1-4/+37
The current GPL only licensing on the device tree makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Arnaud Ebalard <arno@natisbad.org>
2015-01-27ARM: mvebu: armada-xp-openblocks-ax3-4: Relicense the device tree under ↵Gregory CLEMENT1-3/+37
GPLv2+/X11 The current GPL only licensing on the device tree makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>