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

Commit e4ccf203 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-dts-for-4.16' of... 

Merge tag 'qcom-dts-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Pull "Qualcomm Device Tree Changes for v4.16" from Andy Gross:

* Add uSD slot nodes on msm8974-FP2 board

* tag 'qcom-dts-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: dts: msm8974-FP2: Add uSD slot nodes
parents 5375ef7d 6e2797bd

arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts

+34 −0
Original line number Diff line number Diff line
@@ -265,6 +265,28 @@ 
				bias-pull-up;

			};

		};



		sdhc2_cd_pin_a: sdhc2-cd-pin-active {

			pins = "gpio62";

			function = "gpio";



			drive-strength = <2>;

			bias-disable;

		};



		sdhc2_pin_a: sdhc2-pin-active {

			clk {

				pins = "sdc2_clk";

				drive-strength = <10>;

				bias-disable;

			};



			cmd-data {

				pins = "sdc2_cmd", "sdc2_data";

				drive-strength = <6>;

				bias-pull-up;

			};

		};

	};



	sdhci@f9824900 {
@@ -280,6 +302,18 @@ 
		pinctrl-0 = <&sdhc1_pin_a>;

	};



	sdhci@f98a4900 {

		status = "ok";



		vmmc-supply = <&pm8941_l21>;

		vqmmc-supply = <&pm8941_l13>;



		bus-width = <4>;



		pinctrl-names = "default";

		pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>;

	};



	usb@f9a55000 {

		status = "ok";