Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce57b60f authored Oct 11, 2018 by 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: Arnd Bergmann <arnd@arndb.de>

parents b483792c 2352ae13

arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

+15 −3

Original line number	Diff line number	Diff line
		@@ -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 {