git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
dra7.dtsi
diff --git
a/arch/arm/boot/dts/dra7.dtsi
b/arch/arm/boot/dts/dra7.dtsi
index cca6b123856fe64f5c61bb96bf1e9083c20a049f..4e1bbc0198eb7f6e1a0db7de486b3c753b09ebfd 100644
(file)
--- a/
arch/arm/boot/dts/dra7.dtsi
+++ b/
arch/arm/boot/dts/dra7.dtsi
@@
-37,8
+37,8
@@
serial7 = &uart8;
serial8 = &uart9;
serial9 = &uart10;
- ethernet0 = &cpsw_
emac0
;
- ethernet1 = &cpsw_
emac1
;
+ ethernet0 = &cpsw_
port1
;
+ ethernet1 = &cpsw_
port2
;
d_can0 = &dcan1;
d_can1 = &dcan2;
spi0 = &qspi;