diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-25 15:51:45 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-08-22 23:28:24 +0800 |
| commit | f0741ce730ca0bf6f9c463d2cb9264830c1833ef (patch) | |
| tree | 515472ab4a028821f5ff5757b6443c5812cabd84 /arch/arm/boot/dts/imx6q.dtsi | |
| parent | 6c04ad229735348a5a14d17ea90bce478f678988 (diff) | |
| download | lwn-f0741ce730ca0bf6f9c463d2cb9264830c1833ef.tar.gz lwn-f0741ce730ca0bf6f9c463d2cb9264830c1833ef.zip | |
ARM: dts: i.MX6: sync imx6q and imx6dl pinmux entries
The i.MX6Q and i.MX6DL are pin compatible, so the pinmux entries
should be in sync. This patch systematically adds the pinmux entries
missing from the imx6q to the imx6dl file.
Some name inconsistencies and whitespace damage is fixed along the
way.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6q.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 9a6989183e94..6f4d6ab9c255 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -382,7 +382,7 @@ >; }; - pinctrl_weim_nor_1: weimnorgrp-1 { + pinctrl_weim_nor_1: weim_norgrp-1 { fsl,pins = < MX6Q_PAD_EIM_OE__EIM_OE_B 0xb0b1 MX6Q_PAD_EIM_RW__EIM_RW 0xb0b1 @@ -431,7 +431,6 @@ MX6Q_PAD_EIM_DA0__EIM_AD00 0xb0b1 >; }; - }; }; }; |