diff options
| author | Tejun Heo <tj@kernel.org> | 2014-09-24 13:40:58 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-09-24 13:40:58 -0400 |
| commit | 92f4f528666751919f49f3b9a829486c7a493eec (patch) | |
| tree | 300495712e7f246f847667d8a44870fabb88f84f /arch/arm/boot/dts/r8a7791-koelsch.dts | |
| parent | cbbe3a37a8b9cb3f1e86d82b5230344cf97124ef (diff) | |
| parent | 17497acbdce9506fd6a75115dee4ab80c3cc5ee5 (diff) | |
Merge branch 'for-3.18' into for-next
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>; |