Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / stm32mp15xx-dkx.dtsi

diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
index 93398cf..89c0e1d 100644 (file)
--- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
@@ -124,6 +124,10 @@
        status = "okay";
 };
 
+&crc1 {
+       status = "okay";
+};
+
 &dts {
        status = "okay";
 };
@@ -151,6 +155,10 @@
        contiguous-area = <&gpu_reserved>;
 };
 
+&hash1 {
+       status = "okay";
+};
+
 &i2c1 {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&i2c1_pins_a>;
@@ -238,6 +246,30 @@
        /delete-property/dmas;
        /delete-property/dma-names;
 
+       stusb1600@28 {
+               compatible = "st,stusb1600";
+               reg = <0x28>;
+               interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
+               interrupt-parent = <&gpioi>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&stusb1600_pins_a>;
+               status = "okay";
+               vdd-supply = <&vin>;
+
+               connector {
+                       compatible = "usb-c-connector";
+                       label = "USB-C";
+                       power-role = "dual";
+                       typec-power-opmode = "default";
+
+                       port {
+                               con_usbotg_hs_ep: endpoint {
+                                       remote-endpoint = <&usbotg_hs_ep>;
+                               };
+                       };
+               };
+       };
+
        pmic: stpmic@33 {
                compatible = "st,stpmic1";
                reg = <0x33>;
@@ -648,6 +680,12 @@
        phy-names = "usb2-phy";
        usb-role-switch;
        status = "okay";
+
+       port {
+               usbotg_hs_ep: endpoint {
+                       remote-endpoint = <&con_usbotg_hs_ep>;
+               };
+       };
 };
 
 &usbphyc {