]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
MIPS: ath25: Add basic AR2315 SoC support
authorSergey Ryazanov <ryazanov.s.a@gmail.com>
Tue, 28 Oct 2014 23:18:40 +0000 (03:18 +0400)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 24 Nov 2014 06:45:26 +0000 (07:45 +0100)
Add basic support for Atheros AR2315+ SoCs: registers definition file
and initial setup code.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Cc: Linux MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/8239/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/ath25/Kconfig
arch/mips/ath25/Makefile
arch/mips/ath25/ar2315.c [new file with mode: 0644]
arch/mips/ath25/ar2315.h [new file with mode: 0644]
arch/mips/ath25/ar2315_regs.h [new file with mode: 0644]
arch/mips/ath25/board.c
arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h

index cf933ea38044fa1e8580a74112691a9e42e777a2..ca3dde472bef3c77ef88e1f3f757da97519ae6f9 100644 (file)
@@ -2,3 +2,8 @@ config SOC_AR5312
        bool "Atheros AR5312/AR2312+ SoC support"
        depends on ATH25
        default y
+
+config SOC_AR2315
+       bool "Atheros AR2315+ SoC support"
+       depends on ATH25
+       default y
index 3361619caa9bdd744b3e9d9406a4d94fc00b004e..201b7d412902d63b021d0c1accc8d7800aed2dd7 100644 (file)
@@ -11,3 +11,4 @@
 obj-y += board.o prom.o devices.o
 
 obj-$(CONFIG_SOC_AR5312) += ar5312.o
