forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4 
 kernel/arch/arm/boot/dts/imx6ul-isiot.dtsi
....@@ -1,43 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0 OR X11
12 /*
23  * Copyright (C) 2016 Amarula Solutions B.V.
34  * Copyright (C) 2016 Engicam S.r.l.
4
- *
5
- * This file is dual-licensed: you can use it either under the terms
6
- * of the GPL or the X11 license, at your option. Note that this dual
7
- * licensing only applies to this file, and not this project as a
8
- * whole.
9
- *
10
- *  a) This file is free software; you can redistribute it and/or
11
- *     modify it under the terms of the GNU General Public License
12
- *     version 2 as published by the Free Software Foundation.
13
- *
14
- *     This file 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.
415  */
426 
437 #include <dt-bindings/gpio/gpio.h>
....@@ -134,6 +98,13 @@
13498 	};
13599 };
136100 
101
+&gpmi {
102
+	pinctrl-names = "default";
103
+	pinctrl-0 = <&pinctrl_gpmi_nand>;
104
+	nand-on-flash-bbt;
105
+	status = "disabled";
106
+};
107
+
137108 &i2c1 {
138109 	clock-frequency = <100000>;
139110 	pinctrl-names = "default";
....@@ -177,7 +148,7 @@
177148 };
178149 
179150 &i2c2 {
180
-	clock_frequency = <100000>;
151
+	clock-frequency = <100000>;
181152 	pinctrl-names = "default";
182153 	pinctrl-0 = <&pinctrl_i2c2>;
183154 	status = "okay";
....@@ -190,7 +161,7 @@
190161 	display = <&display0>;
191162 	status = "okay";
192163 
193
-	display0: display {
164
+	display0: display0 {
194165 		bits-per-pixel = <16>;
195166 		bus-width = <18>;
196167 
....@@ -216,6 +187,7 @@
216187 };
217188 
218189 &pwm8 {
190
+	#pwm-cells = <2>;
219191 	pinctrl-names = "default";
220192 	pinctrl-0 = <&pinctrl_pwm8>;
221193 	status = "okay";
....@@ -244,6 +216,15 @@
244216 	status = "okay";
245217 };
246218 
219
+&usdhc2 {
220
+	pinctrl-names = "default";
221
+	pinctrl-0 = <&pinctrl_usdhc2>;
222
+	cd-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>;
223
+	bus-width = <8>;
224
+	no-1-8-v;
225
+	status = "disabled";
226
+};
227
+
247228 &iomuxc {
248229 	pinctrl_enet1: enet1grp {
249230 		fsl,pins = <
....@@ -257,6 +238,26 @@
257238 			MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01	0x1b0b0
258239 			MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1	0x4001b031
259240 			MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10	0x1b0b0
241
+		>;
242
+	};
243
+
244
+	pinctrl_gpmi_nand: gpminandgrp {
245
+		fsl,pins = <
246
+			MX6UL_PAD_NAND_CLE__RAWNAND_CLE         0xb0b1
247
+			MX6UL_PAD_NAND_ALE__RAWNAND_ALE         0xb0b1
248
+			MX6UL_PAD_NAND_WP_B__RAWNAND_WP_B       0xb0b1
249
+			MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0xb000
250
+			MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B     0xb0b1
251
+			MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B       0xb0b1
252
+			MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B       0xb0b1
253
+			MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00   0xb0b1
254
+			MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01   0xb0b1
255
+			MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02   0xb0b1
256
+			MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03   0xb0b1
257
+			MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04   0xb0b1
258
+			MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05   0xb0b1
259
+			MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06   0xb0b1
260
+			MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07   0xb0b1
260261 		>;
261262 	};
262263 
....@@ -367,4 +368,20 @@
367368 			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170f9
368369 		>;
369370 	};
371
+
372
+	pinctrl_usdhc2: usdhc2grp {
373
+		fsl,pins = <
374
+			MX6UL_PAD_NAND_RE_B__USDHC2_CLK      0x17070
375
+			MX6UL_PAD_NAND_WE_B__USDHC2_CMD      0x10070
376
+			MX6UL_PAD_NAND_DATA00__USDHC2_DATA0  0x17070
377
+			MX6UL_PAD_NAND_DATA01__USDHC2_DATA1  0x17070
378
+			MX6UL_PAD_NAND_DATA02__USDHC2_DATA2  0x17070
379
+			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3  0x17070
380
+			MX6UL_PAD_NAND_DATA04__USDHC2_DATA4  0x17070
381
+			MX6UL_PAD_NAND_DATA05__USDHC2_DATA5  0x17070
382
+			MX6UL_PAD_NAND_DATA06__USDHC2_DATA6  0x17070
383
+			MX6UL_PAD_NAND_DATA07__USDHC2_DATA7  0x17070
384
+			MX6UL_PAD_NAND_ALE__USDHC2_RESET_B   0x17070
385
+		>;
386
+	};
370387 };