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, 31 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index ad4118f7e1a6..746cddb1b8f5 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -26,6 +26,16 @@
                 regulator-max-microvolt = <3300000>;
         };
 
+        extcon_usb1: extcon_usb1 {
+                compatible = "linux,extcon-usb-gpio";
+                id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
+        };
+
+        extcon_usb2: extcon_usb2 {
+                compatible = "linux,extcon-usb-gpio";
+                id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
+        };
+
         vtt_fixed: fixedregulator-vtt {
                 compatible = "regulator-fixed";
                 regulator-name = "vtt_fixed";
@@ -391,6 +401,19 @@
                         };
                 };
         };
+
+        pcf_gpio_21: gpio@21 {
+                compatible = "ti,pcf8575";
+                reg = <0x21>;
+                lines-initial-states = <0x1408>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                interrupt-parent = <&gpio6>;
+                interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
 };
 
 &i2c2 {
@@ -520,6 +543,14 @@
         };
 };
 
+&omap_dwc3_1 {
+        extcon = <&extcon_usb1>;
+};
+
+&omap_dwc3_2 {
+        extcon = <&extcon_usb2>;
+};
+
 &usb1 {
         dr_mode = "peripheral";
         pinctrl-names = "default";