Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: nomadik: push ethernet down to board

The SoC file defines the location and type of the ethernet
adapter, this should be in the per-board file, as it is by no
means necessary to have an ethernet adapter connected to this
memory space.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

+16 -20
+16 -8
arch/arm/boot/dts/ste-nomadik-s8815.dts
··· 4 4 */ 5 5 6 6 /dts-v1/; 7 + #include <dt-bindings/interrupt-controller/irq.h> 7 8 #include "ste-nomadik-stn8815.dtsi" 8 9 9 10 / { ··· 13 12 14 13 chosen { 15 14 bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk"; 16 - }; 17 - 18 - /* This is where the interrupt is routed on the S8815 board */ 19 - external-bus@34000000 { 20 - ethernet@300 { 21 - interrupt-parent = <&gpio3>; 22 - interrupts = <8 0x1>; 23 - }; 24 15 }; 25 16 26 17 src@101e0000 { ··· 63 70 ste,input = <0>; 64 71 }; 65 72 }; 73 + }; 74 + }; 75 + 76 + /* Ethernet */ 77 + external-bus@34000000 { 78 + compatible = "simple-bus"; 79 + reg = <0x34000000 0x1000000>; 80 + #address-cells = <1>; 81 + #size-cells = <1>; 82 + ranges = <0 0x34000000 0x1000000>; 83 + ethernet@300 { 84 + compatible = "smsc,lan91c111"; 85 + reg = <0x300 0x0fd00>; 86 + interrupt-parent = <&gpio3>; 87 + interrupts = <8 IRQ_TYPE_EDGE_RISING>; 66 88 }; 67 89 }; 68 90
-12
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
··· 673 673 }; 674 674 }; 675 675 676 - external-bus@34000000 { 677 - compatible = "simple-bus"; 678 - reg = <0x34000000 0x1000000>; 679 - #address-cells = <1>; 680 - #size-cells = <1>; 681 - ranges = <0 0x34000000 0x1000000>; 682 - ethernet@300 { 683 - compatible = "smsc,lan91c111"; 684 - reg = <0x300 0x0fd00>; 685 - }; 686 - }; 687 - 688 676 /* I2C0 connected to the STw4811 power management chip */ 689 677 i2c0 { 690 678 compatible = "st,nomadik-i2c", "arm,primecell";