leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the ethernet issue on revision D of the RealView EB

Browse Source 
Split the DTS files in per-revision variants
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJX0rCKAAoJEEEQszewGV1zfxkQAKYtCbDqM84kQjk6ac4iUGVQ
 /04ZFQ/GDa8M2KycEe5Zh1UzEdwX0ErKZpjdHVujZwC5TS+eDvzrqnvdmtq/Ef5F
 NwbI+17tQTqgW+/uSL5u0E7b00Jd9XqEeQILlZxwAn8fl2iy5DYBVHmgx8/cGNzr
 MRf+Kd+kJuC5PwSIuIP+yEGePZAVrAwcz5oHHuPUWSnT//VvM7vF49wO249TJXIq
 wOa/u2cQclIPl58jCHd0LL7mfst/3bHTT+erjoGmEwRuKCFopYE/sgrkoVbI0vuL
 oFI/MsXUP5y5IIziNL5PPhQPiZFO4fjnzdFda4EFj1r69uv50pIEztAK45o410Us
 1ES/aEEWvYDiVY9wnUsZXjkQY0NUIxASvNkeBrzNrqR/XGLxNL5JcwsLEJJMUr35
 bIhMKfoLEGjLsTcctDZJon15fp+eNnbS+usGNat2n94/Rmdaxl7OvorRhgpPyx37
 T90gw0b9BmAUXlR8C4V6eY2z5LnD5NipcPXN2SZk8pASP/PAdM2Zwi8URUPmTEIG
 M4R8LJKWHUleALmR1L67wQ+U/WwgfVpBpKKFaguYIcXsWirs2QHwfpEPDo0ppMhw
 m3wA4bEErblRuMy0kEMMBXim1zxt3K9rvZmafHvHpIyHstcZPQL/SFeHdDVk5XV9
 DsgQnyN5zcuCt3ditKlx
 =BnYS
 -----END PGP SIGNATURE-----

Merge tag 'realview-dts-split' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt

Pull "RealView DTS file fixup and split" from Linus Walleij:

Fix the ethernet issue on revision D of the RealView EB
Split the DTS files in per-revision variants

* tag 'realview-dts-split' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: dts: add RealView EB rev D A9 MPCore variant
  ARM: dts: split RealView EB 11MPCore variants
  ARM: dts: add device tree for the RealView EB Rev D
  ARM: dts: fix RealView EB SMSC ethernet version
This commit is contained in:
Arnd Bergmann 2016-09-13 17:41:15 +02:00
commit 971b4c6e1a
9 changed files with 175 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/Makefile
View File

@ -609,9 +609,13 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \
arm-realview-pb1176.dtb \
arm-realview-pb11mp.dtb \
arm-realview-eb.dtb \
arm-realview-eb-bbrevd.dtb \
arm-realview-eb-11mp.dtb \
arm-realview-eb-11mp-revb.dtb \
arm-realview-eb-11mp-bbrevd.dtb \
arm-realview-eb-11mp-ctrevb.dtb \
arm-realview-eb-11mp-bbrevd-ctrevb.dtb \
arm-realview-eb-a9mp.dtb \
arm-realview-eb-a9mp-bbrevd.dtb \
arm-realview-pba8.dtb \
arm-realview-pbx-a9.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += \

32
arch/arm/boot/dts/arm-realview-eb-11mp-bbrevd-ctrevb.dts Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright 2016 Linaro Ltd
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "arm-realview-eb-11mp-ctrevb.dts"
#include "arm-realview-eb-bbrevd.dtsi"
/*
* This is the EB with the new Revision D baseboard with SMSC9118 ethernet and
* the Rev B core tile.
*/
/ {
model = "ARM RealView Emulation Baseboard Rev D with ARM11MPCore Core Tile Rev B";
};

28
arch/arm/boot/dts/arm-realview-eb-11mp-bbrevd.dts Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright 2016 Linaro Ltd
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "arm-realview-eb-11mp.dts"
#include "arm-realview-eb-bbrevd.dtsi"
/ {
model = "ARM RealView Emulation Baseboard Rev D with ARM11MPCore Rev C Core Tile";
};

0
arch/arm/boot/dts/arm-realview-eb-11mp-revb.dts → arch/arm/boot/dts/arm-realview-eb-11mp-ctrevb.dts
View File

2
arch/arm/boot/dts/arm-realview-eb-11mp.dts
View File

@ -24,7 +24,7 @@
#include "arm-realview-eb-mp.dtsi"
/ {
model = "ARM RealView Emulation Baseboard with ARM11MPCore Rev C";
model = "ARM RealView Emulation Baseboard with ARM11MPCore Rev C Core Tile";
arm,hbi = <0x146>;
/*

28
arch/arm/boot/dts/arm-realview-eb-a9mp-bbrevd.dts Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright 2016 Linaro Ltd
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "arm-realview-eb-a9mp.dts"
#include "arm-realview-eb-bbrevd.dtsi"
/ {
model = "ARM RealView EB Baseboard Rev D Cortex A9 MPCore";
};

29
arch/arm/boot/dts/arm-realview-eb-bbrevd.dts Normal file
View File

@ -0,0 +1,29 @@
/*
* Copyright 2016 Linaro Ltd
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
/* This derives from the Realview Baseboard, and overlays the new ethernet */
#include "arm-realview-eb.dts"
#include "arm-realview-eb-bbrevd.dtsi"
/ {
model = "ARM RealView Emulation Baseboard Rev D";
};

45
arch/arm/boot/dts/arm-realview-eb-bbrevd.dtsi Normal file
View File

@ -0,0 +1,45 @@
/*
* Copyright 2016 Linaro Ltd
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
/ {
/* Introduce a fixed regulator for the new ethernet controller */
veth: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "veth";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
};
};
/*
* The revision D has a different ethernet controller that the elder boards:
* the older board uses LAN91C111 but the new one uses LAN9118.
*/
&ethernet {
compatible = "smsc,lan9118", "smsc,lan9115";
phy-mode = "mii";
smsc,irq-active-high;
smsc,irq-push-pull;
vdd33a-supply = <&veth>;
vddvario-supply = <&veth>;
};

23
arch/arm/boot/dts/arm-realview-eb.dtsi
View File

@ -51,14 +51,6 @@
regulator-boot-on;
};
veth: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "veth";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
};
xtal24mhz: xtal24mhz@24M {
#clock-cells = <0>;
compatible = "fixed-clock";
@ -134,16 +126,15 @@
bank-width = <4>;
};
/* SMSC 9118 ethernet with PHY and EEPROM */
/* SMSC LAN91C111 ethernet with PHY and EEPROM */
ethernet: ethernet@4e000000 {
compatible = "smsc,lan9118", "smsc,lan9115";
compatible = "smsc,lan91c111";
reg = <0x4e000000 0x10000>;
phy-mode = "mii";
reg-io-width = <4>;
smsc,irq-active-high;
smsc,irq-push-pull;
vdd33a-supply = <&veth>;
vddvario-supply = <&veth>;
/*
* This means the adapter can be accessed with 8, 16 or
* 32 bit reads/writes.
*/
reg-io-width = <7>;
};
usb: usb@4f000000 {