colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imx6ull: synchronise device tree with linux

Browse Source 
Synchronise device tree with linux v6.0-rc1.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
This commit is contained in:
Marcel Ziswiler
2022-10-22 23:59:33 +02:00
committed by Stefano Babic
parent bf947d2a4b
commit 1c385db358
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/dts/imx6ull-colibri.dtsi
View File

@@ -94,7 +94,6 @@
}; };
&adc1 { &adc1 {
num-channels = <10>;
vref-supply = <&reg_module_3v3_avdd>; vref-supply = <&reg_module_3v3_avdd>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_adc1>; pinctrl-0 = <&pinctrl_adc1>;
@@ -166,7 +165,7 @@
atmel_mxt_ts: touchscreen@4a { atmel_mxt_ts: touchscreen@4a {
compatible = "atmel,maxtouch"; compatible = "atmel,maxtouch";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_atmel_conn>; pinctrl-0 = <&pinctrl_atmel_conn &pinctrl_atmel_snvs_conn>;
reg = <0x4a>; reg = <0x4a>;
interrupt-parent = <&gpio5>; interrupt-parent = <&gpio5>;
interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 / INT */ interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 / INT */
@@ -331,7 +330,6 @@
pinctrl_atmel_conn: atmelconngrp { pinctrl_atmel_conn: atmelconngrp {
fsl,pins = < fsl,pins = <
MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */ MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */
MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */
>; >;
}; };
@@ -684,6 +682,12 @@
}; };
&iomuxc_snvs { &iomuxc_snvs {
pinctrl_atmel_snvs_conn: atmelsnvsconngrp {
fsl,pins = <
MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */
>;
};
pinctrl_snvs_gpio1: snvsgpio1grp { pinctrl_snvs_gpio1: snvsgpio1grp {
fsl,pins = < fsl,pins = <
MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */ MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */

2
arch/arm/dts/imx6ull.dtsi
View File

@@ -50,7 +50,7 @@
}; };
/ { / {
soc { soc: soc {
aips3: bus@2200000 { aips3: bus@2200000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;