Merge "ARM: dts: msm: Clean up 8992 SPI pinctrl entries" (a0f50e1e) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/msm8992-pinctrl.dtsi

+11 −50

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@
		/* CS */
		qcom,pins = <&gp 9>;
		qcom,num-grp-pins = <1>;
		qcom,pin-func = <4>;
		qcom,pin-func = <0>;
		label = "spi0-cs2-suspend";
		spi0_cs2_sleep: cs2_sleep {
		drive-strength = <2>;
		@@ -94,62 +94,23 @@
		};
		};

		spi1_active {
		/* MOSI, MISO, CLK */
		qcom,pins = <&gp 4>, <&gp 5>, <&gp 7>;
		qcom,num-grp-pins = <3>;
		qcom,pin-func = <1>;
		label = "spi1-active";
		/* active state */
		spi1_default: default {
		drive-strength = <12>; /* 12 MA */
		bias-disable = <0>; /* No PULL */
		};
		};

		spi1_suspend {
		/* MOSI, MISO, CLK */
		qcom,pins = <&gp 4>, <&gp 5>, <&gp 7>;
		qcom,num-grp-pins = <3>;
		qcom,pin-func = <0>;
		label = "spi1-suspend";
		/* suspended state */
		spi1_sleep: sleep {
		drive-strength = <2>; /* 2 MA */
		bias-pull-down; /* pull down */
		};
		};

		spi1_cs2_active {
		/* CS */
		qcom,pins = <&gp 6>;
		qcom,num-grp-pins = <1>;
		qcom,pin-func = <1>;
		label = "spi1-cs2-active";
		spi1_cs2_active: cs2_active {
		drive-strength = <2>;
		bias-disable = <0>;
		};
		};

		spi1_cs2_suspend {
		/* CS */
		qcom,pins = <&gp 6>;
		eth-irq {
		qcom,pins = <&gp 75>;
		qcom,num-grp-pins = <1>;
		qcom,pin-func = <0>;
		label = "spi1-cs2-suspend";
		spi1_cs2_sleep: cs2_sleep {
		label = "eth-irq";
		eth_irq_default: default {
		drive-strength = <2>;
		bias-disable = <0>;
		bias-pull-up;
		};
		};

		eth-irq {
		qcom,pins = <&gp 75>;
		qcom,num-grp-pins = <1>;
		spi0-unused-cs {
		qcom,pins = <&gp 8>, <&gp 10>, <&gp 11>;
		qcom,num-grp-pins = <3>;
		qcom,pin-func = <0>;
		label = "eth-irq";
		eth_irq_default: default {
		label = "unused-cs";
		spi0_unused_cs_default: default {
		drive-strength = <2>;
		bias-pull-up;
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,6 @@
		vdd-io-supply = <&dummy_vreg>;
		vdd-phy-supply = <&dummy_vreg>;
		pinctrl-names = "default";
		pinctrl-0 = <&eth_irq_default>;
		pinctrl-0 = <&eth_irq_default &spi0_unused_cs_default>;
		};
		};

+2 −2

Original line number	Diff line number	Diff line
		@@ -276,8 +276,8 @@
		interrupts = <0 95 0>;
		spi-max-frequency = <50000000>;
		pinctrl-names = "default", "sleep";
		pinctrl-0 = <&spi1_default &spi1_cs2_active>;
		pinctrl-1 = <&spi1_sleep &spi1_cs2_sleep>;
		pinctrl-0 = <&spi0_default &spi0_cs2_active>;
		pinctrl-1 = <&spi0_sleep &spi0_cs2_sleep>;
		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
		<&clock_gcc clk_gcc_blsp1_qup2_spi_apps_clk>;
		clock-names = "iface_clk", "core_clk";