svn commit: r262711 - in head/sys: arm/allwinner arm/allwinner/a20 arm/conf boot/fdt/dts/arm

[Ganbold Tsagaankhuu]

Author: ganbold
Date: Mon Mar  3 11:36:39 2014
New Revision: 262711
URL: http://svnweb.freebsd.org/changeset/base/262711

Log:
  Add EMAC and SRAM controller entries to FDT.
  Add EMAC device to kernel config files and
  enable EMAC, SRAM drivers for build.
  
  Approved by:	stas (mentor)

Modified:
  head/sys/arm/allwinner/a20/files.a20
  head/sys/arm/allwinner/files.a10
  head/sys/arm/conf/CUBIEBOARD
  head/sys/arm/conf/CUBIEBOARD2
  head/sys/boot/fdt/dts/arm/cubieboard.dts
  head/sys/boot/fdt/dts/arm/cubieboard2.dts

Modified: head/sys/arm/allwinner/a20/files.a20
==============================================================================
--- head/sys/arm/allwinner/a20/files.a20	Mon Mar  3 11:32:55 2014	(r262710)
+++ head/sys/arm/allwinner/a20/files.a20	Mon Mar  3 11:36:39 2014	(r262711)
@@ -12,8 +12,10 @@ arm/arm/gic.c				standard
 
 arm/allwinner/a20/a20_cpu_cfg.c 	standard
 arm/allwinner/a10_clk.c 		standard
+arm/allwinner/a10_sramc.c		standard
 arm/allwinner/a10_gpio.c		optional	gpio
 arm/allwinner/a10_ehci.c		optional	ehci
+arm/allwinner/if_emac.c			optional	emac
 arm/allwinner/a10_wdog.c		standard
 arm/allwinner/timer.c			standard
 arm/arm/bus_space-v6.c			standard

Modified: head/sys/arm/allwinner/files.a10
==============================================================================
--- head/sys/arm/allwinner/files.a10	Mon Mar  3 11:32:55 2014	(r262710)
+++ head/sys/arm/allwinner/files.a10	Mon Mar  3 11:36:39 2014	(r262711)
@@ -11,8 +11,10 @@ arm/arm/irq_dispatch.S			standard
 
 arm/allwinner/a20/a20_cpu_cfg.c 	standard
 arm/allwinner/a10_clk.c			standard
+arm/allwinner/a10_sramc.c		standard
 arm/allwinner/a10_gpio.c		optional	gpio
 arm/allwinner/a10_ehci.c		optional	ehci
+arm/allwinner/if_emac.c			optional	emac
 arm/allwinner/a10_wdog.c		standard
 arm/allwinner/timer.c			standard
 arm/allwinner/aintc.c			standard

Modified: head/sys/arm/conf/CUBIEBOARD
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD	Mon Mar  3 11:32:55 2014	(r262710)
+++ head/sys/arm/conf/CUBIEBOARD	Mon Mar  3 11:36:39 2014	(r262711)
@@ -125,6 +125,8 @@ device		smscphy
 #device		cpsw
 device		bpf
 
+device		emac
+
 # USB ethernet support, requires miibus
 device		miibus
 

Modified: head/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD2	Mon Mar  3 11:32:55 2014	(r262710)
+++ head/sys/arm/conf/CUBIEBOARD2	Mon Mar  3 11:36:39 2014	(r262711)
@@ -125,6 +125,8 @@ device		smscphy
 #device 	cpsw
 device		bpf
 
+device		emac
+
 # USB ethernet support, requires miibus
 device		miibus
 

Modified: head/sys/boot/fdt/dts/arm/cubieboard.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/cubieboard.dts	Mon Mar  3 11:32:55 2014	(r262710)
+++ head/sys/boot/fdt/dts/arm/cubieboard.dts	Mon Mar  3 11:36:39 2014	(r262711)
@@ -61,6 +61,13 @@
 			reg =   < 0x01c20400 0x400 >;
 		};
 
+		sramc at 01c00000 {
+			compatible = "allwinner,sun4i-sramc";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			reg = < 0x01c00000 0x1000 >;
+		};
+
 		ccm at 01c20000 {
 			compatible = "allwinner,sun4i-ccm";
 			#address-cells = <1>;
@@ -124,6 +131,13 @@
 			busy-detect = <1>;
 			broken-txfifo = <1>;
 		};
+
+		emac at 01c0b000 {
+			compatible = "allwinner,sun4i-emac";
+			reg = <0x01c0b000 0x1000>;
+			interrupts = <55>;
+			interrupt-parent = <&AINTC>;
+		};
 	};
 
 	chosen {

Modified: head/sys/boot/fdt/dts/arm/cubieboard2.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/cubieboard2.dts	Mon Mar  3 11:32:55 2014	(r262710)
+++ head/sys/boot/fdt/dts/arm/cubieboard2.dts	Mon Mar  3 11:36:39 2014	(r262711)
@@ -61,6 +61,13 @@
 			#interrupt-cells = <1>;
 		};
 
+		sramc at 01c00000 {
+			compatible = "allwinner,sun4i-sramc";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			reg = < 0x01c00000 0x1000 >;
+		};
+
 		cpu-cfg at 01c25c00 {
 			compatible = "allwinner,sun7i-cpu-cfg";
 			#address-cells = <1>;
@@ -130,6 +137,13 @@
 			busy-detect = <1>;
 			broken-txfifo = <1>;
 		};
+
+		emac at 01c0b000 {
+			compatible = "allwinner,sun4i-emac";
+			reg = <0x01c0b000 0x1000>;
+			interrupts = <55>;
+			interrupt-parent = <&GIC>;
+		};
 	};
 
 	chosen {