* [PATCH v5 01/13] ARM: dts: imx7-colibri: add GPIO wakeup key
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 02/13] ARM: dts: imx7-colibri: fix 1.8V/UHS support Philippe Schenker
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Stefan Agner, Sascha Hauer, linux-kernel, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
From: Stefan Agner <stefan.agner@toradex.com>
Add wakeup GPIO key which is able to wake the system from sleep
modes (e.g. Suspend-to-Memory).
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v5:
- changed legacy gpio-key,wakeup to wakeup-source
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 14 ++++++++++++++
arch/arm/boot/dts/imx7-colibri.dtsi | 7 ++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 3f2746169181..45c4e721115a 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -52,6 +52,20 @@
clock-frequency = <16000000>;
};
+ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpiokeys>;
+
+ power {
+ label = "Wake-Up";
+ gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+ linux,code = <KEY_WAKEUP>;
+ debounce-interval = <10>;
+ wakeup-source;
+ };
+ };
+
panel: panel {
compatible = "edt,et057090dhu";
backlight = <&bl>;
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 895fbde4d433..b72940e7d00b 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -682,12 +682,17 @@
pinctrl_gpio_lpsr: gpio1-grp {
fsl,pins = <
- MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x59
MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2 0x59
MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3 0x59
>;
};
+ pinctrl_gpiokeys: gpiokeysgrp {
+ fsl,pins = <
+ MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x19
+ >;
+ };
+
pinctrl_i2c1: i2c1-grp {
fsl,pins = <
MX7D_PAD_LPSR_GPIO1_IO05__I2C1_SDA 0x4000007f
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 02/13] ARM: dts: imx7-colibri: fix 1.8V/UHS support
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 01/13] ARM: dts: imx7-colibri: add GPIO wakeup key Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 03/13] ARM: dts: imx7-colibri: Add touch controllers Philippe Schenker
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Stefan Agner, Sascha Hauer, linux-kernel, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
From: Stefan Agner <stefan.agner@toradex.com>
Add pinmuxing and do not specify voltage restrictions for the usdhc
instance available on the modules edge connector. This allows to use
SD-cards with higher transfer modes if supported by the carrier board.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v5: None
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3:
- Add new commit message from Stefan's proposal on ML
Changes in v2: None
arch/arm/boot/dts/imx7-colibri.dtsi | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index b72940e7d00b..cbcb97886e80 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -304,7 +304,6 @@
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>;
- no-1-8-v;
cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
disable-wp;
vqmmc-supply = <®_LDO2>;
@@ -612,6 +611,28 @@
>;
};
+ pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {
+ fsl,pins = <
+ MX7D_PAD_SD1_CMD__SD1_CMD 0x5a
+ MX7D_PAD_SD1_CLK__SD1_CLK 0x1a
+ MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a
+ MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a
+ MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a
+ MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a
+ >;
+ };
+
+ pinctrl_usdhc1_200mhz: usdhc1grp_200mhz {
+ fsl,pins = <
+ MX7D_PAD_SD1_CMD__SD1_CMD 0x5b
+ MX7D_PAD_SD1_CLK__SD1_CLK 0x1b
+ MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b
+ MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b
+ MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b
+ MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b
+ >;
+ };
+
pinctrl_usdhc3: usdhc3grp {
fsl,pins = <
MX7D_PAD_SD3_CMD__SD3_CMD 0x59
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 03/13] ARM: dts: imx7-colibri: Add touch controllers
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 01/13] ARM: dts: imx7-colibri: add GPIO wakeup key Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 02/13] ARM: dts: imx7-colibri: fix 1.8V/UHS support Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 04/13] ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc Philippe Schenker
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Oleksandr Suvorov, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
Add touch controller that is connected over an I2C bus.
It is disabled by default because the pins are also used for PWM,
which is the standard use for colibri boards.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---
Changes in v5:
- Add note in commit message about disabled status
- Added Olek's reviewed-by
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3:
- Fix commit message
Changes in v2:
- Deleted touchrevolution downstream stuff
- Use generic node name
- Better comment
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 24 +++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 45c4e721115a..6aa123cbdadb 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -145,6 +145,21 @@
&i2c4 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpiotouch>;
+ reg = <0x4a>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */
+ reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */
+ status = "disabled";
+ };
+
/* M41T0M6 real time clock on carrier board */
rtc: m41t0m6@68 {
compatible = "st,m41t0";
@@ -200,3 +215,12 @@
vmmc-supply = <®_3v3>;
status = "okay";
};
+
+&iomuxc {
+ pinctrl_gpiotouch: touchgpios {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x74
+ MX7D_PAD_GPIO1_IO10__GPIO1_IO10 0x14
+ >;
+ };
+};
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 04/13] ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (2 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 03/13] ARM: dts: imx7-colibri: Add touch controllers Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 05/13] ARM: dts: imx6qdl-apalis: Add sleep state to can interfaces Philippe Schenker
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Philippe Schenker, NXP Linux Team,
Pengutronix Kernel Team, linux-arm-kernel
This adds the muxing for the optional pins usb-oc (overcurrent) and
usb-id.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v5:
- change group name
- Add pinmux to iomuxc
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 1beac22266ed..07379d3d2f4e 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -415,6 +415,9 @@
};
&iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbh_oc_1>;
+
pinctrl_audmux: audmuxgrp {
fsl,pins = <
MX6QDL_PAD_KEY_COL0__AUD5_TXC 0x130b0
@@ -604,6 +607,13 @@
>;
};
+ pinctrl_usbh_oc_1: usbhoc1grp {
+ fsl,pins = <
+ /* USBH_OC */
+ MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x1b0b0
+ >;
+ };
+
pinctrl_spdif: spdifgrp {
fsl,pins = <
MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0
@@ -670,6 +680,13 @@
>;
};
+ pinctrl_usbc_id_1: usbc_id-1 {
+ fsl,pins = <
+ /* USBC_ID */
+ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
+ >;
+ };
+
pinctrl_usdhc1: usdhc1grp {
fsl,pins = <
MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 05/13] ARM: dts: imx6qdl-apalis: Add sleep state to can interfaces
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (3 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 04/13] ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 06/13] ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards Philippe Schenker
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Philippe Schenker, NXP Linux Team,
Pengutronix Kernel Team, linux-arm-kernel
This patch prepares the devicetree for the new Ixora V1.2 where we are
able to turn off the supply of the can transceiver. This implies to use
a sleep state on transmission pins in order to prevent backfeeding.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v5: None
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3: None
Changes in v2:
- Changed commit title to '...imx6qdl-apalis:...'
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 7c4ad541c3f5..59ed2e4a1fd1 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -148,14 +148,16 @@
};
&can1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_flexcan1>;
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&pinctrl_flexcan1_default>;
+ pinctrl-1 = <&pinctrl_flexcan1_sleep>;
status = "disabled";
};
&can2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_flexcan2>;
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&pinctrl_flexcan2_default>;
+ pinctrl-1 = <&pinctrl_flexcan2_sleep>;
status = "disabled";
};
@@ -599,19 +601,32 @@
>;
};
- pinctrl_flexcan1: flexcan1grp {
+ pinctrl_flexcan1_default: flexcan1defgrp {
fsl,pins = <
MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x1b0b0
MX6QDL_PAD_GPIO_8__FLEXCAN1_RX 0x1b0b0
>;
};
- pinctrl_flexcan2: flexcan2grp {
+ pinctrl_flexcan1_sleep: flexcan1slpgrp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_7__GPIO1_IO07 0x0
+ MX6QDL_PAD_GPIO_8__GPIO1_IO08 0x0
+ >;
+ };
+
+ pinctrl_flexcan2_default: flexcan2defgrp {
fsl,pins = <
MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0
MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0
>;
};
+ pinctrl_flexcan2_sleep: flexcan2slpgrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x0
+ MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x0
+ >;
+ };
pinctrl_gpio_bl_on: gpioblon {
fsl,pins = <
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 06/13] ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (4 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 05/13] ARM: dts: imx6qdl-apalis: Add sleep state to can interfaces Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 07/13] ARM: dts: imx6-colibri: Add missing pinmuxing to Toradex eval board Philippe Schenker
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Oleksandr Suvorov, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
This commit adds the touchscreen from Toradex so one can enable it.
It is disabled by default because the pins are also used for PWM<B>,
PWM<C>, aka pwm2, pwm3 which is the standard use for colibri boards.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---
Changes in v5:
- Adjusted commit message
- Switched to consistent naming: pinctrl_xxx: xxxgrp
- Added Olek's Reviewed-by
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3:
- Fix commit title to "...imx6-apalis:..."
Changes in v2:
- Deleted touchrevolution downstream stuff
- Use generic node name
- Put a better comment in there
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 31 +++++++++++++++++++
arch/arm/boot/dts/imx6q-apalis-eval.dts | 13 ++++++++
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 ++++++++
arch/arm/boot/dts/imx6q-apalis-ixora.dts | 13 ++++++++
4 files changed, 70 insertions(+)
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 9a5d6c94cca4..5e9d844d78f2 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -168,6 +168,21 @@
&i2c3 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pcap_1>;
+ reg = <0x4a>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */
+ reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */
+ status = "disabled";
+ };
+
/* M41T0M6 real time clock on carrier board */
rtc_i2c: rtc@68 {
compatible = "st,m41t0";
@@ -175,6 +190,22 @@
};
};
+&iomuxc {
+ pinctrl_pcap_1: pcap1grp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 /* SODIMM 28 */
+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* SODIMM 30 */
+ >;
+ };
+
+ pinctrl_mxt_ts: mxttsgrp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x130b0 /* SODIMM 107 */
+ MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x130b0 /* SODIMM 106 */
+ >;
+ };
+};
+
&ipu1_di0_disp0 {
remote-endpoint = <&lcd_display_in>;
};
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index 0edd3043d9c1..4665e15b196d 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -167,6 +167,19 @@
&i2c1 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ reg = <0x4a>;
+ interrupt-parent = <&gpio6>;
+ interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
+ status = "disabled";
+ };
+
pcie-switch@58 {
compatible = "plx,pex8605";
reg = <0x58>;
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
index b94bb687be6b..a3fa04a97d81 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
@@ -172,6 +172,19 @@
&i2c1 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ reg = <0x4a>;
+ interrupt-parent = <&gpio6>;
+ interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
+ status = "disabled";
+ };
+
/* M41T0M6 real time clock on carrier board */
rtc_i2c: rtc@68 {
compatible = "st,m41t0";
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 302fd6adc8a7..5ba49d0f4880 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -171,6 +171,19 @@
&i2c1 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ reg = <0x4a>;
+ interrupt-parent = <&gpio6>;
+ interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
+ status = "disabled";
+ };
+
eeprom@50 {
compatible = "atmel,24c02";
reg = <0x50>;
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 07/13] ARM: dts: imx6-colibri: Add missing pinmuxing to Toradex eval board
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (5 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 06/13] ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 08/13] ARM: dts: imx6ull-colibri: Add sleep mode to fec Philippe Schenker
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Oleksandr Suvorov, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
This patch adds some missing pinmuxing that is in the colibri
standard to the dts.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---
Changes in v5:
- Added Olek's Reviewed-by
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3: None
Changes in v2:
- Commit title
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 5e9d844d78f2..cd075621de52 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -191,6 +191,14 @@
};
&iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &pinctrl_weim_gpio_1 &pinctrl_weim_gpio_2
+ &pinctrl_weim_gpio_3 &pinctrl_weim_gpio_4
+ &pinctrl_weim_gpio_5 &pinctrl_weim_gpio_6
+ &pinctrl_usbh_oc_1 &pinctrl_usbc_id_1
+ >;
+
pinctrl_pcap_1: pcap1grp {
fsl,pins = <
MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 /* SODIMM 28 */
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 08/13] ARM: dts: imx6ull-colibri: Add sleep mode to fec
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (6 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 07/13] ARM: dts: imx6-colibri: Add missing pinmuxing to Toradex eval board Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 09/13] ARM: dts: imx6ull-colibri: reduce v_batt current in power off Philippe Schenker
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Oleksandr Suvorov, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
Do not change the clock as the power for this phy is switched
with that clock.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---
Changes in v5:
- Added Olek's Reviewed-by
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/imx6ull-colibri.dtsi | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index d56728f03c35..1019ce69a242 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -62,8 +62,9 @@
};
&fec2 {
- pinctrl-names = "default";
+ pinctrl-names = "default", "sleep";
pinctrl-0 = <&pinctrl_enet2>;
+ pinctrl-1 = <&pinctrl_enet2_sleep>;
phy-mode = "rmii";
phy-handle = <ðphy1>;
status = "okay";
@@ -220,6 +221,21 @@
>;
};
+ pinctrl_enet2_sleep: enet2sleepgrp {
+ fsl,pins = <
+ MX6UL_PAD_GPIO1_IO06__GPIO1_IO06 0x0
+ MX6UL_PAD_GPIO1_IO07__GPIO1_IO07 0x0
+ MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x0
+ MX6UL_PAD_ENET2_RX_DATA1__GPIO2_IO09 0x0
+ MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10 0x0
+ MX6UL_PAD_ENET2_RX_ER__GPIO2_IO15 0x0
+ MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031
+ MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0
+ MX6UL_PAD_ENET2_TX_DATA1__GPIO2_IO12 0x0
+ MX6UL_PAD_ENET2_TX_EN__GPIO2_IO13 0x0
+ >;
+ };
+
pinctrl_ecspi1_cs: ecspi1-cs-grp {
fsl,pins = <
MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x000a0
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 09/13] ARM: dts: imx6ull-colibri: reduce v_batt current in power off
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (7 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 08/13] ARM: dts: imx6ull-colibri: Add sleep mode to fec Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 10/13] ARM: dts: imx6ull-colibri: Add watchdog Philippe Schenker
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Oleksandr Suvorov, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
From: Max Krummenacher <max.krummenacher@toradex.com>
Reduce the current drawn from VCC_BATT when the main power on the 3V3
pins to the module are switched off.
This switches off SoC internal pull resistors which are provided on the
module for TAMPER7 and TAMPER9 SoC pin and switches on a pull down
instead of a pullup for the USBC_DET module pin (TAMPER2).
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---
Changes in v5:
- Added Olek's Reviewd-by
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/imx6ull-colibri.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index 1019ce69a242..1f112ec55e5c 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -533,19 +533,19 @@
pinctrl_snvs_ad7879_int: snvs-ad7879-int-grp { /* TOUCH Interrupt */
fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x1b0b0
+ MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x100b0
>;
};
pinctrl_snvs_reg_sd: snvs-reg-sd-grp {
fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x4001b8b0
+ MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x400100b0
>;
};
pinctrl_snvs_usbc_det: snvs-usbc-det-grp {
fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x1b0b0
+ MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x130b0
>;
};
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 10/13] ARM: dts: imx6ull-colibri: Add watchdog
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (8 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 09/13] ARM: dts: imx6ull-colibri: reduce v_batt current in power off Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 11/13] ARM: dts: imx6ull: improve can templates Philippe Schenker
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Philippe Schenker, NXP Linux Team,
Pengutronix Kernel Team, linux-arm-kernel
This patch adds the watchdog to the imx6ull-colibri devicetree
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v5: None
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/imx6ull-colibri.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index 1f112ec55e5c..e3220298dd6f 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -199,6 +199,12 @@
assigned-clock-rates = <0>, <198000000>;
};
+&wdog1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_wdog>;
+ fsl,ext-reset-output;
+};
+
&iomuxc {
pinctrl_can_int: canint-grp {
fsl,pins = <
@@ -506,6 +512,12 @@
MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x14
>;
};
+
+ pinctrl_wdog: wdog-grp {
+ fsl,pins = <
+ MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0
+ >;
+ };
};
&iomuxc_snvs {
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 11/13] ARM: dts: imx6ull: improve can templates
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (9 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 10/13] ARM: dts: imx6ull-colibri: Add watchdog Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 12/13] ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri Philippe Schenker
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Oleksandr Suvorov, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
From: Max Krummenacher <max.krummenacher@toradex.com>
Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63
and move the inactive flexcan nodes to imx6ull-colibri-eval-v3.dtsi
where they belong.
Note that this commit does not enable flexcan functionality, but rather
eases the effort needed to do so.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---
Changes in v5:
- Added Olek's Reviewed-by
Changes in v4:
- Move can nodes to module deviceteree include imx6ull-colibri.dtsi
Changes in v3: None
Changes in v2: None
.../arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +-
arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +-
arch/arm/boot/dts/imx6ull-colibri.dtsi | 28 +++++++++++++++++--
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
index fb213bec4654..95a11b8bcbdb 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@ -15,7 +15,7 @@
&iomuxc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
- &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6>;
+ &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6 &pinctrl_gpio7>;
};
&iomuxc_snvs {
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
index 038d8c90f6df..a0545431b3dc 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -26,7 +26,7 @@
&iomuxc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
- &pinctrl_gpio4 &pinctrl_gpio5>;
+ &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>;
};
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index e3220298dd6f..6d850d997e1e 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -54,6 +54,18 @@
vref-supply = <®_module_3v3_avdd>;
};
+&can1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan1>;
+ status = "disabled";
+};
+
+&can2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan2>;
+ status = "disabled";
+};
+
/* Colibri SPI */
&ecspi1 {
cs-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>;
@@ -256,6 +268,13 @@
>;
};
+ pinctrl_flexcan1: flexcan1-grp {
+ fsl,pins = <
+ MX6UL_PAD_ENET1_RX_DATA0__FLEXCAN1_TX 0x1b020
+ MX6UL_PAD_ENET1_RX_DATA1__FLEXCAN1_RX 0x1b020
+ >;
+ };
+
pinctrl_flexcan2: flexcan2-grp {
fsl,pins = <
MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX 0x1b020
@@ -271,8 +290,6 @@
pinctrl_gpio1: gpio1-grp {
fsl,pins = <
- MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */
- MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0x74 /* SODIMM 63 */
MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0X14 /* SODIMM 77 */
MX6UL_PAD_JTAG_TCK__GPIO1_IO14 0x14 /* SODIMM 99 */
MX6UL_PAD_NAND_CE1_B__GPIO4_IO14 0x14 /* SODIMM 133 */
@@ -325,6 +342,13 @@
>;
};
+ pinctrl_gpio7: gpio7-grp { /* CAN1 */
+ fsl,pins = <
+ MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */
+ MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0x74 /* SODIMM 63 */
+ >;
+ };
+
pinctrl_gpmi_nand: gpmi-nand-grp {
fsl,pins = <
MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 12/13] ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (10 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 11/13] ARM: dts: imx6ull: improve can templates Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-08-27 13:18 ` [PATCH v5 13/13] ARM: dts: imx6ull-colibri: Add touchscreen used with Eval Board Philippe Schenker
2019-09-14 2:30 ` [PATCH v5 00/13] Common patches from downstream development Shawn Guo
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Oleksandr Suvorov, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
This adds the possibility to wake the module with an external signal
as defined in the Colibri standard
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---
Changes in v5:
- Add Olek's Reviewed-by
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
index b6147c76d159..a78849fd2afa 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
@@ -8,6 +8,20 @@
stdout-path = "serial0:115200n8";
};
+ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_snvs_gpiokeys>;
+
+ power {
+ label = "Wake-Up";
+ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
+ linux,code = <KEY_WAKEUP>;
+ debounce-interval = <10>;
+ wakeup-source;
+ };
+ };
+
/* fixed crystal dedicated to mcp2515 */
clk16m: clk16m {
compatible = "fixed-clock";
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v5 13/13] ARM: dts: imx6ull-colibri: Add touchscreen used with Eval Board
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (11 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 12/13] ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri Philippe Schenker
@ 2019-08-27 13:18 ` Philippe Schenker
2019-09-14 2:30 ` [PATCH v5 00/13] Common patches from downstream development Shawn Guo
13 siblings, 0 replies; 15+ messages in thread
From: Philippe Schenker @ 2019-08-27 13:18 UTC (permalink / raw)
To: Marcel Ziswiler, Max Krummenacher, stefan @ agner . ch,
devicetree @ vger . kernel . org, Rob Herring, Shawn Guo,
Mark Rutland, Michal Vokáč,
Fabio Estevam
Cc: Sascha Hauer, linux-kernel, Oleksandr Suvorov, Philippe Schenker,
NXP Linux Team, Pengutronix Kernel Team, linux-arm-kernel
This adds the common touchscreen that is used with Toradex's
Eval Boards.
It is disabled by default because the pins are also used for PWM,
which is the standard use for colibri boards.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Marcel Ziswiler <marcel.ziswiler@toradex.com>
Max Krummenacher <max.krummenacher@toradex.com>
stefan@agner.ch <stefan@agner.ch>
devicetree@vger.kernel.org <devicetree@vger.kernel.org>
Rob Herring <robh+dt@kernel.org>
Shawn Guo <shawnguo@kernel.org>
Mark Rutland <mark.rutland@arm.com>
Michal Vokáč <michal.vokac@ysoft.com>
Fabio Estevam <festevam@gmail.com>
---
Changes in v5:
- Added note to commit message about disabled status
- Add Olek's Reviewed-by
Changes in v4: None
Changes in v3: None
Changes in v2:
- Removed f0710a
that is downstream only
- Changed to generic node name
- Better comment
.../arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
index a78849fd2afa..458a4084e53c 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
@@ -100,6 +100,21 @@
&i2c1 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpiotouch>;
+ reg = <0x4a>;
+ interrupt-parent = <&gpio4>;
+ interrupts = <16 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */
+ reset-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */
+ status = "disabled";
+ };
+
/* M41T0M6 real time clock on carrier board */
m41t0m6: rtc@68 {
compatible = "st,m41t0";
@@ -176,3 +191,12 @@
sd-uhs-sdr104;
status = "okay";
};
+
+&iomuxc {
+ pinctrl_gpiotouch: touchgpios {
+ fsl,pins = <
+ MX6UL_PAD_NAND_DQS__GPIO4_IO16 0x74
+ MX6UL_PAD_ENET1_TX_EN__GPIO2_IO05 0x14
+ >;
+ };
+};
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v5 00/13] Common patches from downstream development
2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker
` (12 preceding siblings ...)
2019-08-27 13:18 ` [PATCH v5 13/13] ARM: dts: imx6ull-colibri: Add touchscreen used with Eval Board Philippe Schenker
@ 2019-09-14 2:30 ` Shawn Guo
13 siblings, 0 replies; 15+ messages in thread
From: Shawn Guo @ 2019-09-14 2:30 UTC (permalink / raw)
To: Philippe Schenker
Cc: Mark Rutland, devicetree @ vger . kernel . org,
Michal Vokáč,
Pengutronix Kernel Team, Marcel Ziswiler, Sascha Hauer,
linux-kernel, stefan @ agner . ch, Rob Herring, NXP Linux Team,
Max Krummenacher, Fabio Estevam, linux-arm-kernel
On Tue, Aug 27, 2019 at 01:18:16PM +0000, Philippe Schenker wrote:
>
> This patchset holds some common changes that were never upstreamed.
> With latest downstream kernel upgrade, I took the aproach to select
> mainline devicetrees and atomically add missing stuff for downstream.
>
> These patches I send here are separated out with changes that also
> have a benefit for mainline.
>
> --------------------- Update version 4 and later -----------------------
> Patches that got pulled in an earlier patchset version got dropped in
> this patchset.
> ------------------------------------------------------------------------
>
> Philippe
>
> Changes in v5:
> - changed legacy gpio-key,wakeup to wakeup-source
> - Add note in commit message about disabled status
> - Added Olek's reviewed-by
> - change group name
> - Add pinmux to iomuxc
> - Adjusted commit message
> - Switched to consistent naming: pinctrl_xxx: xxxgrp
> - Added Olek's Reviewed-by
> - Added Olek's Reviewed-by
> - Added Olek's Reviewed-by
> - Added Olek's Reviewd-by
> - Added Olek's Reviewed-by
> - Add Olek's Reviewed-by
> - Added note to commit message about disabled status
> - Add Olek's Reviewed-by
>
> Changes in v4:
> - Add Marcel Ziswiler's Ack
> - Add Marcel Ziswiler's Ack
> - Add Marcel Ziswiler's Ack
> - Add Marcel Ziswiler's Ack
> - Add Marcel Ziswiler's Ack
> - Add Marcel Ziswiler's Ack
> - Add Marcel Ziswiler's Ack
> - Add Marcel Ziswiler's Ack
> - Add Marcel Ziswiler's Ack
> - Add Marcel Ziswiler's Ack
> - Move can nodes to module deviceteree include imx6ull-colibri.dtsi
> - Add Marcel Ziswiler's Ack
>
> Changes in v3:
> - Add new commit message from Stefan's proposal on ML
> - Fix commit message
> - Fix commit title to "...imx6-apalis:..."
>
> Changes in v2:
> - Deleted touchrevolution downstream stuff
> - Use generic node name
> - Better comment
> - Changed commit title to '...imx6qdl-apalis:...'
> - Deleted touchrevolution downstream stuff
> - Use generic node name
> - Put a better comment in there
> - Commit title
> - Removed f0710a
> that is downstream only
> - Changed to generic node name
> - Better comment
>
> Max Krummenacher (2):
> ARM: dts: imx6ull-colibri: reduce v_batt current in power off
> ARM: dts: imx6ull: improve can templates
>
> Philippe Schenker (9):
> ARM: dts: imx7-colibri: Add touch controllers
> ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc
> ARM: dts: imx6qdl-apalis: Add sleep state to can interfaces
> ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards
> ARM: dts: imx6-colibri: Add missing pinmuxing to Toradex eval board
> ARM: dts: imx6ull-colibri: Add sleep mode to fec
> ARM: dts: imx6ull-colibri: Add watchdog
> ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri
> ARM: dts: imx6ull-colibri: Add touchscreen used with Eval Board
Applied all, but except this one which uses base64
Content-Transfer-Encoding.
Shawn
>
> Stefan Agner (2):
> ARM: dts: imx7-colibri: add GPIO wakeup key
> ARM: dts: imx7-colibri: fix 1.8V/UHS support
>
> arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 39 +++++++++++
> arch/arm/boot/dts/imx6q-apalis-eval.dts | 13 ++++
> arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 ++++
> arch/arm/boot/dts/imx6q-apalis-ixora.dts | 13 ++++
> arch/arm/boot/dts/imx6qdl-apalis.dtsi | 27 ++++++--
> arch/arm/boot/dts/imx6qdl-colibri.dtsi | 17 +++++
> .../arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 38 +++++++++++
> .../arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +-
> arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +-
> arch/arm/boot/dts/imx6ull-colibri.dtsi | 64 +++++++++++++++++--
> arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 38 +++++++++++
> arch/arm/boot/dts/imx7-colibri.dtsi | 30 ++++++++-
> 12 files changed, 280 insertions(+), 16 deletions(-)
>
> --
> 2.23.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread