github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i.MX ARM device tree changes for 6.18:

Browse Source 
- A series from Alexander Stein to clean up the most of dt-schema warnings
   for LS1021A
 - A couple of changes from Bence Csókás to replace license text comment
   with SPDX identifier for imx6-display5 and imx6-aristainetos2 board
 - A couple of vfxxx dt-schema cleanups from Fabio Estevam
 - A bunch of changes from Frank Li to clean up dt-schema warnings on
   various platforms, VF610, LS1021A, i.MX6, etc.
 - Minor whitespace cleanup on i.MX8ULL from Krzysztof Kozlowski
 - An imx6ulz-bsh-smm-m2 workaround from Wolfgang Birkner to get resume
   via console work
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmjICQgACgkQUFdYWoew
 fM5RNAf/YKC5iC2NScdLxmP98jo7Wq5JmyrqdIOPZXfhwsSE7k671X7eHwn36E7r
 Tqi+9+TuasayUIw/bO5zWVntQ146ZUkA2LtPIITSbAGPTHdJKzUZ+D9tGlqmjKBU
 /9sgbsmv28LL3zlw5nZW4UyP8JIVn9p8EO8Yg6mosKPxD38uorJu0OEfjRUCV0qI
 mUiUg+y3X6Mm/1Ln7GXDPgZHZXcdm4OZoaFs8DjX0c2mW2zf2AnuhNYfPno0hi8p
 w1h0rbHhEJC4A1m0uMpTDAFJzmsraJhhDPOfBhZKS6fajne3kKR+1OAt110jfu7e
 iwqI8jsME1fOvhKq5DwheA5rFtmpDA==
 =EFSx
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmjII+MACgkQmmx57+YA
 GNlS5w/+OFDeJXusPowNuiZX3WoFy9wzDxT9SLmGQLBpVQD7RqUPBNVjO+83VuQQ
 Djq0gM3ZniEf3UwYAPwvTLPxQ7S1AFUCJ+ePky2/5G+gs4tLDNgRfxU9lsnOzE56
 Ksk46F4FpNP7OutBrzf0HQO8z0O0jCSNjods4pHw6P66gkePuu787hQJAvyPpsyU
 Fq3qYLXEnrK0Vqwue8i2+f5DNvcZsHD2S0488qc9YorebYnYKLQBgvAr1igrPjxH
 25ccAa+Jv4uClGU57mof951tFxZY7I949lV5qFmEpsBmCRkwF618Z+xUHrzMZ/BJ
 CyfaUi+xmiX/pQuYYL+FjPU+qevnffdon8M/8si5IxY1ohRIKPNZQaek9khp4eu8
 dyj2XbuaP5GcU10CUwFNvI98ausNwoxgZZ0pYT2RoGWZia44L8IP5ZEoL+m8dnm1
 SZn/X45zwvoG0IkNCG+tw+IYaQEOypJ1gLUCsbUpwACPIWIS5mfzBOfaY5GLsuC9
 gV9hIAXQr//fKqYuy9FQw/1wmR0Q612JvCkDCnflD+k6MrphYmS8jLMsRVA7m4uO
 LnjyldDx3t+CL7q5pOp0vyLpHdeM+/NX/hgXfJooKohhb0HjxpI2LkTFVOTNueqb
 concPonTZ/tRoyGNq4tKxVUZyQjT5ocQ0YKVmIHSuCq65Xh3FE4=
 =JgN0
 -----END PGP SIGNATURE-----

Merge tag 'imx-dt-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt

i.MX ARM device tree changes for 6.18:

- A series from Alexander Stein to clean up the most of dt-schema warnings
  for LS1021A
- A couple of changes from Bence Csókás to replace license text comment
  with SPDX identifier for imx6-display5 and imx6-aristainetos2 board
- A couple of vfxxx dt-schema cleanups from Fabio Estevam
- A bunch of changes from Frank Li to clean up dt-schema warnings on
  various platforms, VF610, LS1021A, i.MX6, etc.
- Minor whitespace cleanup on i.MX8ULL from Krzysztof Kozlowski
- An imx6ulz-bsh-smm-m2 workaround from Wolfgang Birkner to get resume
  via console work

* tag 'imx-dt-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (44 commits)
  ARM: dts: imx6sll: Use 'dma-names'
  ARM: dts: imx6: change rtc compatible string to st,m41t00 from m41t00
  ARM: dts: imx6: remove undefined linux,default-trigger source
  ARM: dts: imx6ul-pico: add power-supply for vxt,vl050-8048nt-c01
  ARM: dts: imx6ul-14x14-evk: add regulator for ov5640
  ARM: dts: imx6: replace isl,isl12022 with isil,isl12022 for RTC
  ARM: dts: imx6: replace gpio-key with gpio-keys compatible string
  ARM: dts: imx6: rename i2c<n>mux i2c-mux-<n>
  ARM: dts: imx6: rename node name flash to eeprom
  ARM: dts: imx6: rename node i2c-gpio to i2c.
  ARM: dts: imx6: rename touch screen's node name to touchscreen
  ARM: dts: imx6: remove redundant pinctrl-names
  ARM: dts: imx6qdl-aristainetos2: rename ethernet-phy to ethernet-phy@0
  ARM: dts: imx6: add interrupt-cells for dlg,da9063 pmic
  ARM: dts: imx6: align rtc chip node name to 'rtc'
  ARM: dts: imx6: add key- prefix for gpio-keys
  ARM: dts: imx6: add #address-cells for gsc@20
  ARM: dts: imx6ul-tx6ul: Switch away from deprecated `phy-reset-gpios`
  ARM: dts: mba6ul: Add MicIn routing
  ARM: dts: ls1021a-tsn: Remove redundant #address-cells for ethernet-switch@1
  ...

Link: https://lore.kernel.org/r/20250915132535.253859-2-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-09-15 16:34:08 +02:00
commit 636d134e3c
82 changed files with 271 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/nxp/imx/imx35-eukrea-cpuimx35.dtsi
View File

