diff options
20 files changed, 401 insertions, 202 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b7d0dcb36336..aba8f03c798e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -383,13 +383,19 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-12x12-lpddr3-arm2-mqs.dtb \ imx7d-19x19-lpddr2-arm2.dtb \ imx7d-sdb.dtb \ - imx7d-sdb-wm8960.dtb \ - imx7d-sdb-hdmi-audio.dtb \ imx7d-sdb-epdc.dtb \ imx7d-sdb-gpmi-weim.dtb \ + imx7d-sdb-m4.dtb \ imx7d-sdb-qspi.dtb \ - imx7d-sdb-touch.dtb \ - imx7d-sdb-m4.dtb + imx7d-sdb-reva.dtb \ + imx7d-sdb-reva-epdc.dtb \ + imx7d-sdb-reva-gpmi-weim.dtb \ + imx7d-sdb-reva-hdmi-audio.dtb \ + imx7d-sdb-reva-m4.dtb \ + imx7d-sdb-reva-qspi.dtb \ + imx7d-sdb-reva-touch.dtb \ + imx7d-sdb-reva-wm8960.dtb \ + imx7d-sdb-touch.dtb dtb-$(CONFIG_SOC_LS1021A) += \ ls1021a-qds.dtb \ ls1021a-twr.dtb diff --git a/arch/arm/boot/dts/imx7d-sdb-epdc.dts b/arch/arm/boot/dts/imx7d-sdb-epdc.dts index 9eb5d8381252..e263ad446373 100644 --- a/arch/arm/boot/dts/imx7d-sdb-epdc.dts +++ b/arch/arm/boot/dts/imx7d-sdb-epdc.dts @@ -5,34 +5,5 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - #include "imx7d-sdb.dts" - -&epdc { - status = "okay"; -}; - -&fec1 { - status = "disabled"; -}; - -&fec2 { - status = "disabled"; -}; - -&flexcan2 { - status = "disabled"; -}; - -&max17135 { - status = "okay"; -}; - -&sii902x { - status = "disabled"; -}; - -&sim1 { - status = "disabled"; -}; - +#include "imx7d-sdb-epdc.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-epdc.dtsi b/arch/arm/boot/dts/imx7d-sdb-epdc.dtsi new file mode 100644 index 000000000000..cbc7ca1af076 --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-epdc.dtsi @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +&epdc { + status = "okay"; +}; + +&fec1 { + status = "disabled"; +}; + +&fec2 { + status = "disabled"; +}; + +&flexcan2 { + status = "disabled"; +}; + +&max17135 { + status = "okay"; +}; + +&sii902x { + status = "disabled"; +}; + +&sim1 { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dts b/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dts index 2014f0a976ba..346e38cca609 100644 --- a/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dts +++ b/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dts @@ -5,21 +5,5 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - #include "imx7d-sdb.dts" - -&gpmi{ - status = "okay"; -}; - -&sai1{ - status = "disabled"; -}; - -&usdhc3{ - status = "disabled"; -}; - -&uart5{ - status = "disabled"; -}; +#include "imx7d-sdb-gpmi-weim.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dtsi b/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dtsi new file mode 100644 index 000000000000..3a1208f44242 --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dtsi @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +&gpmi{ + status = "okay"; +}; + +&sai1{ + status = "disabled"; +}; + +&usdhc3{ + status = "disabled"; +}; + +&uart5{ + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx7d-sdb-m4.dts b/arch/arm/boot/dts/imx7d-sdb-m4.dts index 85fb1b981aaa..7aa803559ef5 100644 --- a/arch/arm/boot/dts/imx7d-sdb-m4.dts +++ b/arch/arm/boot/dts/imx7d-sdb-m4.dts @@ -5,56 +5,5 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - #include "imx7d-sdb.dts" - -/ { - memory { - linux,usable-memory = <0x80000000 0x1ff00000>, - <0xa0000000 0x1ff00000>; - }; -}; - -&adc1 { - status = "disabled"; -}; - -&adc2 { - status = "disabled"; -}; - -&flexcan1 { - status = "disabled"; -}; - -&flexcan2 { - status = "disabled"; -}; - -&i2c2 { - status = "disabled"; -}; - -&gpt3 { - status = "disabled"; -}; - -&gpt4 { - status = "disabled"; -}; - -&ocram { - reg = <0x00901000 0xf000>; -}; - -&rpmsg{ - status = "okay"; -}; - -&uart2 { - status = "disabled"; -}; - -&wdog3{ - status = "disabled"; -}; +#include "imx7d-sdb-m4.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-m4.dtsi b/arch/arm/boot/dts/imx7d-sdb-m4.dtsi new file mode 100644 index 000000000000..1f71eeb27bdf --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-m4.dtsi @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/ { + memory { + linux,usable-memory = <0x80000000 0x1ff00000>, + <0xa0000000 0x1ff00000>; + }; +}; + +&adc1 { + status = "disabled"; +}; + +&adc2 { + status = "disabled"; +}; + +&flexcan1 { + status = "disabled"; +}; + +&flexcan2 { + status = "disabled"; +}; + +&i2c2 { + status = "disabled"; +}; + +&gpt3 { + status = "disabled"; +}; + +&gpt4 { + status = "disabled"; +}; + +&ocram { + reg = <0x00901000 0xf000>; +}; + +&rpmsg{ + status = "okay"; +}; + +&uart2 { + status = "disabled"; +}; + +&wdog3{ + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx7d-sdb-qspi.dts b/arch/arm/boot/dts/imx7d-sdb-qspi.dts index d49ddf2e9af4..a46990554d28 100644 --- a/arch/arm/boot/dts/imx7d-sdb-qspi.dts +++ b/arch/arm/boot/dts/imx7d-sdb-qspi.dts @@ -5,42 +5,5 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - #include "imx7d-sdb.dts" - -/* disable epdc, conflict with qspi */ -&epdc { - status = "disabled"; -}; - -&iomuxc { - qspi1 { - pinctrl_qspi1_1: qspi1grp_1 { - fsl,pins = < - MX7D_PAD_EPDC_DATA00__QSPI_A_DATA0 0x51 - MX7D_PAD_EPDC_DATA01__QSPI_A_DATA1 0x51 - MX7D_PAD_EPDC_DATA02__QSPI_A_DATA2 0x51 - MX7D_PAD_EPDC_DATA03__QSPI_A_DATA3 0x51 - MX7D_PAD_EPDC_DATA05__QSPI_A_SCLK 0x51 - MX7D_PAD_EPDC_DATA06__QSPI_A_SS0_B 0x51 - >; - }; - }; -}; - -&qspi1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_qspi1_1>; - status = "okay"; - ddrsmp=<0>; - - flash0: mx25l51245g@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "macronix,mx25l51245g"; - spi-max-frequency = <29000000>; - /* take off one dummy cycle */ - spi-nor,ddr-quad-read-dummy = <5>; - reg = <0>; - }; -}; +#include "imx7d-sdb-qspi.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-qspi.dtsi b/arch/arm/boot/dts/imx7d-sdb-qspi.dtsi new file mode 100644 index 000000000000..1ba3e66c974a --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-qspi.dtsi @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* disable epdc, conflict with qspi */ +&epdc { + status = "disabled"; +}; + +&iomuxc { + qspi1 { + pinctrl_qspi1_1: qspi1grp_1 { + fsl,pins = < + MX7D_PAD_EPDC_DATA00__QSPI_A_DATA0 0x51 + MX7D_PAD_EPDC_DATA01__QSPI_A_DATA1 0x51 + MX7D_PAD_EPDC_DATA02__QSPI_A_DATA2 0x51 + MX7D_PAD_EPDC_DATA03__QSPI_A_DATA3 0x51 + MX7D_PAD_EPDC_DATA05__QSPI_A_SCLK 0x51 + MX7D_PAD_EPDC_DATA06__QSPI_A_SS0_B 0x51 + >; + }; + }; +}; + +&qspi1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_qspi1_1>; + status = "okay"; + ddrsmp=<0>; + + flash0: mx25l51245g@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "macronix,mx25l51245g"; + spi-max-frequency = <29000000>; + /* take off one dummy cycle */ + spi-nor,ddr-quad-read-dummy = <5>; + reg = <0>; + }; +}; diff --git a/arch/arm/boot/dts/imx7d-sdb-reva-epdc.dts b/arch/arm/boot/dts/imx7d-sdb-reva-epdc.dts new file mode 100644 index 000000000000..341a8ad0b696 --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-reva-epdc.dts @@ -0,0 +1,9 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include "imx7d-sdb-reva.dts" +#include "imx7d-sdb-epdc.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-reva-gpmi-weim.dts b/arch/arm/boot/dts/imx7d-sdb-reva-gpmi-weim.dts new file mode 100644 index 000000000000..4d221f8d7dd7 --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-reva-gpmi-weim.dts @@ -0,0 +1,9 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include "imx7d-sdb-reva.dts" +#include "imx7d-sdb-gpmi-weim.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-hdmi-audio.dts b/arch/arm/boot/dts/imx7d-sdb-reva-hdmi-audio.dts index 221fdd0750d1..221fdd0750d1 100644 --- a/arch/arm/boot/dts/imx7d-sdb-hdmi-audio.dts +++ b/arch/arm/boot/dts/imx7d-sdb-reva-hdmi-audio.dts diff --git a/arch/arm/boot/dts/imx7d-sdb-reva-m4.dts b/arch/arm/boot/dts/imx7d-sdb-reva-m4.dts new file mode 100644 index 000000000000..78148f0d0a04 --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-reva-m4.dts @@ -0,0 +1,9 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include "imx7d-sdb-reva.dts" +#include "imx7d-sdb-m4.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-reva-qspi.dts b/arch/arm/boot/dts/imx7d-sdb-reva-qspi.dts new file mode 100644 index 000000000000..7b523cac9575 --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-reva-qspi.dts @@ -0,0 +1,9 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include "imx7d-sdb-reva.dts" +#include "imx7d-sdb-qspi.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-reva-touch.dts b/arch/arm/boot/dts/imx7d-sdb-reva-touch.dts new file mode 100644 index 000000000000..7c338d536cf5 --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-reva-touch.dts @@ -0,0 +1,9 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include "imx7d-sdb-reva.dts" +#include "imx7d-sdb-touch.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-wm8960.dts b/arch/arm/boot/dts/imx7d-sdb-reva-wm8960.dts index d9f38298f154..d9f38298f154 100644 --- a/arch/arm/boot/dts/imx7d-sdb-wm8960.dts +++ b/arch/arm/boot/dts/imx7d-sdb-reva-wm8960.dts diff --git a/arch/arm/boot/dts/imx7d-sdb-reva.dts b/arch/arm/boot/dts/imx7d-sdb-reva.dts new file mode 100644 index 000000000000..772eb8a2db92 --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-reva.dts @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "imx7d-sdb.dts" + +/ { + regulators { + reg_usb_otg2_vbus: regulator@1 { + gpio = <&gpio4 7 GPIO_ACTIVE_HIGH>; + }; + + reg_pcie: regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "MPCIE_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio_spi 6 GPIO_ACTIVE_HIGH>; + regulator-always-on; + enable-active-high; + }; + }; + + sound-hdmi { + cpu-dai = <&sai1>; + }; +}; + +&epdc { + pinctrl-0 = <&pinctrl_epdc0>; + en-gpios = <&gpio_spi 5 GPIO_ACTIVE_LOW>; +}; + +&fec2 { + pinctrl-0 = <&pinctrl_enet2>; + pinctrl-assert-gpios = <>; +}; + +&i2c4 { + ov5647_mipi: ov5647_mipi@36 { + pwn-gpios = <&gpio_spi 7 GPIO_ACTIVE_HIGH>; + }; +}; + +&iomuxc { + imx7d-sdb { + pinctrl_tsc2046_pendown: tsc2046_pendown { + fsl,pins = < + MX7D_PAD_EPDC_DATA13__GPIO2_IO13 0x59 + >; + }; + + pinctrl_uart5: uart5grp { + fsl,pins = < + MX7D_PAD_SAI1_TX_BCLK__UART5_DCE_TX 0x79 + MX7D_PAD_SAI1_RX_DATA__UART5_DCE_RX 0x79 + MX7D_PAD_SAI1_TX_SYNC__UART5_DCE_CTS 0x79 + MX7D_PAD_SAI1_TX_DATA__UART5_DCE_RTS 0x79 + >; + }; + + pinctrl_uart5dte: uart5dtegrp { + fsl,pins = < + MX7D_PAD_SAI1_TX_BCLK__UART5_DTE_RX 0x79 + MX7D_PAD_SAI1_RX_DATA__UART5_DTE_TX 0x79 + MX7D_PAD_SAI1_TX_SYNC__UART5_DTE_RTS 0x79 + MX7D_PAD_SAI1_TX_DATA__UART5_DTE_CTS 0x79 + >; + }; + }; +}; + +&iomuxc { + pinctrl-0 = <&pinctrl_hog_1 &pinctrl_usbotg2_pwr_1>; +}; + +&iomuxc_lpsr { + pinctrl-0 = <&pinctrl_hog_2>; +}; + +&uart5 { + fsl,uart-has-rtscts; +}; diff --git a/arch/arm/boot/dts/imx7d-sdb-touch.dts b/arch/arm/boot/dts/imx7d-sdb-touch.dts index 3f854e307ffc..22b3f1ae26b6 100644 --- a/arch/arm/boot/dts/imx7d-sdb-touch.dts +++ b/arch/arm/boot/dts/imx7d-sdb-touch.dts @@ -1,32 +1,9 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ #include "imx7d-sdb.dts" - -&sii902x { - status = "disabled"; -}; - -&ecspi3 { - fsl,spi-num-chipselects = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs>; - cs-gpios = <&gpio5 9 0>; - status = "okay"; - - tsc2046 { - compatible = "ti,tsc2046"; - reg = <0>; - spi-max-frequency = <1000000>; - pinctrl-names ="default"; - pinctrl-0 = <&pinctrl_tsc2046_pendown>; - interrupt-parent = <&gpio2>; - interrupts = <13 0>; - pendown-gpio = <&gpio2 13 0>; - ti,x-min = /bits/ 16 <0>; - ti,x-max = /bits/ 16 <0>; - ti,y-min = /bits/ 16 <0>; - ti,y-max = /bits/ 16 <0>; - ti,pressure-max = /bits/ 16 <0>; - ti,x-plat-ohms = /bits/ 16 <400>; - linux,wakeup; - }; -}; - +#include "imx7d-sdb-touch.dtsi" diff --git a/arch/arm/boot/dts/imx7d-sdb-touch.dtsi b/arch/arm/boot/dts/imx7d-sdb-touch.dtsi new file mode 100644 index 000000000000..296dee12119d --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-touch.dtsi @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +&ecspi3 { + fsl,spi-num-chipselects = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs>; + cs-gpios = <&gpio5 9 0>; + status = "okay"; + + tsc2046 { + compatible = "ti,tsc2046"; + reg = <0>; + spi-max-frequency = <1000000>; + pinctrl-names ="default"; + pinctrl-0 = <&pinctrl_tsc2046_pendown>; + interrupt-parent = <&gpio2>; + interrupts = <13 0>; + pendown-gpio = <&gpio2 13 0>; + ti,x-min = /bits/ 16 <0>; + ti,x-max = /bits/ 16 <0>; + ti,y-min = /bits/ 16 <0>; + ti,y-max = /bits/ 16 <0>; + ti,pressure-max = /bits/ 16 <0>; + ti,x-plat-ohms = /bits/ 16 <400>; + linux,wakeup; + }; +}; + +&sii902x { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index b30c8f09e2bb..5a9bea0c4f47 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -59,7 +59,7 @@ compatible = "fsl,imx7d-sdb-sii902x", "fsl,imx-audio-sii902x"; model = "sii902x-audio"; - cpu-dai = <&sai1>; + cpu-dai = <&sai3>; hdmi-controler = <&sii902x>; }; @@ -107,18 +107,7 @@ regulator-name = "usb_otg2_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio4 7 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - reg_pcie: regulator@2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "MPCIE_3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio_spi 6 GPIO_ACTIVE_HIGH>; - regulator-always-on; + gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>; enable-active-high; }; @@ -174,11 +163,11 @@ &epdc { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_epdc0>; + pinctrl-0 = <&pinctrl_epdc0 &pinctrl_enet2_epdc0_en>; V3P3-supply = <&V3P3_reg>; VCOM-supply = <&VCOM_reg>; DISPLAY-supply = <&DISPLAY_reg>; - en-gpios = <&gpio_spi 5 0>; + en-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; status = "disabled"; }; @@ -217,7 +206,8 @@ &fec2 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_enet2>; + pinctrl-0 = <&pinctrl_enet2 &pinctrl_enet2_epdc0_en>; + pinctrl-assert-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; assigned-clocks = <&clks IMX7D_ENET2_TIME_ROOT_SRC>, <&clks IMX7D_ENET2_TIME_ROOT_CLK>; assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>; @@ -481,7 +471,7 @@ clocks = <&clks IMX7D_CLK_DUMMY>; clock-names = "csi_mclk"; csi_id = <0>; - pwn-gpios = <&gpio_spi 7 GPIO_ACTIVE_HIGH>; + pwn-gpios = <&gpio_spi 6 GPIO_ACTIVE_HIGH>; mclk = <24000000>; mclk_source = <0>; port { @@ -506,8 +496,7 @@ imx7d-sdb { pinctrl_hog_1: hoggrp-1 { fsl,pins = < - MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 - MX7D_PAD_ECSPI2_SS0__GPIO4_IO23 0x80000000 /* bt reg on */ + MX7D_PAD_ECSPI2_SS0__GPIO4_IO23 0x80000000 /* bt reg on */ >; }; @@ -561,6 +550,12 @@ >; }; + pinctrl_enet2_epdc0_en: enet2_epdc0_grp { + fsl,pins = < + MX7D_PAD_GPIO1_IO04__GPIO1_IO4 0x59 + >; + }; + pinctrl_epdc0: epdcgrp0 { fsl,pins = < MX7D_PAD_EPDC_DATA00__EPDC_DATA0 0x2 @@ -589,8 +584,6 @@ MX7D_PAD_EPDC_GDOE__EPDC_GDOE 0x2 MX7D_PAD_EPDC_GDRL__EPDC_GDRL 0x2 MX7D_PAD_EPDC_GDSP__EPDC_GDSP 0x2 - MX7D_PAD_EPDC_BDR0__EPDC_BDR0 0x2 - MX7D_PAD_EPDC_BDR1__EPDC_BDR1 0x2 >; }; @@ -719,6 +712,15 @@ >; }; + pinctrl_sai3: sai3grp { + fsl,pins = < + MX7D_PAD_GPIO1_IO03__SAI3_MCLK 0x1f + MX7D_PAD_UART3_TX_DATA__SAI3_TX_BCLK 0x1f + MX7D_PAD_UART3_CTS_B__SAI3_TX_SYNC 0x1f + MX7D_PAD_UART3_RTS_B__SAI3_TX_DATA0 0x30 + >; + }; + pinctrl_spi1: spi1grp { fsl,pins = < MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x59 @@ -745,7 +747,7 @@ pinctrl_tsc2046_pendown: tsc2046_pendown { fsl,pins = < - MX7D_PAD_EPDC_DATA13__GPIO2_IO13 0x59 + MX7D_PAD_EPDC_BDR1__GPIO2_IO29 0x59 >; }; @@ -758,10 +760,8 @@ pinctrl_uart5: uart5grp { fsl,pins = < - MX7D_PAD_SAI1_TX_BCLK__UART5_DCE_TX 0x79 - MX7D_PAD_SAI1_RX_DATA__UART5_DCE_RX 0x79 - MX7D_PAD_SAI1_TX_SYNC__UART5_DCE_CTS 0x79 - MX7D_PAD_SAI1_TX_DATA__UART5_DCE_RTS 0x79 + MX7D_PAD_SAI1_TX_BCLK__UART5_DCE_TX 0x79 + MX7D_PAD_SAI1_RX_DATA__UART5_DCE_RX 0x79 >; }; @@ -769,8 +769,6 @@ fsl,pins = < MX7D_PAD_SAI1_TX_BCLK__UART5_DTE_RX 0x79 MX7D_PAD_SAI1_RX_DATA__UART5_DTE_TX 0x79 - MX7D_PAD_SAI1_TX_SYNC__UART5_DTE_RTS 0x79 - MX7D_PAD_SAI1_TX_DATA__UART5_DTE_CTS 0x79 >; }; @@ -792,6 +790,12 @@ >; }; + pinctrl_usbotg2_pwr_1: usbotg2-1 { + fsl,pins = < + MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 + >; + }; + pinctrl_usdhc1: usdhc1grp { fsl,pins = < MX7D_PAD_SD1_CMD__SD1_CMD 0x59 @@ -960,6 +964,16 @@ status = "okay"; }; +&sai3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai3>; + assigned-clocks = <&clks IMX7D_SAI3_ROOT_SRC>, + <&clks IMX7D_SAI3_ROOT_CLK>; + assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; + assigned-clock-rates = <0>, <36864000>; + status = "disabled"; +}; + &sdma { status = "okay"; }; @@ -972,7 +986,7 @@ &iomuxc_lpsr { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_hog_2>; + pinctrl-0 = <&pinctrl_hog_2 &pinctrl_usbotg2_pwr_2>; imx7d-sdb { pinctrl_hog_2: hoggrp-2 { @@ -987,6 +1001,12 @@ >; }; + pinctrl_usbotg2_pwr_2: usbotg2-2 { + fsl,pins = < + MX7D_PAD_GPIO1_IO07__GPIO1_IO7 0x14 + >; + }; + pinctrl_wdog: wdoggrp { fsl,pins = < MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74 @@ -1018,7 +1038,6 @@ pinctrl-0 = <&pinctrl_uart5>; assigned-clocks = <&clks IMX7D_UART5_ROOT_SRC>; assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; - fsl,uart-has-rtscts; /* for DTE mode, add below change */ /* fsl,dte-mode; */ /* pinctrl-0 = <&pinctrl_uart5dte>; */ |