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

Commit 3e4225b9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "spi_qsd: don't use "default" string for pin ctrl state"

parents 15a5a1db 9233cd8c

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

+2 −2
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ 
                        qcom,pin-func = <1>;

                        label = "spi0-active";

                        /* active state */

                        spi0_default: default {

                        spi0_default: spi0_default {

                                drive-strength = <12>; /* 12 MA */

                                bias-disable = <0>; /* No PULL */

                        };
@@ -890,7 +890,7 @@ 
                        qcom,pin-func = <0>;

                        label = "spi0-suspend";

                        /* suspended state */

                        spi0_sleep: sleep {

                        spi0_sleep: spi0_sleep {

                                drive-strength = <2>; /* 2 MA */

                                bias-pull-down; /* pull down */

                        };

arch/arm/boot/dts/qcom/msm8909.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ 
                interrupt-names = "spi_irq", "spi_bam_irq";

                interrupts = <0 100 0>, <0 238 0>;

                spi-max-frequency = <19200000>;

                pinctrl-names = "default", "sleep";

                pinctrl-names = "spi_default", "spi_sleep";

                pinctrl-0 = <&spi0_default &spi0_cs0_active>;

                pinctrl-1 = <&spi0_sleep &spi0_cs0_sleep>;

                clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

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

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ 
			qcom,pin-func = <1>;

			label = "spi0-active";

			/* active state */

			spi0_default: default {

			spi0_default: spi0_default {

				drive-strength = <12>; /* 12 MA */

				bias-disable = <0>; /* No PULL */

			};
@@ -314,7 +314,7 @@ 
			qcom,pin-func = <0>;

			label = "spi0-suspend";

			/* suspended state */

			spi0_sleep: sleep {

			spi0_sleep: spi0_sleep {

				drive-strength = <2>; /* 2 MA */

				bias-pull-down; /* pull down */

			};

arch/arm/boot/dts/qcom/msm8916.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ 
                interrupt-names = "spi_irq", "spi_bam_irq";

                interrupts = <0 97 0>, <0 238 0>;

                spi-max-frequency = <50000000>;

                pinctrl-names = "default", "sleep";

                pinctrl-names = "spi_default", "spi_sleep";

                pinctrl-0 = <&spi0_default &spi0_cs0_active>;

		pinctrl-1 = <&spi0_sleep &spi0_cs0_sleep>;

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

arch/arm/boot/dts/qcom/msm8939-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ 
		interrupt-names = "spi_irq", "spi_bam_irq";

		interrupts = <0 97 0>, <0 238 0>;

		spi-max-frequency = <19200000>;

		pinctrl-names = "default", "sleep";

		pinctrl-names = "spi_default", "spi_sleep";

		pinctrl-0 = <&spi0_default &spi0_cs0_active>;

		pinctrl-1 = <&spi0_sleep &spi0_cs0_sleep>;

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
@@ -990,7 +990,7 @@ 
		interrupts = <0 99 0>, <0 238 0>;

		spi-max-frequency = <18000000>;

		qcom,use-pinctrl;

		pinctrl-names = "default", "sleep";

		pinctrl-names = "spi_default", "spi_sleep";

		pinctrl-0 = <&spi5_default &spi5_cs0_active>;

		pinctrl-1 = <&spi5_sleep &spi5_cs0_sleep>;

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,