Skip to contentSkip to conversation

ARM: dts: imx: add CX9020 Embedded PC device tree

PATCH In review [email protected] 3 participants 8 messages Jul 26, 2017 – Aug 5, 2017

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

v5 cover ARM: dts: imx: add CX9020 Embedded PC device tree

From: Patrick Bruenn <[email protected]>

The CX9020 differs from i.MX53 Quick Start Board by:
- use uart2 instead of uart1
- DVI-D connector instead of VGA
- no audio
- no SATA connector
- CCAT FPGA connected to emi
- enable rtc

v5:
- rebased on v4.13-rc2
- don't take maintainership for imx53-cx9020.dtsi, keep it to ARM/FREESCALE IMX maintainers
- add explicit pinmux settings for pwr leds (EIM_D22 - D24)
- remove display0->status="okay"
- use "regulator-vbus" as name for usb_vbus regulator node
- use correct reset values for explicit pinmux settings of:
MX53_PAD_GPIO_0__CCM_CLKO MX53_PAD_GPIO_16__I2C3_SDA MX53_PAD_GPIO_1__ESDHC1_CD MX53_PAD_GPIO_3__GPIO1_3
MX53_PAD_GPIO_8__GPIO1_8

v4:
- move alternative UART2 pinmux settings to imx53-pinfunc.h
- fix copyright notice and model name to clearify cx9020 is a Beckhoff board and not from Freescale/NXP/Qualcomm
- add "bhf,cx9020" compatible
- remove ccat node and pin configuration as long as the ccat driver is not mainlined
- use dvi-connector + ti,tfp410 instead of panel-simple
- add newlines between property list and child nodes
- replace underscores in node names with hypens
- replace magic number 0 with polarity defines from include/dt-bindings/gpio/gpio.h
- move rtc node into imx53.dtsi, change it's name into 'srtc', to avoid a conflict with 'rtc' node in imx53-m53.dtsi
- rename regulator-3p2v
- drop imx53-qsb container node
- make iomux configuration explicit
- remove unused audmux
- remove unused led_pin_gpio3_23 configuration
- use blue gpio-leds as disk-activity indicators for mmc0 and mmc1
- add mmc indicator leds to sdhc pingroups
- keep node names in alphabetical order
- remove unused sata and ssi2
- remove unused pin configs from hoggrp
- add entry for Beckhoff related files to MAINTAINERS

v3: add missig changelog
v2:
- keep alphabetic order of dts/Makefile
- configure uart2 with 'fsl,dte-mode'
- use display-0 and panel-0 as node names
- remove unnecessary "simple-bus" for fixed regulators

Patrick Bruenn (4):
dt-bindings: arm: Add entry for Beckhoff CX9020
ARM: dts: imx53: add srtc node
ARM: dts: imx53: add alternative UART2 configuration
ARM: dts: imx: add CX9020 Embedded PC device tree

 Documentation/devicetree/bindings/arm/bhf.txt      |   6 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 MAINTAINERS                                        |   5 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/imx53-cx9020.dts                 | 297 +++++++++++++++++++++
 arch/arm/boot/dts/imx53-pinfunc.h                  |   4 +
 arch/arm/boot/dts/imx53.dtsi                       |   9 +
 7 files changed, 323 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/bhf.txt
 create mode 100644 arch/arm/boot/dts/imx53-cx9020.dts
Signature · 1 line
2.11.0
#1 lore raw

PATCH v5 1/4 dt-bindings: arm: Add entry for Beckhoff CX9020

From: Patrick Bruenn <[email protected]>

- add vendor prefix bhf for Beckhoff
- add new board binding bhf,cx9020

---
 Documentation/devicetree/bindings/arm/bhf.txt         | 6 ++++++
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 MAINTAINERS                                           | 5 +++++
 3 files changed, 12 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/bhf.txt
Documentation/devicetree/bindings/arm/bhf.txt new file +6 -0
new file mode 100644
index 000000000000..886b503caf9c
@@ -0,0 +1,6 @@
+Beckhoff Automation Platforms Device Tree Bindings
+--------------------------------------------------
+
+CX9020 Embedded PC
+Required root node properties:
+    - compatible = "bhf,cx9020", "fsl,imx53";
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
index daf465bef758..20c2cf57ebc9 100644
@@ -47,6 +47,7 @@ avic	Shanghai AVIC Optoelectronics Co., Ltd.
 axentia	Axentia Technologies AB
 axis	Axis Communications AB
 bananapi BIPAI KEJI LIMITED
