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

Commit 0b2e0fbc authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: Modify pinctrl settings for HS-I2S device nodes"

parents 898820ec 8f344f9d

Documentation/devicetree/bindings/sound/qcom,hsi2s.txt

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ Required properties: 
 - interrupts : Interrupt number used by this interface

 - clocks : Core clocks used by this interface

 - clock-names : Clock names for each core clock

 - bit-clock-hz : Default bit clock frequency in hertz

 - interrupt-interval-ms : Default interrupt interval in milliseconds



* HS-I2S interface nodes

arch/arm64/boot/dts/qcom/sa6155-adp-air.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
		clock-names = "core_clk", "wr0_mem_clk",

			      "wr1_mem_clk", "wr2_mem_clk",

			      "csr_hclk";

		bit-clock-hz = <20000000>;

		interrupt-interval-ms = <10>;



		sdr0: qcom,hs0_i2s {

			compatible = "qcom,hsi2s-interface";

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ 
		clock-names = "core_clk", "wr0_mem_clk",

			      "wr1_mem_clk", "wr2_mem_clk",

			      "csr_hclk";

		bit-clock-hz = <20000000>;

		interrupt-interval-ms = <10>;



		sdr0: qcom,hs0_i2s {

			compatible = "qcom,hsi2s-interface";

arch/arm64/boot/dts/qcom/sa8155.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -506,6 +506,8 @@ 
		      <0x17080000 0xE000>;

		reg-names = "lpa_if", "lpass_tcsr";

		interrupts = <GIC_SPI 267 0>;

		bit-clock-hz = <20000000>;

		interrupt-interval-ms = <10>;



		sdr0: qcom,hs0_i2s {

			compatible = "qcom,hsi2s-interface";

arch/arm64/boot/dts/qcom/sm6150-pinctrl.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -1821,7 +1821,7 @@ 
					pins = "gpio38";

					drive-strength = <4>;   /* 4 mA */

					bias-no-pull;

					input-enable;

					output-high;

				};

			};

		};
@@ -1849,7 +1849,7 @@ 
					pins = "gpio39";

					drive-strength = <4>;   /* 4 mA */

					bias-no-pull;

					output-high;

					input-enable;

				};

			};

		};
@@ -1905,7 +1905,7 @@ 
					pins = "gpio26";

					drive-strength = <4>;   /* 4 mA */

					bias-no-pull;

					input-enable;

					output-high;

				};

			};

		};
@@ -1933,7 +1933,7 @@ 
					pins = "gpio27";

					drive-strength = <4>;   /* 4 mA */

					bias-no-pull;

					output-high;

					input-enable;

				};

			};

		};