+obj-$(CONFIG_SOC_AR2315) += ar2315.o
diff --git a/arch/mips/ath25/ar2315.c b/arch/mips/ath25/ar2315.c
new file mode 100644 (file)
index 0000000..8289432
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
+ * Copyright (C) 2006 FON Technology, SL.
+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2012 Alexandros C. Couloumbis <alex@ozo.com>
+ */
+
+/*
+ * Platform devices for Atheros AR2315 SoCs
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/reboot.h>
+#include <asm/bootinfo.h>
+#include <asm/reboot.h>
+#include <asm/time.h>
+
+#include "devices.h"
+#include "ar2315.h"
+#include "ar2315_regs.h"
+
+static void __iomem *ar2315_rst_base;
+
+static inline u32 ar2315_rst_reg_read(u32 reg)
+{
+       return __raw_readl(ar2315_rst_base + reg);
+}
+
+static inline void ar2315_rst_reg_write(u32 reg, u32 val)
+{
+       __raw_writel(val, ar2315_rst_base + reg);
+}
+
+static inline void ar2315_rst_reg_mask(u32 reg, u32 mask, u32 val)
+{
+       u32 ret = ar2315_rst_reg_read(reg);
+
+       ret &= ~mask;
+       ret |= val;
+       ar2315_rst_reg_write(reg, ret);
+}
+
+static void ar2315_restart(char *command)
+{
+       void (*mips_reset_vec)(void) = (void *)0xbfc00000;
+
+       local_irq_disable();
+
+       /* try reset the system via reset control */
+       ar2315_rst_reg_write(AR2315_COLD_RESET, AR2317_RESET_SYSTEM);
+
+       /* Cold reset does not work on the AR2315/6, use the GPIO reset bits
+        * a workaround. Give it some time to attempt a gpio based hardware
+        * reset (atheros reference design workaround) */
+
+       /* TODO: implement the GPIO reset workaround */
+
+       /* Some boards (e.g. Senao EOC-2610) don't implement the reset logic
+        * workaround. Attempt to jump to the mips reset location -
+        * the boot loader itself might be able to recover the system */
+       mips_reset_vec();
+}
+
+/*
+ * This table is indexed by bits 5..4 of the CLOCKCTL1 register
+ * to determine the predevisor value.
+ */
+static int clockctl1_predivide_table[4] __initdata = { 1, 2, 4, 5 };
+static int pllc_divide_table[5] __initdata = { 2, 3, 4, 6, 3 };
+
+static unsigned __init ar2315_sys_clk(u32 clock_ctl)
+{
+       unsigned int pllc_ctrl, cpu_div;
+       unsigned int pllc_out, refdiv, fdiv, divby2;
+       unsigned int clk_div;
+
+       pllc_ctrl = ar2315_rst_reg_read(AR2315_PLLC_CTL);
+       refdiv = ATH25_REG_MS(pllc_ctrl, AR2315_PLLC_REF_DIV);
+       refdiv = clockctl1_predivide_table[refdiv];
+       fdiv = ATH25_REG_MS(pllc_ctrl, AR2315_PLLC_FDBACK_DIV);
+       divby2 = ATH25_REG_MS(pllc_ctrl, AR2315_PLLC_ADD_FDBACK_DIV) + 1;
+       pllc_out = (40000000 / refdiv) * (2 * divby2) * fdiv;
+
+       /* clkm input selected */
+       switch (clock_ctl & AR2315_CPUCLK_CLK_SEL_M) {
+       case 0:
+       case 1:
+               clk_div = ATH25_REG_MS(pllc_ctrl, AR2315_PLLC_CLKM_DIV);
+               clk_div = pllc_divide_table[clk_div];
+               break;
+       case 2:
+               clk_div = ATH25_REG_MS(pllc_ctrl, AR2315_PLLC_CLKC_DIV);
+               clk_div = pllc_divide_table[clk_div];
+               break;
+       default:
+               pllc_out = 40000000;
+               clk_div = 1;
+               break;
+       }
+
+       cpu_div = ATH25_REG_MS(clock_ctl, AR2315_CPUCLK_CLK_DIV);
+       cpu_div = cpu_div * 2 ?: 1;
+
+       return pllc_out / (clk_div * cpu_div);
+}
+
+static inline unsigned ar2315_cpu_frequency(void)
+{
+       return ar2315_sys_clk(ar2315_rst_reg_read(AR2315_CPUCLK));
+}
+
+static inline unsigned ar2315_apb_frequency(void)
+{
+       return ar2315_sys_clk(ar2315_rst_reg_read(AR2315_AMBACLK));
+}
+
+void __init ar2315_plat_time_init(void)
+{
+       mips_hpt_frequency = ar2315_cpu_frequency() / 2;
+}
+
+void __init ar2315_plat_mem_setup(void)
+{
+       void __iomem *sdram_base;
+       u32 memsize, memcfg;
+       u32 config;
+
+       /* Detect memory size */
+       sdram_base = ioremap_nocache(AR2315_SDRAMCTL_BASE,
+                                    AR2315_SDRAMCTL_SIZE);
+       memcfg = __raw_readl(sdram_base + AR2315_MEM_CFG);
+       memsize   = 1 + ATH25_REG_MS(memcfg, AR2315_MEM_CFG_DATA_WIDTH);
+       memsize <<= 1 + ATH25_REG_MS(memcfg, AR2315_MEM_CFG_COL_WIDTH);
+       memsize <<= 1 + ATH25_REG_MS(memcfg, AR2315_MEM_CFG_ROW_WIDTH);
+       memsize <<= 3;
+       add_memory_region(0, memsize, BOOT_MEM_RAM);
+       iounmap(sdram_base);
+
+       ar2315_rst_base = ioremap_nocache(AR2315_RST_BASE, AR2315_RST_SIZE);
+
+       /* Clear any lingering AHB errors */
+       config = read_c0_config();
+       write_c0_config(config & ~0x3);
+       ar2315_rst_reg_write(AR2315_AHB_ERR0, AR2315_AHB_ERROR_DET);
+       ar2315_rst_reg_read(AR2315_AHB_ERR1);
+       ar2315_rst_reg_write(AR2315_WDT_CTRL, AR2315_WDT_CTRL_IGNORE);
+
+       _machine_restart = ar2315_restart;
+}
diff --git a/arch/mips/ath25/ar2315.h b/arch/mips/ath25/ar2315.h
new file mode 100644 (file)
index 0000000..baeaf84
--- /dev/null
@@ -0,0 +1,16 @@
+#ifndef __AR2315_H
+#define __AR2315_H
+
+#ifdef CONFIG_SOC_AR2315
+
+void ar2315_plat_time_init(void);
+void ar2315_plat_mem_setup(void);
+
+#else
+
+static inline void ar2315_plat_time_init(void) {}
+static inline void ar2315_plat_mem_setup(void) {}
+
+#endif
+
+#endif /* __AR2315_H */
diff --git a/arch/mips/ath25/ar2315_regs.h b/arch/mips/ath25/ar2315_regs.h
new file mode 100644 (file)
index 0000000..c97d351
--- /dev/null
@@ -0,0 +1,387 @@
+/*
+ * Register definitions for AR2315+
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
+ * Copyright (C) 2006 FON Technology, SL.
+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
+ * Copyright (C) 2006-2008 Felix Fietkau <nbd@openwrt.org>
+ */
+
+#ifndef __ASM_MACH_ATH25_AR2315_REGS_H
+#define __ASM_MACH_ATH25_AR2315_REGS_H
+
+/*
+ * Address map
+ */
+#define AR2315_SPI_READ_BASE   0x08000000      /* SPI flash */
+#define AR2315_SPI_READ_SIZE   0x01000000
+#define AR2315_WLAN0_BASE      0x10000000      /* Wireless MMR */
+#define AR2315_PCI_BASE                0x10100000      /* PCI MMR */
+#define AR2315_PCI_SIZE                0x00001000
+#define AR2315_SDRAMCTL_BASE   0x10300000      /* SDRAM MMR */
+#define AR2315_SDRAMCTL_SIZE   0x00000020
+#define AR2315_LOCAL_BASE      0x10400000      /* Local bus MMR */
+#define AR2315_ENET0_BASE      0x10500000      /* Ethernet MMR */
+#define AR2315_RST_BASE                0x11000000      /* Reset control MMR */
+#define AR2315_RST_SIZE                0x00000100
+#define AR2315_UART0_BASE      0x11100000      /* UART MMR */
+#define AR2315_SPI_MMR_BASE    0x11300000      /* SPI flash MMR */
+#define AR2315_SPI_MMR_SIZE    0x00000010
+#define AR2315_PCI_EXT_BASE    0x80000000      /* PCI external */
+#define AR2315_PCI_EXT_SIZE    0x40000000
+
+/*
+ * Configuration registers
+ */
+
+/* Cold reset register */
+#define AR2315_COLD_RESET              0x0000
+
+#define AR2315_RESET_COLD_AHB          0x00000001
+#define AR2315_RESET_COLD_APB          0x00000002
+#define AR2315_RESET_COLD_CPU          0x00000004
+#define AR2315_RESET_COLD_CPUWARM      0x00000008
+#define AR2315_RESET_SYSTEM            (RESET_COLD_CPU |\
+                                        RESET_COLD_APB |\
+                                        RESET_COLD_AHB)  /* full system */
+#define AR2317_RESET_SYSTEM            0x00000010
+
+/* Reset register */
+#define AR2315_RESET                   0x0004
+
+#define AR2315_RESET_WARM_WLAN0_MAC    0x00000001  /* warm reset WLAN0 MAC */
+#define AR2315_RESET_WARM_WLAN0_BB     0x00000002  /* warm reset WLAN0 BB */
+#define AR2315_RESET_MPEGTS_RSVD       0x00000004  /* warm reset MPEG-TS */
+#define AR2315_RESET_PCIDMA            0x00000008  /* warm reset PCI ahb/dma */
+#define AR2315_RESET_MEMCTL            0x00000010  /* warm reset mem control */
+#define AR2315_RESET_LOCAL             0x00000020  /* warm reset local bus */
+#define AR2315_RESET_I2C_RSVD          0x00000040  /* warm reset I2C bus */
+#define AR2315_RESET_SPI               0x00000080  /* warm reset SPI iface */
+#define AR2315_RESET_UART0             0x00000100  /* warm reset UART0 */
+#define AR2315_RESET_IR_RSVD           0x00000200  /* warm reset IR iface */
+#define AR2315_RESET_EPHY0             0x00000400  /* cold reset ENET0 phy */
+#define AR2315_RESET_ENET0             0x00000800  /* cold reset ENET0 MAC */
+
+/* AHB master arbitration control */
+#define AR2315_AHB_ARB_CTL             0x0008
+
+#define AR2315_ARB_CPU                 0x00000001  /* CPU, default */
+#define AR2315_ARB_WLAN                        0x00000002  /* WLAN */
+#define AR2315_ARB_MPEGTS_RSVD         0x00000004  /* MPEG-TS */
+#define AR2315_ARB_LOCAL               0x00000008  /* Local bus */
+#define AR2315_ARB_PCI                 0x00000010  /* PCI bus */
+#define AR2315_ARB_ETHERNET            0x00000020  /* Ethernet */
+#define AR2315_ARB_RETRY               0x00000100  /* Retry policy (debug) */
+
+/* Config Register */
+#define AR2315_ENDIAN_CTL              0x000c
+
+#define AR2315_CONFIG_AHB              0x00000001  /* EC-AHB bridge endian */
+#define AR2315_CONFIG_WLAN             0x00000002  /* WLAN byteswap */
+#define AR2315_CONFIG_MPEGTS_RSVD      0x00000004  /* MPEG-TS byteswap */
+#define AR2315_CONFIG_PCI              0x00000008  /* PCI byteswap */
+#define AR2315_CONFIG_MEMCTL           0x00000010  /* Mem controller endian */
+#define AR2315_CONFIG_LOCAL            0x00000020  /* Local bus byteswap */
+#define AR2315_CONFIG_ETHERNET         0x00000040  /* Ethernet byteswap */
+#define AR2315_CONFIG_MERGE            0x00000200  /* CPU write buffer merge */
+#define AR2315_CONFIG_CPU              0x00000400  /* CPU big endian */
+#define AR2315_CONFIG_BIG              0x00000400
+#define AR2315_CONFIG_PCIAHB           0x00000800
+#define AR2315_CONFIG_PCIAHB_BRIDGE    0x00001000
+#define AR2315_CONFIG_SPI              0x00008000  /* SPI byteswap */
+#define AR2315_CONFIG_CPU_DRAM         0x00010000
+#define AR2315_CONFIG_CPU_PCI          0x00020000
+#define AR2315_CONFIG_CPU_MMR          0x00040000
+
+/* NMI control */
+#define AR2315_NMI_CTL                 0x0010
+
+#define AR2315_NMI_EN                  1
+
+/* Revision Register - Initial value is 0x3010 (WMAC 3.0, AR231X 1.0). */
+#define AR2315_SREV                    0x0014
+
+#define AR2315_REV_MAJ                 0x000000f0
+#define AR2315_REV_MAJ_S               4
+#define AR2315_REV_MIN                 0x0000000f
+#define AR2315_REV_MIN_S               0
+#define AR2315_REV_CHIP                        (AR2315_REV_MAJ | AR2315_REV_MIN)
+
+/* Interface Enable */
+#define AR2315_IF_CTL                  0x0018
+
+#define AR2315_IF_MASK                 0x00000007
+#define AR2315_IF_DISABLED             0               /* Disable all */
+#define AR2315_IF_PCI                  1               /* PCI */
+#define AR2315_IF_TS_LOCAL             2               /* Local bus */
+#define AR2315_IF_ALL                  3               /* Emulation only */
+#define AR2315_IF_LOCAL_HOST           0x00000008
+#define AR2315_IF_PCI_HOST             0x00000010
+#define AR2315_IF_PCI_INTR             0x00000020
+#define AR2315_IF_PCI_CLK_MASK         0x00030000
+#define AR2315_IF_PCI_CLK_INPUT                0
+#define AR2315_IF_PCI_CLK_OUTPUT_LOW   1
+#define AR2315_IF_PCI_CLK_OUTPUT_CLK   2
+#define AR2315_IF_PCI_CLK_OUTPUT_HIGH  3
+#define AR2315_IF_PCI_CLK_SHIFT                16
+
+/* APB Interrupt control */
+#define AR2315_ISR                     0x0020
+#define AR2315_IMR                     0x0024
+#define AR2315_GISR                    0x0028
+
+#define AR2315_ISR_UART0       0x00000001      /* high speed UART */
+#define AR2315_ISR_I2C_RSVD    0x00000002      /* I2C bus */
+#define AR2315_ISR_SPI         0x00000004      /* SPI bus */
+#define AR2315_ISR_AHB         0x00000008      /* AHB error */
+#define AR2315_ISR_APB         0x00000010      /* APB error */
+#define AR2315_ISR_TIMER       0x00000020      /* Timer */
+#define AR2315_ISR_GPIO                0x00000040      /* GPIO */
+#define AR2315_ISR_WD          0x00000080      /* Watchdog */
+#define AR2315_ISR_IR_RSVD     0x00000100      /* IR */
+
+#define AR2315_GISR_MISC       0x00000001      /* Misc */
+#define AR2315_GISR_WLAN0      0x00000002      /* WLAN0 */
+#define AR2315_GISR_MPEGTS_RSVD        0x00000004      /* MPEG-TS */
+#define AR2315_GISR_LOCALPCI   0x00000008      /* Local/PCI bus */
+#define AR2315_GISR_WMACPOLL   0x00000010
+#define AR2315_GISR_TIMER      0x00000020
+#define AR2315_GISR_ETHERNET   0x00000040      /* Ethernet */
+
+/* Generic timer */
+#define AR2315_TIMER                   0x0030
+#define AR2315_RELOAD                  0x0034
+
+/* Watchdog timer */
+#define AR2315_WDT_TIMER               0x0038
+#define AR2315_WDT_CTRL                        0x003c
+
+#define AR2315_WDT_CTRL_IGNORE 0x00000000      /* ignore expiration */
+#define AR2315_WDT_CTRL_NMI    0x00000001      /* NMI on watchdog */
+#define AR2315_WDT_CTRL_RESET  0x00000002      /* reset on watchdog */
+
+/* CPU Performance Counters */
+#define AR2315_PERFCNT0                        0x0048
+#define AR2315_PERFCNT1                        0x004c
+
+#define AR2315_PERF0_DATAHIT   0x00000001  /* Count Data Cache Hits */
+#define AR2315_PERF0_DATAMISS  0x00000002  /* Count Data Cache Misses */
+#define AR2315_PERF0_INSTHIT   0x00000004  /* Count Instruction Cache Hits */
+#define AR2315_PERF0_INSTMISS  0x00000008  /* Count Instruction Cache Misses */
+#define AR2315_PERF0_ACTIVE    0x00000010  /* Count Active Processor Cycles */
+#define AR2315_PERF0_WBHIT     0x00000020  /* Count CPU Write Buffer Hits */
+#define AR2315_PERF0_WBMISS    0x00000040  /* Count CPU Write Buffer Misses */
+
+#define AR2315_PERF1_EB_ARDY   0x00000001  /* Count EB_ARdy signal */
+#define AR2315_PERF1_EB_AVALID 0x00000002  /* Count EB_AValid signal */
+#define AR2315_PERF1_EB_WDRDY  0x00000004  /* Count EB_WDRdy signal */
+#define AR2315_PERF1_EB_RDVAL  0x00000008  /* Count EB_RdVal signal */
+#define AR2315_PERF1_VRADDR    0x00000010  /* Count valid read address cycles*/
+#define AR2315_PERF1_VWADDR    0x00000020  /* Count valid write address cycl.*/
+#define AR2315_PERF1_VWDATA    0x00000040  /* Count valid write data cycles */
+
+/* AHB Error Reporting */
+#define AR2315_AHB_ERR0                        0x0050  /* error  */
+#define AR2315_AHB_ERR1                        0x0054  /* haddr  */
+#define AR2315_AHB_ERR2                        0x0058  /* hwdata */
+#define AR2315_AHB_ERR3                        0x005c  /* hrdata */
+#define AR2315_AHB_ERR4                        0x0060  /* status */
+
+#define AR2315_AHB_ERROR_DET   1 /* AHB Error has been detected,          */
+                                 /* write 1 to clear all bits in ERR0     */
+#define AR2315_AHB_ERROR_OVR   2 /* AHB Error overflow has been detected  */
+#define AR2315_AHB_ERROR_WDT   4 /* AHB Error due to wdt instead of hresp */
+
+#define AR2315_PROCERR_HMAST           0x0000000f
+#define AR2315_PROCERR_HMAST_DFLT      0
+#define AR2315_PROCERR_HMAST_WMAC      1
+#define AR2315_PROCERR_HMAST_ENET      2
+#define AR2315_PROCERR_HMAST_PCIENDPT  3
+#define AR2315_PROCERR_HMAST_LOCAL     4
+#define AR2315_PROCERR_HMAST_CPU       5
+#define AR2315_PROCERR_HMAST_PCITGT    6
+#define AR2315_PROCERR_HMAST_S         0
+#define AR2315_PROCERR_HWRITE          0x00000010
+#define AR2315_PROCERR_HSIZE           0x00000060
+#define AR2315_PROCERR_HSIZE_S         5
+#define AR2315_PROCERR_HTRANS          0x00000180
+#define AR2315_PROCERR_HTRANS_S                7
+#define AR2315_PROCERR_HBURST          0x00000e00
+#define AR2315_PROCERR_HBURST_S                9
+
+/* Clock Control */
+#define AR2315_PLLC_CTL                        0x0064
+#define AR2315_PLLV_CTL                        0x0068
+#define AR2315_CPUCLK                  0x006c
+#define AR2315_AMBACLK                 0x0070
+#define AR2315_SYNCCLK                 0x0074
+#define AR2315_DSL_SLEEP_CTL           0x0080
+#define AR2315_DSL_SLEEP_DUR           0x0084
+
+/* PLLc Control fields */
+#define AR2315_PLLC_REF_DIV_M          0x00000003
+#define AR2315_PLLC_REF_DIV_S          0
+#define AR2315_PLLC_FDBACK_DIV_M       0x0000007c
+#define AR2315_PLLC_FDBACK_DIV_S       2
+#define AR2315_PLLC_ADD_FDBACK_DIV_M   0x00000080
+#define AR2315_PLLC_ADD_FDBACK_DIV_S   7
+#define AR2315_PLLC_CLKC_DIV_M         0x0001c000
+#define AR2315_PLLC_CLKC_DIV_S         14
+#define AR2315_PLLC_CLKM_DIV_M         0x00700000
+#define AR2315_PLLC_CLKM_DIV_S         20
+
+/* CPU CLK Control fields */
+#define AR2315_CPUCLK_CLK_SEL_M                0x00000003
+#define AR2315_CPUCLK_CLK_SEL_S                0
+#define AR2315_CPUCLK_CLK_DIV_M                0x0000000c
+#define AR2315_CPUCLK_CLK_DIV_S                2
+
+/* AMBA CLK Control fields */
+#define AR2315_AMBACLK_CLK_SEL_M       0x00000003
+#define AR2315_AMBACLK_CLK_SEL_S       0
+#define AR2315_AMBACLK_CLK_DIV_M       0x0000000c
+#define AR2315_AMBACLK_CLK_DIV_S       2
+
+/* PCI Clock Control */
+#define AR2315_PCICLK                  0x00a4
+
+#define AR2315_PCICLK_INPUT_M          0x00000003
+#define AR2315_PCICLK_INPUT_S          0
+#define AR2315_PCICLK_PLLC_CLKM                0
+#define AR2315_PCICLK_PLLC_CLKM1       1
+#define AR2315_PCICLK_PLLC_CLKC                2
+#define AR2315_PCICLK_REF_CLK          3
+#define AR2315_PCICLK_DIV_M            0x0000000c
+#define AR2315_PCICLK_DIV_S            2
+#define AR2315_PCICLK_IN_FREQ          0
+#define AR2315_PCICLK_IN_FREQ_DIV_6    1
+#define AR2315_PCICLK_IN_FREQ_DIV_8    2
+#define AR2315_PCICLK_IN_FREQ_DIV_10   3
+
+/* Observation Control Register */
+#define AR2315_OCR                     0x00b0
+
+#define AR2315_OCR_GPIO0_IRIN          0x00000040
+#define AR2315_OCR_GPIO1_IROUT         0x00000080
+#define AR2315_OCR_GPIO3_RXCLR         0x00000200
+
+/* General Clock Control */
+#define AR2315_MISCCLK                 0x00b4
+
+#define AR2315_MISCCLK_PLLBYPASS_EN    0x00000001
+#define AR2315_MISCCLK_PROCREFCLK      0x00000002
+
+/*
+ * SDRAM Controller
+ *   - No read or write buffers are included.
+ */
+#define AR2315_MEM_CFG                 0x0000
+#define AR2315_MEM_CTRL                        0x000c
+#define AR2315_MEM_REF                 0x0010
+
+#define AR2315_MEM_CFG_DATA_WIDTH_M    0x00006000
+#define AR2315_MEM_CFG_DATA_WIDTH_S    13
+#define AR2315_MEM_CFG_COL_WIDTH_M     0x00001e00
+#define AR2315_MEM_CFG_COL_WIDTH_S     9
+#define AR2315_MEM_CFG_ROW_WIDTH_M     0x000001e0
+#define AR2315_MEM_CFG_ROW_WIDTH_S     5
+#define AR2315_MEM_CFG_BANKADDR_BITS_M 0x00000018
+#define AR2315_MEM_CFG_BANKADDR_BITS_S 3
+
+/*
+ * Local Bus Interface Registers
+ */
+#define AR2315_LB_CONFIG               0x0000
+
+#define AR2315_LBCONF_OE       0x00000001      /* =1 OE is low-true */
+#define AR2315_LBCONF_CS0      0x00000002      /* =1 first CS is low-true */
+#define AR2315_LBCONF_CS1      0x00000004      /* =1 2nd CS is low-true */
+#define AR2315_LBCONF_RDY      0x00000008      /* =1 RDY is low-true */
+#define AR2315_LBCONF_WE       0x00000010      /* =1 Write En is low-true */
+#define AR2315_LBCONF_WAIT     0x00000020      /* =1 WAIT is low-true */
+#define AR2315_LBCONF_ADS      0x00000040      /* =1 Adr Strobe is low-true */
+#define AR2315_LBCONF_MOT      0x00000080      /* =0 Intel, =1 Motorola */
+#define AR2315_LBCONF_8CS      0x00000100      /* =1 8 bits CS, 0= 16bits */
+#define AR2315_LBCONF_8DS      0x00000200      /* =1 8 bits Data S, 0=16bits */
+#define AR2315_LBCONF_ADS_EN   0x00000400      /* =1 Enable ADS */
+#define AR2315_LBCONF_ADR_OE   0x00000800      /* =1 Adr cap on OE, WE or DS */
+#define AR2315_LBCONF_ADDT_MUX 0x00001000      /* =1 Adr and Data share bus */
+#define AR2315_LBCONF_DATA_OE  0x00002000      /* =1 Data cap on OE, WE, DS */
+#define AR2315_LBCONF_16DATA   0x00004000      /* =1 Data is 16 bits wide */
+#define AR2315_LBCONF_SWAPDT   0x00008000      /* =1 Byte swap data */
+#define AR2315_LBCONF_SYNC     0x00010000      /* =1 Bus synchronous to clk */
+#define AR2315_LBCONF_INT      0x00020000      /* =1 Intr is low true */
+#define AR2315_LBCONF_INT_CTR0 0x00000000      /* GND high-Z, Vdd is high-Z */
+#define AR2315_LBCONF_INT_CTR1 0x00040000      /* GND drive, Vdd is high-Z */
+#define AR2315_LBCONF_INT_CTR2 0x00080000      /* GND high-Z, Vdd drive */
+#define AR2315_LBCONF_INT_CTR3 0x000c0000      /* GND drive, Vdd drive */
+#define AR2315_LBCONF_RDY_WAIT 0x00100000      /* =1 RDY is negative of WAIT */
+#define AR2315_LBCONF_INT_PULSE        0x00200000      /* =1 Interrupt is a pulse */
+#define AR2315_LBCONF_ENABLE   0x00400000      /* =1 Falcon respond to LB */
+
+#define AR2315_LB_CLKSEL               0x0004
+
+#define AR2315_LBCLK_EXT       0x00000001      /* use external clk for lb */
+
+#define AR2315_LB_1MS                  0x0008
+
+#define AR2315_LB1MS_MASK      0x0003ffff      /* # of AHB clk cycles in 1ms */
+
+#define AR2315_LB_MISCCFG              0x000c
+
+#define AR2315_LBM_TXD_EN      0x00000001      /* Enable TXD for fragments */
+#define AR2315_LBM_RX_INTEN    0x00000002      /* Enable LB ints on RX ready */
+#define AR2315_LBM_MBOXWR_INTEN        0x00000004      /* Enable LB ints on mbox wr */
+#define AR2315_LBM_MBOXRD_INTEN        0x00000008      /* Enable LB ints on mbox rd */
+#define AR2315_LMB_DESCSWAP_EN 0x00000010      /* Byte swap desc enable */
+#define AR2315_LBM_TIMEOUT_M   0x00ffff80
+#define AR2315_LBM_TIMEOUT_S   7
+#define AR2315_LBM_PORTMUX     0x07000000
+
+#define AR2315_LB_RXTSOFF              0x0010
+
+#define AR2315_LB_TX_CHAIN_EN          0x0100
+
+#define AR2315_LB_TXEN_0       0x00000001
+#define AR2315_LB_TXEN_1       0x00000002
+#define AR2315_LB_TXEN_2       0x00000004
+#define AR2315_LB_TXEN_3       0x00000008
+
+#define AR2315_LB_TX_CHAIN_DIS         0x0104
+#define AR2315_LB_TX_DESC_PTR          0x0200
+
+#define AR2315_LB_RX_CHAIN_EN          0x0400
+
+#define AR2315_LB_RXEN         0x00000001
+
+#define AR2315_LB_RX_CHAIN_DIS         0x0404
+#define AR2315_LB_RX_DESC_PTR          0x0408
+
+#define AR2315_LB_INT_STATUS           0x0500
+
+#define AR2315_LB_INT_TX_DESC          0x00000001
+#define AR2315_LB_INT_TX_OK            0x00000002
+#define AR2315_LB_INT_TX_ERR           0x00000004
+#define AR2315_LB_INT_TX_EOF           0x00000008
+#define AR2315_LB_INT_RX_DESC          0x00000010
+#define AR2315_LB_INT_RX_OK            0x00000020
+#define AR2315_LB_INT_RX_ERR           0x00000040
+#define AR2315_LB_INT_RX_EOF           0x00000080
+#define AR2315_LB_INT_TX_TRUNC         0x00000100
+#define AR2315_LB_INT_TX_STARVE                0x00000200
+#define AR2315_LB_INT_LB_TIMEOUT       0x00000400
+#define AR2315_LB_INT_LB_ERR           0x00000800
+#define AR2315_LB_INT_MBOX_WR          0x00001000
+#define AR2315_LB_INT_MBOX_RD          0x00002000
+
+/* Bit definitions for INT MASK are the same as INT_STATUS */
+#define AR2315_LB_INT_MASK             0x0504
+
+#define AR2315_LB_INT_EN               0x0508
+#define AR2315_LB_MBOX                 0x0600
+
+#endif /* __ASM_MACH_ATH25_AR2315_REGS_H */
index 03baeceb3e351f1ad5cbd2420e5652ff2ca24ac6..6063bdf9066e0e9e8e87b696b37cfb7c36eb3d80 100644 (file)
@@ -18,6 +18,7 @@
 
 #include "devices.h"
 #include "ar5312.h"