+bhf	Beckhoff Automation GmbH & Co. KG
 boe	BOE Technology Group Co., Ltd.
 bosch	Bosch Sensortec GmbH
 boundary	Boundary Devices Inc.
MAINTAINERS +5 -0
index f66488dfdbc9..e1d3111aea97 100644
@@ -1196,6 +1196,11 @@ F:	arch/arm/boot/dts/sama*.dtsi
 F:	arch/arm/include/debug/at91.S
 F:	drivers/memory/atmel*
 
+ARM/BECKHOFF SUPPORT
+M:	Patrick Bruenn <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/arm/bhf.txt
+
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:	Rob Herring <[email protected]>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
Signature · 1 line
2.11.0
maintainer Acked-by on v5 1/4
#2 lore raw

Re: [PATCH v5 1/4] dt-bindings: arm: Add entry for Beckhoff CX9020

Quoted 5 lines · linux-kernel-dev at beckhoff.com

From: Patrick Bruenn <[email protected]>

- add vendor prefix bhf for Beckhoff
- add new board binding bhf,cx9020

Quoted 7 lines
---
 Documentation/devicetree/bindings/arm/bhf.txt         | 6 ++++++
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 MAINTAINERS                                           | 5 +++++
 3 files changed, 12 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/bhf.txt
#3 lore raw

PATCH v5 2/4 ARM: dts: imx53: add srtc node

In reply to [email protected]

From: Patrick Bruenn <[email protected]>

The i.MX53 has an integrated secure real time clock. Add it to the dtsi.

---
 arch/arm/boot/dts/imx53.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/boot/dts/imx53.dtsi +9 -0
index 2e516f4985e4..8bf0d89cdd35 100644
@@ -433,6 +433,15 @@
 				clock-names = "ipg", "per";
 			};
 
