diff options
author | Leonard Crestez <leonard.crestez@nxp.com> | 2018-03-05 16:24:23 +0200 |
---|---|---|
committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:24:03 +0800 |
commit | 82ff7d045fd3cf180f4717381cccc070131e8065 (patch) | |
tree | ebd2ff1a7578ca7ab6c5a8e0293736bea8c1744e /arch/arm/boot/dts/imx7d-sdb-qspi.dts | |
parent | d0b5ca98730eb2bd96800de5107c1e54cca56dd9 (diff) |
MLK-12035 dts: imx7d-sdb-revb: add i.MX7d sdb revb support
Base on i.MX7d sdb revb board change list, below modules has changed:
- enet2 and epdc enable pin
- usb_otg2 pwr enable pin
- ov5647_mipi pwr pin
- tsc2046 touch pendown pin
- uart5 tx/rx pins
- sensor INT pin
- pcie power is controlled by por_b, not gpio_spi pin6
- hdmi audio change to SAI3 from SAI1
The patch add the changes for revb, and keep the original functions for
reva board. Remove redundancy sim and enet dts files to avoid excessive
dts file for reva and revb.
After the patch, there have below diff:
- default dts file: imx7d-sdb.dts for revb board, imx7d-sdb-reva.dts for reva board
- remove enet, sim extended dts files, so these modules are enabled in default dts
file for reva and revb board.
The change of expanded dts due to pin confliction:
- Keep the original expanded name of dts file for revb board, add suffix "-reva" in dts
file name for reva board.
- Like:
hdmi/codec audio:
hdmi audio and wm8960 codec are enabled in default dts file for revb board,
no extended dts files to separate them.
Keep original extended dts files for reva board:
imx7d-sdb-reva-hdmi-audio.dts
imx7d-sdb-reva-wm8960.dts
epdc:
imx7d-sdb-epdc.dts is for revb board, imx7d-sdb-reva-epdc.dts is for reva board.
gpmi-weim:
imx7d-sdb-gpmi-weim.dtsi for revb, imx7d-sdb-reva-gpmi-weim.dtsi for reva.
m4:
imx7d-sdb-m4.dts for revb, imx7d-sdb-reva-m4.dts for reva.
qspi:
imx7d-sdb-qspi.dts for revb, imx7d-sdb-reva-qspi.dts for reva.
touchscreen:
imx7d-sdb-touch.dts for revb, imx7d-sdb-reva-touch.dts for reva.
Cherry picked from commit: 2be1a236696d, and disable sai3 since there have many
Transmit underrun on kernel 4.1.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Acked-by: Robby Cai <robby.cai@nxp.com>
Acked-by: Gao Pan <pandy.gao@nxp.com>
Acked-by: Peter Chen <peter.chen@freescale.com>
Acked-by: Chen Bough <Haibo.Chen@freescale.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-sdb-qspi.dts')
-rw-r--r-- | arch/arm/boot/dts/imx7d-sdb-qspi.dts | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb-qspi.dts b/arch/arm/boot/dts/imx7d-sdb-qspi.dts index 83b040170f2f..a46990554d28 100644 --- a/arch/arm/boot/dts/imx7d-sdb-qspi.dts +++ b/arch/arm/boot/dts/imx7d-sdb-qspi.dts @@ -5,40 +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>; - reg = <0>; - }; -}; +#include "imx7d-sdb-qspi.dtsi" |