diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-30 16:37:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-30 16:37:13 -0400 |
| commit | 9ba10afe3202aaf3ace1e696ff017d0c0bf4e7a9 (patch) | |
| tree | 4fb2b86ad599012ee4079141512cf1b71d10c922 /arch | |
| parent | 4cb53f3f519545b04d55c7954fc1a1b27c5fa16b (diff) | |
| parent | 75215193b975d9b5663f21d885c9f794de787328 (diff) | |
| download | linux-9ba10afe3202aaf3ace1e696ff017d0c0bf4e7a9.tar.gz linux-9ba10afe3202aaf3ace1e696ff017d0c0bf4e7a9.tar.bz2 linux-9ba10afe3202aaf3ace1e696ff017d0c0bf4e7a9.zip | |
Merge branch 'pxa168_eth'
Antoine Tenart says:
====================
ARM: Berlin: Ethernet support
This series introduce support for the Ethernet controller on Berlin SoCs,
using the existing pxa168 Ethernet driver. In order to do this, DT
support is added to the driver alongside some other modifications and
fixes.
This has been tested on a Berlin BG2Q DMP board.
Changes since v5:
- fixed the build when building the driver as a module
Changes since v4:
- removed the phy-addr property and added a phy subnode
- added COMPILE_TEST for the pxa168_eth driver
Changes since v3:
- moved the addition of pxa168_eth_get_mac_address() to the patch
using it first
Changes since v2:
- reworked how the MAC address is configured
- made the clock anonymous
Changes since v1:
- removed custom Berlin Ethernet driver
- used the pxa168 Ethernet driver instead
- made modifications to the pxa168 driver (DT support, fixes)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/berlin2q.dtsi | 17 |
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts index a357ce02a64e..ea1f99b8eed6 100644 --- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts +++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts @@ -45,3 +45,7 @@ &uart0 { status = "okay"; }; + +ð0 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 400c40fceccc..891d56b03922 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi @@ -114,6 +114,23 @@ #interrupt-cells = <3>; }; + eth0: ethernet@b90000 { + compatible = "marvell,pxa168-eth"; + reg = <0xb90000 0x10000>; + clocks = <&chip CLKID_GETH0>; + interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; + /* set by bootloader */ + local-mac-address = [00 00 00 00 00 00]; + #address-cells = <1>; + #size-cells = <0>; + phy-handle = <ðphy0>; + status = "disabled"; + + ethphy0: ethernet-phy@0 { + reg = <0>; + }; + }; + cpu-ctrl@dd0000 { compatible = "marvell,berlin-cpu-ctrl"; reg = <0xdd0000 0x10000>; |