+			srtc: srtc at 53fa4000 {
+				compatible = "fsl,imx53-rtc", "fsl,imx25-rtc";
+				reg = <0x53fa4000 0x4000>;
+				interrupts = <24>;
+				interrupt-parent = <&tzic>;
+				clocks = <&clks IMX5_CLK_SRTC_GATE>;
+				clock-names = "ipg";
+			};
+
 			iomuxc: iomuxc at 53fa8000 {
 				compatible = "fsl,imx53-iomuxc";
 				reg = <0x53fa8000 0x4000>;
Signature · 1 line
2.11.0
#4 lore raw

PATCH v5 3/4 ARM: dts: imx53: add alternative UART2 configuration

In reply to [email protected]

From: Patrick Bruenn <[email protected]>

UART2 on EIM_D26 - EIM_D29 pins supports interchanging RXD/TXD pins and RTS/CTS pins.
One board using these alternate settings is Beckhoff CX9020. Add the alternative configuration here, to make it available to others, too.

---
 arch/arm/boot/dts/imx53-pinfunc.h | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/imx53-pinfunc.h +4 -0
index aec406bc65eb..59f9c29e3fe2 100644
@@ -524,6 +524,7 @@
 #define MX53_PAD_EIM_D25__UART1_DSR				0x140 0x488 0x000 0x7 0x0
 #define MX53_PAD_EIM_D26__EMI_WEIM_D_26				0x144 0x48c 0x000 0x0 0x0
 #define MX53_PAD_EIM_D26__GPIO3_26				0x144 0x48c 0x000 0x1 0x0
+#define MX53_PAD_EIM_D26__UART2_RXD_MUX				0x144 0x48c 0x880 0x2 0x0
 #define MX53_PAD_EIM_D26__UART2_TXD_MUX				0x144 0x48c 0x000 0x2 0x0
 #define MX53_PAD_EIM_D26__FIRI_RXD				0x144 0x48c 0x80c 0x3 0x0
 #define MX53_PAD_EIM_D26__IPU_CSI0_D_1				0x144 0x48c 0x000 0x4 0x0
@@ -533,6 +534,7 @@
 #define MX53_PAD_EIM_D27__EMI_WEIM_D_27				0x148 0x490 0x000 0x0 0x0
 #define MX53_PAD_EIM_D27__GPIO3_27				0x148 0x490 0x000 0x1 0x0
 #define MX53_PAD_EIM_D27__UART2_RXD_MUX				0x148 0x490 0x880 0x2 0x1
+#define MX53_PAD_EIM_D27__UART2_TXD_MUX				0x148 0x490 0x000 0x2 0x0
 #define MX53_PAD_EIM_D27__FIRI_TXD				0x148 0x490 0x000 0x3 0x0
 #define MX53_PAD_EIM_D27__IPU_CSI0_D_0				0x148 0x490 0x000 0x4 0x0
 #define MX53_PAD_EIM_D27__IPU_DI1_PIN13				0x148 0x490 0x000 0x5 0x0
@@ -541,6 +543,7 @@
 #define MX53_PAD_EIM_D28__EMI_WEIM_D_28				0x14c 0x494 0x000 0x0 0x0
 #define MX53_PAD_EIM_D28__GPIO3_28				0x14c 0x494 0x000 0x1 0x0
 #define MX53_PAD_EIM_D28__UART2_CTS				0x14c 0x494 0x000 0x2 0x0
+#define MX53_PAD_EIM_D28__UART2_RTS				0x14c 0x494 0x87c 0x2 0x0
 #define MX53_PAD_EIM_D28__IPU_DISPB0_SER_DIO			0x14c 0x494 0x82c 0x3 0x1
 #define MX53_PAD_EIM_D28__CSPI_MOSI				0x14c 0x494 0x788 0x4 0x1
 #define MX53_PAD_EIM_D28__I2C1_SDA				0x14c 0x494 0x818 0x5 0x1
@@ -548,6 +551,7 @@
 #define MX53_PAD_EIM_D28__IPU_DI0_PIN13				0x14c 0x494 0x000 0x7 0x0
 #define MX53_PAD_EIM_D29__EMI_WEIM_D_29				0x150 0x498 0x000 0x0 0x0
 #define MX53_PAD_EIM_D29__GPIO3_29				0x150 0x498 0x000 0x1 0x0
+#define MX53_PAD_EIM_D29__UART2_CTS				0x150 0x498 0x000 0x2 0x0
 #define MX53_PAD_EIM_D29__UART2_RTS				0x150 0x498 0x87c 0x2 0x1
 #define MX53_PAD_EIM_D29__IPU_DISPB0_SER_RS			0x150 0x498 0x000 0x3 0x0
 #define MX53_PAD_EIM_D29__CSPI_SS0				0x150 0x498 0x78c 0x4 0x2
Signature · 1 line
2.11.0
#5 lore raw

PATCH v5 4/4 ARM: dts: imx: add CX9020 Embedded PC device tree

In reply to [email protected]

From: Patrick Bruenn <[email protected]>

The CX9020 differs from i.MX53 Quick Start Board by:
- use uart2 instead of uart1
- DVI-D connector instead of VGA
- no audio
- no SATA connector
- CCAT FPGA connected to emi
- enable rtc

---
 arch/arm/boot/dts/Makefile         |   1 +
 arch/arm/boot/dts/imx53-cx9020.dts | 297 +++++++++++++++++++++++++++++++++++++
 2 files changed, 298 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx53-cx9020.dts
arch/arm/boot/dts/Makefile +1 -0
index 4b17f35dc9a7..f0ba9be523e0 100644
@@ -340,6 +340,7 @@ dtb-$(CONFIG_SOC_IMX51) += \
 	imx51-ts4800.dtb
 dtb-$(CONFIG_SOC_IMX53) += \
 	imx53-ard.dtb \
+	imx53-cx9020.dtb \
 	imx53-m53evk.dtb \
 	imx53-mba53.dtb \
 	imx53-qsb.dtb \
arch/arm/boot/dts/imx53-cx9020.dts new file +297 -0

297 lines not on this page · raw message

Signature · 1 line
2.11.0
#6 lore raw
In reply to [email protected]
Quoted 5 lines · linux-kernel-dev at beckhoff.com

Patrick Bruenn (4):
dt-bindings: arm: Add entry for Beckhoff CX9020
ARM: dts: imx53: add srtc node
ARM: dts: imx53: add alternative UART2 configuration
ARM: dts: imx: add CX9020 Embedded PC device tree

I'm ready to pick up the series except I need Rob's ACK on the dt-bindings patch.

Shawn

#7 lore raw
In reply to [email protected]
Quoted 5 lines · linux-kernel-dev at beckhoff.com

Patrick Bruenn (4):
dt-bindings: arm: Add entry for Beckhoff CX9020
ARM: dts: imx53: add srtc node
ARM: dts: imx53: add alternative UART2 configuration
ARM: dts: imx: add CX9020 Embedded PC device tree

Applied all.

Quoted 1 line

...

Quoted 1 line
 MAINTAINERS                                        |   5 +

This MAINTAINERS file doesn't apply to my tree, so I dropped it.

Shawn