Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC DT updates from Olof Johansson:
 "DT changes continue to be the bulk of our merge window contents.

  We continue to have a large set of changes across the board as new
  platforms and drivers are added.

  Some of the new platforms are:
   - Alphascale ASM9260
   - Marvell Armada 388
   - CSR Atlas7
   - TI Davinci DM816x
   - Hisilicon HiP01
   - ST STiH418

  There have also been some sweeping changes, including relicensing of
  DTS contents from GPL to GPLv2+/X11 so that the same files can be
  reused in other non-GPL projects more easily.  There's also been
  changes to the DT Makefile to make it a little less conflict-ridden
  and churny down the road"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (330 commits)
  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
  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: 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
  ...

1 files changed, 99 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/stih418.dtsi b/arch/arm/boot/dts/stih418.dtsi
new file mode 100644
index 000000000000..354d90f521b6
--- /dev/null
+++ b/arch/arm/boot/dts/stih418.dtsi
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2014 STMicroelectronics Limited.
+ * Author: Peter Griffin <peter.griffin@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * publishhed by the Free Software Foundation.
+ */
+#include "stih418-clock.dtsi"
+#include "stih407-family.dtsi"
+#include "stih410-pinctrl.dtsi"
+/ {
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                cpu@2 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        reg = <2>;
+                };
+                cpu@3 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        reg = <3>;
+                };
+        };
+
+        soc {
+                usb2_picophy1: phy2 {
+                        compatible = "st,stih407-usb2-phy";
+                        #phy-cells = <0>;
+                        st,syscfg = <&syscfg_core 0xf8 0xf4>;
+                        resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
+                                 <&picophyreset STIH407_PICOPHY0_RESET>;
+                        reset-names = "global", "port";
+                };
+
+                usb2_picophy2: phy3 {
+                        compatible = "st,stih407-usb2-phy";
+                        #phy-cells = <0>;
+                        st,syscfg = <&syscfg_core 0xfc 0xf4>;
+                        resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
+                                 <&picophyreset STIH407_PICOPHY1_RESET>;
+                        reset-names = "global", "port";
+                };
+
+                ohci0: usb@9a03c00 {
+                        compatible = "st,st-ohci-300x";
+                        reg = <0x9a03c00 0x100>;
+                        interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>;
+                        clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
+                        resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
+                                 <&softreset STIH407_USB2_PORT0_SOFTRESET>;
+                        reset-names = "power", "softreset";
+                        phys = <&usb2_picophy1>;
+                        phy-names = "usb";
+                };
+
+                ehci0: usb@9a03e00 {
+                        compatible = "st,st-ehci-300x";
+                        reg = <0x9a03e00 0x100>;
+                        interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usb0>;
+                        clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
+                        resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
+                                 <&softreset STIH407_USB2_PORT0_SOFTRESET>;
+                        reset-names = "power", "softreset";
+                        phys = <&usb2_picophy1>;
+                        phy-names = "usb";
+                };
+
+                ohci1: usb@9a83c00 {
+                        compatible = "st,st-ohci-300x";
+                        reg = <0x9a83c00 0x100>;
+                        interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>;
+                        clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
+                        resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
+                                 <&softreset STIH407_USB2_PORT1_SOFTRESET>;
+                        reset-names = "power", "softreset";
+                        phys = <&usb2_picophy2>;
+                        phy-names = "usb";
+                };
+
+                ehci1: usb@9a83e00 {
+                        compatible = "st,st-ehci-300x";
+                        reg = <0x9a83e00 0x100>;
+                        interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usb1>;
+                        clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
+                        resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
+                                 <&softreset STIH407_USB2_PORT1_SOFTRESET>;
+                        reset-names = "power", "softreset";
+                        phys = <&usb2_picophy2>;
+                        phy-names = "usb";
+                };
+        };
+};