diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-10-11 16:05:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-10-11 16:06:17 +0200 |
| commit | ce57b60f38c82f2b0fb3eeea12245b504d781723 (patch) | |
| tree | d2173f08d87aed96aae5e9cf51c04474ebc0e5a7 /arch/arm64 | |
| parent | b483792c9ea8d8bf898261d148e1dd5590bf3ae4 (diff) | |
| parent | 2352ae1306974528d11fb9c7dbf2cf91e0dd2c31 (diff) | |
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index a1e3194b7483..f3ed4c078ba5 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -868,6 +868,14 @@ }; }; }; + + ports { + port { + muic_to_usb: endpoint { + remote-endpoint = <&usb_to_muic>; + }; + }; + }; }; regulators { @@ -939,8 +947,7 @@ status = "okay"; cap-sd-highspeed; disable-wp; - cd-gpios = <&gpa2 4 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpa2 4 GPIO_ACTIVE_LOW>; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <0 4>; @@ -1283,12 +1290,17 @@ &usbdrd_dwc3 { dr_mode = "otg"; - extcon = <&muic>; }; &usbdrd30_phy { vbus-supply = <&safeout1_reg>; status = "okay"; + + port { + usb_to_muic: endpoint { + remote-endpoint = <&muic_to_usb>; + }; + }; }; &xxti { |