diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-02 17:53:35 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-02 17:53:35 +0200 |
| commit | 04a0b8ef6b27c2b6280dcbfcdd418b7d851f8491 (patch) | |
| tree | 062e082e19ab94a4ca7bc60286df970debdd2d6f /arch/arm/boot/dts/r8a7791-koelsch.dts | |
| parent | ASoC: simple-card: tidyup get dai_link/dai_props from priv (diff) | |
| parent | Linux 3.17-rc4 (diff) | |
| download | linux-04a0b8ef6b27c2b6280dcbfcdd418b7d851f8491.tar.xz linux-04a0b8ef6b27c2b6280dcbfcdd418b7d851f8491.zip | |
Merge tag 'v3.17-rc4' into asoc-simple
Linux 3.17-rc4
Diffstat (limited to 'arch/arm/boot/dts/r8a7791-koelsch.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 7 |
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>; |