From: Huang Shijie Date: Tue, 28 May 2013 06:20:08 +0000 (+0800) Subject: ARM: dts: imx6q{dl}: fix the pin conflict between SPI and WEIM X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~69^2~9^2~19 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72eb4cca7844c600f2e839c2e27a16c1eaa213f9;p=pandora-kernel.git ARM: dts: imx6q{dl}: fix the pin conflict between SPI and WEIM In the imx6q-sabreauto and imx6dl-sabreauto boards, the pin MX6Q{DL}_PAD_EIM_D19 is used as a GPIO for SPI NOR, but it is used as a data pin for the WEIM NOR. In order to fix the conflict, this patch removes the pin from the hog, and adds a new board-level pinctrl: pinctrl_ecspi1_sabreauto. The SPI NOR selects this pinctrl_ecspi1_sabreauto when it is enabled. Signed-off-by: Huang Shijie Signed-off-by: Shawn Guo --- Reading git-diff-tree failed