ARM: nomadik: push ethernet down to board (98ba16bb) · Commits · 戴 / test

arch/arm/boot/dts/ste-nomadik-s8815.dts

+16 −8

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		*/

		/dts-v1/;
		#include <dt-bindings/interrupt-controller/irq.h>
		#include "ste-nomadik-stn8815.dtsi"

		/ {
		@@ -14,14 +15,6 @@
		bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
		};

		/* This is where the interrupt is routed on the S8815 board */
		external-bus@34000000 {
		ethernet@300 {
		interrupt-parent = <&gpio3>;
		interrupts = <8 0x1>;
		};
		};

		src@101e0000 {
		/* These chrystal drivers are not used on this board */
		disable-sxtalo;
		@@ -73,6 +66,21 @@
		};
		};

		/* Ethernet */
		external-bus@34000000 {
		compatible = "simple-bus";
		reg = <0x34000000 0x1000000>;
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0 0x34000000 0x1000000>;
		ethernet@300 {
		compatible = "smsc,lan91c111";
		reg = <0x300 0x0fd00>;
		interrupt-parent = <&gpio3>;
		interrupts = <8 IRQ_TYPE_EDGE_RISING>;
		};
		};

		/* GPIO I2C connected to the USB portions of the STw4811 only */
		gpio-i2c {
		compatible = "i2c-gpio";

+0 −12

Original line number	Diff line number	Diff line
		@@ -673,18 +673,6 @@
		};
		};

		external-bus@34000000 {
		compatible = "simple-bus";
		reg = <0x34000000 0x1000000>;
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0 0x34000000 0x1000000>;
		ethernet@300 {
		compatible = "smsc,lan91c111";
		reg = <0x300 0x0fd00>;
		};
		};

		/* I2C0 connected to the STw4811 power management chip */
		i2c0 {
		compatible = "st,nomadik-i2c", "arm,primecell";