From 23b22e549ed6ede5b44a948824463daafb6745c3 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 10 Dec 2014 16:10:22 +0100 Subject: apalis-imx6: device-tree: add HW 1.0 tree rework the device-tree include structure to faciliate several device-tree's depending on HW version. Add a device tree imx6q-apalis-eval_v1_0.dtb for V1.0 HW, imx6q-apalis-eval.dtb working with V1.1 and newer HW. --- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'arch/arm/boot/dts/imx6qdl-apalis.dtsi') diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index ade6d88a86a7..384bc7553b6a 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -773,10 +773,9 @@ status = "okay"; }; -#define USE_UART_IN_DTE_MODE /* on HW V1.1 */ &uart1 { pinctrl-names = "default"; -#ifdef USE_UART_IN_DTE_MODE +#ifndef USE_UART_IN_DCE_MODE pinctrl-0 = <&pinctrl_uart1_t1 &pinctrl_uart1_t2>; fsl,dte-mode; fsl,uart-has-rtscts; @@ -788,7 +787,7 @@ &uart2 { pinctrl-names = "default"; -#ifdef USE_UART_IN_DTE_MODE +#ifndef USE_UART_IN_DCE_MODE pinctrl-0 = <&pinctrl_uart2_t2>; fsl,dte-mode; fsl,uart-has-rtscts; @@ -800,7 +799,7 @@ &uart4 { pinctrl-names = "default"; -#ifdef USE_UART_IN_DTE_MODE +#ifndef USE_UART_IN_DCE_MODE pinctrl-0 = <&pinctrl_uart4_t1>; fsl,dte-mode; #else @@ -811,7 +810,7 @@ &uart5 { pinctrl-names = "default"; -#ifdef USE_UART_IN_DTE_MODE +#ifndef USE_UART_IN_DCE_MODE pinctrl-0 = <&pinctrl_uart5_t2>; fsl,dte-mode; #else -- cgit v1.2.3