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

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

Merge "ARM: dts: msm: sensor interrupt gpio name changed for MDM9607"

parents e10c87e6 99776625

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

+3 −3
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -261,7 +261,7 @@ 
			};

			};

		};

		};





		bmi160_int1_default: bmi160_int1_default {

		sensor_int1_default: sensor_int1_default {

			mux {

			mux {

				pins = "gpio78";

				pins = "gpio78";

				function = "gpio";

				function = "gpio";
@@ -273,7 +273,7 @@ 
			};

			};

		};

		};





		bmi160_int2_default: bmi160_int2_default {

		sensor_int2_default: sensor_int2_default {

			mux {

			mux {

				pins = "gpio79";

				pins = "gpio79";

				function = "gpio";

				function = "gpio";

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -539,7 +539,7 @@ 
			compatible = "bosch-sensortec,bmi160";

			compatible = "bosch-sensortec,bmi160";

			reg = <0x68>;

			reg = <0x68>;

			pinctrl-names = "default";

			pinctrl-names = "default";

			pinctrl-0 = <&bmi160_int1_default &bmi160_int2_default>;

			pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;

			interrupt-parent = <&tlmm_pinmux>;

			interrupt-parent = <&tlmm_pinmux>;

			interrupts = <78 0x2002>;

			interrupts = <78 0x2002>;

			bmi,init-interval = <200>;

			bmi,init-interval = <200>;
@@ -551,7 +551,7 @@ 
			compatible = "inven,iam20680";

			compatible = "inven,iam20680";

			reg = <0x69>;

			reg = <0x69>;

			pinctrl-names = "default";

			pinctrl-names = "default";

			pinctrl-0 = <&bmi160_int1_default &bmi160_int2_default>;

			pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;

			interrupt-parent = <&tlmm_pinmux>;

			interrupt-parent = <&tlmm_pinmux>;

			interrupts = <78 IRQ_TYPE_EDGE_RISING>;

			interrupts = <78 IRQ_TYPE_EDGE_RISING>;

			axis_map_x = <1>;

			axis_map_x = <1>;
@@ -569,7 +569,7 @@ 
			compatible = "st,asm330lhh";

			compatible = "st,asm330lhh";

			reg = <0x6b>;

			reg = <0x6b>;

			pinctrl-names = "default";

			pinctrl-names = "default";

			pinctrl-0 = <&bmi160_int1_default &bmi160_int2_default>;

			pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;

			interrupt-parent = <&tlmm_pinmux>;

			interrupt-parent = <&tlmm_pinmux>;

			interrupts = <78 IRQ_TYPE_EDGE_RISING>;

			interrupts = <78 IRQ_TYPE_EDGE_RISING>;

		};

		};