Skip to contentSkip to conversation

arm: imx6q: pcm058: Convert support to use DM with DTs

PATCH New Niel Fourie 1 participant 5 messages May 19, 2020

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

cover arm: imx6q: pcm058: Convert support to use DM with DTs

This patch series updates the existing pcm058 board support to use device trees with driver model. The first two patches in the series pulls in the unmodified Linux dt-binding and dts files. The third patch changes the maintainer. The last patch contains the required changes.

Niel Fourie (4):
dts-bindings: regulator: Add dlg,da9063-regulator
arm: dts: imx6q: Add Linux dts files for Phytec Mira
arm: imx6q: pcm058: change MAINTAINER
arm: imx6q: pcm058: Convert pcm058 to use DM with DTs

 arch/arm/dts/Makefile                         |   1 +
 .../imx6q-phytec-mira-rdk-nand-u-boot.dtsi    |  42 ++
 arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts   |  72 ++++
 arch/arm/dts/imx6qdl-phytec-mira.dtsi         | 390 ++++++++++++++++++
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi  | 287 +++++++++++++
 arch/arm/mach-imx/mx6/Kconfig                 |   4 +
 board/phytec/pcm058/MAINTAINERS               |   3 +-
 board/phytec/pcm058/README                    |  51 +++
 board/phytec/pcm058/pcm058.c                  | 324 +--------------
 configs/pcm058_defconfig                      |  42 +-
 include/configs/pcm058.h                      |  69 ++--
 .../regulator/dlg,da9063-regulator.h          |  16 +
 12 files changed, 945 insertions(+), 356 deletions(-)
 create mode 100644 arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
 create mode 100644 include/dt-bindings/regulator/dlg,da9063-regulator.h
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/4 dts-bindings: regulator: Add dlg,da9063-regulator

Add da9063-regulator bindings from Linux 5.6:
commit 7111951b8d49 upstream

---
 .../dt-bindings/regulator/dlg,da9063-regulator.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 include/dt-bindings/regulator/dlg,da9063-regulator.h
include/dt-bindings/regulator/dlg,da9063-regulator.h new file +16 -0
new file mode 100644
index 0000000000..1de710dd08
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef _DT_BINDINGS_REGULATOR_DLG_DA9063_H
+#define _DT_BINDINGS_REGULATOR_DLG_DA9063_H
+
+/*
+ * These buck mode constants may be used to specify values in device tree
+ * properties (e.g. regulator-initial-mode).
+ * A description of the following modes is in the manufacturers datasheet.
+ */
+
+#define DA9063_BUCK_MODE_SLEEP		1
+#define DA9063_BUCK_MODE_SYNC		2
+#define DA9063_BUCK_MODE_AUTO		3
+
+#endif
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/4 arm: dts: imx6q: Add Linux dts files for Phytec Mira

In reply to Niel Fourie

Add Phytec Mira device tree files, for use with pcm058. From Linux 5.6, commit 7111951b8d49 upstream

---
 arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts  |  72 ++++
 arch/arm/dts/imx6qdl-phytec-mira.dtsi        | 390 +++++++++++++++++++
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 287 ++++++++++++++
 3 files changed, 749 insertions(+)
 create mode 100644 arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts new file +72 -0
new file mode 100644
index 0000000000..65d2e483c1
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2018 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <[email protected]>
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
+
+/ {
+	model = "PHYTEC phyBOARD-Mira Quad Carrier-Board with NAND";
+	compatible = "phytec,imx6q-pbac06-nand", "phytec,imx6q-pbac06",
+		     "phytec,imx6qdl-pcm058", "fsl,imx6q";
+
+	chosen {
+		stdout-path = &uart2;
+	};
+};
+
+&can1 {
+	status = "okay";
+};
+
+&fec {
+	status = "okay";
+};
+
+&gpmi {
+	status = "okay";
+};
+
+&hdmi {
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+&i2c2 {
+	status = "okay";
+};
+
+&i2c_rtc {
+	status = "okay";
+};
+
+&m25p80 {
+	status = "okay";
+};
+
+&pcie {
+	status = "okay";
+};
+
+&uart3 {
+	status = "okay";
+};
+
+&usbh1 {
+	status = "okay";
+};
+
+&usbotg {
+	status = "okay";
+};
+
+&usdhc1 {
+	status = "okay";
+};
arch/arm/dts/imx6qdl-phytec-mira.dtsi new file +390 -0

390 lines not on this page · raw message

arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi new file +287 -0

287 lines not on this page · raw message

Signature · 1 line
2.26.2
#3 lore raw

PATCH 3/4 arm: imx6q: pcm058: change MAINTAINER

In reply to Niel Fourie

Change the MAINTAINER of pcm058.

---
 board/phytec/pcm058/MAINTAINERS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
board/phytec/pcm058/MAINTAINERS +2 -1
index b0ca40277f..909dfc44af 100644
@@ -1,6 +1,7 @@
 PHYTEC PHYBOARD MIRA
-M:	Stefano Babic <[email protected]>
+M:	Niel Fourie <[email protected]>
 S:	Maintained
 F:	board/phytec/pcm058/
 F:	include/configs/pcm058.h
 F:	configs/pcm058_defconfig
+F:	arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi
Signature · 1 line
2.26.2
#4 lore raw

PATCH 4/4 arm: imx6q: pcm058: Convert pcm058 to use DM with DTs

In reply to Niel Fourie

Convert pcm058 support to use device trees and the driver model. Add rudimentary boot scripts to the environment, expand README.

---
 arch/arm/dts/Makefile                         |   1 +
 .../imx6q-phytec-mira-rdk-nand-u-boot.dtsi    |  42 +++
 arch/arm/mach-imx/mx6/Kconfig                 |   4 +
 board/phytec/pcm058/README                    |  51 +++
 board/phytec/pcm058/pcm058.c                  | 324 ++----------------
 configs/pcm058_defconfig                      |  42 ++-
 include/configs/pcm058.h                      |  69 ++--
 7 files changed, 178 insertions(+), 355 deletions(-)
 create mode 100644 arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi
arch/arm/dts/Makefile +1 -0
index ca663a86f2..4df74c5207 100644
@@ -663,6 +663,7 @@ dtb-y += \
 	imx6q-nitrogen6x.dtb \
 	imx6q-novena.dtb \
 	imx6q-pico.dtb \
+	imx6q-phytec-mira-rdk-nand.dtb \
 	imx6q-sabreauto.dtb \
 	imx6q-sabrelite.dtb \
 	imx6q-sabresd.dtb \
arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi new file +42 -0

42 lines not on this page · raw message

arch/arm/mach-imx/mx6/Kconfig +4 -0
index fa6e1112e6..fdee0d4f64 100644
@@ -511,6 +511,10 @@ config TARGET_PCM058
 	bool "Phytec PCM058 i.MX6 Quad"
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
+	select MX6Q
+	select DM
+	select OF_CONTROL
+	imply CMD_DM
 
 config TARGET_PFLA02
 	bool "Phytec PFLA02 (PhyFlex) i.MX6 Quad"
board/phytec/pcm058/README +51 -0

54 lines not on this page · raw message

board/phytec/pcm058/pcm058.c +20 -304

390 lines not on this page · raw message

configs/pcm058_defconfig +32 -10

83 lines not on this page · raw message

include/configs/pcm058.h +28 -41

93 lines not on this page · raw message

Signature · 1 line
2.26.2