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

Commit 0229bbc1 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: Add support for ABUG board for sdxpoorwills-ttp"

parents c48c5466 732102b0
Loading
Loading
Loading
Loading
+53 −1
Original line number Diff line number Diff line
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
 *
 * 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
@@ -1699,6 +1699,58 @@
				};
			};
		};

		sensor_int1_default: sensor_int1_default {
			     mux {
				     pins = "gpio78";
				     function = "gpio";
			     };

			     config {
				     pins = "gpio78";
				     drive-strength = <16>; /* 16 mA */
				     bias-pull-down; /* pull down */
			     };
		};

		sensor_int2_default: sensor_int2_default {
			     mux {
				     pins = "gpio79";
				     function = "gpio";
			     };

			     config {
				     pins = "gpio79";
				     drive-strength = <16>; /* 16 mA */
				     bias-pull-down; /* pull down */
			     };
		};

		pinctrl_pps: ppsgrp {
			mux {
				pins = "gpio42";
				function = "nav_dr";
			};

			config {
				pins = "gpio42";
				bias-pull-down;
			};
		};

		pmx_can_reset: pmx_can_reset {
			mux {
				pins = "gpio99";
				function = "gpio";
			};

			config {
				pins = "gpio99";
				drive-strength = <2>;
				bias-disable;
				output-high;
			};
		};
	};
};

+63 −1
Original line number Diff line number Diff line
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
 *
 * 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
@@ -21,3 +21,65 @@
	qcom,connector-type-uAB;
	extcon = <0>, <0>, <0>, <&vbus_detect>;
};

&soc {
	pps {
		compatible = "pps-gpio";
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_pps>;
		gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>;
		status = "okay";
	};

	vreg_can: vreg_can {
		compatible = "regulator-fixed";
		regulator-name = "vreg_can";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		regulator-always-on;
		enable-active-high;
		gpio = <&tlmm 71 GPIO_ACTIVE_HIGH>;
	};
};

&i2c_4 {
	status = "okay";

	iam20680@69 {
	       compatible = "inven,iam20680";
	       reg = <0x69>;
	       pinctrl-names = "default";
	       pinctrl-0 = <&sensor_int1_default>;
	       interrupt-parent = <&tlmm>;
	       interrupts = <78 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@6a {
	       compatible = "st,asm330lhh";
	       reg = <0x6a>;
	       pinctrl-names = "default";
	       pinctrl-0 = <&sensor_int1_default>;
	       interrupt-parent = <&tlmm>;
	       interrupts = <78 IRQ_TYPE_EDGE_RISING>;
	       st,drdy-int-pin= <2>;
	};
};

&spi_2 {
	status = "okay";
};

&tlmm {
	/* Set these up as hogs */
	pinctrl-names = "default";
	pinctrl-0 = <&pmx_can_reset>;
};