summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-03-18 16:25:38 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-03-18 16:25:38 +0100
commitc1e3f22e22b5e6c82d4818ff4c9503cb8b6a9ccd (patch)
treeace04bda1bbfc4e8368b98493550a3fedd06e60c
parente39a720a75cf88562eb5383e25c13fb341c96cb5 (diff)
ARM: dts: imx8: colibri-imx8qxp: use spdx license identifier
Use SPDX license identifier GPL-2.0+ or X11. While at it also clean-up some whitespacing and re-order some properties. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts15
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dts15
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi34
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts14
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts15
5 files changed, 24 insertions, 69 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
index 38b40b7fd473..76f8f96e496a 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
- * Copyright (C) 2018, Toradex AG
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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.
+ * Copyright 2018-2019, Toradex
*/
/dts-v1/;
@@ -60,6 +51,7 @@
de-active = <0>;
pixelclk-active = <0>;
};
+
timing1: timing1 {
clock-frequency = <148500000>;
hactive = <1920>;
@@ -143,4 +135,3 @@
&mipi_dsi_bridge2 {
status = "disabled";
};
-
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dts
index 64d3e82bfa7a..ae39a0ba244e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dts
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
- * Copyright (C) 2018, Toradex AG
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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.
+ * Copyright 2018-2019, Toradex
*/
/dts-v1/;
@@ -17,6 +8,7 @@
#include "dt-bindings/pwm/pwm.h"
#include "fsl-imx8qxp-colibri-eval-v3.dtsi"
+
/ {
model = "Toradex Colibri iMX8QXP";
compatible = "toradex,imx8qxp-colibri", "fsl,imx8qxp";
@@ -157,4 +149,3 @@
pinctrl-0 = <&pinctrl_pwm_a>;
status = "okay";
};
-
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi
index 681f50420bef..0001a41eae37 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
- * Copyright (C) 2018, Toradex AG
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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.
+ * Copyright 2018-2019, Toradex
*/
#include "fsl-imx8qxp.dtsi"
@@ -78,6 +69,7 @@
simple-audio-card,bitclock-master = <&dailink_master>;
simple-audio-card,frame-master = <&dailink_master>;
/*simple-audio-card,mclk-fs = <1>;*/
+
simple-audio-card,cpu {
sound-dai = <&sai0>;
};
@@ -92,8 +84,8 @@
&iomuxc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_hog0>, <&pinctrl_hog1>, <&pinctrl_hog2>;
- imx8qxp-colibri {
+ imx8qxp-colibri {
pinctrl_ad7879_int: ad7879-int { /* TOUCH Interrupt */
fsl,pins = <
SC_P_MIPI_CSI0_I2C0_SCL_LSIO_GPIO3_IO05 0x00000021
@@ -131,6 +123,7 @@
SC_P_FLEXCAN2_TX_ADMA_UART3_TX 0x06000020
>;
};
+
pinctrl_lpuart3_ctrl: lpuart3ctrlgrp {
fsl,pins = <
SC_P_MIPI_DSI1_GPIO0_01_LSIO_GPIO2_IO00 0x00000020 /* DTR */
@@ -816,17 +809,13 @@
&pcieb{
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pcieb &pinctrl_wifi>;
-
ext_osc = <1>;
-
clkreq-gpio = <&gpio_expander_43 3 GPIO_ACTIVE_HIGH>;
disable-gpio = <&gpio_expander_43 6 GPIO_ACTIVE_LOW>;
power-on-gpio = <&gpio_expander_43 2 GPIO_ACTIVE_LOW>;
reset-gpio = <&gpio4 0 GPIO_ACTIVE_HIGH>;
/* epdev_on-supply = <&reg_wifi>;*/
-
fsl,max-link-speed = <1>;
-
status = "okay";
};
@@ -879,18 +868,21 @@
polling-delay-passive = <250>;
polling-delay = <2000>;
thermal-sensors = <&tsens 2>;
+
trips {
pmic_alert0: trip0 {
temperature = <80000>;
hysteresis = <2000>;
type = "passive";
};
+
pmic_crit0: trip1 {
temperature = <125000>;
hysteresis = <2000>;
type = "critical";
};
};
+
cooling-maps {
map0 {
trip = <&pmic_alert0>;
@@ -902,23 +894,23 @@
};
&usdhc1 {
+ bus-width = <8>;
+ non-removable;
pinctrl-names = "default", "state_100mhz", "state_200mhz";
pinctrl-0 = <&pinctrl_usdhc1>;
pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
- bus-width = <8>;
- non-removable;
status = "okay";
};
&usdhc2 {
+ bus-width = <4>;
+ cd-gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
+ vmmc-supply = <&reg_module_3v3>;
pinctrl-names = "default", "state_100mhz", "state_200mhz";
pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>;
pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
- bus-width = <4>;
- cd-gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
- vmmc-supply = <&reg_module_3v3>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts
index 614d96a7a3f0..674a93dca19c 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
- * Copyright (C) 2018, Toradex AG
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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.
+ * Copyright 2018-2019, Toradex
*/
/dts-v1/;
@@ -33,7 +24,6 @@
status = "okay";
};
-
lvds1_panel {
compatible = "lg,lp156wf1";
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
index dfbbe9c716fc..3b51fdf6149c 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
- * Copyright (C) 2018, Toradex AG
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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.
+ * Copyright 2018-2019, Toradex
*/
/dts-v1/;
@@ -42,8 +33,8 @@
&iomuxc {
pinctrl-names = "default";
- imx8qxp-colibri {
+ imx8qxp-colibri {
pinctrl_touch: touchgrp {
fsl,pins = <
SC_P_QSPI0B_DATA3_LSIO_GPIO3_IO21 0x06000040