Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 326768
b: refs/heads/master
c: 52ccd49
h: refs/heads/master
v: v3
  • Loading branch information
Shawn Guo committed Sep 11, 2012
1 parent 1660397 commit 5ee2d27
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e30ba89fdf3891c3ff32d25a73fbffd37e893572
refs/heads/master: 52ccd4920301b9fecbac577ad4283995730ecf76
20 changes: 10 additions & 10 deletions trunk/arch/arm/boot/dts/imx6q.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,16 @@
};
};

ecspi1 {
pinctrl_ecspi1_1: ecspi1grp-1 {
fsl,pins = <
101 0x100b1 /* MX6Q_PAD_EIM_D17__ECSPI1_MISO */
109 0x100b1 /* MX6Q_PAD_EIM_D18__ECSPI1_MOSI */
94 0x100b1 /* MX6Q_PAD_EIM_D16__ECSPI1_SCLK */
>;
};
};

gpmi-nand {
pinctrl_gpmi_nand_1: gpmi-nand-1 {
fsl,pins = <
Expand Down Expand Up @@ -599,16 +609,6 @@
>;
};
};

ecspi1 {
pinctrl_ecspi1_1: ecspi1grp-1 {
fsl,pins = <
101 0x100b1 /* MX6Q_PAD_EIM_D17__ECSPI1_MISO */
109 0x100b1 /* MX6Q_PAD_EIM_D18__ECSPI1_MOSI */
94 0x100b1 /* MX6Q_PAD_EIM_D16__ECSPI1_SCLK */
>;
};
};
};

dcic@020e4000 { /* DCIC1 */
Expand Down

0 comments on commit 5ee2d27

Please sign in to comment.