+#include "ar2315.h"
 
 static void ath25_halt(void)
 {
@@ -32,6 +33,8 @@ void __init plat_mem_setup(void)
 
        if (is_ar5312())
                ar5312_plat_mem_setup();
+       else
+               ar2315_plat_mem_setup();
 
        /* Disable data watchpoints */
        write_c0_watchlo0(0);
@@ -45,6 +48,8 @@ void __init plat_time_init(void)
 {
        if (is_ar5312())
                ar5312_plat_time_init();
+       else
+               ar2315_plat_time_init();
 }
 
 unsigned int __cpuinit get_c0_compare_int(void)
index 5fd82d8908438573e863221816f39f481adb2c35..ade0356df2570cc2b0ae287c9dc95e45f82b3870 100644 (file)
 #define cpu_has_counter                        1
 #define cpu_has_ejtag                  1
 
+#if !defined(CONFIG_SOC_AR5312)
+#  define cpu_has_llsc                 1
+#else
 /*
  * The MIPS 4Kc V0.9 core in the AR5312/AR2312 have problems with the
  * ll/sc instructions.
  */
-#define cpu_has_llsc                   0
+#  define cpu_has_llsc                 0
+#endif
 
 #define cpu_has_mips16                 0
 #define cpu_has_mdmx                   0
 
 #define cpu_has_mips32r1               1
 
+#if !defined(CONFIG_SOC_AR5312)
+#  define cpu_has_mips32r2             1
+#endif
+
 #define cpu_has_mips64r1               0
 #define cpu_has_mips64r2               0