diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-02-03 17:57:16 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-02-03 17:57:16 +0100 |
commit | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (patch) | |
tree | 18b8573687ae8131db155aa791f4d2357d91e6c5 /arch/arm/boot/dts/imx6sx-sdb.dts | |
parent | 6ccd93bdb989507717edb375d40534f1177822c5 (diff) | |
parent | 830953c0724b42be30a74febcde6c89c706ed286 (diff) | |
download | blackbird-op-linux-3fe9cf390f6dc84f76b112b0a660967a84f9a81b.tar.gz blackbird-op-linux-3fe9cf390f6dc84f76b112b0a660967a84f9a81b.zip |
Merge branch 'topic/snd-device' into for-next
Diffstat (limited to 'arch/arm/boot/dts/imx6sx-sdb.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts index 8c1febd7e3f2..c108bb451337 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts @@ -166,12 +166,12 @@ #address-cells = <1>; #size-cells = <0>; - ethphy1: ethernet-phy@0 { - reg = <0>; + ethphy1: ethernet-phy@1 { + reg = <1>; }; - ethphy2: ethernet-phy@1 { - reg = <1>; + ethphy2: ethernet-phy@2 { + reg = <2>; }; }; }; |