diff options
author | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2013-04-03 09:55:44 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-03 17:21:51 +0200 |
commit | 508b996a6207f9f490cb5cf7b67e1889f4ca4536 (patch) | |
tree | 178ac806eb290a2bb634a85c514008729ea41880 /arch/arm/mach-zynq | |
parent | 33552e74b416b4b83bd92a7ac3598ab5168707bd (diff) | |
download | barebox-508b996a6207f9f490cb5cf7b67e1889f4ca4536.tar.gz barebox-508b996a6207f9f490cb5cf7b67e1889f4ca4536.tar.xz |
ARM: zynq: add support for ethernet
Add support for the ethernet device 0 on the Zynq7000 SoC.
The GEM is compatible to/the same one as the macb on at91.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-zynq')
-rw-r--r-- | arch/arm/mach-zynq/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-zynq/clk-zynq7000.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-zynq/devices.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-zynq/include/mach/devices.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-zynq/include/mach/zynq7000-regs.h | 1 |
5 files changed, 22 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 5bbd6483cd..49a12f7f2c 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -20,6 +20,7 @@ config ARCH_ZYNQ7000 select CLKDEV_LOOKUP select COMMON_CLK select ARM_SMP_TWD + select HAS_MACB endchoice diff --git a/arch/arm/mach-zynq/clk-zynq7000.c b/arch/arm/mach-zynq/clk-zynq7000.c index 1e03514f3e..6472c642fd 100644 --- a/arch/arm/mach-zynq/clk-zynq7000.c +++ b/arch/arm/mach-zynq/clk-zynq7000.c @@ -31,7 +31,8 @@ enum zynq_clks { dummy, ps_clk, arm_pll, ddr_pll, io_pll, uart_clk, uart0, uart1, - cpu_clk, cpu_6x4x, cpu_3x2x, cpu_2x, cpu_1x, clks_max + cpu_clk, cpu_6x4x, cpu_3x2x, cpu_2x, cpu_1x, + gem_clk, gem0, gem1, clks_max }; enum zynq_pll_type { @@ -376,6 +377,9 @@ static int zynq_clock_probe(struct device_d *dev) clks[uart0] = clk_gate("uart0", "uart_clk", slcr_base + 0x154, 0); clks[uart1] = clk_gate("uart1", "uart_clk", slcr_base + 0x154, 1); + clks[gem0] = clk_gate("gem0", "io_pll", slcr_base + 0x140, 0); + clks[gem1] = clk_gate("gem1", "io_pll", slcr_base + 0x144, 1); + clks[cpu_clk] = zynq_cpu_clk("cpu_clk", slcr_base + 0x120); clks[cpu_6x4x] = zynq_cpu_subclk("cpu_6x4x", CPU_SUBCLK_6X4X, @@ -390,9 +394,12 @@ static int zynq_clock_probe(struct device_d *dev) clk_register_clkdev(clks[cpu_3x2x], NULL, "arm_smp_twd"); clk_register_clkdev(clks[uart0], NULL, "zynq_serial0"); clk_register_clkdev(clks[uart1], NULL, "zynq_serial1"); + clk_register_clkdev(clks[gem0], NULL, "macb0"); + clk_register_clkdev(clks[gem1], NULL, "macb1"); clkdev_add_physbase(clks[cpu_3x2x], CORTEXA9_SCU_TIMER_BASE_ADDR, NULL); clkdev_add_physbase(clks[uart1], ZYNQ_UART1_BASE_ADDR, NULL); + return 0; } diff --git a/arch/arm/mach-zynq/devices.c b/arch/arm/mach-zynq/devices.c index 777bb8765f..55e9433c51 100644 --- a/arch/arm/mach-zynq/devices.c +++ b/arch/arm/mach-zynq/devices.c @@ -6,3 +6,8 @@ struct device_d *zynq_add_uart(resource_size_t base, int id) { return add_generic_device("cadence-uart", id, NULL, base, 0x1000, IORESOURCE_MEM, NULL); } + +struct device_d *zynq_add_eth(resource_size_t base, int id, struct macb_platform_data *pdata) +{ + return add_generic_device("macb", id, NULL, base, 0x1000, IORESOURCE_MEM, pdata); +} diff --git a/arch/arm/mach-zynq/include/mach/devices.h b/arch/arm/mach-zynq/include/mach/devices.h index 281d7c6204..c9670b02f3 100644 --- a/arch/arm/mach-zynq/include/mach/devices.h +++ b/arch/arm/mach-zynq/include/mach/devices.h @@ -1,6 +1,8 @@ #include <mach/zynq7000-regs.h> +#include <platform_data/macb.h> struct device_d *zynq_add_uart(resource_size_t base, int id); +struct device_d *zynq_add_eth(resource_size_t base, int id, struct macb_platform_data *pdata); static inline struct device_d *zynq_add_uart0(void) { @@ -11,3 +13,8 @@ static inline struct device_d *zynq_add_uart1(void) { return zynq_add_uart((resource_size_t)ZYNQ_UART1_BASE_ADDR, 1); } + +static inline struct device_d *zynq_add_eth0(struct macb_platform_data *pdata) +{ + return zynq_add_eth((resource_size_t)ZYNQ_GEM0_BASE_ADDR, 0, pdata); +} diff --git a/arch/arm/mach-zynq/include/mach/zynq7000-regs.h b/arch/arm/mach-zynq/include/mach/zynq7000-regs.h index f5ccbb0378..dd02f5b407 100644 --- a/arch/arm/mach-zynq/include/mach/zynq7000-regs.h +++ b/arch/arm/mach-zynq/include/mach/zynq7000-regs.h @@ -22,6 +22,7 @@ #define ZYNQ_CAN0_BASE_ADDR 0xE0008000 #define ZYNQ_CAN1_BASE_ADDR 0xE0009000 #define ZYNQ_GPIO_BASE_ADDR 0xE000A000 +#define ZYNQ_GEM0_BASE_ADDR 0xE000B000 #define ZYNQ_SLCR_BASE 0xF8000000 #define ZYNQ_SLCR_SCL (ZYNQ_SLCR_BASE + 0x000) |