summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2017-01-04 10:39:40 +0530
committerTony Lindgren <tony@atomide.com>2017-01-05 09:30:07 -0800
commit6ca36a455e2730a3195a5596d53c900c9cd00838 (patch)
treec57b505dbf98ee5ad0b6e5b2a5f41f60282a8456 /arch/arm/boot
parenta3ac350793d90d1da631c8beeee9352387974ed5 (diff)
downloadlinux-6ca36a455e2730a3195a5596d53c900c9cd00838.tar.bz2
ARM: dts: am335x-icev2: Remove the duplicated pinmux setting
There is no mmc sd card detect on am335x-ice board. But the spi0_cs1 pin being configured as mmcsd_cd. Removing it fixes the below warning during boot: pinctrl-single 44e10800.pinmux: pin 44e10960.0 already requested by 48030000.spi; cannot claim for 48060000.mmc Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> [tony@atomide.com: tidied up commit message] Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/am335x-icev2.dts1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
index 1463df3b5b19..8ed46f9d79b7 100644
--- a/arch/arm/boot/dts/am335x-icev2.dts
+++ b/arch/arm/boot/dts/am335x-icev2.dts
@@ -170,7 +170,6 @@
AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0) /* (G16) mmc0_dat0.mmc0_dat0 */
AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0) /* (G17) mmc0_clk.mmc0_clk */
AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0) /* (G18) mmc0_cmd.mmc0_cmd */
- AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE5) /* (C15) spi0_cs1.mmc0_sdcd */
>;
};