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

Commit ccd140b5 authored Jun 10, 2016 by Srinivas Kandagatla Committed by Andy Gross Jun 27, 2016

ARM: dts: apq8064: move sdcc1 pinctrl nodes to soc file



This patch moves out the sdcc1 pinctrl nodes out of board files to soc file,
so that it will be duplicated in other board files.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

parent c49e9e95

arch/arm/boot/dts/qcom-apq8064-pins.dtsi

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,26 @@
	};		};
	};		};

			sdcc1_pins: sdcc1-pin-active {
			clk {
			pins = "sdc1_clk";
			drive-strengh = <16>;
			bias-disable;
			};

			cmd {
			pins = "sdc1_cmd";
			drive-strengh = <10>;
			bias-pull-up;
			};

			data {
			pins = "sdc1_data";
			drive-strengh = <10>;
			bias-pull-up;
			};
			};

	ps_hold: ps_hold {		ps_hold: ps_hold {
	mux {		mux {
	pins = "gpio78";		pins = "gpio78";

arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts

+0 −22

Original line number	Original line	Diff line number	Diff line
	@@ -70,25 +70,6 @@
	};		};
	};		};

	sdcc1_pin_a: sdcc1-pin-active {
	clk {
	pins = "sdc1_clk";
	drive-strengh = <16>;
	bias-disable;
	};

	cmd {
	pins = "sdc1_cmd";
	drive-strengh = <10>;
	bias-pull-up;
	};

	data {
	pins = "sdc1_data";
	drive-strengh = <10>;
	bias-pull-up;
	};
	};

	sdcc3_pin_a: sdcc3-pin-active {		sdcc3_pin_a: sdcc3-pin-active {
	clk {		clk {
	@@ -417,9 +398,6 @@

	vmmc-supply = <&pm8921_l5>;		vmmc-supply = <&pm8921_l5>;
	vqmmc-supply = <&pm8921_s4>;		vqmmc-supply = <&pm8921_s4>;

	pinctrl-names = "default";
	pinctrl-0 = <&sdcc1_pin_a>;
	};		};

	sdcc3: sdcc@12180000 {		sdcc3: sdcc@12180000 {

arch/arm/boot/dts/qcom-apq8064.dtsi

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -859,6 +859,8 @@
	sdcc1: sdcc@12400000 {		sdcc1: sdcc@12400000 {
	status = "disabled";		status = "disabled";
	compatible = "arm,pl18x", "arm,primecell";		compatible = "arm,pl18x", "arm,primecell";
			pinctrl-names = "default";
			pinctrl-0 = <&sdcc1_pins>;
	arm,primecell-periphid = <0x00051180>;		arm,primecell-periphid = <0x00051180>;
	reg = <0x12400000 0x2000>;		reg = <0x12400000 0x2000>;
	interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;