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 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
