diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-04-30 14:56:35 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-05-05 02:52:36 +0200 |
| commit | 9dd85ad219328689b04d6406b942a6b17aa9242a (patch) | |
| tree | e3dca774d2979702acf3711f742e871835721c33 /arch | |
| parent | ARM: dts: kirkwood: consolidate common pinctrl settings (diff) | |
| download | linux-9dd85ad219328689b04d6406b942a6b17aa9242a.tar.xz linux-9dd85ad219328689b04d6406b942a6b17aa9242a.zip | |
ARM: dts: kirkwood: set default pinctrl for GBE1
On Kirkwood, there is only one valid pinctrl setting for GBE1. With
a common SoC pinctrl node, we can now set it in the node instead of
in each board file.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-9-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts index 1a7f18d5530d..622a3ca12c2d 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts @@ -207,8 +207,6 @@ ð1 { status = "okay"; - pinctrl-0 = <&pmx_ge1>; - pinctrl-names = "default"; ethernet1-port@0 { phy-handle = <ðphy1>; }; diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 5d412e71b9fb..fff28b71b474 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -320,6 +320,8 @@ reg = <0x76000 0x4000>; clocks = <&gate_clk 19>; marvell,tx-checksum-limit = <1600>; + pinctrl-0 = <&pmx_ge1>; + pinctrl-names = "default"; status = "disabled"; ethernet1-port@0 { |