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

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

Merge "ARM: dts: msm: Enable ASM330, SMI130 & IAM20680 sensor for sa515m-ccard"

parents e0139549 391853e8

arch/arm64/boot/dts/qcom/sa515m-ccard.dtsi

+48 −0
Original line number Diff line number Diff line
@@ -176,6 +176,54 @@ 


&i2c_4 {

	status = "okay";

	smi130_gyro@68 {

		compatible = "smi130_gyro";

		reg = <0x68>;

		pinctrl-names = "default";

		pinctrl-0 = <&sensor_int1_default>;

		interrupt-parent = <&tlmm>;

		interrupts = <84 IRQ_TYPE_EDGE_RISING>;

		smi130_gyro,gpio_irq = <&tlmm 84 IRQ_TYPE_EDGE_RISING>;

	};



	smi130_acc@18 {

		compatible = "smi130_acc";

		reg = <0x18>;

		pinctrl-names = "default";

		pinctrl-0 = <&sensor_int2_default>;

		interrupt-parent = <&tlmm>;

		interrupts = <85 IRQ_TYPE_EDGE_RISING>;

	};



	iam20680@69 {

		compatible = "inven,iam20680";

		reg = <0x69>;

		pinctrl-names = "default";

		pinctrl-0 = <&sensor_int1_default>;

		interrupt-parent = <&tlmm>;

		interrupts = <84 IRQ_TYPE_EDGE_RISING>;

		axis_map_x = <1>;

		axis_map_y = <0>;

		axis_map_z = <2>;

		negate_x = <1>;

		negate_y = <0>;

		negate_z = <0>;

		inven,secondary_type = "none";

		inven,aux_type = "none";

		inven,read_only_slave_type = "none";

	};



	asm330@6b {

		compatible = "st,asm330lhh";

		reg = <0x6b>;

		pinctrl-names = "default";

		pinctrl-0 = <&sensor_int1_default>;

		interrupt-parent = <&tlmm>;

		interrupts = <84 IRQ_TYPE_EDGE_RISING>;

		st,drdy-int-pin= <2>;

		qcom,regulator_check = <0>; /* 0:Disable 1:Enable */

	};



};



&emac_hw {

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

+25 −0
Original line number Diff line number Diff line
@@ -1593,6 +1593,31 @@ 
				};

			};

		};

		sensor_int1_default: sensor_int1_default {

			     mux {

				     pins = "gpio84";

				     function = "gpio";

			     };



			     config {

				     pins = "gpio84";

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

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

			     };

		     };



		sensor_int2_default: sensor_int2_default {

			     mux {

				     pins = "gpio85";

				     function = "gpio";

			     };



			     config {

				     pins = "gpio85";

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

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

			     };

		     };



		pinctrl_pps: ppsgrp {

			mux {