@ -26,7 +26,7 @@ &i2c1 {
pinctrl-0 = <&pinctrl_i2c1>;
status = "okay";
pcf8563@51 {
rtc@51 {
compatible = "nxp,pcf8563";
reg = <0x51>;
};

2
arch/arm/boot/dts/nxp/imx/imx51-eukrea-cpuimx51.dtsi
View File

@ -26,7 +26,7 @@ &i2c1 {
pinctrl-0 = <&pinctrl_i2c1>;
status = "okay";
pcf8563@51 {
rtc@51 {
compatible = "nxp,pcf8563";
reg = <0x51>;
};

4
arch/arm/boot/dts/nxp/imx/imx53-kp.dtsi
View File

@ -42,14 +42,14 @@ leds {
led-bus {
label = "bus";
gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "gpio";
linux,default-trigger = "none";
default-state = "off";
};
led-error {
label = "error";
gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "gpio";
linux,default-trigger = "none";
default-state = "off";
};

2
arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi
View File

@ -47,7 +47,7 @@ touchscreen@41 {
interrupt-parent = <&gpio7>;
irq-trigger = <0x1>;
stmpe_touchscreen {
touchscreen {
compatible = "st,stmpe-ts";
st,sample-time = <4>;
st,mod-12b = <1>;

4
arch/arm/boot/dts/nxp/imx/imx6dl-alti6p.dts
View File

@ -25,7 +25,7 @@ clock_ksz8081: clock-ksz8081 {
clock-output-names = "enet_ref_pad";
};
i2c2-mux {
i2c-mux-2 {
compatible = "i2c-mux";
i2c-parent = <&i2c2>;
mux-controls = <&i2c_mux>;
@ -45,7 +45,7 @@ i2c@2 {
};
};
i2c4-mux {
i2c-mux-4 {
compatible = "i2c-mux";
i2c-parent = <&i2c4>;
mux-controls = <&i2c_mux>;

38
arch/arm/boot/dts/nxp/imx/imx6dl-aristainetos2_4.dts
View File

@ -1,44 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
/*
* support for the imx6 based aristainetos2 board
*
* Copyright (C) 2015 Heiko Schocher <hs@denx.de>
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
#include "imx6dl.dtsi"

38
arch/arm/boot/dts/nxp/imx/imx6dl-aristainetos2_7.dts
View File

@ -1,44 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
/*
* support for the imx6 based aristainetos2 board
*
* Copyright (C) 2015 Heiko Schocher <hs@denx.de>
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
#include "imx6dl.dtsi"

1
arch/arm/boot/dts/nxp/imx/imx6dl-prtmvt.dts
View File

@ -557,7 +557,6 @@ &uart5 {
&usbh1 {
vbus-supply = <&reg_h1_vbus>;
pinctrl-names = "default";
phy_type = "utmi";
dr_mode = "host";
disable-over-current;

2
arch/arm/boot/dts/nxp/imx/imx6dl-qmx6.dtsi
View File

@ -157,7 +157,7 @@ &i2c3 {
sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
status = "okay";
rtc: m41t62@68 {
rtc: rtc@68 {
compatible = "st,m41t62";
reg = <0x68>;

2
arch/arm/boot/dts/nxp/imx/imx6dl-riotboard.dts
View File

@ -389,8 +389,6 @@ &usdhc4 {
};
&iomuxc {
pinctrl-names = "default";
pinctrl_audmux: audmuxgrp {
fsl,pins = <
MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0

2
arch/arm/boot/dts/nxp/imx/imx6q-ba16.dtsi
View File

@ -222,6 +222,8 @@ pmic@58 {
pinctrl-0 = <&pinctrl_pmic>;
interrupt-parent = <&gpio7>;
interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <2>;
onkey {
compatible = "dlg,da9063-onkey";

2
arch/arm/boot/dts/nxp/imx/imx6q-bx50v3.dtsi
View File

@ -160,7 +160,7 @@ &ecspi5 {
pinctrl-0 = <&pinctrl_ecspi5>;
status = "okay";
m25_eeprom: flash@0 {
m25_eeprom: eeprom@0 {
compatible = "atmel,at25";
spi-max-frequency = <10000000>;
size = <0x8000>;

33
arch/arm/boot/dts/nxp/imx/imx6q-display5-tianma-tm070-1280x768.dts
View File

@ -1,38 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
/*
* Copyright 2017
* Lukasz Majewski, DENX Software Engineering, lukma@denx.de
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without
* any warranty of any kind, whether express or implied.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;

33
arch/arm/boot/dts/nxp/imx/imx6q-display5.dtsi
View File

@ -1,38 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
/*
* Copyright 2017
* Lukasz Majewski, DENX Software Engineering, lukma@denx.de
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without
* any warranty of any kind, whether express or implied.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;

2
arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts
View File

@ -266,7 +266,7 @@ temp2: ad7414@4d {
reg = <0x4d>;
};
rtc: m41t62@68 {
rtc: rtc@68 {
compatible = "st,m41t62";
reg = <0x68>;
};

2
arch/arm/boot/dts/nxp/imx/imx6q-dms-ba16.dts
View File

@ -47,7 +47,7 @@ &ecspi5 {
pinctrl-0 = <&pinctrl_ecspi5>;
status = "okay";
m25_eeprom: flash@0 {
m25_eeprom: eeprom@0 {
compatible = "atmel,at25256B", "atmel,at25";
spi-max-frequency = <20000000>;
size = <0x8000>;

2
arch/arm/boot/dts/nxp/imx/imx6q-gw5400-a.dts
View File

@ -184,7 +184,7 @@ gpio: pca9555@23 {
#gpio-cells = <2>;
};
rtc: ds1672@68 {
rtc: rtc@68 {
compatible = "dallas,ds1672";
reg = <0x68>;
};

2
arch/arm/boot/dts/nxp/imx/imx6q-h100.dts
View File

@ -171,7 +171,7 @@ eeprom: eeprom@51 {
reg = <0x51>;
};
rtc: pcf8523@68 {
rtc: rtc@68 {
compatible = "nxp,pcf8523";
reg = <0x68>;
};

4
arch/arm/boot/dts/nxp/imx/imx6q-kp.dtsi
View File

@ -69,14 +69,14 @@ leds {
led-green {
label = "led1";
gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "gpio";
linux,default-trigger = "none";
default-state = "off";
};
led-red {
label = "led0";
gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "gpio";
linux,default-trigger = "none";
default-state = "off";
};
};

2
arch/arm/boot/dts/nxp/imx/imx6q-mccmon6.dts
View File

@ -292,8 +292,6 @@ flash@0,0 {
};
&iomuxc {
pinctrl-names = "default";
pinctrl_backlight: dispgrp {
fsl,pins = <
/* BLEN_OUT */

4
arch/arm/boot/dts/nxp/imx/imx6q-novena.dts
View File

@ -265,7 +265,7 @@ accel: mma8452@1c {
reg = <0x1c>;
};
rtc: pcf8523@68 {
rtc: rtc@68 {
compatible = "nxp,pcf8523";
reg = <0x68>;
};
@ -288,7 +288,7 @@ touch: stmpe811@44 {
vio-supply = <&reg_3p3v>;
vcc-supply = <&reg_3p3v>;
stmpe_touchscreen {
touchscreen {
compatible = "st,stmpe-ts";
st,sample-time = <4>;
st,mod-12b = <1>;

4
arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
View File

@ -648,7 +648,7 @@ stmpe811@41 {
/* ADC conversion time: 80 clocks */
st,sample-time = <4>;
stmpe_ts: stmpe_touchscreen {
stmpe_ts: touchscreen {
compatible = "st,stmpe-ts";
/* 8 sample average control */
st,ave-ctrl = <3>;
@ -665,7 +665,7 @@ stmpe_ts: stmpe_touchscreen {
st,touch-det-delay = <5>;
};
stmpe_adc: stmpe_adc {
stmpe_adc: adc {
compatible = "st,stmpe-adc";
#io-channel-cells = <1>;
/* forbid to use ADC channels 3-0 (touch) */

43
arch/arm/boot/dts/nxp/imx/imx6qdl-aristainetos2.dtsi
View File

@ -1,44 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-only OR MIT)
/*
* support for the imx6 based aristainetos2 board
*
* Copyright (C) 2015 Heiko Schocher <hs@denx.de>
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/imx6qdl-clock.h>
@ -150,6 +114,8 @@ pmic@58 {
reg = <0x58>;
interrupt-parent = <&gpio1>;
interrupts = <04 0x8>;
#interrupt-cells = <2>;
interrupt-controller;
regulators {
bcore1 {
@ -324,8 +290,9 @@ mdio {
#address-cells = <1>;
#size-cells = <0>;
ethphy: ethernet-phy {
ethphy: ethernet-phy@0 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <0>;
txd0-skew-ps = <0>;
txd1-skew-ps = <0>;
txd2-skew-ps = <0>;

2
arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
View File

@ -572,7 +572,7 @@ stmpe811@41 {
/* ADC converstion time: 80 clocks */
st,sample-time = <4>;
stmpe_ts: stmpe_touchscreen {
stmpe_ts: touchscreen {
compatible = "st,stmpe-ts";
/* 8 sample average control */
st,ave-ctrl = <3>;

2
arch/arm/boot/dts/nxp/imx/imx6qdl-cubox-i.dtsi
View File

@ -118,7 +118,7 @@ gpio-keys {
pinctrl-0 = <&pinctrl_gpio_key>;
pinctrl-names = "default";
button_0 {
button-0 {
label = "Button 0";
gpios = <&gpio3 8 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;

4
arch/arm/boot/dts/nxp/imx/imx6qdl-emcon.dtsi
View File

@ -33,7 +33,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emcon_wake>;
wake {
key-wake {
label = "Wake";
linux,code = <KEY_WAKEUP>;
gpios = <&gpio3 2 GPIO_ACTIVE_LOW>;
@ -225,6 +225,8 @@ da9063: pmic@58 {
pinctrl-0 = <&pinctrl_pmic>;
interrupt-parent = <&gpio2>;
interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <2>;
onkey {
compatible = "dlg,da9063-onkey";

13
arch/arm/boot/dts/nxp/imx/imx6qdl-gw51xx.dtsi
View File

@ -24,13 +24,13 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -44,21 +44,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -156,6 +156,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {
@ -270,7 +271,7 @@ eeprom4: eeprom@53 {
pagesize = <16>;
};
rtc: ds1672@68 {
rtc: rtc@68 {
compatible = "dallas,ds1672";
reg = <0x68>;
};

13
arch/arm/boot/dts/nxp/imx/imx6qdl-gw52xx.dtsi
View File

@ -33,13 +33,13 @@ backlight {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -53,21 +53,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -230,6 +230,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {
@ -350,7 +351,7 @@ eeprom4: eeprom@53 {
pagesize = <16>;
};
rtc: ds1672@68 {
rtc: rtc@68 {
compatible = "dallas,ds1672";
reg = <0x68>;
};

13
arch/arm/boot/dts/nxp/imx/imx6qdl-gw53xx.dtsi
View File

@ -33,13 +33,13 @@ backlight {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -53,21 +53,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -223,6 +223,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {
@ -349,7 +350,7 @@ eeprom4: eeprom@53 {
pagesize = <16>;
};
rtc: ds1672@68 {
rtc: rtc@68 {
compatible = "dallas,ds1672";
reg = <0x68>;
};

12
arch/arm/boot/dts/nxp/imx/imx6qdl-gw54xx.dtsi
View File

@ -34,13 +34,13 @@ backlight {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -54,21 +54,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -376,7 +376,7 @@ eeprom4: eeprom@53 {
pagesize = <16>;
};
rtc: ds1672@68 {
rtc: rtc@68 {
compatible = "dallas,ds1672";
reg = <0x68>;
};

13
arch/arm/boot/dts/nxp/imx/imx6qdl-gw551x.dtsi
View File

@ -26,13 +26,13 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -46,21 +46,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -179,6 +179,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {
@ -287,7 +288,7 @@ eeprom4: eeprom@53 {
pagesize = <16>;
};
rtc: ds1672@68 {
rtc: rtc@68 {
compatible = "dallas,ds1672";
reg = <0x68>;
};

13
arch/arm/boot/dts/nxp/imx/imx6qdl-gw552x.dtsi
View File

@ -25,13 +25,13 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -45,21 +45,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -146,6 +146,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {
@ -260,7 +261,7 @@ eeprom4: eeprom@53 {
pagesize = <16>;
};
rtc: ds1672@68 {
rtc: rtc@68 {
compatible = "dallas,ds1672";
reg = <0x68>;
};

13
arch/arm/boot/dts/nxp/imx/imx6qdl-gw553x.dtsi
View File

@ -24,13 +24,13 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -44,21 +44,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -142,6 +142,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {
@ -256,7 +257,7 @@ eeprom4: eeprom@53 {
pagesize = <16>;
};
rtc: ds1672@68 {
rtc: rtc@68 {
compatible = "dallas,ds1672";
reg = <0x68>;
};

11
arch/arm/boot/dts/nxp/imx/imx6qdl-gw560x.dtsi
View File

@ -50,13 +50,13 @@ backlight-keypad {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -70,21 +70,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -254,6 +254,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {

11
arch/arm/boot/dts/nxp/imx/imx6qdl-gw5903.dtsi
View File

@ -34,13 +34,13 @@ backlight {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -54,21 +54,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -195,6 +195,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {

11
arch/arm/boot/dts/nxp/imx/imx6qdl-gw5904.dtsi
View File

@ -36,13 +36,13 @@ backlight {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -56,21 +56,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -260,6 +260,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {

13
arch/arm/boot/dts/nxp/imx/imx6qdl-gw5907.dtsi
View File

@ -24,13 +24,13 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -44,21 +44,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -156,6 +156,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {
@ -270,7 +271,7 @@ eeprom@53 {
pagesize = <16>;
};
ds1672@68 {
rtc@68 {
compatible = "dallas,ds1672";
reg = <0x68>;
};

11
arch/arm/boot/dts/nxp/imx/imx6qdl-gw5910.dtsi
View File

@ -27,13 +27,13 @@ memory@10000000 {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -47,21 +47,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -165,6 +165,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {

10
arch/arm/boot/dts/nxp/imx/imx6qdl-gw5912.dtsi
View File

@ -25,13 +25,13 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -45,21 +45,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;

11
arch/arm/boot/dts/nxp/imx/imx6qdl-gw5913.dtsi
View File

@ -24,13 +24,13 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
user-pb {
key-user-pb {
label = "user_pb";
gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
};
user-pb1x {
key-user-pb1x {
label = "user_pb1x";
linux,code = <BTN_1>;
interrupt-parent = <&gsc>;
@ -44,21 +44,21 @@ key-erased {
interrupts = <1>;
};
eeprom-wp {
key-eeprom-wp {
label = "eeprom_wp";
linux,code = <BTN_3>;
interrupt-parent = <&gsc>;
interrupts = <2>;
};
tamper {
key-tamper {
label = "tamper";
linux,code = <BTN_4>;
interrupt-parent = <&gsc>;
interrupts = <5>;
};
switch-hold {
key-switch-hold {
label = "switch_hold";
linux,code = <BTN_5>;
interrupt-parent = <&gsc>;
@ -141,6 +141,7 @@ gsc: gsc@20 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
adc {

1
arch/arm/boot/dts/nxp/imx/imx6qdl-hummingboard.dtsi
View File

@ -332,7 +332,6 @@ &pwm1 {
};
&pwm2 {
pinctrl-names = "default";
status = "okay";
};

4
arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi
View File

@ -57,13 +57,13 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
home {
key-home {
label = "Home";
gpios = <&gpio7 13 IRQ_TYPE_LEVEL_LOW>;
linux,code = <102>;
};
back {
key-back {
label = "Back";
gpios = <&gpio4 5 IRQ_TYPE_LEVEL_LOW>;
linux,code = <158>;

16
arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6_max.dtsi
View File

@ -86,45 +86,45 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
power {
key-power {
label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
wakeup-source;
};
menu {
key-menu {
label = "Menu";
gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_MENU>;
};
home {
key-home {
label = "Home";
gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>;
};
back {
key-back {
label = "Back";
gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_BACK>;
};
volume-up {
key-volume-up {
label = "Volume Up";
gpios = <&gpio7 13 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
volume-down {
key-volume-down {
label = "Volume Down";
gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
};
};
i2c2mux {
i2c-mux-2 {
compatible = "i2c-mux-gpio";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2mux>;
@ -148,7 +148,7 @@ i2c2mux@2 {
};
};
i2c3mux {
i2c-mux-3 {
compatible = "i2c-mux-gpio";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3mux>;

12
arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6_som2.dtsi
View File

@ -47,38 +47,38 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
power {
key-power {
label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
wakeup-source;
};
menu {
key-menu {
label = "Menu";
gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_MENU>;
};
home {
key-home {
label = "Home";
gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>;
};
back {
key-back {
label = "Back";
gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_BACK>;
};
volume-up {
key-volume-up {
label = "Volume Up";
gpios = <&gpio7 13 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
volume-down {
key-volume-down {
label = "Volume Down";
gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;

12
arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6x.dtsi
View File

@ -80,38 +80,38 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
power {
key-power {
label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
wakeup-source;
};
menu {
key-menu {
label = "Menu";
gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_MENU>;
};
home {
key-home {
label = "Home";
gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>;
};
back {
key-back {
label = "Back";
gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_BACK>;
};
volume-up {
key-volume-up {
label = "Volume Up";
gpios = <&gpio7 13 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
volume-down {
key-volume-down {
label = "Volume Down";
gpios = <&gpio4 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;

10
arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira-peb-eval-01.dtsi
View File

@ -13,14 +13,14 @@ gpio-keys {
pinctrl-0 = <&pinctrl_gpio_keys>;
status = "disabled";
power {
key-power {
label = "Power Button";
gpios = <&gpio5 28 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WAKEUP>;
wakeup-source;
};
sleep {
key-sleep {
label = "Sleep Button";
gpios = <&gpio6 18 GPIO_ACTIVE_LOW>;
linux,code = <KEY_SLEEP>;
@ -35,19 +35,19 @@ user_leds: user-leds {
user-led1 {
gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "gpio";
linux,default-trigger = "none";
default-state = "on";
};
user-led2 {
gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "gpio";
linux,default-trigger = "none";
default-state = "on";
};
user-led3 {
gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "gpio";
linux,default-trigger = "none";
default-state = "on";
};
};

2
arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi
View File

@ -162,7 +162,7 @@ stmpe: touchctrl@44 {
interrupts = <12 IRQ_TYPE_NONE>;
status = "disabled";
stmpe_touchscreen {
touchscreen {
compatible = "st,stmpe-ts";
st,sample-time = <4>;
st,mod-12b = <1>;

2
arch/arm/boot/dts/nxp/imx/imx6qdl-rex.dtsi
View File

@ -23,7 +23,6 @@ reg_3p3v: regulator-3p3v {
reg_usbh1_vbus: regulator-usbh1-vbus {
compatible = "regulator-fixed";
pinctrl-names = "default";
regulator-name = "usbh1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@ -33,7 +32,6 @@ reg_usbh1_vbus: regulator-usbh1-vbus {
reg_usb_otg_vbus: regulator-otg-vbus {
compatible = "regulator-fixed";
pinctrl-names = "default";
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;

10
arch/arm/boot/dts/nxp/imx/imx6qdl-sabreauto.dtsi
View File

@ -32,35 +32,35 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
home {
key-home {
label = "Home";
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>;
wakeup-source;
};
back {
key-back {
label = "Back";
gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
linux,code = <KEY_BACK>;
wakeup-source;
};
program {
key-program {
label = "Program";
gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
linux,code = <KEY_PROGRAM>;
wakeup-source;
};
volume-up {
key-volume-up {
label = "Volume Up";
gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
wakeup-source;
};
volume-down {
key-volume-down {
label = "Volume Down";
gpios = <&gpio5 14 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;

12
arch/arm/boot/dts/nxp/imx/imx6qdl-sabrelite.dtsi
View File

@ -108,38 +108,38 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
power {
key-power {
label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
wakeup-source;
};
menu {
key-menu {
label = "Menu";
gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_MENU>;
};
home {
key-home {
label = "Home";
gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>;
};
back {
key-back {
label = "Back";
gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_BACK>;
};
volume-up {
key-volume-up {
label = "Volume Up";
gpios = <&gpio7 13 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
volume-down {
key-volume-down {
label = "Volume Down";
gpios = <&gpio4 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;

6
arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi
View File

@ -71,21 +71,21 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
power {
key-power {
label = "Power Button";
gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
wakeup-source;
linux,code = <KEY_POWER>;
};
volume-up {
key-volume-up {
label = "Volume Up";
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
wakeup-source;
linux,code = <KEY_VOLUMEUP>;
};
volume-down {
key-volume-down {
label = "Volume Down";
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
wakeup-source;

2
arch/arm/boot/dts/nxp/imx/imx6qdl-savageboard.dtsi
View File

@ -58,7 +58,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
power {
key-power {
gpios = <&gpio3 7 GPIO_ACTIVE_LOW>;
label = "Power Button";
linux,code = <KEY_POWER>;

4
arch/arm/boot/dts/nxp/imx/imx6qdl-ts7970.dtsi
View File

@ -213,12 +213,12 @@ &i2c1 {
status = "okay";
m41t00s: rtc@68 {
compatible = "m41t00";
compatible = "st,m41t00";
reg = <0x68>;
};
isl12022: rtc@6f {
compatible = "isl,isl12022";
compatible = "isil,isl12022";
reg = <0x6f>;
};

2
arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
View File

@ -44,7 +44,7 @@ mclk: clock {
gpio-keys {
compatible = "gpio-keys";
power {
key-power {
label = "Power Button";
gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_POWER>;

1
arch/arm/boot/dts/nxp/imx/imx6qdl-vicut1.dtsi
View File

@ -429,7 +429,6 @@ &uart5 {
};
&usbh1 {
pinctrl-names = "default";
phy_type = "utmi";
dr_mode = "host";
disable-over-current;

2
arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts
View File

@ -84,7 +84,7 @@ led-0 {
led-1 {
label = "tolinoshine2hd:white:backlightboost";
gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "off";
linux,default-trigger = "none";
};
};

2
arch/arm/boot/dts/nxp/imx/imx6sll.dtsi
View File

@ -309,7 +309,7 @@ uart3: serial@2034000 {
reg = <0x02034000 0x4000>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
dma-name = "rx", "tx";
dma-names = "rx", "tx";
clocks = <&clks IMX6SLL_CLK_UART3_IPG>,
<&clks IMX6SLL_CLK_UART3_SERIAL>;
clock-names = "ipg", "per";

4
arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi
View File

@ -33,14 +33,14 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
volume-up {
key-volume-up {
label = "Volume Up";
gpios = <&gpio1 18 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
wakeup-source;
};
volume-down {
key-volume-down {
label = "Volume Down";
gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;

25
arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi
View File

@ -22,6 +22,26 @@ backlight_display: backlight-display {
status = "okay";
};
reg_1v5: regulator-1v5 {
compatible = "regulator-fixed";
regulator-name = "1v5";
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
};
reg_1v8: regulator-1v8 {
compatible = "regulator-fixed";
regulator-name = "1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
reg_2v8: regulator-2v8 {
compatible = "regulator-fixed";
regulator-name = "2v8";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
};
reg_sd1_vmmc: regulator-sd1-vmmc {
compatible = "regulator-fixed";
@ -182,6 +202,9 @@ camera@3c {
clock-names = "xclk";
powerdown-gpios = <&gpio_spi 6 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio_spi 5 GPIO_ACTIVE_LOW>;
AVDD-supply = <&reg_2v8>;
DVDD-supply = <&reg_1v5>;
DOVDD-supply = <&reg_1v8>;
port {
ov5640_to_parallel: endpoint {
@ -421,8 +444,6 @@ &wdog1 {
};
&iomuxc {
pinctrl-names = "default";
pinctrl_camera_clock: cameraclockgrp {
fsl,pins = <
MX6UL_PAD_CSI_MCLK__CSI_MCLK 0x1b088

2
arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-peb-av-02.dtsi
View File

@ -61,7 +61,7 @@ stmpe: touchscreen@44 {
wakeup-source;
status = "disabled";
stmpe_touchscreen {
touchscreen {
compatible = "st,stmpe-ts";
st,sample-time = <4>;
st,mod-12b = <1>;

8
arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-peb-eval-01.dtsi
View File

@ -8,12 +8,12 @@
/ {
gpio_keys: gpio-keys {
compatible = "gpio-key";
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
status = "disabled";
power {
key-power {
label = "Power Button";
gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
@ -29,13 +29,13 @@ user_leds: user-leds {
user-led1 {
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "gpio";
linux,default-trigger = "none";
default-state = "on";
};
user-led2 {
gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "gpio";
linux,default-trigger = "none";
default-state = "on";
};
};

1
arch/arm/boot/dts/nxp/imx/imx6ul-pico.dtsi
View File

@ -76,6 +76,7 @@ reg_brcm: regulator-brcm {
panel {
compatible = "vxt,vl050-8048nt-c01";
backlight = <&backlight>;
power-supply = <&reg_3p3v>;
port {
panel_in: endpoint {

12
arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
View File

@ -72,7 +72,7 @@ backlight: backlight {
default-brightness-level = <50>;
};
i2c_gpio: i2c-gpio {
i2c_gpio: i2c {
compatible = "i2c-gpio";
#address-cells = <1>;
#size-cells = <0>;
@ -246,7 +246,6 @@ &fec1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet1 &pinctrl_enet1_mdio &pinctrl_etnphy0_rst>;
phy-mode = "rmii";
phy-reset-gpios = <&gpio5 6 GPIO_ACTIVE_LOW>;
phy-supply = <&reg_3v3_etn>;
phy-handle = <&etnphy0>;
status = "okay";
@ -262,6 +261,11 @@ etnphy0: ethernet-phy@0 {
pinctrl-0 = <&pinctrl_etnphy0_int>;
interrupt-parent = <&gpio5>;
interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&gpio5 6 GPIO_ACTIVE_LOW>;
reset-assert-us = <100>;
reset-deassert-us = <25000>;
/* Energy detect sometimes causes link failures */
smsc,disable-energy-detect;
status = "okay";
};
@ -272,6 +276,9 @@ etnphy1: ethernet-phy@2 {
pinctrl-0 = <&pinctrl_etnphy1_int>;
interrupt-parent = <&gpio4>;
interrupts = <27 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
reset-assert-us = <100>;
reset-deassert-us = <25000>;
status = "okay";
};
};
@ -281,7 +288,6 @@ &fec2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet2 &pinctrl_etnphy1_rst>;
phy-mode = "rmii";
phy-reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
phy-supply = <&reg_3v3_etn>;
phy-handle = <&etnphy1>;
status = "disabled";

2
arch/arm/boot/dts/nxp/imx/imx6ull-colibri-aster.dtsi
View File

@ -13,7 +13,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_snvs_gpiokeys>;
power {
key-power {
label = "Wake-Up";
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_WAKEUP>;

2
arch/arm/boot/dts/nxp/imx/imx6ull-colibri-iris.dtsi
View File

@ -13,7 +13,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_snvs_gpiokeys>;
power {
key-power {
label = "Wake-Up";
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_WAKEUP>;

2
arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea-rmm.dts
View File

@ -129,7 +129,7 @@ &i2c1 {
status = "okay";
touchscreen: touchscreen@38 {
compatible ="edt,edt-ft5306";
compatible = "edt,edt-ft5306";
reg = <0x38>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_touchscreen>;

6
arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi
View File

@ -15,7 +15,7 @@ aliases {
};
gpio_keys: gpio-keys {
compatible = "gpio-key";
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
@ -79,13 +79,13 @@ user_leds: user-leds {
user-led1 {
label = "yellow";
gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "off";
linux,default-trigger = "none";
};
user-led2 {
label = "red";
gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "off";
linux,default-trigger = "none";
};
};
};

4
arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts
View File

@ -33,6 +33,10 @@ &snvs_poweroff {
status = "okay";
};
&uart2 {
status = "okay";
};
&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart3>;

2
arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dts
View File

@ -270,7 +270,7 @@ &i2c3 {
pinctrl-0 = <&pinctrl_i2c3>;
status = "okay";
touch@48 {
touchscreen@48 {
compatible = "ti,tsc2004";
reg = <0x48>;
pinctrl-names = "default";

2
arch/arm/boot/dts/nxp/imx/imx7s-warp.dts
View File

@ -23,7 +23,7 @@ gpio-keys {
pinctrl-0 = <&pinctrl_gpio>;
autorepeat;
back {
key-back {
label = "Back";
gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_BACK>;

7
arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi
View File

@ -146,6 +146,13 @@ sound {
ssi-controller = <&sai1>;
audio-codec = <&tlv320aic32x4>;
audio-asrc = <&asrc>;
audio-routing =
"IN3_L", "Mic Jack",
"Mic Jack", "Mic Bias",
"IN1_L", "Line In Jack",
"IN1_R", "Line In Jack",
"Line Out Jack", "LOL",
"Line Out Jack", "LOR";
};
};

8
arch/arm/boot/dts/nxp/ls/ls1021a-qds.dts
View File

@ -66,7 +66,7 @@ &dspi0 {
bus-num = <0>;
status = "okay";
dspiflash: at45db021d@0 {
dspiflash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "atmel,at45db021d", "atmel,at45", "atmel,dataflash";
@ -187,7 +187,7 @@ &ifc {
<0x3 0x0 0x0 0x7fb00000 0x00000100>;
status = "okay";
nor@0,0 {
flash@0,0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "cfi-flash";
@ -211,8 +211,8 @@ fpga: board-control@3,0 {
device-width = <1>;
ranges = <0 3 0 0x100>;
mdio-mux-emi1 {
compatible = "mdio-mux-mmioreg";
mdio-mux@54 {
compatible = "mdio-mux-mmioreg", "mdio-mux";
mdio-parent-bus = <&mdio0>;
#address-cells = <1>;
#size-cells = <0>;

2
arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a-rgb-cdtech-dc44.dtso
View File

@ -36,7 +36,7 @@ &i2c0 {
#size-cells = <0>;
polytouch: touchscreen@38 {
compatible = "edt,edt-ft5406", "edt,edt-ft5x06";
compatible = "edt,edt-ft5406";
reg = <0x38>;
interrupt-parent = <&pca9554_0>;
interrupts = <6 IRQ_TYPE_EDGE_FALLING>;

2
arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a-rgb-cdtech-fc21.dtso
View File

@ -36,7 +36,7 @@ &i2c0 {
#size-cells = <0>;
polytouch: touchscreen@38 {
compatible = "edt,edt-ft5406", "edt,edt-ft5x06";
compatible = "edt,edt-ft5406";
reg = <0x38>;
interrupt-parent = <&pca9554_0>;
interrupts = <6 IRQ_TYPE_EDGE_FALLING>;

2
arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi
View File

@ -66,8 +66,6 @@ &qspi {
qflash0: flash@0 {
compatible = "jedec,spi-nor";
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <20000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;

2
arch/arm/boot/dts/nxp/ls/ls1021a-tsn.dts
View File

@ -40,8 +40,6 @@ &dspi0 {
/* ADG704BRMZ 1:4 SPI mux/demux */
sja1105: ethernet-switch@1 {
reg = <0x1>;
#address-cells = <1>;
#size-cells = <0>;
compatible = "nxp,sja1105t";
/* 12 MHz */
spi-max-frequency = <12000000>;

2
arch/arm/boot/dts/nxp/ls/ls1021a-twr.dts
View File

@ -151,7 +151,7 @@ &ifc {
ranges = <0x0 0x0 0x0 0x60000000 0x08000000>;
status = "okay";
nor@0,0 {
flash@0,0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "cfi-flash";

45
arch/arm/boot/dts/nxp/ls/ls1021a.dtsi
View File

@ -93,10 +93,9 @@ ddr: memory-controller@1080000 {
compatible = "fsl,qoriq-memory-controller";
reg = <0x0 0x1080000 0x0 0x1000>;
interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
big-endian;
};
gic: interrupt-controller@1400000 {
gic: interrupt-controller@1401000 {
compatible = "arm,gic-400", "arm,cortex-a7-gic";
#interrupt-cells = <3>;
interrupt-controller;
@ -155,14 +154,13 @@ qspi: spi@1550000 {
status = "disabled";
};
esdhc: esdhc@1560000 {
esdhc: mmc@1560000 {
compatible = "fsl,ls1021a-esdhc", "fsl,esdhc";
reg = <0x0 0x1560000 0x0 0x10000>;
interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <0>;
voltage-ranges = <1800 1800 3300 3300>;
sdhci,auto-cmd12;
big-endian;
bus-width = <4>;
status = "disabled";
};
@ -611,11 +609,10 @@ pwm7: pwm@2a40000 {
};
wdog0: watchdog@2ad0000 {
compatible = "fsl,imx21-wdt";
compatible = "fsl,ls1021a-wdt", "fsl,imx21-wdt";
reg = <0x0 0x2ad0000 0x0 0x10000>;
interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>;
clock-names = "wdog-en";
big-endian;
};
@ -627,9 +624,9 @@ sai1: sai@2b50000 {
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
<&clockgen 4 1>, <&clockgen 4 1>;
clock-names = "bus", "mclk1", "mclk2", "mclk3";
dma-names = "tx", "rx";
dmas = <&edma0 1 47>,
<&edma0 1 46>;
dma-names = "rx", "tx";
dmas = <&edma0 1 46>,
<&edma0 1 47>;
status = "disabled";
};
@ -641,9 +638,9 @@ sai2: sai@2b60000 {
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
<&clockgen 4 1>, <&clockgen 4 1>;
clock-names = "bus", "mclk1", "mclk2", "mclk3";
dma-names = "tx", "rx";
dmas = <&edma0 1 45>,
<&edma0 1 44>;
dma-names = "rx", "tx";
dmas = <&edma0 1 44>,
<&edma0 1 45>;
status = "disabled";
};
@ -707,6 +704,7 @@ ptp_clock@2d10e00 {
enet0: ethernet@2d10000 {
compatible = "fsl,etsec2";
reg = <0x0 0x2d10000 0x0 0x5000>;
device_type = "network";
#address-cells = <2>;
#size-cells = <2>;
@ -717,8 +715,6 @@ enet0: ethernet@2d10000 {
dma-coherent;
queue-group@2d10000 {
#address-cells = <2>;
#size-cells = <2>;
reg = <0x0 0x2d10000 0x0 0x1000>;
interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
@ -726,8 +722,6 @@ queue-group@2d10000 {
};
queue-group@2d14000 {
#address-cells = <2>;
#size-cells = <2>;
reg = <0x0 0x2d14000 0x0 0x1000>;
interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
@ -737,6 +731,7 @@ queue-group@2d14000 {
enet1: ethernet@2d50000 {
compatible = "fsl,etsec2";
reg = <0x0 0x2d50000 0x0 0x5000>;
device_type = "network";
#address-cells = <2>;
#size-cells = <2>;
@ -746,8 +741,6 @@ enet1: ethernet@2d50000 {
dma-coherent;
queue-group@2d50000 {
#address-cells = <2>;
#size-cells = <2>;
reg = <0x0 0x2d50000 0x0 0x1000>;
interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
@ -755,8 +748,6 @@ queue-group@2d50000 {
};
queue-group@2d54000 {
#address-cells = <2>;
#size-cells = <2>;
reg = <0x0 0x2d54000 0x0 0x1000>;
interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>,
@ -766,6 +757,7 @@ queue-group@2d54000 {
enet2: ethernet@2d90000 {
compatible = "fsl,etsec2";
reg = <0x0 0x2d90000 0x0 0x5000>;
device_type = "network";
#address-cells = <2>;
#size-cells = <2>;
@ -775,8 +767,6 @@ enet2: ethernet@2d90000 {
dma-coherent;
queue-group@2d90000 {
#address-cells = <2>;
#size-cells = <2>;
reg = <0x0 0x2d90000 0x0 0x1000>;
interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>,
@ -784,8 +774,6 @@ queue-group@2d90000 {
};
queue-group@2d94000 {
#address-cells = <2>;
#size-cells = <2>;
reg = <0x0 0x2d94000 0x0 0x1000>;
interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
@ -810,7 +798,6 @@ usb3: usb@3100000 {
snps,dis_rxdet_inp3_quirk;
usb3-lpm-capable;
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
snps,host-vbus-glitches;
};
pcie@3400000 {
@ -917,7 +904,7 @@ ocram2: sram@10010000 {
ranges = <0x0 0x0 0x10010000 0x10000>;
};
qdma: dma-controller@8390000 {
qdma: dma-controller@8388000 {
compatible = "fsl,ls1021a-qdma";
reg = <0x0 0x8388000 0x0 0x1000>, /* Controller regs */
<0x0 0x8389000 0x0 0x1000>, /* Status regs */
@ -937,17 +924,15 @@ qdma: dma-controller@8390000 {
big-endian;
};
rcpm: power-controller@1ee2140 {
rcpm: wakeup-controller@1ee2140 {
compatible = "fsl,ls1021a-rcpm", "fsl,qoriq-rcpm-2.1+";
reg = <0x0 0x1ee2140 0x0 0x8>;
#fsl,rcpm-wakeup-cells = <2>;
#power-domain-cells = <0>;
};
ftm_alarm0: timer0@29d0000 {
ftm_alarm0: rtc@29d0000 {
compatible = "fsl,ls1021a-ftm-alarm";
reg = <0x0 0x29d0000 0x0 0x10000>;
reg-names = "ftm";
fsl,rcpm-wakeup = <&rcpm 0x0 0x20000000>;
interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
big-endian;

8
arch/arm/boot/dts/nxp/vf/vf610-zii-dev-rev-b.dts
View File

@ -412,13 +412,13 @@ &mdio1 {
};
&iomuxc {
pinctrl_gpio_e6185_eeprom_sel: pinctrl-gpio-e6185-eeprom-spi0 {
pinctrl_gpio_e6185_eeprom_sel: pinctrl-gpio-e6185-eeprom-spi0-grp {
fsl,pins = <
VF610_PAD_PTE27__GPIO_132 0x33e2
>;
};
pinctrl_gpio_spi0: pinctrl-gpio-spi0 {
pinctrl_gpio_spi0: pinctrl-gpio-spi0-grp {
fsl,pins = <
VF610_PAD_PTB22__GPIO_44 0x33e2
VF610_PAD_PTB21__GPIO_43 0x33e2
@ -428,7 +428,7 @@ VF610_PAD_PTB18__GPIO_40 0x33e2
>;
};
pinctrl_mdio_mux: pinctrl-mdio-mux {
pinctrl_mdio_mux: pinctrl-mdio-mux-grp {
fsl,pins = <
VF610_PAD_PTA18__GPIO_8 0x31c2
VF610_PAD_PTA19__GPIO_9 0x31c2
@ -437,7 +437,7 @@ VF610_PAD_PTB3__GPIO_25 0x31c2
>;
};
pinctrl_pca9554_22: pinctrl-pca95540-22 {
pinctrl_pca9554_22: pinctrl-pca95540-22-grp {
fsl,pins = <
VF610_PAD_PTB28__GPIO_98 0x219d
>;

14
arch/arm/boot/dts/nxp/vf/vf610-zii-dev.dtsi
View File

@ -335,7 +335,7 @@ VF610_PAD_PTC17__ENET_RMII1_TXEN 0x30d2
>;
};
pinctrl_gpio_spi0: pinctrl-gpio-spi0 {
pinctrl_gpio_spi0: pinctrl-gpio-spi0-grp {
fsl,pins = <
VF610_PAD_PTB22__GPIO_44 0x33e2
VF610_PAD_PTB21__GPIO_43 0x33e2
@ -345,19 +345,19 @@ VF610_PAD_PTB18__GPIO_40 0x33e2
>;
};
pinctrl_gpio_switch0: pinctrl-gpio-switch0 {
pinctrl_gpio_switch0: pinctrl-gpio-switch0-grp {
fsl,pins = <
VF610_PAD_PTB5__GPIO_27 0x219d
>;
};
pinctrl_gpio_switch1: pinctrl-gpio-switch1 {
pinctrl_gpio_switch1: pinctrl-gpio-switch1-grp {
fsl,pins = <
VF610_PAD_PTB4__GPIO_26 0x219d
>;
};
pinctrl_i2c_mux_reset: pinctrl-i2c-mux-reset {
pinctrl_i2c_mux_reset: pinctrl-i2c-mux-reset-grp {
fsl,pins = <
VF610_PAD_PTE14__GPIO_119 0x31c2
>;
@ -370,7 +370,7 @@ VF610_PAD_PTB15__I2C0_SDA 0x37ff
>;
};
pinctrl_i2c0_gpio: i2c0grp-gpio {
pinctrl_i2c0_gpio: i2c0-gpio-grp {
fsl,pins = <
VF610_PAD_PTB14__GPIO_36 0x31c2
VF610_PAD_PTB15__GPIO_37 0x31c2
@ -392,7 +392,7 @@ VF610_PAD_PTA23__I2C2_SDA 0x37ff
>;
};
pinctrl_leds_debug: pinctrl-leds-debug {
pinctrl_leds_debug: pinctrl-leds-debug-grp {
fsl,pins = <
VF610_PAD_PTD20__GPIO_74 0x31c2
>;
@ -436,7 +436,7 @@ VF610_PAD_PTD22__UART2_RX 0x21a1
>;
};
pinctrl_usb_vbus: pinctrl-usb-vbus {
pinctrl_usb_vbus: pinctrl-usb-vbus-grp {
fsl,pins = <
VF610_PAD_PTA16__GPIO_6 0x31c2
>;

4
arch/arm/boot/dts/nxp/vf/vf610m4.dtsi
View File

@ -55,3 +55,7 @@ / {
&mscm_ir {
interrupt-parent = <&nvic>;
};
&nvic {
arm,num-irq-priority-bits = <4>;
};

4
arch/arm/boot/dts/nxp/vf/vfxxx.dtsi
View File

@ -304,7 +304,7 @@ qspi0: spi@40044000 {
status = "disabled";
};
iomuxc: iomuxc@40048000 {
iomuxc: pinctrl@40048000 {
compatible = "fsl,vf610-iomuxc";
reg = <0x40048000 0x1000>;
};
@ -682,7 +682,7 @@ can1: can@400d4000 {
status = "disabled";
};
nfc: nand@400e0000 {
nfc: nand-controller@400e0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,vf610-nfc";