diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-12-10 16:10:22 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-12-10 17:25:07 +0100 |
| commit | 23b22e549ed6ede5b44a948824463daafb6745c3 (patch) | |
| tree | 0d2fc15132713b6703a122536171264472b6a5d8 /arch/arm/boot/dts/imx6qdl-apalis.dtsi | |
| parent | 85f226ee20ede27e72bae20f1dc2ba12e016268b (diff) | |
apalis-imx6: device-tree: add HW 1.0 treeColibri_iMX6_LinuxImageV2.3Beta5_20141219Apalis_iMX6_LinuxImageV2.3Beta6_20150112Apalis_iMX6_LinuxImageV2.3Beta5_20141219
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.
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-apalis.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 9 |
1 files changed, 4 insertions, 5 deletions
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 |