* [PATCH 2/8] ARM: dts: imx6q-apalis-eval: add carrier board 3.3V supply
2018-07-09 15:48 [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Stefan Agner
@ 2018-07-09 15:48 ` Stefan Agner
2018-07-09 15:48 ` [PATCH 3/8] ARM: dts: imx6qdl-apalis/-colibri: prevent 1.8V modes Stefan Agner
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Stefan Agner @ 2018-07-09 15:48 UTC (permalink / raw)
To: shawnguo, s.hauer
Cc: kernel, fabio.estevam, linux-imx, robh+dt, mark.rutland,
marcel.ziswiler, max.krummenacher, maitysanchayan,
linux-arm-kernel, devicetree, linux-kernel, Stefan Agner
Add the 3.3V main supply on the carrier board. Currently as a fixed
supply since not all consumer are modeled yet. This gets also rid of
some missing supply warnings.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx6q-apalis-eval.dts | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index 621d9709effa..707ac9a46115 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -113,6 +113,7 @@
*/
compatible = "edt,et057090dhu";
backlight = <&backlight>;
+ power-supply = <®_3v3_sw>;
port {
lcd_panel_in: endpoint {
@@ -131,19 +132,30 @@
enable-active-high;
status = "okay";
};
+
+ reg_3v3_sw: regulator-3v3-sw {
+ compatible = "regulator-fixed";
+ regulator-name = "3.3V_SW";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
};
&backlight {
brightness-levels = <0 127 191 223 239 247 251 255>;
default-brightness-level = <1>;
+ power-supply = <®_3v3_sw>;
status = "okay";
};
&can1 {
+ xceiver-supply = <®_3v3_sw>;
status = "okay";
};
&can2 {
+ xceiver-supply = <®_3v3_sw>;
status = "okay";
};
--
2.18.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/8] ARM: dts: imx6qdl-apalis/-colibri: prevent 1.8V modes
2018-07-09 15:48 [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Stefan Agner
2018-07-09 15:48 ` [PATCH 2/8] ARM: dts: imx6q-apalis-eval: add carrier board 3.3V supply Stefan Agner
@ 2018-07-09 15:48 ` Stefan Agner
2018-07-09 15:48 ` [PATCH 4/8] ARM: dts: imx6qdl-apalis/-colibri: disable read-only switch Stefan Agner
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Stefan Agner @ 2018-07-09 15:48 UTC (permalink / raw)
To: shawnguo, s.hauer
Cc: kernel, fabio.estevam, linux-imx, robh+dt, mark.rutland,
marcel.ziswiler, max.krummenacher, maitysanchayan,
linux-arm-kernel, devicetree, linux-kernel, Stefan Agner
Use no-1-8-v device tree property to indicate that the board does
not support 1.8V signaling. The property voltage-ranges seems not
appropriate in our case since we do not have level shifters in
place.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 6 +++---
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 64fbee61de44..55bcea245df6 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -457,7 +457,7 @@
pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>;
vqmmc-supply = <®_3p3v>;
bus-width = <8>;
- voltage-ranges = <3300 3300>;
+ no-1-8-v;
status = "disabled";
};
@@ -467,7 +467,7 @@
pinctrl-0 = <&pinctrl_usdhc2>;
vqmmc-supply = <®_3p3v>;
bus-width = <4>;
- voltage-ranges = <3300 3300>;
+ no-1-8-v;
status = "disabled";
};
@@ -477,7 +477,7 @@
pinctrl-0 = <&pinctrl_usdhc3>;
vqmmc-supply = <®_3p3v>;
bus-width = <8>;
- voltage-ranges = <3300 3300>;
+ no-1-8-v;
non-removable;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 6e937ca20869..bb44829dacbe 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -389,7 +389,7 @@
cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */
vqmmc-supply = <®_3p3v>;
bus-width = <4>;
- voltage-ranges = <3300 3300>;
+ no-1-8-v;
status = "disabled";
};
@@ -399,7 +399,7 @@
pinctrl-0 = <&pinctrl_usdhc3>;
vqmmc-supply = <®_3p3v>;
bus-width = <8>;
- voltage-ranges = <3300 3300>;
+ no-1-8-v;
non-removable;
status = "okay";
};
--
2.18.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/8] ARM: dts: imx6qdl-apalis/-colibri: disable read-only switch
2018-07-09 15:48 [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Stefan Agner
2018-07-09 15:48 ` [PATCH 2/8] ARM: dts: imx6q-apalis-eval: add carrier board 3.3V supply Stefan Agner
2018-07-09 15:48 ` [PATCH 3/8] ARM: dts: imx6qdl-apalis/-colibri: prevent 1.8V modes Stefan Agner
@ 2018-07-09 15:48 ` Stefan Agner
2018-07-09 15:48 ` [PATCH 5/8] ARM: dts: imx6qdl-apalis/-colibri: remove 1.8V regulator Stefan Agner
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Stefan Agner @ 2018-07-09 15:48 UTC (permalink / raw)
To: shawnguo, s.hauer
Cc: mark.rutland, devicetree, max.krummenacher, marcel.ziswiler,
linux-kernel, Stefan Agner, maitysanchayan, robh+dt, linux-imx,
kernel, fabio.estevam, linux-arm-kernel
Use the disable-wp to indicate that Apalis and Colibri iMX6 do not
make use of the native write-protect signal available on the i.MX 6
SoCs. This prevents warnings:
mmc0: host does not support reading read-only switch, assuming write-enable
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 2 ++
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 1 +
2 files changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 55bcea245df6..f9bacc9ff2b6 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -457,6 +457,7 @@
pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>;
vqmmc-supply = <®_3p3v>;
bus-width = <8>;
+ disable-wp;
no-1-8-v;
status = "disabled";
};
@@ -467,6 +468,7 @@
pinctrl-0 = <&pinctrl_usdhc2>;
vqmmc-supply = <®_3p3v>;
bus-width = <4>;
+ disable-wp;
no-1-8-v;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index bb44829dacbe..8ae17fdf6cf6 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -387,6 +387,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */
+ disable-wp;
vqmmc-supply = <®_3p3v>;
bus-width = <4>;
no-1-8-v;
--
2.18.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/8] ARM: dts: imx6qdl-apalis/-colibri: remove 1.8V regulator
2018-07-09 15:48 [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Stefan Agner
` (2 preceding siblings ...)
2018-07-09 15:48 ` [PATCH 4/8] ARM: dts: imx6qdl-apalis/-colibri: disable read-only switch Stefan Agner
@ 2018-07-09 15:48 ` Stefan Agner
2018-07-09 15:48 ` [PATCH 6/8] ARM: dts: imx6qdl-apalis/-colibri: fix on-module regulators Stefan Agner
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Stefan Agner @ 2018-07-09 15:48 UTC (permalink / raw)
To: shawnguo, s.hauer
Cc: mark.rutland, devicetree, max.krummenacher, marcel.ziswiler,
linux-kernel, Stefan Agner, maitysanchayan, robh+dt, linux-imx,
kernel, fabio.estevam, linux-arm-kernel
The fixed 1.8V regulator is not used, and there is in fact no
fixed 1.8V regulator on the module. Remove it.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 8 --------
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 8 --------
2 files changed, 16 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index f9bacc9ff2b6..2f711fffa06e 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -61,14 +61,6 @@
status = "disabled";
};
- reg_1p8v: regulator-1p8v {
- compatible = "regulator-fixed";
- regulator-name = "1P8V";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-always-on;
- };
-
reg_2p5v: regulator-2p5v {
compatible = "regulator-fixed";
regulator-name = "2P5V";
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 8ae17fdf6cf6..1a147cb0bed0 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -56,14 +56,6 @@
status = "disabled";
};
- reg_1p8v: regulator-1p8v {
- compatible = "regulator-fixed";
- regulator-name = "1P8V";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-always-on;
- };
-
reg_2p5v: regulator-2p5v {
compatible = "regulator-fixed";
regulator-name = "2P5V";
--
2.18.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/8] ARM: dts: imx6qdl-apalis/-colibri: fix on-module regulators
2018-07-09 15:48 [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Stefan Agner
` (3 preceding siblings ...)
2018-07-09 15:48 ` [PATCH 5/8] ARM: dts: imx6qdl-apalis/-colibri: remove 1.8V regulator Stefan Agner
@ 2018-07-09 15:48 ` Stefan Agner
2018-07-09 15:48 ` [PATCH 7/8] ARM: dts: imx6qdl-apalis/-colibri: assign VDDD to SGTL5000 Stefan Agner
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Stefan Agner @ 2018-07-09 15:48 UTC (permalink / raw)
To: shawnguo, s.hauer
Cc: mark.rutland, devicetree, max.krummenacher, marcel.ziswiler,
linux-kernel, Stefan Agner, maitysanchayan, robh+dt, linux-imx,
kernel, fabio.estevam, linux-arm-kernel
Remove the 2.5V regulator, it does not exist. There is 3.3V and
3.3V_AUDIO provided to the module through the edge connector,
model those as fixed regulators like we use to do in other
Colibri device trees. The SGTL5000 uses 3.3V_AUDIO as VDDA. Note
that the driver derives the analog ground voltage (VAG) from this
supply. The new value should allow higher output swings before
clipping occurs. Refer to the SGTL5000 datasheet for details.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 22 +++++++++++-----------
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 20 ++++++++++----------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 2f711fffa06e..6813f4326807 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -61,17 +61,17 @@
status = "disabled";
};
- reg_2p5v: regulator-2p5v {
+ reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
- regulator-name = "2P5V";
- regulator-min-microvolt = <2500000>;
- regulator-max-microvolt = <2500000>;
+ regulator-name = "+V3.3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
regulator-always-on;
};
- reg_3p3v: regulator-3p3v {
+ reg_module_3v3_audio: regulator-module-3v3-audio {
compatible = "regulator-fixed";
- regulator-name = "3P3V";
+ regulator-name = "+V3.3_AUDIO";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
@@ -314,8 +314,8 @@
compatible = "fsl,sgtl5000";
reg = <0x0a>;
clocks = <&clks IMX6QDL_CLK_CKO>;
- VDDA-supply = <®_2p5v>;
- VDDIO-supply = <®_3p3v>;
+ VDDA-supply = <®_module_3v3_audio>;
+ VDDIO-supply = <®_module_3v3>;
};
/* STMPE811 touch screen controller */
@@ -447,7 +447,7 @@
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
disable-wp;
no-1-8-v;
@@ -458,7 +458,7 @@
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <4>;
disable-wp;
no-1-8-v;
@@ -469,7 +469,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
no-1-8-v;
non-removable;
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 1a147cb0bed0..9a3bac5be5e2 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -56,17 +56,17 @@
status = "disabled";
};
- reg_2p5v: regulator-2p5v {
+ reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
- regulator-name = "2P5V";
- regulator-min-microvolt = <2500000>;
- regulator-max-microvolt = <2500000>;
+ regulator-name = "+V3.3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
regulator-always-on;
};
- reg_3p3v: regulator-3p3v {
+ reg_module_3v3_audio: regulator-module-3v3-audio {
compatible = "regulator-fixed";
- regulator-name = "3P3V";
+ regulator-name = "+V3.3_AUDIO";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
@@ -244,8 +244,8 @@
compatible = "fsl,sgtl5000";
reg = <0x0a>;
clocks = <&clks IMX6QDL_CLK_CKO>;
- VDDA-supply = <®_2p5v>;
- VDDIO-supply = <®_3p3v>;
+ VDDA-supply = <®_module_3v3_audio>;
+ VDDIO-supply = <®_module_3v3>;
lrclk-strength = <3>;
};
@@ -380,7 +380,7 @@
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */
disable-wp;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <4>;
no-1-8-v;
status = "disabled";
@@ -390,7 +390,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
no-1-8-v;
non-removable;
--
2.18.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 7/8] ARM: dts: imx6qdl-apalis/-colibri: assign VDDD to SGTL5000
2018-07-09 15:48 [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Stefan Agner
` (4 preceding siblings ...)
2018-07-09 15:48 ` [PATCH 6/8] ARM: dts: imx6qdl-apalis/-colibri: fix on-module regulators Stefan Agner
@ 2018-07-09 15:48 ` Stefan Agner
2018-07-09 15:48 ` [PATCH 8/8] ARM: dts: imx6qdl-apalis/-colibri: remove unused pinctrl groups Stefan Agner
2018-07-11 13:01 ` [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Shawn Guo
7 siblings, 0 replies; 9+ messages in thread
From: Stefan Agner @ 2018-07-09 15:48 UTC (permalink / raw)
To: shawnguo, s.hauer
Cc: kernel, fabio.estevam, linux-imx, robh+dt, mark.rutland,
marcel.ziswiler, max.krummenacher, maitysanchayan,
linux-arm-kernel, devicetree, linux-kernel, Stefan Agner
VDDD is connected to VGEN4 of the PF0100. This rail should only
run at 1.8V since there are multiple consumer and they all
expect the rail to be at 1.8V.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 ++-
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 6813f4326807..8c04f42fdb71 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -289,7 +289,7 @@
vgen4_reg: vgen4 {
regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
+ regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
};
@@ -316,6 +316,7 @@
clocks = <&clks IMX6QDL_CLK_CKO>;
VDDA-supply = <®_module_3v3_audio>;
VDDIO-supply = <®_module_3v3>;
+ VDDD-supply = <&vgen4_reg>;
};
/* STMPE811 touch screen controller */
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 9a3bac5be5e2..6821ea511051 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -219,7 +219,7 @@
vgen4_reg: vgen4 {
regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
+ regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
};
@@ -246,6 +246,7 @@
clocks = <&clks IMX6QDL_CLK_CKO>;
VDDA-supply = <®_module_3v3_audio>;
VDDIO-supply = <®_module_3v3>;
+ VDDD-supply = <&vgen4_reg>;
lrclk-strength = <3>;
};
--
2.18.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 8/8] ARM: dts: imx6qdl-apalis/-colibri: remove unused pinctrl groups
2018-07-09 15:48 [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Stefan Agner
` (5 preceding siblings ...)
2018-07-09 15:48 ` [PATCH 7/8] ARM: dts: imx6qdl-apalis/-colibri: assign VDDD to SGTL5000 Stefan Agner
@ 2018-07-09 15:48 ` Stefan Agner
2018-07-11 13:01 ` [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Shawn Guo
7 siblings, 0 replies; 9+ messages in thread
From: Stefan Agner @ 2018-07-09 15:48 UTC (permalink / raw)
To: shawnguo, s.hauer
Cc: mark.rutland, devicetree, max.krummenacher, marcel.ziswiler,
linux-kernel, Stefan Agner, maitysanchayan, robh+dt, linux-imx,
kernel, fabio.estevam, linux-arm-kernel
100/200MHz states for USDHC3 are not required since the SoC
does not support modes faster than DDR52 for the on board eMMC.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 34 --------------------------
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 34 --------------------------
2 files changed, 68 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 8c04f42fdb71..05f07ea3e8c8 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -947,38 +947,4 @@
MX6QDL_PAD_SD3_RST__SD3_RESET 0x17059
>;
};
-
- pinctrl_usdhc3_100mhz: usdhc3100mhzgrp {
- fsl,pins = <
- MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170b9
- MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100b9
- MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170b9
- MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170b9
- MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170b9
- MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170b9
- MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170b9
- MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170b9
- MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170b9
- MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170b9
- /* eMMC reset */
- MX6QDL_PAD_SD3_RST__SD3_RESET 0x170b9
- >;
- };
-
- pinctrl_usdhc3_200mhz: usdhc3200mhzgrp {
- fsl,pins = <
- MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170f9
- MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100f9
- MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170f9
- MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170f9
- MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170f9
- MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170f9
- MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170f9
- MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170f9
- MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170f9
- MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170f9
- /* eMMC reset */
- MX6QDL_PAD_SD3_RST__SD3_RESET 0x170f9
- >;
- };
};
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 6821ea511051..87e15e7cb32b 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -692,40 +692,6 @@
>;
};
- pinctrl_usdhc3_100mhz: usdhc3100mhzgrp {
- fsl,pins = <
- MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170b9
- MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100b9
- MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170b9
- MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170b9
- MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170b9
- MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170b9
- MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170b9
- MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170b9
- MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170b9
- MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170b9
- /* eMMC reset */
- MX6QDL_PAD_SD3_RST__SD3_RESET 0x170b9
- >;
- };
-
- pinctrl_usdhc3_200mhz: usdhc3200mhzgrp {
- fsl,pins = <
- MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170f9
- MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100f9
- MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170f9
- MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170f9
- MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170f9
- MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170f9
- MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170f9
- MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170f9
- MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170f9
- MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170f9
- /* eMMC reset */
- MX6QDL_PAD_SD3_RST__SD3_RESET 0x170f9
- >;
- };
-
pinctrl_weim_cs0: weimcs0grp {
fsl,pins = <
/* nEXT_CS0 */
--
2.18.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node
2018-07-09 15:48 [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Stefan Agner
` (6 preceding siblings ...)
2018-07-09 15:48 ` [PATCH 8/8] ARM: dts: imx6qdl-apalis/-colibri: remove unused pinctrl groups Stefan Agner
@ 2018-07-11 13:01 ` Shawn Guo
7 siblings, 0 replies; 9+ messages in thread
From: Shawn Guo @ 2018-07-11 13:01 UTC (permalink / raw)
To: Stefan Agner
Cc: s.hauer, kernel, fabio.estevam, linux-imx, robh+dt, mark.rutland,
marcel.ziswiler, max.krummenacher, maitysanchayan,
linux-arm-kernel, devicetree, linux-kernel
On Mon, Jul 09, 2018 at 05:48:41PM +0200, Stefan Agner wrote:
> Add Apalis UART1 as default serial console.
>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
Applied all, thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread