summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-08-15 07:19:10 +0900
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>2015-02-04 11:16:18 +0100
commit4f39bc34a2c636bac03488d02e21eefa7ebcd32c (patch)
tree5b50580c26ccfa1254a907a21bd28a44c45e922f
parent3defe88536866a7ab288b2f863dd72bed5ca3683 (diff)
downloadkernel-common-4f39bc34a2c636bac03488d02e21eefa7ebcd32c.tar.gz
kernel-common-4f39bc34a2c636bac03488d02e21eefa7ebcd32c.tar.bz2
kernel-common-4f39bc34a2c636bac03488d02e21eefa7ebcd32c.zip
ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux
On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts refers to non-existent pinmux configuration data: pinmux core: sh-pfc does not support function i2c6 sh-pfc e6060000.pfc: invalid function i2c6 in map table Remove it to fix this. Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile: koelsch dts: Add VDD MPU regulator for DVFS") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Olof Johansson <olof@lixom.net> (cherry picked from commit 12266db732ff3845eaa9ba9354c4938249787aaf) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/boot/dts/r8a7791-koelsch.dts7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 23486c081a69..be59014474b2 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -275,11 +275,6 @@
renesas,function = "msiof0";
};
- i2c6_pins: i2c6 {
- renesas,groups = "i2c6";
- renesas,function = "i2c6";
- };
-
usb0_pins: usb0 {
renesas,groups = "usb0";
renesas,function = "usb0";
@@ -420,8 +415,6 @@
};
&i2c6 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c6_pins>;
status = "okay";
clock-frequency = <100000>;