forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-02-19 890e1df1bec891d9203724541e81f8fbe5183388 
 kernel/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
....@@ -1,43 +1,6 @@
1
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
12 /*
23  * Copyright (c) 2016 Andreas Färber
3
- *
4
- * This file is dual-licensed: you can use it either under the terms
5
- * of the GPL or the X11 license, at your option. Note that this dual
6
- * licensing only applies to this file, and not this project as a
7
- * whole.
8
- *
9
- *  a) This library is free software; you can redistribute it and/or
10
- *     modify it under the terms of the GNU General Public License as
11
- *     published by the Free Software Foundation; either version 2 of the
12
- *     License, or (at your option) any later version.
13
- *
14
- *     This library is distributed in the hope that it will be useful,
15
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
- *     GNU General Public License for more details.
18
- *
19
- * Or, alternatively,
20
- *
21
- *  b) Permission is hereby granted, free of charge, to any person
22
- *     obtaining a copy of this software and associated documentation
23
- *     files (the "Software"), to deal in the Software without
24
- *     restriction, including without limitation the rights to use,
25
- *     copy, modify, merge, publish, distribute, sublicense, and/or
26
- *     sell copies of the Software, and to permit persons to whom the
27
- *     Software is furnished to do so, subject to the following
28
- *     conditions:
29
- *
30
- *     The above copyright notice and this permission notice shall be
31
- *     included in all copies or substantial portions of the Software.
32
- *
33
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
34
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
35
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
36
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
37
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
38
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
39
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
40
- *     OTHER DEALINGS IN THE SOFTWARE.
414  */
425 
436 #include "imx6sx.dtsi"
....@@ -106,18 +69,6 @@
10669 		gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>;
10770 		startup-delay-us = <70000>;
10871 		enable-active-high;
109
-	};
110
-
111
-	reg_bt: regulator-bt {
112
-		compatible = "regulator-fixed";
113
-		pinctrl-names = "default";
114
-		pinctrl-0 = <&pinctrl_bt_reg>;
115
-		enable-active-high;
116
-		gpio = <&gpio2 17 GPIO_ACTIVE_HIGH>;
117
-		regulator-name = "bt_reg";
118
-		regulator-min-microvolt = <1800000>;
119
-		regulator-max-microvolt = <1800000>;
120
-		regulator-always-on;
12172 	};
12273 };
12374 
....@@ -225,6 +176,20 @@
225176 	};
226177 };
227178 
179
+&i2c2 { /* Brick snap in sensors connector */
180
+	pinctrl-names = "default";
181
+	pinctrl-0 = <&pinctrl_i2c2>;
182
+	clock-frequency = <100000>;
183
+	status = "okay";
184
+};
185
+
186
+&i2c4 { /* Onboard Motion sensors */
187
+	pinctrl-names = "default";
188
+	pinctrl-0 = <&pinctrl_i2c4>;
189
+	clock-frequency = <100000>;
190
+	status = "disabled";
191
+};
192
+
228193 &iomuxc {
229194 	pinctrl_bt_reg: btreggrp {
230195 		fsl,pins =
....@@ -256,30 +221,42 @@
256221 			<MX6SX_PAD_GPIO1_IO01__I2C1_SDA		0x4001b8b1>;
257222 	};
258223 
224
+	pinctrl_i2c2: i2c2grp {
225
+		fsl,pins =
226
+			<MX6SX_PAD_GPIO1_IO03__I2C2_SDA		0x4001b8b1>,
227
+			<MX6SX_PAD_GPIO1_IO02__I2C2_SCL		0x4001b8b1>;
228
+	};
229
+
230
+	pinctrl_i2c4: i2c4grp {
231
+		fsl,pins =
232
+			<MX6SX_PAD_USB_H_DATA__I2C4_SDA		0x4001b8b1>,
233
+			<MX6SX_PAD_USB_H_STROBE__I2C4_SCL	0x4001b8b1>;
234
+	};
235
+
259236 	pinctrl_uart1: uart1grp {
260237 		fsl,pins =
261
-			<MX6SX_PAD_GPIO1_IO04__UART1_TX		0x1b0b1>,
262
-			<MX6SX_PAD_GPIO1_IO05__UART1_RX		0x1b0b1>;
238
+			<MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX	0x1b0b1>,
239
+			<MX6SX_PAD_GPIO1_IO05__UART1_DCE_RX	0x1b0b1>;
263240 	};
264241 
265242 	pinctrl_uart2: uart2grp {
266243 		fsl,pins =
267
-			<MX6SX_PAD_GPIO1_IO06__UART2_TX		0x1b0b1>,
268
-			<MX6SX_PAD_GPIO1_IO07__UART2_RX		0x1b0b1>;
244
+			<MX6SX_PAD_GPIO1_IO06__UART2_DCE_TX	0x1b0b1>,
245
+			<MX6SX_PAD_GPIO1_IO07__UART2_DCE_RX	0x1b0b1>;
269246 	};
270247 
271248 	pinctrl_uart3: uart3grp {
272249 		fsl,pins =
273
-			<MX6SX_PAD_SD3_DATA4__UART3_RX          0x13059>,
274
-			<MX6SX_PAD_SD3_DATA5__UART3_TX          0x13059>,
275
-			<MX6SX_PAD_SD3_DATA6__UART3_RTS_B       0x13059>,
276
-			<MX6SX_PAD_SD3_DATA7__UART3_CTS_B       0x13059>;
250
+			<MX6SX_PAD_SD3_DATA4__UART3_DCE_RX	0x13059>,
251
+			<MX6SX_PAD_SD3_DATA5__UART3_DCE_TX	0x13059>,
252
+			<MX6SX_PAD_SD3_DATA6__UART3_DCE_RTS	0x13059>,
253
+			<MX6SX_PAD_SD3_DATA7__UART3_DCE_CTS	0x13059>;
277254 	};
278255 
279256 	pinctrl_uart5: uart5grp {
280257 		fsl,pins =
281
-			<MX6SX_PAD_SD4_DATA4__UART5_RX		0x1b0b1>,
282
-			<MX6SX_PAD_SD4_DATA5__UART5_TX		0x1b0b1>;
258
+			<MX6SX_PAD_SD4_DATA4__UART5_DCE_RX	0x1b0b1>,
259
+			<MX6SX_PAD_SD4_DATA5__UART5_DCE_TX	0x1b0b1>;
283260 	};
284261 
285262 	pinctrl_uart6: uart6grp {
....@@ -288,10 +265,10 @@
288265 			<MX6SX_PAD_CSI_DATA01__UART6_DSR_B	0x1b0b1>,
289266 			<MX6SX_PAD_CSI_DATA02__UART6_DTR_B	0x1b0b1>,
290267 			<MX6SX_PAD_CSI_DATA03__UART6_DCD_B	0x1b0b1>,
291
-			<MX6SX_PAD_CSI_DATA04__UART6_RX		0x1b0b1>,
292
-			<MX6SX_PAD_CSI_DATA05__UART6_TX		0x1b0b1>,
293
-			<MX6SX_PAD_CSI_DATA06__UART6_RTS_B	0x1b0b1>,
294
-			<MX6SX_PAD_CSI_DATA07__UART6_CTS_B	0x1b0b1>;
268
+			<MX6SX_PAD_CSI_DATA04__UART6_DCE_RX	0x1b0b1>,
269
+			<MX6SX_PAD_CSI_DATA05__UART6_DCE_TX	0x1b0b1>,
270
+			<MX6SX_PAD_CSI_DATA06__UART6_DCE_RTS	0x1b0b1>,
271
+			<MX6SX_PAD_CSI_DATA07__UART6_DCE_CTS	0x1b0b1>;
295272 	};
296273 
297274 	pinctrl_otg1_reg: otg1grp {
....@@ -354,11 +331,19 @@
354331 	status = "disabled";
355332 };
356333 
357
-&uart3 { /* Bluetooth */
334
+&uart3 { /* Bluetooth - only on Extended/Full versions */
358335 	pinctrl-names = "default";
359336 	pinctrl-0 = <&pinctrl_uart3>;
360337 	uart-has-rtscts;
361
-	status = "okay";
338
+	status = "disabled";
339
+
340
+	bluetooth {
341
+		compatible = "ti,wl1831-st";
342
+		enable-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>;
343
+		pinctrl-names = "default";
344
+		pinctrl-0 = <&pinctrl_bt_reg>;
345
+		max-speed = <921600>;
346
+	};
362347 };
363348 
364349 /* Arduino serial */