aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Brodkin <abrodkin@synopsys.com>2013-06-26 06:02:18 -0400
committerVineet Gupta <vgupta@synopsys.com>2013-06-28 05:37:20 -0400
commitd0e63ed9411fb9fe95dac1690deb01f9ccb1701d (patch)
tree5540ed6824ffe5e075b21426548a6d1d2861a58b
parent7d132055814ef17a6c7b69f342244c410a5e000f (diff)
ARC: [plat-arcfpga] Enable arc_emac for ARCAngle4 Board
* Add arc_emac to DeviceTree DT description "Documentation/devicetree/bindings/net/arc_emac.txt". * Update defconfig correspondingly [vgupta: tweaked changelog] Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r--arch/arc/boot/dts/angel4.dts16
-rw-r--r--arch/arc/configs/fpga_defconfig3
-rw-r--r--arch/arc/plat-arcfpga/include/plat/irq.h2
-rw-r--r--arch/arc/plat-arcfpga/include/plat/memmap.h2
4 files changed, 19 insertions, 4 deletions
diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/angel4.dts
index bae4f936cb03..4fb2d6f655bd 100644
--- a/arch/arc/boot/dts/angel4.dts
+++ b/arch/arc/boot/dts/angel4.dts
@@ -51,5 +51,21 @@
51 current-speed = <115200>; 51 current-speed = <115200>;
52 status = "okay"; 52 status = "okay";
53 }; 53 };
54
55 ethernet@c0fc2000 {
56 compatible = "snps,arc-emac";
57 reg = <0xc0fc2000 0x3c>;
58 interrupts = <6>;
59 mac-address = [ 00 11 22 33 44 55 ];
60 clock-frequency = <80000000>;
61 max-speed = <100>;
62 phy = <&phy0>;
63
64 #address-cells = <1>;
65 #size-cells = <0>;
66 phy0: ethernet-phy@0 {
67 reg = <1>;
68 };
69 };
54 }; 70 };
55}; 71};
diff --git a/arch/arc/configs/fpga_defconfig b/arch/arc/configs/fpga_defconfig
index 95350be6ef6f..2c8ee30e2756 100644
--- a/arch/arc/configs/fpga_defconfig
+++ b/arch/arc/configs/fpga_defconfig
@@ -38,6 +38,9 @@ CONFIG_INET=y
38# CONFIG_PREVENT_FIRMWARE_BUILD is not set 38# CONFIG_PREVENT_FIRMWARE_BUILD is not set
39# CONFIG_FIRMWARE_IN_KERNEL is not set 39# CONFIG_FIRMWARE_IN_KERNEL is not set
40# CONFIG_BLK_DEV is not set 40# CONFIG_BLK_DEV is not set
41CONFIG_NETDEVICES=y
42CONFIG_ARC_EMAC=y
43CONFIG_LXT_PHY=y
41# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 44# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
42# CONFIG_INPUT_KEYBOARD is not set 45# CONFIG_INPUT_KEYBOARD is not set
43# CONFIG_INPUT_MOUSE is not set 46# CONFIG_INPUT_MOUSE is not set
diff --git a/arch/arc/plat-arcfpga/include/plat/irq.h b/arch/arc/plat-arcfpga/include/plat/irq.h
index 41e335670f60..6adbc53c3a5b 100644
--- a/arch/arc/plat-arcfpga/include/plat/irq.h
+++ b/arch/arc/plat-arcfpga/include/plat/irq.h
@@ -16,8 +16,6 @@
16#define UART1_IRQ 10 16#define UART1_IRQ 10
17#define UART2_IRQ 11 17#define UART2_IRQ 11
18 18
19#define VMAC_IRQ 6
20
21#define IDE_IRQ 13 19#define IDE_IRQ 13
22#define PCI_IRQ 14 20#define PCI_IRQ 14
23#define PS2_IRQ 15 21#define PS2_IRQ 15
diff --git a/arch/arc/plat-arcfpga/include/plat/memmap.h b/arch/arc/plat-arcfpga/include/plat/memmap.h
index 1663f3388085..5c78e6135a1f 100644
--- a/arch/arc/plat-arcfpga/include/plat/memmap.h
+++ b/arch/arc/plat-arcfpga/include/plat/memmap.h
@@ -15,8 +15,6 @@
15#define UART0_BASE 0xC0FC1000 15#define UART0_BASE 0xC0FC1000
16#define UART1_BASE 0xC0FC1100 16#define UART1_BASE 0xC0FC1100
17 17
18#define VMAC_REG_BASEADDR 0xC0FC2000
19
20#define IDE_CONTROLLER_BASE 0xC0FC9000 18#define IDE_CONTROLLER_BASE 0xC0FC9000
21 19
22#define AHB_PCI_HOST_BRG_BASE 0xC0FD0000 20#define AHB_PCI_HOST_BRG_BASE 0xC0FD0000