diff options
| author | Puneet Yatnal <puneet@codeaurora.org> | 2018-12-20 10:35:06 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-20 01:00:40 -0800 |
| commit | 901178c7ed8d5900a35e0c04c816971b2ba8b619 (patch) | |
| tree | a57f0db9b86f7e464a94a717afe7905c5d7be08e | |
| parent | c434e9712c9e2ddbb3db8b70c5cb6a6d032d5534 (diff) | |
Revert "ARM: dts: msm: Enabled dt entry for bmi160 and iam20680"
BMI160 and IAM20680 sensor driver was used in automotive platform for
dead reckoning solution, reverting the change since QDR no longer
required.
This reverts commit b7d92272196b67b22a2aeda2080efe268e3609ab.
Change-Id: Id5e41b0fa7f0a145c40e01d1cc9a3869f4688b9a
Signed-off-by: Puneet Yatnal <puneet@codeaurora.org>
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi | 35 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi | 52 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996.dtsi | 23 |
4 files changed, 0 insertions, 112 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 7354ff18e919..f9097941c192 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -259,8 +259,6 @@ xes Extreme Engineering Solutions (X-ES) xillybus Xillybus Ltd. xlnx Xilinx zyxel ZyXEL Communications Corp. -bosch-sensortec» Bosch Sensortec GmbH -inven InvenSense, Inc. zarlink Zarlink Semiconductor zii Zodiac Inflight Innovations zte ZTE Corp. diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi index db99055e095f..62c72942eb46 100644 --- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi @@ -1536,41 +1536,6 @@ }; }; -&i2c_10 { - bmi160@68 { - compatible = "bosch-sensortec,bmi160"; - reg = <0x68>; - vdd-supply = <&pm8994_lvs2>; - vio-supply = <&pm8994_lvs2>; - pinctrl-names = "default"; - pinctrl-0 = <&sensor_int1_default &sensor_int2_default>; - interrupt-parent = <&tlmm>; - interrupts = <117 0x2002>; - bmi,init-interval = <200>; - bmi,place = <1>; - bmi,gpio_irq = <&tlmm 117 0x2002>; - }; - iam20680@69 { - compatible = "inven,iam20680"; - reg = <0x69>; - vdd-supply = <&pm8994_lvs2>; - vio-supply = <&pm8994_lvs2>; - pinctrl-names = "default"; - pinctrl-0 = <&sensor_int1_default &sensor_int2_default>; - interrupt-parent = <&tlmm>; - interrupts = <118 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"; - }; -}; - &dsi_dual_jdi_video { /delete-property/ pwms; /delete-property/ qcom,5v-boost-gpio; diff --git a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi index 50b435547982..3e2e7bbf56f6 100644 --- a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi @@ -850,58 +850,6 @@ }; }; }; - i2c_10 { - i2c_10_active: i2c_10_active { - mux { - pins = "gpio10", "gpio11"; - function = "blsp_i2c10"; - }; - - config { - pins = "gpio10", "gpio11"; - drive-strength = <16>; - bias-pull-up; - }; - }; - - i2c_10_sleep: i2c_10_sleep { - mux { - pins = "gpio10", "gpio11"; - function = "blsp_i2c10"; - }; - - config { - pins = "gpio10", "gpio11"; - drive-strength = <16>; - bias-pull-up; - }; - }; - }; - - sensor_int1_default: sensor_int1_default { - mux { - pins = "gpio117"; - function = "gpio"; - }; - - config { - pins = "gpio117"; - drive-strength = <16>; /* 16 mA */ - bias-pull-down; /* pull down */ - }; - }; - sensor_int2_default: sensor_int2_default { - mux { - pins = "gpio118"; - function = "gpio"; - }; - - config { - pins = "gpio118"; - drive-strength = <16>; /* 16 mA */ - bias-pull-down; /* pull down */ - }; - }; pmx_fm_int { fm_int_active: fm_int_active { diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi index aa1d28a082a8..4d93105fb6dd 100644 --- a/arch/arm/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996.dtsi @@ -39,7 +39,6 @@ i2c6 = &i2c_6; i2c7 = &i2c_7; i2c8 = &i2c_8; - i2c10 = &i2c_10; i2c12 = &i2c_12; spi0 = &spi_0; serial0 = &uartblsp2dm1; @@ -388,28 +387,6 @@ clock-names = "core_clk", "iface_clk"; }; - i2c_10: i2c@75b8000 { /* BLSP2 QUP4 */ - compatible = "qcom,i2c-msm-v2"; - #address-cells = <1>; - #size-cells = <0>; - reg-names = "qup_phys_addr"; - reg = <0x75b8000 0x600>; - interrupt-names = "qup_irq"; - interrupts = <0 104 0>; - dmas = <&dma_blsp2 18 32 0x20000020 0x20>, - <&dma_blsp2 19 32 0x20000020 0x20>; - dma-names = "tx", "rx"; - qcom,master-id = <84>; - qcom,clk-freq-out = <400000>; - qcom,clk-freq-in = <19200000>; - clock-names = "iface_clk", "core_clk"; - clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>, - <&clock_gcc clk_gcc_blsp2_qup4_i2c_apps_clk>; - pinctrl-names = "i2c_active", "i2c_sleep"; - pinctrl-0 = <&i2c_10_active>; - pinctrl-1 = <&i2c_10_sleep>; - }; - i2c_12: i2c@75ba000 { compatible = "qcom,i2c-msm-v2"; #address-cells = <1>; |
