mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-28 13:34:38 +08:00
ed2ca6ee4b
* A bunch of new board additions, imx6sl-evk, vf610-twr, imx53-tx53, imx53-m53evk and imx27-phytec-phycore * Various pinctrl setting updates and additions * Enable various on board peripherals, usb, audio, nor, display etc. * Configure L2 cache data and tag latency from device tree * Add imx-weim bus driver -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJRvsoqAAoJEFBXWFqHsHzOWCsIAIhbVAz9Q/HvRrrT2/viiu5G S6/O16PbTqCmRPOgjnABGNOzRxo94/abhYT7gbGDz/zqAK2wEzEtUMwX8SXJbvl2 ynt4oX/QTgeQsZZXW+dCdet6XiBSJwfbFFo0c01pCBvPb7os739pO3u3CUvNeqKx vsEfiq190PSPVL0FdfyLpQB+64ApUB1L/Ez9BaWmJjQYN2LWM0lxyvbC0SPo1vrw eb8NJ7qz/qq3zXCKgD8LEvkfal4ZsezPYzap1sqKl1+T2aN4CsgzYaRra/wDv7BC 0ssW3+11StrwrbdwOEQRwiSU15fc9ckVldoFGlB+9HKTZxh80u0HmZRvFWbWo0E= =jngF -----END PGP SIGNATURE----- Merge tag 'imx-dt-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt From Shawn Guo: imx device tree changes for 3.11: * A bunch of new board additions, imx6sl-evk, vf610-twr, imx53-tx53, imx53-m53evk and imx27-phytec-phycore * Various pinctrl setting updates and additions * Enable various on board peripherals, usb, audio, nor, display etc. * Configure L2 cache data and tag latency from device tree * Add imx-weim bus driver * tag 'imx-dt-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6: (82 commits) ARM: dts: imx27: Add VPU devicetree node ARM: mxc: fix gpio-ranges for VF610 ARM: dtsi: imx6qdl-sabresd: Enable WM8962 audio support ARM: dtsi: imx6qdl-sabresd: Enable SSI2 and AUDMUX ARM: dtsi: imx6qdl-sabresd: Add WM8962 CODEC support ARM: dtsi: imx6qdl-sabresd: add a fixed regulator for WM8962 ARM: dtsi: imx6dl: Add a pinctrl for AUDMUX ARM: dtsi: imx6q/imx6dl: Add a pinctrl for I2C1 ARM: dts: imx6qdl-sabresd: add clko1 iomux configuration ARM: dts: Phytec imx6q pfla02 and pbab01 support ARM: dts: imx6q: Add pinctrl for usdhc2 and enet ARM: dts: imx27-phytec-phycore-rdk: Add MTD name for NOR flash ARM: dts: imx27-phytec-phycore-rdk: Add SDHC support ARM: dts: i.MX27: Add SDHC devicetree nodes ARM: dts: i.MX27: Add DMA devicetree node ARM: dts: imx6qdl-sabreauto: enable the WEIM NOR ARM: dts: imx6dl: add pinctrls for WEIM NOR ARM: dts: imx6q: add pinctrls for WEIM NOR ARM: dts: imx6qdl: add more information for WEIM ARM: dts: imx6q{dl}: fix the pin conflict between SPI and WEIM ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
297 lines
8.6 KiB
Plaintext
297 lines
8.6 KiB
Plaintext
|
|
/*
|
|
* Copyright 2013 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 "imx6qdl.dtsi"
|
|
#include "imx6dl-pinfunc.h"
|
|
|
|
/ {
|
|
cpus {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
cpu@0 {
|
|
compatible = "arm,cortex-a9";
|
|
device_type = "cpu";
|
|
reg = <0>;
|
|
next-level-cache = <&L2>;
|
|
};
|
|
|
|
cpu@1 {
|
|
compatible = "arm,cortex-a9";
|
|
device_type = "cpu";
|
|
reg = <1>;
|
|
next-level-cache = <&L2>;
|
|
};
|
|
};
|
|
|
|
soc {
|
|
aips1: aips-bus@02000000 {
|
|
iomuxc: iomuxc@020e0000 {
|
|
compatible = "fsl,imx6dl-iomuxc";
|
|
reg = <0x020e0000 0x4000>;
|
|
|
|
audmux {
|
|
pinctrl_audmux_2: audmux-2 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_CSI0_DAT7__AUD3_RXD 0x80000000
|
|
MX6DL_PAD_CSI0_DAT4__AUD3_TXC 0x80000000
|
|
MX6DL_PAD_CSI0_DAT5__AUD3_TXD 0x80000000
|
|
MX6DL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
|
|
>;
|
|
};
|
|
};
|
|
|
|
ecspi1 {
|
|
pinctrl_ecspi1_1: ecspi1grp-1 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
|
|
MX6DL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
|
|
MX6DL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
|
|
>;
|
|
};
|
|
};
|
|
|
|
enet {
|
|
pinctrl_enet_1: enetgrp-1 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
|
|
MX6DL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
|
|
MX6DL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
|
|
MX6DL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
|
|
MX6DL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
|
|
MX6DL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
|
|
MX6DL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
|
|
MX6DL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
|
|
MX6DL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
|
|
MX6DL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
|
|
MX6DL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
|
|
MX6DL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
|
|
MX6DL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
|
|
MX6DL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
|
|
MX6DL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
|
|
MX6DL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
|
|
>;
|
|
};
|
|
|
|
pinctrl_enet_2: enetgrp-2 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_KEY_COL1__ENET_MDIO 0x1b0b0
|
|
MX6DL_PAD_KEY_COL2__ENET_MDC 0x1b0b0
|
|
MX6DL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
|
|
MX6DL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
|
|
MX6DL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
|
|
MX6DL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
|
|
MX6DL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
|
|
MX6DL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
|
|
MX6DL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
|
|
MX6DL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
|
|
MX6DL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
|
|
MX6DL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
|
|
MX6DL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
|
|
MX6DL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
|
|
MX6DL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
|
|
>;
|
|
};
|
|
};
|
|
|
|
gpmi-nand {
|
|
pinctrl_gpmi_nand_1: gpmi-nand-1 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
|
|
MX6DL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
|
|
MX6DL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
|
|
MX6DL_PAD_NANDF_RB0__NAND_READY_B 0xb000
|
|
MX6DL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
|
|
MX6DL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
|
|
MX6DL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
|
|
MX6DL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
|
|
MX6DL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
|
|
MX6DL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
|
|
MX6DL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
|
|
MX6DL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
|
|
MX6DL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
|
|
MX6DL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
|
|
MX6DL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
|
|
MX6DL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
|
|
MX6DL_PAD_SD4_DAT0__NAND_DQS 0x00b1
|
|
>;
|
|
};
|
|
};
|
|
|
|
i2c1 {
|
|
pinctrl_i2c1_2: i2c1grp-2 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
|
|
MX6DL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
|
|
>;
|
|
};
|
|
};
|
|
|
|
uart1 {
|
|
pinctrl_uart1_1: uart1grp-1 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
|
|
MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
|
|
>;
|
|
};
|
|
};
|
|
|
|
uart4 {
|
|
pinctrl_uart4_1: uart4grp-1 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
|
|
MX6DL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
|
|
>;
|
|
};
|
|
};
|
|
|
|
usbotg {
|
|
pinctrl_usbotg_2: usbotggrp-2 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
|
|
>;
|
|
};
|
|
};
|
|
|
|
usdhc2 {
|
|
pinctrl_usdhc2_1: usdhc2grp-1 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_SD2_CMD__SD2_CMD 0x17059
|
|
MX6DL_PAD_SD2_CLK__SD2_CLK 0x10059
|
|
MX6DL_PAD_SD2_DAT0__SD2_DATA0 0x17059
|
|
MX6DL_PAD_SD2_DAT1__SD2_DATA1 0x17059
|
|
MX6DL_PAD_SD2_DAT2__SD2_DATA2 0x17059
|
|
MX6DL_PAD_SD2_DAT3__SD2_DATA3 0x17059
|
|
MX6DL_PAD_NANDF_D4__SD2_DATA4 0x17059
|
|
MX6DL_PAD_NANDF_D5__SD2_DATA5 0x17059
|
|
MX6DL_PAD_NANDF_D6__SD2_DATA6 0x17059
|
|
MX6DL_PAD_NANDF_D7__SD2_DATA7 0x17059
|
|
>;
|
|
};
|
|
};
|
|
|
|
usdhc3 {
|
|
pinctrl_usdhc3_1: usdhc3grp-1 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_SD3_CMD__SD3_CMD 0x17059
|
|
MX6DL_PAD_SD3_CLK__SD3_CLK 0x10059
|
|
MX6DL_PAD_SD3_DAT0__SD3_DATA0 0x17059
|
|
MX6DL_PAD_SD3_DAT1__SD3_DATA1 0x17059
|
|
MX6DL_PAD_SD3_DAT2__SD3_DATA2 0x17059
|
|
MX6DL_PAD_SD3_DAT3__SD3_DATA3 0x17059
|
|
MX6DL_PAD_SD3_DAT4__SD3_DATA4 0x17059
|
|
MX6DL_PAD_SD3_DAT5__SD3_DATA5 0x17059
|
|
MX6DL_PAD_SD3_DAT6__SD3_DATA6 0x17059
|
|
MX6DL_PAD_SD3_DAT7__SD3_DATA7 0x17059
|
|
>;
|
|
};
|
|
|
|
pinctrl_usdhc3_2: usdhc3grp_2 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_SD3_CMD__SD3_CMD 0x17059
|
|
MX6DL_PAD_SD3_CLK__SD3_CLK 0x10059
|
|
MX6DL_PAD_SD3_DAT0__SD3_DATA0 0x17059
|
|
MX6DL_PAD_SD3_DAT1__SD3_DATA1 0x17059
|
|
MX6DL_PAD_SD3_DAT2__SD3_DATA2 0x17059
|
|
MX6DL_PAD_SD3_DAT3__SD3_DATA3 0x17059
|
|
>;
|
|
};
|
|
};
|
|
|
|
weim {
|
|
pinctrl_weim_cs0_1: weim_cs0grp-1 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_EIM_CS0__EIM_CS0_B 0xb0b1
|
|
>;
|
|
};
|
|
|
|
pinctrl_weim_nor_1: weim_norgrp-1 {
|
|
fsl,pins = <
|
|
MX6DL_PAD_EIM_OE__EIM_OE_B 0xb0b1
|
|
MX6DL_PAD_EIM_RW__EIM_RW 0xb0b1
|
|
MX6DL_PAD_EIM_WAIT__EIM_WAIT_B 0xb060
|
|
/* data */
|
|
MX6DL_PAD_EIM_D16__EIM_DATA16 0x1b0b0
|
|
MX6DL_PAD_EIM_D17__EIM_DATA17 0x1b0b0
|
|
MX6DL_PAD_EIM_D18__EIM_DATA18 0x1b0b0
|
|
MX6DL_PAD_EIM_D19__EIM_DATA19 0x1b0b0
|
|
MX6DL_PAD_EIM_D20__EIM_DATA20 0x1b0b0
|
|
MX6DL_PAD_EIM_D21__EIM_DATA21 0x1b0b0
|
|
MX6DL_PAD_EIM_D22__EIM_DATA22 0x1b0b0
|
|
MX6DL_PAD_EIM_D23__EIM_DATA23 0x1b0b0
|
|
MX6DL_PAD_EIM_D24__EIM_DATA24 0x1b0b0
|
|
MX6DL_PAD_EIM_D25__EIM_DATA25 0x1b0b0
|
|
MX6DL_PAD_EIM_D26__EIM_DATA26 0x1b0b0
|
|
MX6DL_PAD_EIM_D27__EIM_DATA27 0x1b0b0
|
|
MX6DL_PAD_EIM_D28__EIM_DATA28 0x1b0b0
|
|
MX6DL_PAD_EIM_D29__EIM_DATA29 0x1b0b0
|
|
MX6DL_PAD_EIM_D30__EIM_DATA30 0x1b0b0
|
|
MX6DL_PAD_EIM_D31__EIM_DATA31 0x1b0b0
|
|
/* address */
|
|
MX6DL_PAD_EIM_A23__EIM_ADDR23 0xb0b1
|
|
MX6DL_PAD_EIM_A22__EIM_ADDR22 0xb0b1
|
|
MX6DL_PAD_EIM_A21__EIM_ADDR21 0xb0b1
|
|
MX6DL_PAD_EIM_A20__EIM_ADDR20 0xb0b1
|
|
MX6DL_PAD_EIM_A19__EIM_ADDR19 0xb0b1
|
|
MX6DL_PAD_EIM_A18__EIM_ADDR18 0xb0b1
|
|
MX6DL_PAD_EIM_A17__EIM_ADDR17 0xb0b1
|
|
MX6DL_PAD_EIM_A16__EIM_ADDR16 0xb0b1
|
|
MX6DL_PAD_EIM_DA15__EIM_AD15 0xb0b1
|
|
MX6DL_PAD_EIM_DA14__EIM_AD14 0xb0b1
|
|
MX6DL_PAD_EIM_DA13__EIM_AD13 0xb0b1
|
|
MX6DL_PAD_EIM_DA12__EIM_AD12 0xb0b1
|
|
MX6DL_PAD_EIM_DA11__EIM_AD11 0xb0b1
|
|
MX6DL_PAD_EIM_DA10__EIM_AD10 0xb0b1
|
|
MX6DL_PAD_EIM_DA9__EIM_AD09 0xb0b1
|
|
MX6DL_PAD_EIM_DA8__EIM_AD08 0xb0b1
|
|
MX6DL_PAD_EIM_DA7__EIM_AD07 0xb0b1
|
|
MX6DL_PAD_EIM_DA6__EIM_AD06 0xb0b1
|
|
MX6DL_PAD_EIM_DA5__EIM_AD05 0xb0b1
|
|
MX6DL_PAD_EIM_DA4__EIM_AD04 0xb0b1
|
|
MX6DL_PAD_EIM_DA3__EIM_AD03 0xb0b1
|
|
MX6DL_PAD_EIM_DA2__EIM_AD02 0xb0b1
|
|
MX6DL_PAD_EIM_DA1__EIM_AD01 0xb0b1
|
|
MX6DL_PAD_EIM_DA0__EIM_AD00 0xb0b1
|
|
>;
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
pxp: pxp@020f0000 {
|
|
reg = <0x020f0000 0x4000>;
|
|
interrupts = <0 98 0x04>;
|
|
};
|
|
|
|
epdc: epdc@020f4000 {
|
|
reg = <0x020f4000 0x4000>;
|
|
interrupts = <0 97 0x04>;
|
|
};
|
|
|
|
lcdif: lcdif@020f8000 {
|
|
reg = <0x020f8000 0x4000>;
|
|
interrupts = <0 39 0x04>;
|
|
};
|
|
};
|
|
|
|
aips2: aips-bus@02100000 {
|
|
i2c4: i2c@021f8000 {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
compatible = "fsl,imx1-i2c";
|
|
reg = <0x021f8000 0x4000>;
|
|
interrupts = <0 35 0x04>;
|
|
status = "disabled";
|
|
};
|
|
};
|
|
};
|
|
};
|