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

Commit 34a39ff1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Samsung DTS ARM64 changes for v4.14" from Krzysztof Kozłowski:

1. Remove deprecated and unneeded properties from Exynos boards.
2. Implement proper (working) support for USB On-The-Go on Exynos5433
   TM2/TM2E boards.

* tag 'samsung-dt64-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: Remove num-slots from exynos platforms
  arm64: dts: exynos: Add extcon property for TM2 and TM2E
  arm64: dts: exynos: Fix wrong label for USB 3.0 controller node
  arm64: dts: exynos: Remove the OF graph from DSI node
parents aae4e7a8 10acba12

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

+2 −17
Original line number Diff line number Diff line
@@ -310,20 +310,6 @@ 
	samsung,pll-clock-frequency = <24000000>;

	pinctrl-names = "default";

	pinctrl-0 = <&te_irq>;



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@1 {

			reg = <1>;



			dsi_out: endpoint {

				samsung,burst-clock-frequency = <512000000>;

				samsung,esc-clock-frequency = <16000000>;

			};

		};

	};

};



&hdmi {
@@ -846,7 +832,6 @@ 


&mshc_0 {

	status = "okay";

	num-slots = <1>;

	mmc-hs200-1_8v;

	mmc-hs400-1_8v;

	cap-mmc-highspeed;
@@ -868,7 +853,6 @@ 


&mshc_2 {

	status = "okay";

	num-slots = <1>;

	cap-sd-highspeed;

	disable-wp;

	cd-gpios = <&gpa2 4 GPIO_ACTIVE_HIGH>;
@@ -1216,8 +1200,9 @@ 
	status = "okay";

};



&usbdrd_dwc3_0 {

&usbdrd_dwc3 {

	dr_mode = "otg";

	extcon = <&muic>;

};



&usbdrd30_phy {

arch/arm64/boot/dts/exynos/exynos5433.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1367,7 +1367,7 @@ 
			ranges;

			status = "disabled";



			dwc3@15400000 {

			usbdrd_dwc3: dwc3@15400000 {

				compatible = "snps,dwc3";

				reg = <0x15400000 0x10000>;

				interrupts = <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>;
@@ -1414,7 +1414,7 @@ 
			ranges;

			status = "disabled";



			usbdrd_dwc3_0: dwc3@15a00000 {

			usbhost_dwc3: dwc3@15a00000 {

				compatible = "snps,dwc3";

				reg = <0x15a00000 0x10000>;

				interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/exynos/exynos7-espresso.dts

+0 −2
Original line number Diff line number Diff line
@@ -359,7 +359,6 @@ 


&mmc_0 {

	status = "okay";

	num-slots = <1>;

	cap-mmc-highspeed;

	mmc-hs200-1_8v;

	non-removable;
@@ -375,7 +374,6 @@ 


&mmc_2 {

	status = "okay";

	num-slots = <1>;

	cap-sd-highspeed;

	card-detect-delay = <200>;

	clock-frequency = <400000000>;