Commit ce57b60f authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-dt64-4.20' of...

Merge tag 'samsung-dt64-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Samsung DTS ARM64 changes for v4.20

1. Use graph between USB-PHY and MUIC.
2. Cleanup of SD card detect pin level.

* tag 'samsung-dt64-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: ARM: dts: exynos: Remove double SD card detect pin inversion on TM2
  arm64: dts: exynos: Add OF graph between USB-PHY and MUIC
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b483792c 2352ae13
...@@ -868,6 +868,14 @@ musb_con_to_mhl: endpoint { ...@@ -868,6 +868,14 @@ musb_con_to_mhl: endpoint {
}; };
}; };
}; };
ports {
port {
muic_to_usb: endpoint {
remote-endpoint = <&usb_to_muic>;
};
};
};
}; };
regulators { regulators {
...@@ -939,8 +947,7 @@ &mshc_2 { ...@@ -939,8 +947,7 @@ &mshc_2 {
status = "okay"; status = "okay";
cap-sd-highspeed; cap-sd-highspeed;
disable-wp; disable-wp;
cd-gpios = <&gpa2 4 GPIO_ACTIVE_HIGH>; cd-gpios = <&gpa2 4 GPIO_ACTIVE_LOW>;
cd-inverted;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>; samsung,dw-mshc-sdr-timing = <0 4>;
...@@ -1283,12 +1290,17 @@ &usbdrd30 { ...@@ -1283,12 +1290,17 @@ &usbdrd30 {
&usbdrd_dwc3 { &usbdrd_dwc3 {
dr_mode = "otg"; dr_mode = "otg";
extcon = <&muic>;
}; };
&usbdrd30_phy { &usbdrd30_phy {
vbus-supply = <&safeout1_reg>; vbus-supply = <&safeout1_reg>;
status = "okay"; status = "okay";
port {
usb_to_muic: endpoint {
remote-endpoint = <&muic_to_usb>;
};
};
}; };
&xxti { &xxti {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment