disable i2c1

hc

2024-05-11 645e752c5a84baeb21015cdc85fc05b7d16312c8

 kernel/arch/arm/boot/dts/imx6q-apalis-eval.dts
..
..
@@ -1,44 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
1
2
 /*
2
- * Copyright 2014-2017 Toradex AG
3
+ * Copyright 2014-2020 Toradex
3
4
  * Copyright 2012 Freescale Semiconductor, Inc.
4
5
  * Copyright 2011 Linaro Ltd.
5
- *
6
- * This file is dual-licensed: you can use it either under the terms
7
- * of the GPL or the X11 license, at your option. Note that this dual
8
- * licensing only applies to this file, and not this project as a
9
- * whole.
10
- *
11
- *  a) This file is free software; you can redistribute it and/or
12
- *     modify it under the terms of the GNU General Public License
13
- *     version 2 as published by the Free Software Foundation.
14
- *
15
- *     This file is distributed in the hope that it will be useful,
16
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
17
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
- *     GNU General Public License for more details.
19
- *
20
- * Or, alternatively,
21
- *
22
- *  b) Permission is hereby granted, free of charge, to any person
23
- *     obtaining a copy of this software and associated documentation
24
- *     files (the "Software"), to deal in the Software without
25
- *     restriction, including without limitation the rights to use,
26
- *     copy, modify, merge, publish, distribute, sublicense, and/or
27
- *     sell copies of the Software, and to permit persons to whom the
28
- *     Software is furnished to do so, subject to the following
29
- *     conditions:
30
- *
31
- *     The above copyright notice and this permission notice shall be
32
- *     included in all copies or substantial portions of the Software.
33
- *
34
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
35
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
36
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
37
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
38
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
39
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
40
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
41
- *     OTHER DEALINGS IN THE SOFTWARE.
42
6
  */
43
7
 
44
8
 /dts-v1/;
..
..
@@ -167,6 +131,19 @@
167
131
 &i2c1 {
168
132
 	status = "okay";
169
133
 
134
+	/*
135
+	 * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
136
+	 * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
137
+	 */
138
+	touchscreen@4a {
139
+		compatible = "atmel,maxtouch";
140
+		reg = <0x4a>;
141
+		interrupt-parent = <&gpio6>;
142
+		interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
143
+		reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */
144
+		status = "disabled";
145
+	};
146
+
170
147
 	pcie-switch@58 {
171
148
 		compatible = "plx,pex8605";
172
149
 		reg = <0x58>;
..
..
@@ -196,6 +173,8 @@
196
173
 };
197
174
 
198
175
 &pcie {
176
+	pinctrl-names = "default";
177
+	pinctrl-0 = <&pinctrl_reset_moci>;
199
178
 	/* active-high meaning opposite of regular PERST# active-low polarity */
200
179
 	reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>;
201
180
 	reset-gpio-active-high;