mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 17:55:55 +02:00
[ar7] drop support for 2.6.30
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20439 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
b33a0cab3f
commit
3e9fcfad69
@ -1,140 +0,0 @@
|
||||
|
||||
CONFIG_32BIT=y
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_AR7_GPIO=y
|
||||
CONFIG_AR7_WDT=y
|
||||
CONFIG_AR7=y
|
||||
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
|
||||
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
|
||||
CONFIG_ARCH_POPULATES_NODE_MAP=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
CONFIG_ARCH_SUPPORTS_OPROFILE=y
|
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||
# CONFIG_BCM47XX is not set
|
||||
# CONFIG_BINARY_PRINTF is not set
|
||||
CONFIG_BITREVERSE=y
|
||||
CONFIG_BOOT_ELF32=y
|
||||
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
|
||||
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
|
||||
CONFIG_CEVT_R4K_LIB=y
|
||||
CONFIG_CEVT_R4K=y
|
||||
CONFIG_CMDLINE="rootfstype=squashfs,jffs2"
|
||||
CONFIG_CPMAC=y
|
||||
# CONFIG_CPU_BIG_ENDIAN is not set
|
||||
# CONFIG_CPU_CAVIUM_OCTEON is not set
|
||||
CONFIG_CPU_HAS_LLSC=y
|
||||
CONFIG_CPU_HAS_PREFETCH=y
|
||||
CONFIG_CPU_HAS_SYNC=y
|
||||
CONFIG_CPU_LITTLE_ENDIAN=y
|
||||
# CONFIG_CPU_LOONGSON2 is not set
|
||||
CONFIG_CPU_MIPS32_R1=y
|
||||
# CONFIG_CPU_MIPS32_R2 is not set
|
||||
CONFIG_CPU_MIPS32=y
|
||||
# CONFIG_CPU_MIPS64_R1 is not set
|
||||
# CONFIG_CPU_MIPS64_R2 is not set
|
||||
CONFIG_CPU_MIPSR1=y
|
||||
# CONFIG_CPU_NEVADA is not set
|
||||
# CONFIG_CPU_R10000 is not set
|
||||
# CONFIG_CPU_R3000 is not set
|
||||
# CONFIG_CPU_R4300 is not set
|
||||
# CONFIG_CPU_R4X00 is not set
|
||||
# CONFIG_CPU_R5000 is not set
|
||||
# CONFIG_CPU_R5432 is not set
|
||||
# CONFIG_CPU_R5500 is not set
|
||||
# CONFIG_CPU_R6000 is not set
|
||||
# CONFIG_CPU_R8000 is not set
|
||||
# CONFIG_CPU_RM7000 is not set
|
||||
# CONFIG_CPU_RM9000 is not set
|
||||
# CONFIG_CPU_SB1 is not set
|
||||
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
|
||||
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
||||
# CONFIG_CPU_TX39XX is not set
|
||||
# CONFIG_CPU_TX49XX is not set
|
||||
# CONFIG_CPU_VR41XX is not set
|
||||
CONFIG_CSRC_R4K_LIB=y
|
||||
CONFIG_CSRC_R4K=y
|
||||
CONFIG_DECOMPRESS_LZMA=y
|
||||
# CONFIG_DM9000 is not set
|
||||
CONFIG_DMA_NEED_PCI_MAP_STATE=y
|
||||
CONFIG_DMA_NONCOHERENT=y
|
||||
CONFIG_EARLY_PRINTK=y
|
||||
CONFIG_FIXED_PHY=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
||||
CONFIG_GENERIC_FIND_LAST_BIT=y
|
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||
CONFIG_GENERIC_GPIO=y
|
||||
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
|
||||
CONFIG_HARDWARE_WATCHPOINTS=y
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
CONFIG_HAVE_ARCH_KGDB=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_HAVE_IDE=y
|
||||
CONFIG_HAVE_MLOCK=y
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_IRQ_CPU=y
|
||||
CONFIG_KALLSYMS=y
|
||||
CONFIG_LEDS_GPIO=y
|
||||
# CONFIG_LEMOTE_FULONG is not set
|
||||
# CONFIG_MACH_ALCHEMY is not set
|
||||
# CONFIG_MACH_DECSTATION is not set
|
||||
# CONFIG_MACH_JAZZ is not set
|
||||
# CONFIG_MACH_TX39XX is not set
|
||||
# CONFIG_MACH_TX49XX is not set
|
||||
# CONFIG_MACH_VR41XX is not set
|
||||
# CONFIG_MIKROTIK_RB532 is not set
|
||||
# CONFIG_MIPS_COBALT is not set
|
||||
CONFIG_MIPS_L1_CACHE_SHIFT=5
|
||||
# CONFIG_MIPS_MACHINE is not set
|
||||
# CONFIG_MIPS_MALTA is not set
|
||||
CONFIG_MIPS_MT_DISABLED=y
|
||||
# CONFIG_MIPS_MT_SMP is not set
|
||||
# CONFIG_MIPS_MT_SMTC is not set
|
||||
# CONFIG_MIPS_SIM is not set
|
||||
CONFIG_MIPS=y
|
||||
CONFIG_MTD_AR7_PARTS=y
|
||||
CONFIG_MTD_CFI_STAA=y
|
||||
CONFIG_MTD_PHYSMAP=y
|
||||
CONFIG_NO_EXCEPT_FILL=y
|
||||
# CONFIG_NO_IOPORT is not set
|
||||
# CONFIG_NXP_STB220 is not set
|
||||
# CONFIG_NXP_STB225 is not set
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_PHYLIB=y
|
||||
# CONFIG_PMC_MSP is not set
|
||||
# CONFIG_PMC_YOSEMITE is not set
|
||||
# CONFIG_PNX8550_JBS is not set
|
||||
# CONFIG_PNX8550_STB810 is not set
|
||||
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||
# CONFIG_SCSI_DMA is not set
|
||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||
# CONFIG_SGI_IP22 is not set
|
||||
# CONFIG_SGI_IP27 is not set
|
||||
# CONFIG_SGI_IP28 is not set
|
||||
# CONFIG_SGI_IP32 is not set
|
||||
# CONFIG_SIBYTE_BIGSUR is not set
|
||||
# CONFIG_SIBYTE_CARMEL is not set
|
||||
# CONFIG_SIBYTE_CRHINE is not set
|
||||
# CONFIG_SIBYTE_CRHONE is not set
|
||||
# CONFIG_SIBYTE_LITTLESUR is not set
|
||||
# CONFIG_SIBYTE_RHONE is not set
|
||||
# CONFIG_SIBYTE_SENTOSA is not set
|
||||
# CONFIG_SIBYTE_SWARM is not set
|
||||
# CONFIG_SLOW_WORK is not set
|
||||
CONFIG_SWAP_IO_SPACE=y
|
||||
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
|
||||
CONFIG_SYS_HAS_EARLY_PRINTK=y
|
||||
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
|
||||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
|
||||
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
||||
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
|
||||
CONFIG_TRACING_SUPPORT=y
|
||||
CONFIG_TRAD_SIGNALS=y
|
||||
CONFIG_VLYNQ=y
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
@ -1,10 +0,0 @@
|
||||
|
||||
obj-y := \
|
||||
prom.o \
|
||||
setup.o \
|
||||
memory.o \
|
||||
irq.o \
|
||||
time.o \
|
||||
platform.o \
|
||||
gpio.o \
|
||||
clock.o
|
@ -1,483 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
|
||||
* Copyright (C) 2007 Eugene Konev <ejka@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/delay.h>
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/ar7/ar7.h>
|
||||
|
||||
#define BOOT_PLL_SOURCE_MASK 0x3
|
||||
#define CPU_PLL_SOURCE_SHIFT 16
|
||||
#define BUS_PLL_SOURCE_SHIFT 14
|
||||
#define USB_PLL_SOURCE_SHIFT 18
|
||||
#define DSP_PLL_SOURCE_SHIFT 22
|
||||
#define BOOT_PLL_SOURCE_AFE 0
|
||||
#define BOOT_PLL_SOURCE_BUS 0
|
||||
#define BOOT_PLL_SOURCE_REF 1
|
||||
#define BOOT_PLL_SOURCE_XTAL 2
|
||||
#define BOOT_PLL_SOURCE_CPU 3
|
||||
#define BOOT_PLL_BYPASS 0x00000020
|
||||
#define BOOT_PLL_ASYNC_MODE 0x02000000
|
||||
#define BOOT_PLL_2TO1_MODE 0x00008000
|
||||
|
||||
#define TNETD7200_CLOCK_ID_CPU 0
|
||||
#define TNETD7200_CLOCK_ID_DSP 1
|
||||
#define TNETD7200_CLOCK_ID_USB 2
|
||||
|
||||
#define TNETD7200_DEF_CPU_CLK 211000000
|
||||
#define TNETD7200_DEF_DSP_CLK 125000000
|
||||
#define TNETD7200_DEF_USB_CLK 48000000
|
||||
|
||||
struct tnetd7300_clock {
|
||||
u32 ctrl;
|
||||
#define PREDIV_MASK 0x001f0000
|
||||
#define PREDIV_SHIFT 16
|
||||
#define POSTDIV_MASK 0x0000001f
|
||||
u32 unused1[3];
|
||||
u32 pll;
|
||||
#define MUL_MASK 0x0000f000
|
||||
#define MUL_SHIFT 12
|
||||
#define PLL_MODE_MASK 0x00000001
|
||||
#define PLL_NDIV 0x00000800
|
||||
#define PLL_DIV 0x00000002
|
||||
#define PLL_STATUS 0x00000001
|
||||
u32 unused2[3];
|
||||
};
|
||||
|
||||
struct tnetd7300_clocks {
|
||||
struct tnetd7300_clock bus;
|
||||
struct tnetd7300_clock cpu;
|
||||
struct tnetd7300_clock usb;
|
||||
struct tnetd7300_clock dsp;
|
||||
};
|
||||
|
||||
struct tnetd7200_clock {
|
||||
u32 ctrl;
|
||||
u32 unused1[3];
|
||||
#define DIVISOR_ENABLE_MASK 0x00008000
|
||||
u32 mul;
|
||||
u32 prediv;
|
||||
u32 postdiv;
|
||||
u32 postdiv2;
|
||||
u32 unused2[6];
|
||||
u32 cmd;
|
||||
u32 status;
|
||||
u32 cmden;
|
||||
u32 padding[15];
|
||||
};
|
||||
|
||||
struct tnetd7200_clocks {
|
||||
struct tnetd7200_clock cpu;
|
||||
struct tnetd7200_clock dsp;
|
||||
struct tnetd7200_clock usb;
|
||||
};
|
||||
|
||||
int ar7_cpu_clock = 150000000;
|
||||
EXPORT_SYMBOL(ar7_cpu_clock);
|
||||
int ar7_bus_clock = 125000000;
|
||||
EXPORT_SYMBOL(ar7_bus_clock);
|
||||
int ar7_dsp_clock;
|
||||
EXPORT_SYMBOL(ar7_dsp_clock);
|
||||
|
||||
static int gcd(int a, int b)
|
||||
{
|
||||
int c;
|
||||
|
||||
if (a < b) {
|
||||
c = a;
|
||||
a = b;
|
||||
b = c;
|
||||
}
|
||||
while ((c = (a % b))) {
|
||||
a = b;
|
||||
b = c;
|
||||
}
|
||||
return b;
|
||||
}
|
||||
|
||||
static void approximate(int base, int target, int *prediv,
|
||||
int *postdiv, int *mul)
|
||||
{
|
||||
int i, j, k, freq, res = target;
|
||||
for (i = 1; i <= 16; i++)
|
||||
for (j = 1; j <= 32; j++)
|
||||
for (k = 1; k <= 32; k++) {
|
||||
freq = abs(base / j * i / k - target);
|
||||
if (freq < res) {
|
||||
res = freq;
|
||||
*mul = i;
|
||||
*prediv = j;
|
||||
*postdiv = k;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void calculate(int base, int target, int *prediv, int *postdiv,
|
||||
int *mul)
|
||||
{
|
||||
int tmp_gcd, tmp_base, tmp_freq;
|
||||
|
||||
for (*prediv = 1; *prediv <= 32; (*prediv)++) {
|
||||
tmp_base = base / *prediv;
|
||||
tmp_gcd = gcd(target, tmp_base);
|
||||
*mul = target / tmp_gcd;
|
||||
*postdiv = tmp_base / tmp_gcd;
|
||||
if ((*mul < 1) || (*mul >= 16))
|
||||
continue;
|
||||
if ((*postdiv > 0) & (*postdiv <= 32))
|
||||
break;
|
||||
}
|
||||
|
||||
if (base / (*prediv) * (*mul) / (*postdiv) != target) {
|
||||
approximate(base, target, prediv, postdiv, mul);
|
||||
tmp_freq = base / (*prediv) * (*mul) / (*postdiv);
|
||||
printk(KERN_WARNING
|
||||
"Adjusted requested frequency %d to %d\n",
|
||||
target, tmp_freq);
|
||||
}
|
||||
|
||||
printk(KERN_DEBUG "Clocks: prediv: %d, postdiv: %d, mul: %d\n",
|
||||
*prediv, *postdiv, *mul);
|
||||
}
|
||||
|
||||
static int tnetd7300_dsp_clock(void)
|
||||
{
|
||||
u32 didr1, didr2;
|
||||
u8 rev = ar7_chip_rev();
|
||||
didr1 = readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x18));
|
||||
didr2 = readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x1c));
|
||||
if (didr2 & (1 << 23))
|
||||
return 0;
|
||||
if ((rev >= 0x23) && (rev != 0x57))
|
||||
return 250000000;
|
||||
if ((((didr2 & 0x1fff) << 10) | ((didr1 & 0xffc00000) >> 22))
|
||||
> 4208000)
|
||||
return 250000000;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tnetd7300_get_clock(u32 shift, struct tnetd7300_clock *clock,
|
||||
u32 *bootcr, u32 bus_clock)
|
||||
{
|
||||
int product;
|
||||
int base_clock = AR7_REF_CLOCK;
|
||||
u32 ctrl = readl(&clock->ctrl);
|
||||
u32 pll = readl(&clock->pll);
|
||||
int prediv = ((ctrl & PREDIV_MASK) >> PREDIV_SHIFT) + 1;
|
||||
int postdiv = (ctrl & POSTDIV_MASK) + 1;
|
||||
int divisor = prediv * postdiv;
|
||||
int mul = ((pll & MUL_MASK) >> MUL_SHIFT) + 1;
|
||||
|
||||
switch ((*bootcr & (BOOT_PLL_SOURCE_MASK << shift)) >> shift) {
|
||||
case BOOT_PLL_SOURCE_BUS:
|
||||
base_clock = bus_clock;
|
||||
break;
|
||||
case BOOT_PLL_SOURCE_REF:
|
||||
base_clock = AR7_REF_CLOCK;
|
||||
break;
|
||||
case BOOT_PLL_SOURCE_XTAL:
|
||||
base_clock = AR7_XTAL_CLOCK;
|
||||
break;
|
||||
case BOOT_PLL_SOURCE_CPU:
|
||||
base_clock = ar7_cpu_clock;
|
||||
break;
|
||||
}
|
||||
|
||||
if (*bootcr & BOOT_PLL_BYPASS)
|
||||
return base_clock / divisor;
|
||||
|
||||
if ((pll & PLL_MODE_MASK) == 0)
|
||||
return (base_clock >> (mul / 16 + 1)) / divisor;
|
||||
|
||||
if ((pll & (PLL_NDIV | PLL_DIV)) == (PLL_NDIV | PLL_DIV)) {
|
||||
product = (mul & 1) ?
|
||||
(base_clock * mul) >> 1 :
|
||||
(base_clock * (mul - 1)) >> 2;
|
||||
return product / divisor;
|
||||
}
|
||||
|
||||
if (mul == 16)
|
||||
return base_clock / divisor;
|
||||
|
||||
return base_clock * mul / divisor;
|
||||
}
|
||||
|
||||
static void tnetd7300_set_clock(u32 shift, struct tnetd7300_clock *clock,
|
||||
u32 *bootcr, u32 frequency)
|
||||
{
|
||||
int prediv, postdiv, mul;
|
||||
int base_clock = ar7_bus_clock;
|
||||
|
||||
switch ((*bootcr & (BOOT_PLL_SOURCE_MASK << shift)) >> shift) {
|
||||
case BOOT_PLL_SOURCE_BUS:
|
||||
base_clock = ar7_bus_clock;
|
||||
break;
|
||||
case BOOT_PLL_SOURCE_REF:
|
||||
base_clock = AR7_REF_CLOCK;
|
||||
break;
|
||||
case BOOT_PLL_SOURCE_XTAL:
|
||||
base_clock = AR7_XTAL_CLOCK;
|
||||
break;
|
||||
case BOOT_PLL_SOURCE_CPU:
|
||||
base_clock = ar7_cpu_clock;
|
||||
break;
|
||||
}
|
||||
|
||||
calculate(base_clock, frequency, &prediv, &postdiv, &mul);
|
||||
|
||||
writel(((prediv - 1) << PREDIV_SHIFT) | (postdiv - 1), &clock->ctrl);
|
||||
mdelay(1);
|
||||
writel(4, &clock->pll);
|
||||
while (readl(&clock->pll) & PLL_STATUS);
|
||||
writel(((mul - 1) << MUL_SHIFT) | (0xff << 3) | 0x0e, &clock->pll);
|
||||
mdelay(75);
|
||||
}
|
||||
|
||||
static void __init tnetd7300_init_clocks(void)
|
||||
{
|
||||
u32 *bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
|
||||
struct tnetd7300_clocks *clocks =
|
||||
(struct tnetd7300_clocks *)
|
||||
ioremap_nocache(AR7_REGS_POWER + 0x20,
|
||||
sizeof(struct tnetd7300_clocks));
|
||||
|
||||
ar7_bus_clock = tnetd7300_get_clock(BUS_PLL_SOURCE_SHIFT,
|
||||
&clocks->bus, bootcr, AR7_AFE_CLOCK);
|
||||
|
||||
if (*bootcr & BOOT_PLL_ASYNC_MODE)
|
||||
ar7_cpu_clock = tnetd7300_get_clock(CPU_PLL_SOURCE_SHIFT,
|
||||
&clocks->cpu, bootcr, AR7_AFE_CLOCK);
|
||||
else
|
||||
ar7_cpu_clock = ar7_bus_clock;
|
||||
/*
|
||||
tnetd7300_set_clock(USB_PLL_SOURCE_SHIFT, &clocks->usb,
|
||||
bootcr, 48000000);
|
||||
*/
|
||||
if (ar7_dsp_clock == 250000000)
|
||||
tnetd7300_set_clock(DSP_PLL_SOURCE_SHIFT, &clocks->dsp,
|
||||
bootcr, ar7_dsp_clock);
|
||||
|
||||
iounmap(clocks);
|
||||
iounmap(bootcr);
|
||||
}
|
||||
|
||||
static int tnetd7200_get_clock(int base, struct tnetd7200_clock *clock,
|
||||
u32 *bootcr, u32 bus_clock)
|
||||
{
|
||||
int divisor = ((readl(&clock->prediv) & 0x1f) + 1) *
|
||||
((readl(&clock->postdiv) & 0x1f) + 1);
|
||||
|
||||
if (*bootcr & BOOT_PLL_BYPASS)
|
||||
return base / divisor;
|
||||
|
||||
return base * ((readl(&clock->mul) & 0xf) + 1) / divisor;
|
||||
}
|
||||
|
||||
|
||||
static void tnetd7200_set_clock(int base, struct tnetd7200_clock *clock,
|
||||
int prediv, int postdiv, int postdiv2, int mul, u32 frequency)
|
||||
{
|
||||
printk(KERN_INFO
|
||||
"Clocks: base = %d, frequency = %u, prediv = %d, "
|
||||
"postdiv = %d, postdiv2 = %d, mul = %d\n",
|
||||
base, frequency, prediv, postdiv, postdiv2, mul);
|
||||
|
||||
writel(0, &clock->ctrl);
|
||||
writel(DIVISOR_ENABLE_MASK | ((prediv - 1) & 0x1F), &clock->prediv);
|
||||
writel((mul - 1) & 0xF, &clock->mul);
|
||||
|
||||
for (mul = 0; mul < 2000; mul++) /* nop */;
|
||||
|
||||
while (readl(&clock->status) & 0x1) /* nop */;
|
||||
|
||||
writel(DIVISOR_ENABLE_MASK | ((postdiv - 1) & 0x1F), &clock->postdiv);
|
||||
|
||||
writel(readl(&clock->cmden) | 1, &clock->cmden);
|
||||
writel(readl(&clock->cmd) | 1, &clock->cmd);
|
||||
|
||||
while (readl(&clock->status) & 0x1) /* nop */;
|
||||
|
||||
writel(DIVISOR_ENABLE_MASK | ((postdiv2 - 1) & 0x1F), &clock->postdiv2);
|
||||
|
||||
writel(readl(&clock->cmden) | 1, &clock->cmden);
|
||||
writel(readl(&clock->cmd) | 1, &clock->cmd);
|
||||
|
||||
while (readl(&clock->status) & 0x1) /* nop */;
|
||||
|
||||
writel(readl(&clock->ctrl) | 1, &clock->ctrl);
|
||||
}
|
||||
|
||||
static int tnetd7200_get_clock_base(int clock_id, u32 *bootcr)
|
||||
{
|
||||
if (*bootcr & BOOT_PLL_ASYNC_MODE)
|
||||
/* Async */
|
||||
switch (clock_id) {
|
||||
case TNETD7200_CLOCK_ID_DSP:
|
||||
return AR7_REF_CLOCK;
|
||||
default:
|
||||
return AR7_AFE_CLOCK;
|
||||
}
|
||||
else
|
||||
/* Sync */
|
||||
if (*bootcr & BOOT_PLL_2TO1_MODE)
|
||||
/* 2:1 */
|
||||
switch (clock_id) {
|
||||
case TNETD7200_CLOCK_ID_DSP:
|
||||
return AR7_REF_CLOCK;
|
||||
default:
|
||||
return AR7_AFE_CLOCK;
|
||||
}
|
||||
else
|
||||
/* 1:1 */
|
||||
return AR7_REF_CLOCK;
|
||||
}
|
||||
|
||||
|
||||
static void __init tnetd7200_init_clocks(void)
|
||||
{
|
||||
u32 *bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
|
||||
struct tnetd7200_clocks *clocks =
|
||||
(struct tnetd7200_clocks *)
|
||||
ioremap_nocache(AR7_REGS_POWER + 0x80,
|
||||
sizeof(struct tnetd7200_clocks));
|
||||
int cpu_base, cpu_mul, cpu_prediv, cpu_postdiv;
|
||||
int dsp_base, dsp_mul, dsp_prediv, dsp_postdiv;
|
||||
int usb_base, usb_mul, usb_prediv, usb_postdiv;
|
||||
|
||||
/*
|
||||
Log from Fritz!Box 7170 Annex B:
|
||||
|
||||
CPU revision is: 00018448
|
||||
Clocks: Async mode
|
||||
Clocks: Setting DSP clock
|
||||
Clocks: prediv: 1, postdiv: 1, mul: 5
|
||||
Clocks: base = 25000000, frequency = 125000000, prediv = 1,
|
||||
postdiv = 2, postdiv2 = 1, mul = 10
|
||||
Clocks: Setting CPU clock
|
||||
Adjusted requested frequency 211000000 to 211968000
|
||||
Clocks: prediv: 1, postdiv: 1, mul: 6
|
||||
Clocks: base = 35328000, frequency = 211968000, prediv = 1,
|
||||
postdiv = 1, postdiv2 = -1, mul = 6
|
||||
Clocks: Setting USB clock
|
||||
Adjusted requested frequency 48000000 to 48076920
|
||||
Clocks: prediv: 13, postdiv: 1, mul: 5
|
||||
Clocks: base = 125000000, frequency = 48000000, prediv = 13,
|
||||
postdiv = 1, postdiv2 = -1, mul = 5
|
||||
|
||||
DSL didn't work if you didn't set the postdiv 2:1 postdiv2 combination,
|
||||
driver hung on startup.
|
||||
Haven't tested this on a synchronous board,
|
||||
neither do i know what to do with ar7_dsp_clock
|
||||
*/
|
||||
|
||||
cpu_base = tnetd7200_get_clock_base(TNETD7200_CLOCK_ID_CPU, bootcr);
|
||||
dsp_base = tnetd7200_get_clock_base(TNETD7200_CLOCK_ID_DSP, bootcr);
|
||||
|
||||
if (*bootcr & BOOT_PLL_ASYNC_MODE) {
|
||||
printk(KERN_INFO "Clocks: Async mode\n");
|
||||
|
||||
printk(KERN_INFO "Clocks: Setting DSP clock\n");
|
||||
calculate(dsp_base, TNETD7200_DEF_DSP_CLK,
|
||||
&dsp_prediv, &dsp_postdiv, &dsp_mul);
|
||||
ar7_bus_clock =
|
||||
((dsp_base / dsp_prediv) * dsp_mul) / dsp_postdiv;
|
||||
tnetd7200_set_clock(dsp_base, &clocks->dsp,
|
||||
dsp_prediv, dsp_postdiv * 2, dsp_postdiv, dsp_mul * 2,
|
||||
ar7_bus_clock);
|
||||
|
||||
printk(KERN_INFO "Clocks: Setting CPU clock\n");
|
||||
calculate(cpu_base, TNETD7200_DEF_CPU_CLK, &cpu_prediv,
|
||||
&cpu_postdiv, &cpu_mul);
|
||||
ar7_cpu_clock =
|
||||
((cpu_base / cpu_prediv) * cpu_mul) / cpu_postdiv;
|
||||
tnetd7200_set_clock(cpu_base, &clocks->cpu,
|
||||
cpu_prediv, cpu_postdiv, -1, cpu_mul,
|
||||
ar7_cpu_clock);
|
||||
|
||||
} else
|
||||
if (*bootcr & BOOT_PLL_2TO1_MODE) {
|
||||
printk(KERN_INFO "Clocks: Sync 2:1 mode\n");
|
||||
|
||||
printk(KERN_INFO "Clocks: Setting CPU clock\n");
|
||||
calculate(cpu_base, TNETD7200_DEF_CPU_CLK, &cpu_prediv,
|
||||
&cpu_postdiv, &cpu_mul);
|
||||
ar7_cpu_clock = ((cpu_base / cpu_prediv) * cpu_mul)
|
||||
/ cpu_postdiv;
|
||||
tnetd7200_set_clock(cpu_base, &clocks->cpu,
|
||||
cpu_prediv, cpu_postdiv, -1, cpu_mul,
|
||||
ar7_cpu_clock);
|
||||
|
||||
printk(KERN_INFO "Clocks: Setting DSP clock\n");
|
||||
calculate(dsp_base, TNETD7200_DEF_DSP_CLK, &dsp_prediv,
|
||||
&dsp_postdiv, &dsp_mul);
|
||||
ar7_bus_clock = ar7_cpu_clock / 2;
|
||||
tnetd7200_set_clock(dsp_base, &clocks->dsp,
|
||||
dsp_prediv, dsp_postdiv * 2, dsp_postdiv,
|
||||
dsp_mul * 2, ar7_bus_clock);
|
||||
} else {
|
||||
printk(KERN_INFO "Clocks: Sync 1:1 mode\n");
|
||||
|
||||
printk(KERN_INFO "Clocks: Setting DSP clock\n");
|
||||
calculate(dsp_base, TNETD7200_DEF_DSP_CLK, &dsp_prediv,
|
||||
&dsp_postdiv, &dsp_mul);
|
||||
ar7_bus_clock = ((dsp_base / dsp_prediv) * dsp_mul)
|
||||
/ dsp_postdiv;
|
||||
tnetd7200_set_clock(dsp_base, &clocks->dsp,
|
||||
dsp_prediv, dsp_postdiv * 2, dsp_postdiv,
|
||||
dsp_mul * 2, ar7_bus_clock);
|
||||
|
||||
ar7_cpu_clock = ar7_bus_clock;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "Clocks: Setting USB clock\n");
|
||||
usb_base = ar7_bus_clock;
|
||||
calculate(usb_base, TNETD7200_DEF_USB_CLK, &usb_prediv,
|
||||
&usb_postdiv, &usb_mul);
|
||||
tnetd7200_set_clock(usb_base, &clocks->usb,
|
||||
usb_prediv, usb_postdiv, -1, usb_mul,
|
||||
TNETD7200_DEF_USB_CLK);
|
||||
|
||||
#warning FIXME
|
||||
ar7_dsp_clock = ar7_cpu_clock;
|
||||
|
||||
iounmap(clocks);
|
||||
iounmap(bootcr);
|
||||
}
|
||||
|
||||
void __init ar7_init_clocks(void)
|
||||
{
|
||||
switch (ar7_chip_id()) {
|
||||
case AR7_CHIP_7100:
|
||||
#warning FIXME: Check if the new 7200 clock init works for 7100
|
||||
tnetd7200_init_clocks();
|
||||
break;
|
||||
case AR7_CHIP_7200:
|
||||
tnetd7200_init_clocks();
|
||||
break;
|
||||
case AR7_CHIP_7300:
|
||||
ar7_dsp_clock = tnetd7300_dsp_clock();
|
||||
tnetd7300_init_clocks();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
@ -1,49 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
|
||||
* Copyright (C) 2007 Eugene Konev <ejka@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <asm/ar7/gpio.h>
|
||||
|
||||
static const char *ar7_gpio_list[TITAN_GPIO_MAX];
|
||||
|
||||
int gpio_request(unsigned gpio, const char *label)
|
||||
{
|
||||
if (gpio >= (ar7_is_titan() ? TITAN_GPIO_MAX : AR7_GPIO_MAX))
|
||||
return -EINVAL;
|
||||
|
||||
if (ar7_gpio_list[gpio])
|
||||
return -EBUSY;
|
||||
|
||||
if (label) {
|
||||
ar7_gpio_list[gpio] = label;
|
||||
} else {
|
||||
ar7_gpio_list[gpio] = "busy";
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(gpio_request);
|
||||
|
||||
void gpio_free(unsigned gpio)
|
||||
{
|
||||
BUG_ON(!ar7_gpio_list[gpio]);
|
||||
ar7_gpio_list[gpio] = NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(gpio_free);
|
@ -1,183 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2006,2007 Felix Fietkau <nbd@openwrt.org>
|
||||
* Copyright (C) 2006,2007 Eugene Konev <ejka@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <asm/irq_cpu.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/ar7/ar7.h>
|
||||
|
||||
#define EXCEPT_OFFSET 0x80
|
||||
#define PACE_OFFSET 0xA0
|
||||
#define CHNLS_OFFSET 0x200
|
||||
|
||||
#define REG_OFFSET(irq, reg) ((irq) / 32 * 0x4 + reg * 0x10)
|
||||
#define SEC_REG_OFFSET(reg) (EXCEPT_OFFSET + reg * 0x8)
|
||||
#define SEC_SR_OFFSET (SEC_REG_OFFSET(0)) /* 0x80 */
|
||||
#define CR_OFFSET(irq) (REG_OFFSET(irq, 1)) /* 0x10 */
|
||||
#define SEC_CR_OFFSET (SEC_REG_OFFSET(1)) /* 0x88 */
|
||||
#define ESR_OFFSET(irq) (REG_OFFSET(irq, 2)) /* 0x20 */
|
||||
#define SEC_ESR_OFFSET (SEC_REG_OFFSET(2)) /* 0x90 */
|
||||
#define ECR_OFFSET(irq) (REG_OFFSET(irq, 3)) /* 0x30 */
|
||||
#define SEC_ECR_OFFSET (SEC_REG_OFFSET(3)) /* 0x98 */
|
||||
#define PIR_OFFSET (0x40)
|
||||
#define MSR_OFFSET (0x44)
|
||||
#define PM_OFFSET(irq) (REG_OFFSET(irq, 5)) /* 0x50 */
|
||||
#define TM_OFFSET(irq) (REG_OFFSET(irq, 6)) /* 0x60 */
|
||||
|
||||
#define REG(addr) ((u32 *)(KSEG1ADDR(AR7_REGS_IRQ) + addr))
|
||||
|
||||
#define CHNL_OFFSET(chnl) (CHNLS_OFFSET + (chnl * 4))
|
||||
|
||||
static void ar7_unmask_irq(unsigned int irq_nr);
|
||||
static void ar7_mask_irq(unsigned int irq_nr);
|
||||
static void ar7_ack_irq(unsigned int irq_nr);
|
||||
static void ar7_unmask_sec_irq(unsigned int irq_nr);
|
||||
static void ar7_mask_sec_irq(unsigned int irq_nr);
|
||||
static void ar7_ack_sec_irq(unsigned int irq_nr);
|
||||
static void ar7_cascade(void);
|
||||
static void ar7_irq_init(int base);
|
||||
static int ar7_irq_base;
|
||||
|
||||
static struct irq_chip ar7_irq_type = {
|
||||
.name = "AR7",
|
||||
.unmask = ar7_unmask_irq,
|
||||
.mask = ar7_mask_irq,
|
||||
.ack = ar7_ack_irq
|
||||
};
|
||||
|
||||
static struct irq_chip ar7_sec_irq_type = {
|
||||
.name = "AR7",
|
||||
.unmask = ar7_unmask_sec_irq,
|
||||
.mask = ar7_mask_sec_irq,
|
||||
.ack = ar7_ack_sec_irq,
|
||||
};
|
||||
|
||||
static struct irqaction ar7_cascade_action = {
|
||||
.handler = no_action,
|
||||
.name = "AR7 cascade interrupt"
|
||||
};
|
||||
|
||||
static void ar7_unmask_irq(unsigned int irq)
|
||||
{
|
||||
writel(1 << ((irq - ar7_irq_base) % 32),
|
||||
REG(ESR_OFFSET(irq - ar7_irq_base)));
|
||||
}
|
||||
|
||||
static void ar7_mask_irq(unsigned int irq)
|
||||
{
|
||||
writel(1 << ((irq - ar7_irq_base) % 32),
|
||||
REG(ECR_OFFSET(irq - ar7_irq_base)));
|
||||
}
|
||||
|
||||
static void ar7_ack_irq(unsigned int irq)
|
||||
{
|
||||
writel(1 << ((irq - ar7_irq_base) % 32),
|
||||
REG(CR_OFFSET(irq - ar7_irq_base)));
|
||||
}
|
||||
|
||||
static void ar7_unmask_sec_irq(unsigned int irq)
|
||||
{
|
||||
writel(1 << (irq - ar7_irq_base - 40), REG(SEC_ESR_OFFSET));
|
||||
}
|
||||
|
||||
static void ar7_mask_sec_irq(unsigned int irq)
|
||||
{
|
||||
writel(1 << (irq - ar7_irq_base - 40), REG(SEC_ECR_OFFSET));
|
||||
}
|
||||
|
||||
static void ar7_ack_sec_irq(unsigned int irq)
|
||||
{
|
||||
writel(1 << (irq - ar7_irq_base - 40), REG(SEC_CR_OFFSET));
|
||||
}
|
||||
|
||||
void __init arch_init_irq(void) {
|
||||
mips_cpu_irq_init();
|
||||
ar7_irq_init(8);
|
||||
}
|
||||
|
||||
static void __init ar7_irq_init(int base)
|
||||
{
|
||||
int i;
|
||||
/*
|
||||
* Disable interrupts and clear pending
|
||||
*/
|
||||
writel(0xffffffff, REG(ECR_OFFSET(0)));
|
||||
writel(0xff, REG(ECR_OFFSET(32)));
|
||||
writel(0xffffffff, REG(SEC_ECR_OFFSET));
|
||||
writel(0xffffffff, REG(CR_OFFSET(0)));
|
||||
writel(0xff, REG(CR_OFFSET(32)));
|
||||
writel(0xffffffff, REG(SEC_CR_OFFSET));
|
||||
|
||||
ar7_irq_base = base;
|
||||
|
||||
for (i = 0; i < 40; i++) {
|
||||
writel(i, REG(CHNL_OFFSET(i)));
|
||||
/* Primary IRQ's */
|
||||
set_irq_chip_and_handler(base + i, &ar7_irq_type,
|
||||
handle_level_irq);
|
||||
/* Secondary IRQ's */
|
||||
if (i < 32)
|
||||
set_irq_chip_and_handler(base + i + 40,
|
||||
&ar7_sec_irq_type,
|
||||
handle_level_irq);
|
||||
}
|
||||
|
||||
setup_irq(2, &ar7_cascade_action);
|
||||
setup_irq(ar7_irq_base, &ar7_cascade_action);
|
||||
set_c0_status(IE_IRQ0);
|
||||
}
|
||||
|
||||
static void ar7_cascade(void)
|
||||
{
|
||||
u32 status;
|
||||
int i, irq;
|
||||
|
||||
/* Primary IRQ's */
|
||||
irq = readl(REG(PIR_OFFSET)) & 0x3f;
|
||||
if (irq) {
|
||||
do_IRQ(ar7_irq_base + irq);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Secondary IRQ's are cascaded through primary '0' */
|
||||
writel(1, REG(CR_OFFSET(irq)));
|
||||
status = readl(REG(SEC_SR_OFFSET));
|
||||
for (i = 0; i < 32; i++) {
|
||||
if (status & 1) {
|
||||
do_IRQ(ar7_irq_base + i + 40);
|
||||
return;
|
||||
}
|
||||
status >>= 1;
|
||||
}
|
||||
|
||||
spurious_interrupt();
|
||||
}
|
||||
|
||||
asmlinkage void plat_irq_dispatch(void)
|
||||
{
|
||||
unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
|
||||
if (pending & STATUSF_IP7) /* cpu timer */
|
||||
do_IRQ(7);
|
||||
else if (pending & STATUSF_IP2) /* int0 hardware line */
|
||||
ar7_cascade();
|
||||
else
|
||||
spurious_interrupt();
|
||||
}
|
@ -1,74 +0,0 @@
|
||||
/*
|
||||
* Based on arch/mips/mm/init.c
|
||||
* Copyright (C) 1994 - 2000 Ralf Baechle
|
||||
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
|
||||
* Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
|
||||
* Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
#include <linux/bootmem.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/pfn.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/swap.h>
|
||||
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/sections.h>
|
||||
|
||||
#include <asm/mips-boards/prom.h>
|
||||
|
||||
static int __init memsize(void)
|
||||
{
|
||||
u32 size = (64 << 20);
|
||||
u32 *addr = (u32 *)KSEG1ADDR(0x14000000 + size - 4);
|
||||
u32 *kernel_end = (u32 *)KSEG1ADDR(CPHYSADDR((u32)&_end));
|
||||
u32 *tmpaddr = addr;
|
||||
|
||||
while (tmpaddr > kernel_end) {
|
||||
*tmpaddr = (u32)tmpaddr;
|
||||
size >>= 1;
|
||||
tmpaddr -= size >> 2;
|
||||
}
|
||||
|
||||
do {
|
||||
tmpaddr += size >> 2;
|
||||
if (*tmpaddr != (u32)tmpaddr)
|
||||
break;
|
||||
size <<= 1;
|
||||
} while (size < (64 << 20));
|
||||
|
||||
writel(tmpaddr, &addr);
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
void __init prom_meminit(void)
|
||||
{
|
||||
unsigned long pages;
|
||||
|
||||
pages = memsize() >> PAGE_SHIFT;
|
||||
add_memory_region(PHYS_OFFSET, pages << PAGE_SHIFT,
|
||||
BOOT_MEM_RAM);
|
||||
}
|
||||
|
||||
void __init prom_free_prom_memory(void)
|
||||
{
|
||||
return;
|
||||
}
|
@ -1,535 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2006,2007 Felix Fietkau <nbd@openwrt.org>
|
||||
* Copyright (C) 2006,2007 Eugene Konev <ejka@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <linux/autoconf.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/mtd/physmap.h>
|
||||
#include <linux/serial.h>
|
||||
#include <linux/serial_8250.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/vlynq.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/string.h>
|
||||
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/ar7/ar7.h>
|
||||
#include <asm/ar7/gpio.h>
|
||||
#include <asm/ar7/prom.h>
|
||||
|
||||
struct plat_vlynq_data {
|
||||
struct plat_vlynq_ops ops;
|
||||
int gpio_bit;
|
||||
int reset_bit;
|
||||
};
|
||||
|
||||
|
||||
static int vlynq_on(struct vlynq_device *dev)
|
||||
{
|
||||
int result;
|
||||
struct plat_vlynq_data *pdata = dev->dev.platform_data;
|
||||
|
||||
if ((result = gpio_request(pdata->gpio_bit, "vlynq")))
|
||||
goto out;
|
||||
|
||||
ar7_device_reset(pdata->reset_bit);
|
||||
|
||||
if ((result = ar7_gpio_disable(pdata->gpio_bit)))
|
||||
goto out_enabled;
|
||||
|
||||
if ((result = ar7_gpio_enable(pdata->gpio_bit)))
|
||||
goto out_enabled;
|
||||
|
||||
if ((result = gpio_direction_output(pdata->gpio_bit, 0)))
|
||||
goto out_gpio_enabled;
|
||||
|
||||
mdelay(50);
|
||||
|
||||
gpio_set_value(pdata->gpio_bit, 1);
|
||||
mdelay(50);
|
||||
|
||||
return 0;
|
||||
|
||||
out_gpio_enabled:
|
||||
ar7_gpio_disable(pdata->gpio_bit);
|
||||
out_enabled:
|
||||
ar7_device_disable(pdata->reset_bit);
|
||||
gpio_free(pdata->gpio_bit);
|
||||
out:
|
||||
return result;
|
||||
}
|
||||
|
||||
static void vlynq_off(struct vlynq_device *dev)
|
||||
{
|
||||
struct plat_vlynq_data *pdata = dev->dev.platform_data;
|
||||
ar7_gpio_disable(pdata->gpio_bit);
|
||||
gpio_free(pdata->gpio_bit);
|
||||
ar7_device_disable(pdata->reset_bit);
|
||||
}
|
||||
|
||||
static struct resource physmap_flash_resource = {
|
||||
.name = "mem",
|
||||
.flags = IORESOURCE_MEM,
|
||||
.start = 0x10000000,
|
||||
.end = 0x107fffff,
|
||||
};
|
||||
|
||||
static struct resource cpmac_low_res[] = {
|
||||
{
|
||||
.name = "regs",
|
||||
.flags = IORESOURCE_MEM,
|
||||
.start = AR7_REGS_MAC0,
|
||||
.end = AR7_REGS_MAC0 + 0x7ff,
|
||||
},
|
||||
{
|
||||
.name = "irq",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.start = 27,
|
||||
.end = 27,
|
||||
},
|
||||
};
|
||||
|
||||
static struct resource cpmac_high_res[] = {
|
||||
{
|
||||
.name = "regs",
|
||||
.flags = IORESOURCE_MEM,
|
||||
.start = AR7_REGS_MAC1,
|
||||
.end = AR7_REGS_MAC1 + 0x7ff,
|
||||
},
|
||||
{
|
||||
.name = "irq",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.start = 41,
|
||||
.end = 41,
|
||||
},
|
||||
};
|
||||
|
||||
static struct resource vlynq_low_res[] = {
|
||||
{
|
||||
.name = "regs",
|
||||
.flags = IORESOURCE_MEM,
|
||||
.start = AR7_REGS_VLYNQ0,
|
||||
.end = AR7_REGS_VLYNQ0 + 0xff,
|
||||
},
|
||||
{
|
||||
.name = "irq",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.start = 29,
|
||||
.end = 29,
|
||||
},
|
||||
{
|
||||
.name = "mem",
|
||||
.flags = IORESOURCE_MEM,
|
||||
.start = 0x04000000,
|
||||
.end = 0x04ffffff,
|
||||
},
|
||||
{
|
||||
.name = "devirq",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.start = 80,
|
||||
.end = 111,
|
||||
},
|
||||
};
|
||||
|
||||
static struct resource vlynq_high_res[] = {
|
||||
{
|
||||
.name = "regs",
|
||||
.flags = IORESOURCE_MEM,
|
||||
.start = AR7_REGS_VLYNQ1,
|
||||
.end = AR7_REGS_VLYNQ1 + 0xff,
|
||||
},
|
||||
{
|
||||
.name = "irq",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.start = 33,
|
||||
.end = 33,
|
||||
},
|
||||
{
|
||||
.name = "mem",
|
||||
.flags = IORESOURCE_MEM,
|
||||
.start = 0x0c000000,
|
||||
.end = 0x0cffffff,
|
||||
},
|
||||
{
|
||||
.name = "devirq",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.start = 112,
|
||||
.end = 143,
|
||||
},
|
||||
};
|
||||
|
||||
static struct resource usb_res[] = {
|
||||
{
|
||||
.name = "regs",
|
||||
.flags = IORESOURCE_MEM,
|
||||
.start = AR7_REGS_USB,
|
||||
.end = AR7_REGS_USB + 0xff,
|
||||
},
|
||||
{
|
||||
.name = "irq",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.start = 32,
|
||||
.end = 32,
|
||||
},
|
||||
{
|
||||
.name = "mem",
|
||||
.flags = IORESOURCE_MEM,
|
||||
.start = 0x03400000,
|
||||
.end = 0x034001fff,
|
||||
},
|
||||
};
|
||||
|
||||
static struct physmap_flash_data physmap_flash_data = {
|
||||
.width = 2,
|
||||
};
|
||||
|
||||
static struct plat_cpmac_data cpmac_low_data = {
|
||||
.reset_bit = 17,
|
||||
.power_bit = 20,
|
||||
.phy_mask = 0x80000000,
|
||||
};
|
||||
|
||||
static struct plat_cpmac_data cpmac_high_data = {
|
||||
.reset_bit = 21,
|
||||
.power_bit = 22,
|
||||
.phy_mask = 0x7fffffff,
|
||||
};
|
||||
|
||||
static struct plat_vlynq_data vlynq_low_data = {
|
||||
.ops.on = vlynq_on,
|
||||
.ops.off = vlynq_off,
|
||||
.reset_bit = 20,
|
||||
.gpio_bit = 18,
|
||||
};
|
||||
|
||||
static struct plat_vlynq_data vlynq_high_data = {
|
||||
.ops.on = vlynq_on,
|
||||
.ops.off = vlynq_off,
|
||||
.reset_bit = 16,
|
||||
.gpio_bit = 19,
|
||||
};
|
||||
|
||||
static struct platform_device physmap_flash = {
|
||||
.id = 0,
|
||||
.name = "physmap-flash",
|
||||
.dev.platform_data = &physmap_flash_data,
|
||||
.resource = &physmap_flash_resource,
|
||||
.num_resources = 1,
|
||||
};
|
||||
|
||||
static u64 cpmac_dma_mask = DMA_32BIT_MASK;
|
||||
static struct platform_device cpmac_low = {
|
||||
.id = 0,
|
||||
.name = "cpmac",
|
||||
.dev = {
|
||||
.dma_mask = &cpmac_dma_mask,
|
||||
.coherent_dma_mask = DMA_32BIT_MASK,
|
||||
.platform_data = &cpmac_low_data,
|
||||
},
|
||||
.resource = cpmac_low_res,
|
||||
.num_resources = ARRAY_SIZE(cpmac_low_res),
|
||||
};
|
||||
|
||||
static struct platform_device cpmac_high = {
|
||||
.id = 1,
|
||||
.name = "cpmac",
|
||||
.dev = {
|
||||
.dma_mask = &cpmac_dma_mask,
|
||||
.coherent_dma_mask = DMA_32BIT_MASK,
|
||||
.platform_data = &cpmac_high_data,
|
||||
},
|
||||
.resource = cpmac_high_res,
|
||||
.num_resources = ARRAY_SIZE(cpmac_high_res),
|
||||
};
|
||||
|
||||
static struct platform_device vlynq_low = {
|
||||
.id = 0,
|
||||
.name = "vlynq",
|
||||
.dev.platform_data = &vlynq_low_data,
|
||||
.resource = vlynq_low_res,
|
||||
.num_resources = ARRAY_SIZE(vlynq_low_res),
|
||||
};
|
||||
|
||||
static struct platform_device vlynq_high = {
|
||||
.id = 1,
|
||||
.name = "vlynq",
|
||||
.dev.platform_data = &vlynq_high_data,
|
||||
.resource = vlynq_high_res,
|
||||
.num_resources = ARRAY_SIZE(vlynq_high_res),
|
||||
};
|
||||
|
||||
|
||||
/* This is proper way to define uart ports, but they are then detected
|
||||
* as xscale and, obviously, don't work...
|
||||
*/
|
||||
#if !defined(CONFIG_SERIAL_8250)
|
||||
|
||||
static struct plat_serial8250_port uart0_data = {
|
||||
.mapbase = AR7_REGS_UART0,
|
||||
.irq = AR7_IRQ_UART0,
|
||||
.regshift = 2,
|
||||
.iotype = UPIO_MEM,
|
||||
.flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP,
|
||||
};
|
||||
|
||||
static struct plat_serial8250_port uart1_data = {
|
||||
.mapbase = UR8_REGS_UART1,
|
||||
.irq = AR7_IRQ_UART1,
|
||||
.regshift = 2,
|
||||
.iotype = UPIO_MEM,
|
||||
.flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP,
|
||||
};
|
||||
|
||||
static struct plat_serial8250_port uart_data[] = {
|
||||
uart0_data,
|
||||
uart1_data,
|
||||
{ .flags = 0 }
|
||||
};
|
||||
|
||||
static struct plat_serial8250_port uart_data_single[] = {
|
||||
uart0_data,
|
||||
{ .flags = 0 }
|
||||
};
|
||||
|
||||
static struct platform_device uart = {
|
||||
.id = 0,
|
||||
.name = "serial8250",
|
||||
.dev.platform_data = uart_data_single
|
||||
};
|
||||
#endif
|
||||
|
||||
static struct gpio_led default_leds[] = {
|
||||
{ .name = "status", .gpio = 8, .active_low = 1, },
|
||||
};
|
||||
|
||||
static struct gpio_led dsl502t_leds[] = {
|
||||
{ .name = "status", .gpio = 9, .active_low = 1, },
|
||||
{ .name = "ethernet", .gpio = 7, .active_low = 1, },
|
||||
{ .name = "usb", .gpio = 12, .active_low = 1, },
|
||||
};
|
||||
|
||||
static struct gpio_led dg834g_leds[] = {
|
||||
{ .name = "ppp", .gpio = 6, .active_low = 1, },
|
||||
{ .name = "status", .gpio = 7, .active_low = 1, },
|
||||
{ .name = "adsl", .gpio = 8, .active_low = 1, },
|
||||
{ .name = "wifi", .gpio = 12, .active_low = 1, },
|
||||
{ .name = "power", .gpio = 14, .active_low = 1, .default_trigger = "default-on", },
|
||||
};
|
||||
|
||||
static struct gpio_led fb_sl_leds[] = {
|
||||
{ .name = "1", .gpio = 7, },
|
||||
{ .name = "2", .gpio = 13, .active_low = 1, },
|
||||
{ .name = "3", .gpio = 10, .active_low = 1, },
|
||||
{ .name = "4", .gpio = 12, .active_low = 1, },
|
||||
{ .name = "5", .gpio = 9, .active_low = 1, },
|
||||
};
|
||||
|
||||
static struct gpio_led fb_fon_leds[] = {
|
||||
{ .name = "1", .gpio = 8, },
|
||||
{ .name = "2", .gpio = 3, .active_low = 1, },
|
||||
{ .name = "3", .gpio = 5, },
|
||||
{ .name = "4", .gpio = 4, .active_low = 1, },
|
||||
{ .name = "5", .gpio = 11, .active_low = 1, },
|
||||
};
|
||||
|
||||
static struct gpio_led_platform_data ar7_led_data;
|
||||
|
||||
static struct platform_device ar7_gpio_leds = {
|
||||
.name = "leds-gpio",
|
||||
.id = -1,
|
||||
.dev = {
|
||||
.platform_data = &ar7_led_data,
|
||||
}
|
||||
};
|
||||
|
||||
static struct platform_device ar7_udc = {
|
||||
.id = -1,
|
||||
.name = "ar7_udc",
|
||||
.resource = usb_res,
|
||||
.num_resources = ARRAY_SIZE(usb_res),
|
||||
};
|
||||
|
||||
static inline unsigned char char2hex(char h)
|
||||
{
|
||||
switch (h) {
|
||||
case '0': case '1': case '2': case '3': case '4':
|
||||
case '5': case '6': case '7': case '8': case '9':
|
||||
return h - '0';
|
||||
case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
|
||||
return h - 'A' + 10;
|
||||
case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
|
||||
return h - 'a' + 10;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void cpmac_get_mac(int instance, unsigned char *dev_addr)
|
||||
{
|
||||
int i;
|
||||
char name[5], default_mac[] = "00:00:00:12:34:56", *mac;
|
||||
|
||||
mac = NULL;
|
||||
sprintf(name, "mac%c", 'a' + instance);
|
||||
mac = prom_getenv(name);
|
||||
if (!mac) {
|
||||
sprintf(name, "mac%c", 'a');
|
||||
mac = prom_getenv(name);
|
||||
}
|
||||
if (!mac)
|
||||
mac = default_mac;
|
||||
for (i = 0; i < 6; i++)
|
||||
dev_addr[i] = (char2hex(mac[i * 3]) << 4) +
|
||||
char2hex(mac[i * 3 + 1]);
|
||||
}
|
||||
|
||||
static void __init detect_leds(void)
|
||||
{
|
||||
char *prId, *usb_prod;
|
||||
|
||||
/* Default LEDs */
|
||||
ar7_led_data.num_leds = ARRAY_SIZE(default_leds);
|
||||
ar7_led_data.leds = default_leds;
|
||||
|
||||
/* FIXME: the whole thing is unreliable */
|
||||
prId = prom_getenv("ProductID");
|
||||
usb_prod = prom_getenv("usb_prod");
|
||||
|
||||
/* If we can't get the product id from PROM, use the default LEDs */
|
||||
if (!prId)
|
||||
return;
|
||||
|
||||
if (strstr(prId, "Fritz_Box_FON")) {
|
||||
ar7_led_data.num_leds = ARRAY_SIZE(fb_fon_leds);
|
||||
ar7_led_data.leds = fb_fon_leds;
|
||||
} else if (strstr(prId, "Fritz_Box_")) {
|
||||
ar7_led_data.num_leds = ARRAY_SIZE(fb_sl_leds);
|
||||
ar7_led_data.leds = fb_sl_leds;
|
||||
} else if ((!strcmp(prId, "AR7RD") || !strcmp(prId, "AR7DB")) && usb_prod != NULL && strstr(usb_prod, "DSL-502T")) {
|
||||
ar7_led_data.num_leds = ARRAY_SIZE(dsl502t_leds);
|
||||
ar7_led_data.leds = dsl502t_leds;
|
||||
} else if (strstr(prId, "DG834")) {
|
||||
ar7_led_data.num_leds = ARRAY_SIZE(dg834g_leds);
|
||||
ar7_led_data.leds = dg834g_leds;
|
||||
}
|
||||
}
|
||||
|
||||
static int __init ar7_register_devices(void)
|
||||
{
|
||||
int res;
|
||||
|
||||
#ifdef CONFIG_SERIAL_8250
|
||||
|
||||
static struct uart_port uart_port[2];
|
||||
|
||||
memset(uart_port, 0, sizeof(struct uart_port) * 2);
|
||||
|
||||
uart_port[0].type = PORT_AR7;
|
||||
uart_port[0].line = 0;
|
||||
uart_port[0].irq = AR7_IRQ_UART0;
|
||||
uart_port[0].uartclk = ar7_bus_freq() / 2;
|
||||
uart_port[0].iotype = UPIO_MEM;
|
||||
uart_port[0].mapbase = AR7_REGS_UART0;
|
||||
uart_port[0].membase = ioremap(uart_port[0].mapbase, 256);
|
||||
uart_port[0].regshift = 2;
|
||||
uart_port[0].flags = UPF_IOREMAP;
|
||||
res = early_serial_setup(&uart_port[0]);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
|
||||
/* Only TNETD73xx have a second serial port */
|
||||
if (ar7_has_second_uart()) {
|
||||
uart_port[1].type = PORT_AR7;
|
||||
uart_port[1].line = 1;
|
||||
uart_port[1].irq = AR7_IRQ_UART1;
|
||||
uart_port[1].uartclk = ar7_bus_freq() / 2;
|
||||
uart_port[1].iotype = UPIO_MEM;
|
||||
uart_port[1].mapbase = UR8_REGS_UART1;
|
||||
uart_port[1].membase = ioremap(uart_port[1].mapbase, 256);
|
||||
uart_port[1].regshift = 2;
|
||||
uart_port[1].flags = UPF_IOREMAP;
|
||||
res = early_serial_setup(&uart_port[1]);
|
||||
if (res)
|
||||
return res;
|
||||
}
|
||||
|
||||
#else /* !CONFIG_SERIAL_8250 */
|
||||
|
||||
uart_data[0].uartclk = ar7_bus_freq() / 2;
|
||||
uart_data[1].uartclk = uart_data[0].uartclk;
|
||||
|
||||
/* Only TNETD73xx have a second serial port */
|
||||
if (ar7_has_second_uart())
|
||||
uart.dev.platform_data = uart_data;
|
||||
|
||||
res = platform_device_register(&uart);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
#endif /* CONFIG_SERIAL_8250 */
|
||||
|
||||
res = platform_device_register(&physmap_flash);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
ar7_device_disable(vlynq_low_data.reset_bit);
|
||||
res = platform_device_register(&vlynq_low);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
if (ar7_has_high_vlynq()) {
|
||||
ar7_device_disable(vlynq_high_data.reset_bit);
|
||||
res = platform_device_register(&vlynq_high);
|
||||
if (res)
|
||||
return res;
|
||||
}
|
||||
|
||||
if (ar7_has_high_cpmac()) {
|
||||
cpmac_get_mac(1, cpmac_high_data.dev_addr);
|
||||
res = platform_device_register(&cpmac_high);
|
||||
if (res)
|
||||
return res;
|
||||
} else {
|
||||
cpmac_low_data.phy_mask = 0xffffffff;
|
||||
}
|
||||
|
||||
cpmac_get_mac(0, cpmac_low_data.dev_addr);
|
||||
res = platform_device_register(&cpmac_low);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
detect_leds();
|
||||
res = platform_device_register(&ar7_gpio_leds);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
res = platform_device_register(&ar7_udc);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
arch_initcall(ar7_register_devices);
|
@ -1,321 +0,0 @@
|
||||
/*
|
||||
* Carsten Langgaard, carstenl@mips.com
|
||||
* Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can distribute it and/or modify it
|
||||
* under the terms of the GNU General Public License (Version 2) as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
|
||||
*
|
||||
* Putting things on the screen/serial line using YAMONs facilities.
|
||||
*/
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/serial_reg.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/io.h>
|
||||
#include <asm/bootinfo.h>
|
||||
|
||||
#include <asm/ar7/ar7.h>
|
||||
#include <asm/ar7/prom.h>
|
||||
|
||||
#define MAX_ENTRY 80
|
||||
|
||||
struct env_var {
|
||||
char *name;
|
||||
char *value;
|
||||
};
|
||||
|
||||
static struct env_var adam2_env[MAX_ENTRY] = { { 0, }, };
|
||||
|
||||
char *prom_getenv(const char *name)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; (i < MAX_ENTRY) && adam2_env[i].name; i++)
|
||||
if (!strcmp(name, adam2_env[i].name))
|
||||
return adam2_env[i].value;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(prom_getenv);
|
||||
|
||||
char * __init prom_getcmdline(void)
|
||||
{
|
||||
return &(arcs_cmdline[0]);
|
||||
}
|
||||
|
||||
static void __init ar7_init_cmdline(int argc, char *argv[])
|
||||
{
|
||||
char *cp;
|
||||
int actr;
|
||||
|
||||
actr = 1; /* Always ignore argv[0] */
|
||||
|
||||
cp = &(arcs_cmdline[0]);
|
||||
while (actr < argc) {
|
||||
strcpy(cp, argv[actr]);
|
||||
cp += strlen(argv[actr]);
|
||||
*cp++ = ' ';
|
||||
actr++;
|
||||
}
|
||||
if (cp != &(arcs_cmdline[0])) {
|
||||
/* get rid of trailing space */
|
||||
--cp;
|
||||
*cp = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
struct psbl_rec {
|
||||
u32 psbl_size;
|
||||
u32 env_base;
|
||||
u32 env_size;
|
||||
u32 ffs_base;
|
||||
u32 ffs_size;
|
||||
};
|
||||
|
||||
static __initdata char psp_env_version[] = "TIENV0.8";
|
||||
|
||||
struct psp_env_chunk {
|
||||
u8 num;
|
||||
u8 ctrl;
|
||||
u16 csum;
|
||||
u8 len;
|
||||
char data[11];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct psp_var_map_entry {
|
||||
u8 num;
|
||||
char *value;
|
||||
};
|
||||
|
||||
static struct psp_var_map_entry psp_var_map[] = {
|
||||
{ 1, "cpufrequency" },
|
||||
{ 2, "memsize" },
|
||||
{ 3, "flashsize" },
|
||||
{ 4, "modetty0" },
|
||||
{ 5, "modetty1" },
|
||||
{ 8, "maca" },
|
||||
{ 9, "macb" },
|
||||
{ 28, "sysfrequency" },
|
||||
{ 38, "mipsfrequency" },
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
Well-known variable (num is looked up in table above for matching variable name)
|
||||
Example: cpufrequency=211968000
|
||||
+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+---
|
||||
| 01 |CTRL|CHECKSUM | 01 | _2 | _1 | _1 | _9 | _6 | _8 | _0 | _0 | _0 | \0 | FF
|
||||
+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+---
|
||||
|
||||
Name=Value pair in a single chunk
|
||||
Example: NAME=VALUE
|
||||
+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+---
|
||||
| 00 |CTRL|CHECKSUM | 01 | _N | _A | _M | _E | _0 | _V | _A | _L | _U | _E | \0
|
||||
+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+---
|
||||
|
||||
Name=Value pair in 2 chunks (len is the number of chunks)
|
||||
Example: bootloaderVersion=1.3.7.15
|
||||
+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+---
|
||||
| 00 |CTRL|CHECKSUM | 02 | _b | _o | _o | _t | _l | _o | _a | _d | _e | _r | _V
|
||||
+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+---
|
||||
| _e | _r | _s | _i | _o | _n | \0 | _1 | _. | _3 | _. | _7 | _. | _1 | _5 | \0
|
||||
+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+---
|
||||
|
||||
Data is padded with 0xFF
|
||||
|
||||
*/
|
||||
|
||||
#define PSP_ENV_SIZE 4096
|
||||
|
||||
static char psp_env_data[PSP_ENV_SIZE] = { 0, };
|
||||
|
||||
static char * __init lookup_psp_var_map(u8 num)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < sizeof(psp_var_map); i++)
|
||||
if (psp_var_map[i].num == num)
|
||||
return psp_var_map[i].value;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void __init add_adam2_var(char *name, char *value)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < MAX_ENTRY; i++) {
|
||||
if (!adam2_env[i].name) {
|
||||
adam2_env[i].name = name;
|
||||
adam2_env[i].value = value;
|
||||
return;
|
||||
} else if (!strcmp(adam2_env[i].name, name)) {
|
||||
adam2_env[i].value = value;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int __init parse_psp_env(void *psp_env_base)
|
||||
{
|
||||
int i, n;
|
||||
char *name, *value;
|
||||
struct psp_env_chunk *chunks = (struct psp_env_chunk *)psp_env_data;
|
||||
|
||||
memcpy_fromio(chunks, psp_env_base, PSP_ENV_SIZE);
|
||||
|
||||
i = 1;
|
||||
n = PSP_ENV_SIZE / sizeof(struct psp_env_chunk);
|
||||
while (i < n) {
|
||||
if ((chunks[i].num == 0xff) || ((i + chunks[i].len) > n))
|
||||
break;
|
||||
value = chunks[i].data;
|
||||
if (chunks[i].num) {
|
||||
name = lookup_psp_var_map(chunks[i].num);
|
||||
} else {
|
||||
name = value;
|
||||
value += strlen(name) + 1;
|
||||
}
|
||||
if (name)
|
||||
add_adam2_var(name, value);
|
||||
i += chunks[i].len;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __init ar7_init_env(struct env_var *env)
|
||||
{
|
||||
int i;
|
||||
struct psbl_rec *psbl = (struct psbl_rec *)(KSEG1ADDR(0x14000300));
|
||||
void *psp_env = (void *)KSEG1ADDR(psbl->env_base);
|
||||
|
||||
if (strcmp(psp_env, psp_env_version) == 0) {
|
||||
parse_psp_env(psp_env);
|
||||
} else {
|
||||
for (i = 0; i < MAX_ENTRY; i++, env++)
|
||||
if (env->name)
|
||||
add_adam2_var(env->name, env->value);
|
||||
}
|
||||
}
|
||||
|
||||
static void __init console_config(void)
|
||||
{
|
||||
#ifdef CONFIG_SERIAL_8250_CONSOLE
|
||||
char console_string[40];
|
||||
int baud = 0;
|
||||
char parity = '\0', bits = '\0', flow = '\0';
|
||||
char *s, *p;
|
||||
|
||||
if (strstr(prom_getcmdline(), "console="))
|
||||
return;
|
||||
|
||||
#ifdef CONFIG_KGDB
|
||||
if (!strstr(prom_getcmdline(), "nokgdb")) {
|
||||
strcat(prom_getcmdline(), " console=kgdb");
|
||||
kgdb_enabled = 1;
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
if ((s = prom_getenv("modetty0"))) {
|
||||
baud = simple_strtoul(s, &p, 10);
|
||||
s = p;
|
||||
if (*s == ',') s++;
|
||||
if (*s) parity = *s++;
|
||||
if (*s == ',') s++;
|
||||
if (*s) bits = *s++;
|
||||
if (*s == ',') s++;
|
||||
if (*s == 'h') flow = 'r';
|
||||
}
|
||||
|
||||
if (baud == 0)
|
||||
baud = 38400;
|
||||
if (parity != 'n' && parity != 'o' && parity != 'e')
|
||||
parity = 'n';
|
||||
if (bits != '7' && bits != '8')
|
||||
bits = '8';
|
||||
|
||||
if (flow == 'r')
|
||||
sprintf(console_string, " console=ttyS0,%d%c%c%c", baud,
|
||||
parity, bits, flow);
|
||||
else
|
||||
sprintf(console_string, " console=ttyS0,%d%c%c", baud, parity,
|
||||
bits);
|
||||
strcat(prom_getcmdline(), console_string);
|
||||
#endif
|
||||
}
|
||||
|
||||
void __init prom_init(void)
|
||||
{
|
||||
ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
|
||||
ar7_init_env((struct env_var *)fw_arg2);
|
||||
console_config();
|
||||
}
|
||||
|
||||
#define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))
|
||||
static inline unsigned int serial_in(int offset)
|
||||
{
|
||||
return readb((void *)PORT(offset));
|
||||
}
|
||||
|
||||
static inline void serial_out(int offset, int value)
|
||||
{
|
||||
writeb(value, (void *)PORT(offset));
|
||||
}
|
||||
|
||||
char prom_getchar(void)
|
||||
{
|
||||
while (!(serial_in(UART_LSR) & UART_LSR_DR));
|
||||
return serial_in(UART_RX);
|
||||
}
|
||||
|
||||
int prom_putchar(char c)
|
||||
{
|
||||
while ((serial_in(UART_LSR) & UART_LSR_TEMT) == 0);
|
||||
serial_out(UART_TX, c);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* from adm5120/prom.c */
|
||||
void prom_printf(const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
int l;
|
||||
char *p, *buf_end;
|
||||
char buf[1024];
|
||||
|
||||
va_start(args, fmt);
|
||||
l = vsprintf(buf, fmt, args); /* hopefully i < sizeof(buf) */
|
||||
va_end(args);
|
||||
|
||||
buf_end = buf + l;
|
||||
|
||||
for (p = buf; p < buf_end; p++) {
|
||||
/* Crude cr/nl handling is better than none */
|
||||
if (*p == '\n')
|
||||
prom_putchar('\r');
|
||||
prom_putchar(*p);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_KGDB
|
||||
int putDebugChar(char c)
|
||||
{
|
||||
return prom_putchar(c);
|
||||
}
|
||||
|
||||
char getDebugChar(void)
|
||||
{
|
||||
return prom_getchar();
|
||||
}
|
||||
#endif
|
@ -1,119 +0,0 @@
|
||||
/*
|
||||
* Carsten Langgaard, carstenl@mips.com
|
||||
* Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can distribute it and/or modify it
|
||||
* under the terms of the GNU General Public License (Version 2) as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
|
||||
*/
|
||||
#include <linux/version.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/pm.h>
|
||||
|
||||
#include <asm/reboot.h>
|
||||
#include <asm/time.h>
|
||||
#include <asm/ar7/ar7.h>
|
||||
#include <asm/ar7/gpio.h>
|
||||
#include <asm/ar7/prom.h>
|
||||
|
||||
static int titan_variant; /*hold the results of the gpio_init_titan_variant() so that it is only called once*/
|
||||
static void ar7_machine_restart(char *command);
|
||||
static void ar7_machine_halt(void);
|
||||
static void ar7_machine_power_off(void);
|
||||
|
||||
static void ar7_machine_restart(char *command)
|
||||
{
|
||||
u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
|
||||
AR7_RESET_SOFTWARE, 1);
|
||||
writel(1, softres_reg);
|
||||
}
|
||||
|
||||
static void ar7_machine_halt(void)
|
||||
{
|
||||
while (1);
|
||||
}
|
||||
|
||||
static void ar7_machine_power_off(void)
|
||||
{
|
||||
u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1);
|
||||
u32 power_state = readl(power_reg) | (3 << 30);
|
||||
writel(power_state, power_reg);
|
||||
ar7_machine_halt();
|
||||
}
|
||||
|
||||
const char *get_system_type(void)
|
||||
{
|
||||
u16 chip_id = ar7_chip_id();
|
||||
switch (chip_id) {
|
||||
case AR7_CHIP_7300:
|
||||
return "TI AR7 (TNETD7300)";
|
||||
case AR7_CHIP_7100:
|
||||
return "TI AR7 (TNETD7100)";
|
||||
case AR7_CHIP_7200:
|
||||
return "TI AR7 (TNETD7200)";
|
||||
case AR7_CHIP_TITAN:
|
||||
titan_variant = ar7_init_titan_variant();
|
||||
switch (titan_variant /*(gpio_get_value_titan(1) >> 12) & 0xf*/) {
|
||||
case TITAN_CHIP_1050:
|
||||
return "TI AR7 (TNETV1050)";
|
||||
case TITAN_CHIP_1055:
|
||||
return "TI AR7 (TNETV1055)";
|
||||
case TITAN_CHIP_1056:
|
||||
return "TI AR7 (TNETV1056)";
|
||||
case TITAN_CHIP_1060:
|
||||
return "TI AR7 (TNETV1060)";
|
||||
}
|
||||
default:
|
||||
return "TI AR7 (Unknown)";
|
||||
}
|
||||
}
|
||||
|
||||
static int __init ar7_init_console(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Initializes basic routines and structures pointers, memory size (as
|
||||
* given by the bios and saves the command line.
|
||||
*/
|
||||
|
||||
extern void ar7_init_clocks(void);
|
||||
|
||||
void __init plat_mem_setup(void)
|
||||
{
|
||||
unsigned long io_base;
|
||||
|
||||
_machine_restart = ar7_machine_restart;
|
||||
_machine_halt = ar7_machine_halt;
|
||||
pm_power_off = ar7_machine_power_off;
|
||||
panic_timeout = 3;
|
||||
|
||||
io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000);
|
||||
if (!io_base) panic("Can't remap IO base!\n");
|
||||
set_io_port_base(io_base);
|
||||
|
||||
prom_meminit();
|
||||
ar7_init_clocks();
|
||||
|
||||
ioport_resource.start = 0;
|
||||
ioport_resource.end = ~0;
|
||||
iomem_resource.start = 0;
|
||||
iomem_resource.end = ~0;
|
||||
|
||||
printk(KERN_INFO "%s, ID: 0x%04x, Revision: 0x%02x\n",
|
||||
get_system_type(),
|
||||
ar7_chip_id(), ar7_chip_rev());
|
||||
}
|
||||
|
||||
console_initcall(ar7_init_console);
|
@ -1,28 +0,0 @@
|
||||
/*
|
||||
* Carsten Langgaard, carstenl@mips.com
|
||||
* Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can distribute it and/or modify it
|
||||
* under the terms of the GNU General Public License (Version 2) as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
|
||||
*
|
||||
* Setting up the clock on the MIPS boards.
|
||||
*/
|
||||
|
||||
#include <linux/version.h>
|
||||
#include <asm/time.h>
|
||||
#include <asm/ar7/ar7.h>
|
||||
|
||||
void __init plat_time_init(void)
|
||||
{
|
||||
mips_hpt_frequency = ar7_cpu_freq() / 2;
|
||||
}
|
@ -1 +0,0 @@
|
||||
../../../../include/asm-mips/ar7
|
@ -1,158 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2007 Nicolas Thill <nico@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/cdev.h>
|
||||
#include <gpio.h>
|
||||
|
||||
#define DRVNAME "ar7_gpio"
|
||||
#define LONGNAME "TI AR7 GPIOs Driver"
|
||||
|
||||
MODULE_AUTHOR("Nicolas Thill <nico@openwrt.org>");
|
||||
MODULE_DESCRIPTION(LONGNAME);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static int ar7_gpio_major;
|
||||
|
||||
static ssize_t ar7_gpio_write(struct file *file, const char __user *buf,
|
||||
size_t len, loff_t *ppos)
|
||||
{
|
||||
int pin = iminor(file->f_dentry->d_inode);
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < len; ++i) {
|
||||
char c;
|
||||
if (get_user(c, buf + i))
|
||||
return -EFAULT;
|
||||
switch (c) {
|
||||
case '0':
|
||||
gpio_set_value(pin, 0);
|
||||
break;
|
||||
case '1':
|
||||
gpio_set_value(pin, 1);
|
||||
break;
|
||||
case 'd':
|
||||
case 'D':
|
||||
ar7_gpio_disable(pin);
|
||||
break;
|
||||
case 'e':
|
||||
case 'E':
|
||||
ar7_gpio_enable(pin);
|
||||
break;
|
||||
case 'i':
|
||||
case 'I':
|
||||
case '<':
|
||||
gpio_direction_input(pin);
|
||||
break;
|
||||
case 'o':
|
||||
case 'O':
|
||||
case '>':
|
||||
gpio_direction_output(pin, 0);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
static ssize_t ar7_gpio_read(struct file *file, char __user *buf,
|
||||
size_t len, loff_t *ppos)
|
||||
{
|
||||
int pin = iminor(file->f_dentry->d_inode);
|
||||
int value;
|
||||
|
||||
value = gpio_get_value(pin);
|
||||
if (put_user(value ? '1' : '0', buf))
|
||||
return -EFAULT;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int ar7_gpio_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
int m = iminor(inode);
|
||||
|
||||
if (m >= (ar7_is_titan() ? TITAN_GPIO_MAX : AR7_GPIO_MAX))
|
||||
return -EINVAL;
|
||||
|
||||
return nonseekable_open(inode, file);
|
||||
}
|
||||
|
||||
static int ar7_gpio_release(struct inode *inode, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct file_operations ar7_gpio_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.write = ar7_gpio_write,
|
||||
.read = ar7_gpio_read,
|
||||
.open = ar7_gpio_open,
|
||||
.release = ar7_gpio_release,
|
||||
.llseek = no_llseek,
|
||||
};
|
||||
|
||||
static struct platform_device *ar7_gpio_device;
|
||||
|
||||
static int __init ar7_gpio_init(void)
|
||||
{
|
||||
int rc;
|
||||
|
||||
ar7_gpio_device = platform_device_alloc(DRVNAME, -1);
|
||||
if (!ar7_gpio_device)
|
||||
return -ENOMEM;
|
||||
|
||||
rc = platform_device_add(ar7_gpio_device);
|
||||
if (rc < 0)
|
||||
goto out_put;
|
||||
|
||||
rc = register_chrdev(ar7_gpio_major, DRVNAME, &ar7_gpio_fops);
|
||||
if (rc < 0)
|
||||
goto out_put;
|
||||
|
||||
ar7_gpio_major = rc;
|
||||
|
||||
rc = 0;
|
||||
|
||||
goto out;
|
||||
|
||||
out_put:
|
||||
platform_device_put(ar7_gpio_device);
|
||||
out:
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void __exit ar7_gpio_exit(void)
|
||||
{
|
||||
unregister_chrdev(ar7_gpio_major, DRVNAME);
|
||||
platform_device_unregister(ar7_gpio_device);
|
||||
}
|
||||
|
||||
module_init(ar7_gpio_init);
|
||||
module_exit(ar7_gpio_exit);
|
@ -1,349 +0,0 @@
|
||||
/*
|
||||
* drivers/watchdog/ar7_wdt.c
|
||||
*
|
||||
* Copyright (C) 2007 Nicolas Thill <nico@openwrt.org>
|
||||
* Copyright (c) 2005 Enrik Berkhan <Enrik.Berkhan@akk.org>
|
||||
*
|
||||
* Some code taken from:
|
||||
* National Semiconductor SCx200 Watchdog support
|
||||
* Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/moduleparam.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/miscdevice.h>
|
||||
#include <linux/watchdog.h>
|
||||
#include <linux/notifier.h>
|
||||
#include <linux/reboot.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/uaccess.h>
|
||||
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/ar7/ar7.h>
|
||||
|
||||
#define DRVNAME "ar7_wdt"
|
||||
#define LONGNAME "TI AR7 Watchdog Timer"
|
||||
|
||||
MODULE_AUTHOR("Nicolas Thill <nico@openwrt.org>");
|
||||
MODULE_DESCRIPTION(LONGNAME);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
|
||||
|
||||
static int margin = 60;
|
||||
module_param(margin, int, 0);
|
||||
MODULE_PARM_DESC(margin, "Watchdog margin in seconds");
|
||||
|
||||
static int nowayout = WATCHDOG_NOWAYOUT;
|
||||
module_param(nowayout, int, 0);
|
||||
MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close");
|
||||
|
||||
#define READ_REG(x) readl((void __iomem *)&(x))
|
||||
#define WRITE_REG(x, v) writel((v), (void __iomem *)&(x))
|
||||
|
||||
struct ar7_wdt {
|
||||
u32 kick_lock;
|
||||
u32 kick;
|
||||
u32 change_lock;
|
||||
u32 change;
|
||||
u32 disable_lock;
|
||||
u32 disable;
|
||||
u32 prescale_lock;
|
||||
u32 prescale;
|
||||
};
|
||||
|
||||
static struct semaphore open_semaphore;
|
||||
static unsigned expect_close;
|
||||
|
||||
/* XXX currently fixed, allows max margin ~68.72 secs */
|
||||
#define prescale_value 0xffff
|
||||
|
||||
/* Offset of the WDT registers */
|
||||
static unsigned long ar7_regs_wdt;
|
||||
/* Pointer to the remapped WDT IO space */
|
||||
static struct ar7_wdt *ar7_wdt;
|
||||
static void ar7_wdt_get_regs(void)
|
||||
{
|
||||
u16 chip_id = ar7_chip_id();
|
||||
switch (chip_id) {
|
||||
case AR7_CHIP_7100:
|
||||
case AR7_CHIP_7200:
|
||||
ar7_regs_wdt = AR7_REGS_WDT;
|
||||
break;
|
||||
default:
|
||||
ar7_regs_wdt = UR8_REGS_WDT;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void ar7_wdt_kick(u32 value)
|
||||
{
|
||||
WRITE_REG(ar7_wdt->kick_lock, 0x5555);
|
||||
if ((READ_REG(ar7_wdt->kick_lock) & 3) == 1) {
|
||||
WRITE_REG(ar7_wdt->kick_lock, 0xaaaa);
|
||||
if ((READ_REG(ar7_wdt->kick_lock) & 3) == 3) {
|
||||
WRITE_REG(ar7_wdt->kick, value);
|
||||
return;
|
||||
}
|
||||
}
|
||||
printk(KERN_ERR DRVNAME ": failed to unlock WDT kick reg\n");
|
||||
}
|
||||
|
||||
static void ar7_wdt_prescale(u32 value)
|
||||
{
|
||||
WRITE_REG(ar7_wdt->prescale_lock, 0x5a5a);
|
||||
if ((READ_REG(ar7_wdt->prescale_lock) & 3) == 1) {
|
||||
WRITE_REG(ar7_wdt->prescale_lock, 0xa5a5);
|
||||
if ((READ_REG(ar7_wdt->prescale_lock) & 3) == 3) {
|
||||
WRITE_REG(ar7_wdt->prescale, value);
|
||||
return;
|
||||
}
|
||||
}
|
||||
printk(KERN_ERR DRVNAME ": failed to unlock WDT prescale reg\n");
|
||||
}
|
||||
|
||||
static void ar7_wdt_change(u32 value)
|
||||
{
|
||||
WRITE_REG(ar7_wdt->change_lock, 0x6666);
|
||||
if ((READ_REG(ar7_wdt->change_lock) & 3) == 1) {
|
||||
WRITE_REG(ar7_wdt->change_lock, 0xbbbb);
|
||||
if ((READ_REG(ar7_wdt->change_lock) & 3) == 3) {
|
||||
WRITE_REG(ar7_wdt->change, value);
|
||||
return;
|
||||
}
|
||||
}
|
||||
printk(KERN_ERR DRVNAME ": failed to unlock WDT change reg\n");
|
||||
}
|
||||
|
||||
static void ar7_wdt_disable(u32 value)
|
||||
{
|
||||
WRITE_REG(ar7_wdt->disable_lock, 0x7777);
|
||||
if ((READ_REG(ar7_wdt->disable_lock) & 3) == 1) {
|
||||
WRITE_REG(ar7_wdt->disable_lock, 0xcccc);
|
||||
if ((READ_REG(ar7_wdt->disable_lock) & 3) == 2) {
|
||||
WRITE_REG(ar7_wdt->disable_lock, 0xdddd);
|
||||
if ((READ_REG(ar7_wdt->disable_lock) & 3) == 3) {
|
||||
WRITE_REG(ar7_wdt->disable, value);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
printk(KERN_ERR DRVNAME ": failed to unlock WDT disable reg\n");
|
||||
}
|
||||
|
||||
static void ar7_wdt_update_margin(int new_margin)
|
||||
{
|
||||
u32 change;
|
||||
|
||||
change = new_margin * (ar7_vbus_freq() / prescale_value);
|
||||
if (change < 1) change = 1;
|
||||
if (change > 0xffff) change = 0xffff;
|
||||
ar7_wdt_change(change);
|
||||
margin = change * prescale_value / ar7_vbus_freq();
|
||||
printk(KERN_INFO DRVNAME
|
||||
": timer margin %d seconds (prescale %d, change %d, freq %d)\n",
|
||||
margin, prescale_value, change, ar7_vbus_freq());
|
||||
}
|
||||
|
||||
static void ar7_wdt_enable_wdt(void)
|
||||
{
|
||||
printk(KERN_DEBUG DRVNAME ": enabling watchdog timer\n");
|
||||
ar7_wdt_disable(1);
|
||||
ar7_wdt_kick(1);
|
||||
}
|
||||
|
||||
static void ar7_wdt_disable_wdt(void)
|
||||
{
|
||||
printk(KERN_DEBUG DRVNAME ": disabling watchdog timer\n");
|
||||
ar7_wdt_disable(0);
|
||||
}
|
||||
|
||||
static int ar7_wdt_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
/* only allow one at a time */
|
||||
if (down_trylock(&open_semaphore))
|
||||
return -EBUSY;
|
||||
ar7_wdt_enable_wdt();
|
||||
expect_close = 0;
|
||||
|
||||
return nonseekable_open(inode, file);
|
||||
}
|
||||
|
||||
static int ar7_wdt_release(struct inode *inode, struct file *file)
|
||||
{
|
||||
if (!expect_close)
|
||||
printk(KERN_WARNING DRVNAME
|
||||
": watchdog device closed unexpectedly,"
|
||||
"will not disable the watchdog timer\n");
|
||||
else if (!nowayout)
|
||||
ar7_wdt_disable_wdt();
|
||||
|
||||
up(&open_semaphore);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ar7_wdt_notify_sys(struct notifier_block *this,
|
||||
unsigned long code, void *unused)
|
||||
{
|
||||
if (code == SYS_HALT || code == SYS_POWER_OFF)
|
||||
if (!nowayout)
|
||||
ar7_wdt_disable_wdt();
|
||||
|
||||
return NOTIFY_DONE;
|
||||
}
|
||||
|
||||
static struct notifier_block ar7_wdt_notifier = {
|
||||
.notifier_call = ar7_wdt_notify_sys
|
||||
};
|
||||
|
||||
static ssize_t ar7_wdt_write(struct file *file, const char *data,
|
||||
size_t len, loff_t *ppos)
|
||||
{
|
||||
/* check for a magic close character */
|
||||
if (len) {
|
||||
size_t i;
|
||||
|
||||
ar7_wdt_kick(1);
|
||||
|
||||
expect_close = 0;
|
||||
for (i = 0; i < len; ++i) {
|
||||
char c;
|
||||
if (get_user(c, data+i))
|
||||
return -EFAULT;
|
||||
if (c == 'V')
|
||||
expect_close = 1;
|
||||
}
|
||||
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
static int ar7_wdt_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
static struct watchdog_info ident = {
|
||||
.identity = LONGNAME,
|
||||
.firmware_version = 1,
|
||||
.options = (WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING),
|
||||
};
|
||||
int new_margin;
|
||||
|
||||
switch (cmd) {
|
||||
default:
|
||||
return -ENOTTY;
|
||||
case WDIOC_GETSUPPORT:
|
||||
if (copy_to_user((struct watchdog_info *)arg, &ident,
|
||||
sizeof(ident)))
|
||||
return -EFAULT;
|
||||
return 0;
|
||||
case WDIOC_GETSTATUS:
|
||||
case WDIOC_GETBOOTSTATUS:
|
||||
if (put_user(0, (int *)arg))
|
||||
return -EFAULT;
|
||||
return 0;
|
||||
case WDIOC_KEEPALIVE:
|
||||
ar7_wdt_kick(1);
|
||||
return 0;
|
||||
case WDIOC_SETTIMEOUT:
|
||||
if (get_user(new_margin, (int *)arg))
|
||||
return -EFAULT;
|
||||
if (new_margin < 1)
|
||||
return -EINVAL;
|
||||
|
||||
ar7_wdt_update_margin(new_margin);
|
||||
ar7_wdt_kick(1);
|
||||
|
||||
case WDIOC_GETTIMEOUT:
|
||||
if (put_user(margin, (int *)arg))
|
||||
return -EFAULT;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
static struct file_operations ar7_wdt_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.write = ar7_wdt_write,
|
||||
.ioctl = ar7_wdt_ioctl,
|
||||
.open = ar7_wdt_open,
|
||||
.release = ar7_wdt_release,
|
||||
};
|
||||
|
||||
static struct miscdevice ar7_wdt_miscdev = {
|
||||
.minor = WATCHDOG_MINOR,
|
||||
.name = "watchdog",
|
||||
.fops = &ar7_wdt_fops,
|
||||
};
|
||||
|
||||
static int __init ar7_wdt_init(void)
|
||||
{
|
||||
int rc;
|
||||
|
||||
ar7_wdt_get_regs();
|
||||
|
||||
if (!request_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt),
|
||||
LONGNAME)) {
|
||||
printk(KERN_WARNING DRVNAME ": watchdog I/O region busy\n");
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
ar7_wdt = (struct ar7_wdt *)
|
||||
ioremap(ar7_regs_wdt, sizeof(struct ar7_wdt));
|
||||
|
||||
ar7_wdt_disable_wdt();
|
||||
ar7_wdt_prescale(prescale_value);
|
||||
ar7_wdt_update_margin(margin);
|
||||
|
||||
sema_init(&open_semaphore, 1);
|
||||
|
||||
rc = register_reboot_notifier(&ar7_wdt_notifier);
|
||||
if (rc) {
|
||||
printk(KERN_ERR DRVNAME
|
||||
": unable to register reboot notifier\n");
|
||||
goto out_alloc;
|
||||
}
|
||||
|
||||
rc = misc_register(&ar7_wdt_miscdev);
|
||||
if (rc) {
|
||||
printk(KERN_ERR DRVNAME ": unable to register misc device\n");
|
||||
goto out_register;
|
||||
}
|
||||
goto out;
|
||||
|
||||
out_register:
|
||||
unregister_reboot_notifier(&ar7_wdt_notifier);
|
||||
out_alloc:
|
||||
iounmap(ar7_wdt);
|
||||
release_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt));
|
||||
out:
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void __exit ar7_wdt_cleanup(void)
|
||||
{
|
||||
misc_deregister(&ar7_wdt_miscdev);
|
||||
unregister_reboot_notifier(&ar7_wdt_notifier);
|
||||
iounmap(ar7_wdt);
|
||||
release_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt));
|
||||
}
|
||||
|
||||
module_init(ar7_wdt_init);
|
||||
module_exit(ar7_wdt_cleanup);
|
@ -1,13 +0,0 @@
|
||||
menu "TI VLYNQ"
|
||||
|
||||
config VLYNQ
|
||||
bool "TI VLYNQ bus support"
|
||||
depends on AR7 && EXPERIMENTAL
|
||||
help
|
||||
Support for the TI VLYNQ bus
|
||||
|
||||
The module will be called vlynq
|
||||
|
||||
If unsure, say N
|
||||
|
||||
endmenu
|
@ -1,5 +0,0 @@
|
||||
#
|
||||
# Makefile for kernel vlynq drivers
|
||||
#
|
||||
|
||||
obj-$(CONFIG_VLYNQ) += vlynq.o
|
@ -1,783 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2006, 2007 Eugene Konev <ejka@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <linux/vlynq.h>
|
||||
|
||||
#define VLYNQ_CTRL_PM_ENABLE 0x80000000
|
||||
#define VLYNQ_CTRL_CLOCK_INT 0x00008000
|
||||
#define VLYNQ_CTRL_CLOCK_DIV(x) (((x) & 7) << 16)
|
||||
#define VLYNQ_CTRL_INT_LOCAL 0x00004000
|
||||
#define VLYNQ_CTRL_INT_ENABLE 0x00002000
|
||||
#define VLYNQ_CTRL_INT_VECTOR(x) (((x) & 0x1f) << 8)
|
||||
#define VLYNQ_CTRL_INT2CFG 0x00000080
|
||||
#define VLYNQ_CTRL_RESET 0x00000001
|
||||
|
||||
#define VLYNQ_CTRL_CLOCK_MASK (0x7 << 16)
|
||||
|
||||
#define VLYNQ_INT_OFFSET 0x00000014
|
||||
#define VLYNQ_REMOTE_OFFSET 0x00000080
|
||||
|
||||
#define VLYNQ_STATUS_LINK 0x00000001
|
||||
#define VLYNQ_STATUS_LERROR 0x00000080
|
||||
#define VLYNQ_STATUS_RERROR 0x00000100
|
||||
|
||||
#define VINT_ENABLE 0x00000100
|
||||
#define VINT_TYPE_EDGE 0x00000080
|
||||
#define VINT_LEVEL_LOW 0x00000040
|
||||
#define VINT_VECTOR(x) ((x) & 0x1f)
|
||||
#define VINT_OFFSET(irq) (8 * ((irq) % 4))
|
||||
|
||||
#define VLYNQ_AUTONEGO_V2 0x00010000
|
||||
|
||||
struct vlynq_regs {
|
||||
u32 revision;
|
||||
u32 control;
|
||||
u32 status;
|
||||
u32 int_prio;
|
||||
u32 int_status;
|
||||
u32 int_pending;
|
||||
u32 int_ptr;
|
||||
u32 tx_offset;
|
||||
struct vlynq_mapping rx_mapping[4];
|
||||
u32 chip;
|
||||
u32 autonego;
|
||||
u32 unused[6];
|
||||
u32 int_device[8];
|
||||
};
|
||||
|
||||
#define vlynq_reg_read(reg) readl(&(reg))
|
||||
#define vlynq_reg_write(reg, val) writel(val, &(reg))
|
||||
|
||||
static int __vlynq_enable_device(struct vlynq_device *dev);
|
||||
|
||||
#ifdef VLYNQ_DEBUG
|
||||
static void vlynq_dump_regs(struct vlynq_device *dev)
|
||||
{
|
||||
int i;
|
||||
printk(KERN_DEBUG "VLYNQ local=%p remote=%p\n",
|
||||
dev->local, dev->remote);
|
||||
for (i = 0; i < 32; i++) {
|
||||
printk(KERN_DEBUG "VLYNQ: local %d: %08x\n",
|
||||
i + 1, ((u32 *)dev->local)[i]);
|
||||
printk(KERN_DEBUG "VLYNQ: remote %d: %08x\n",
|
||||
i + 1, ((u32 *)dev->remote)[i]);
|
||||
}
|
||||
}
|
||||
|
||||
static void vlynq_dump_mem(u32 *base, int count)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < (count + 3) / 4; i++) {
|
||||
if (i % 4 == 0) printk(KERN_DEBUG "\nMEM[0x%04x]:", i * 4);
|
||||
printk(KERN_DEBUG " 0x%08x", *(base + i));
|
||||
}
|
||||
printk(KERN_DEBUG "\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
int vlynq_linked(struct vlynq_device *dev)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 100; i++)
|
||||
if (vlynq_reg_read(dev->local->status) & VLYNQ_STATUS_LINK)
|
||||
return 1;
|
||||
else
|
||||
cpu_relax();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vlynq_reset(struct vlynq_device *dev)
|
||||
{
|
||||
vlynq_reg_write(dev->local->control,
|
||||
vlynq_reg_read(dev->local->control) |
|
||||
VLYNQ_CTRL_RESET);
|
||||
|
||||
/* Wait for the devices to finish resetting */
|
||||
msleep(5);
|
||||
|
||||
/* Remove reset bit */
|
||||
vlynq_reg_write(dev->local->control,
|
||||
vlynq_reg_read(dev->local->control) &
|
||||
~VLYNQ_CTRL_RESET);
|
||||
|
||||
/* Give some time for the devices to settle */
|
||||
msleep(5);
|
||||
}
|
||||
|
||||
static void vlynq_irq_unmask(unsigned int irq)
|
||||
{
|
||||
u32 val;
|
||||
struct vlynq_device *dev = get_irq_chip_data(irq);
|
||||
int virq;
|
||||
|
||||
BUG_ON(!dev);
|
||||
virq = irq - dev->irq_start;
|
||||
val = vlynq_reg_read(dev->remote->int_device[virq >> 2]);
|
||||
val |= (VINT_ENABLE | virq) << VINT_OFFSET(virq);
|
||||
vlynq_reg_write(dev->remote->int_device[virq >> 2], val);
|
||||
}
|
||||
|
||||
static void vlynq_irq_mask(unsigned int irq)
|
||||
{
|
||||
u32 val;
|
||||
struct vlynq_device *dev = get_irq_chip_data(irq);
|
||||
int virq;
|
||||
|
||||
BUG_ON(!dev);
|
||||
virq = irq - dev->irq_start;
|
||||
val = vlynq_reg_read(dev->remote->int_device[virq >> 2]);
|
||||
val &= ~(VINT_ENABLE << VINT_OFFSET(virq));
|
||||
vlynq_reg_write(dev->remote->int_device[virq >> 2], val);
|
||||
}
|
||||
|
||||
static int vlynq_irq_type(unsigned int irq, unsigned int flow_type)
|
||||
{
|
||||
u32 val;
|
||||
struct vlynq_device *dev = get_irq_chip_data(irq);
|
||||
int virq;
|
||||
|
||||
BUG_ON(!dev);
|
||||
virq = irq - dev->irq_start;
|
||||
val = vlynq_reg_read(dev->remote->int_device[virq >> 2]);
|
||||
switch (flow_type & IRQ_TYPE_SENSE_MASK) {
|
||||
case IRQ_TYPE_EDGE_RISING:
|
||||
case IRQ_TYPE_EDGE_FALLING:
|
||||
case IRQ_TYPE_EDGE_BOTH:
|
||||
val |= VINT_TYPE_EDGE << VINT_OFFSET(virq);
|
||||
val &= ~(VINT_LEVEL_LOW << VINT_OFFSET(virq));
|
||||
break;
|
||||
case IRQ_TYPE_LEVEL_HIGH:
|
||||
val &= ~(VINT_TYPE_EDGE << VINT_OFFSET(virq));
|
||||
val &= ~(VINT_LEVEL_LOW << VINT_OFFSET(virq));
|
||||
break;
|
||||
case IRQ_TYPE_LEVEL_LOW:
|
||||
val &= ~(VINT_TYPE_EDGE << VINT_OFFSET(virq));
|
||||
val |= VINT_LEVEL_LOW << VINT_OFFSET(virq);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
vlynq_reg_write(dev->remote->int_device[virq >> 2], val);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vlynq_local_ack(unsigned int irq)
|
||||
{
|
||||
struct vlynq_device *dev = get_irq_chip_data(irq);
|
||||
u32 status = vlynq_reg_read(dev->local->status);
|
||||
if (printk_ratelimit())
|
||||
printk(KERN_DEBUG "%s: local status: 0x%08x\n",
|
||||
dev->dev.bus_id, status);
|
||||
vlynq_reg_write(dev->local->status, status);
|
||||
}
|
||||
|
||||
static void vlynq_remote_ack(unsigned int irq)
|
||||
{
|
||||
struct vlynq_device *dev = get_irq_chip_data(irq);
|
||||
u32 status = vlynq_reg_read(dev->remote->status);
|
||||
if (printk_ratelimit())
|
||||
printk(KERN_DEBUG "%s: remote status: 0x%08x\n",
|
||||
dev->dev.bus_id, status);
|
||||
vlynq_reg_write(dev->remote->status, status);
|
||||
}
|
||||
|
||||
static irqreturn_t vlynq_irq(int irq, void *dev_id)
|
||||
{
|
||||
struct vlynq_device *dev = dev_id;
|
||||
u32 status;
|
||||
int virq = 0;
|
||||
|
||||
status = vlynq_reg_read(dev->local->int_status);
|
||||
vlynq_reg_write(dev->local->int_status, status);
|
||||
|
||||
if (unlikely(!status))
|
||||
spurious_interrupt();
|
||||
|
||||
while (status) {
|
||||
if (status & 1)
|
||||
do_IRQ(dev->irq_start + virq);
|
||||
status >>= 1;
|
||||
virq++;
|
||||
}
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static struct irq_chip vlynq_irq_chip = {
|
||||
.name = "vlynq",
|
||||
.unmask = vlynq_irq_unmask,
|
||||
.mask = vlynq_irq_mask,
|
||||
.set_type = vlynq_irq_type,
|
||||
};
|
||||
|
||||
static struct irq_chip vlynq_local_chip = {
|
||||
.name = "vlynq local error",
|
||||
.unmask = vlynq_irq_unmask,
|
||||
.mask = vlynq_irq_mask,
|
||||
.ack = vlynq_local_ack,
|
||||
};
|
||||
|
||||
static struct irq_chip vlynq_remote_chip = {
|
||||
.name = "vlynq local error",
|
||||
.unmask = vlynq_irq_unmask,
|
||||
.mask = vlynq_irq_mask,
|
||||
.ack = vlynq_remote_ack,
|
||||
};
|
||||
|
||||
static int vlynq_setup_irq(struct vlynq_device *dev)
|
||||
{
|
||||
u32 val;
|
||||
int i, virq;
|
||||
|
||||
if (dev->local_irq == dev->remote_irq) {
|
||||
printk(KERN_ERR
|
||||
"%s: local vlynq irq should be different from remote\n",
|
||||
dev->dev.bus_id);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Clear local and remote error bits */
|
||||
vlynq_reg_write(dev->local->status, vlynq_reg_read(dev->local->status));
|
||||
vlynq_reg_write(dev->remote->status,
|
||||
vlynq_reg_read(dev->remote->status));
|
||||
|
||||
/* Now setup interrupts */
|
||||
val = VLYNQ_CTRL_INT_VECTOR(dev->local_irq);
|
||||
val |= VLYNQ_CTRL_INT_ENABLE | VLYNQ_CTRL_INT_LOCAL |
|
||||
VLYNQ_CTRL_INT2CFG;
|
||||
val |= vlynq_reg_read(dev->local->control);
|
||||
vlynq_reg_write(dev->local->int_ptr, VLYNQ_INT_OFFSET);
|
||||
vlynq_reg_write(dev->local->control, val);
|
||||
|
||||
val = VLYNQ_CTRL_INT_VECTOR(dev->remote_irq);
|
||||
val |= VLYNQ_CTRL_INT_ENABLE;
|
||||
val |= vlynq_reg_read(dev->remote->control);
|
||||
vlynq_reg_write(dev->remote->int_ptr, VLYNQ_INT_OFFSET);
|
||||
vlynq_reg_write(dev->remote->control, val);
|
||||
|
||||
for (i = dev->irq_start; i <= dev->irq_end; i++) {
|
||||
virq = i - dev->irq_start;
|
||||
if (virq == dev->local_irq) {
|
||||
set_irq_chip_and_handler(i, &vlynq_local_chip,
|
||||
handle_level_irq);
|
||||
set_irq_chip_data(i, dev);
|
||||
} else if (virq == dev->remote_irq) {
|
||||
set_irq_chip_and_handler(i, &vlynq_remote_chip,
|
||||
handle_level_irq);
|
||||
set_irq_chip_data(i, dev);
|
||||
} else {
|
||||
set_irq_chip_and_handler(i, &vlynq_irq_chip,
|
||||
handle_simple_irq);
|
||||
set_irq_chip_data(i, dev);
|
||||
vlynq_reg_write(dev->remote->int_device[virq >> 2], 0);
|
||||
}
|
||||
}
|
||||
|
||||
if (request_irq(dev->irq, vlynq_irq, IRQF_SHARED, "vlynq", dev)) {
|
||||
printk(KERN_ERR "%s: request_irq failed\n", dev->dev.bus_id);
|
||||
return -EAGAIN;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vlynq_device_release(struct device *dev)
|
||||
{
|
||||
struct vlynq_device *vdev = to_vlynq_device(dev);
|
||||
kfree(vdev);
|
||||
}
|
||||
|
||||
static int vlynq_device_match(struct device *dev,
|
||||
struct device_driver *drv)
|
||||
{
|
||||
struct vlynq_device *vdev = to_vlynq_device(dev);
|
||||
struct vlynq_driver *vdrv = to_vlynq_driver(drv);
|
||||
struct vlynq_device_id *ids = vdrv->id_table;
|
||||
|
||||
while (ids->id) {
|
||||
if (ids->id == vdev->dev_id) {
|
||||
vdev->divisor = ids->divisor;
|
||||
vlynq_set_drvdata(vdev, ids);
|
||||
printk(KERN_INFO "Driver found for VLYNQ " \
|
||||
"device: %08x\n", vdev->dev_id);
|
||||
return 1;
|
||||
}
|
||||
printk(KERN_DEBUG "Not using the %08x VLYNQ device's driver" \
|
||||
" for VLYNQ device: %08x\n", ids->id, vdev->dev_id);
|
||||
ids++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vlynq_device_probe(struct device *dev)
|
||||
{
|
||||
struct vlynq_device *vdev = to_vlynq_device(dev);
|
||||
struct vlynq_driver *drv = to_vlynq_driver(dev->driver);
|
||||
struct vlynq_device_id *id = vlynq_get_drvdata(vdev);
|
||||
int result = -ENODEV;
|
||||
|
||||
get_device(dev);
|
||||
if (drv && drv->probe)
|
||||
result = drv->probe(vdev, id);
|
||||
if (result)
|
||||
put_device(dev);
|
||||
return result;
|
||||
}
|
||||
|
||||
static int vlynq_device_remove(struct device *dev)
|
||||
{
|
||||
struct vlynq_driver *drv = to_vlynq_driver(dev->driver);
|
||||
if (drv && drv->remove)
|
||||
drv->remove(to_vlynq_device(dev));
|
||||
put_device(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __vlynq_register_driver(struct vlynq_driver *driver, struct module *owner)
|
||||
{
|
||||
driver->driver.name = driver->name;
|
||||
driver->driver.bus = &vlynq_bus_type;
|
||||
return driver_register(&driver->driver);
|
||||
}
|
||||
EXPORT_SYMBOL(__vlynq_register_driver);
|
||||
|
||||
void vlynq_unregister_driver(struct vlynq_driver *driver)
|
||||
{
|
||||
driver_unregister(&driver->driver);
|
||||
}
|
||||
EXPORT_SYMBOL(vlynq_unregister_driver);
|
||||
|
||||
static int __vlynq_try_remote(struct vlynq_device *dev)
|
||||
{
|
||||
int i;
|
||||
|
||||
vlynq_reset(dev);
|
||||
for (i = dev->dev_id ? vlynq_rdiv2 : vlynq_rdiv8; dev->dev_id ?
|
||||
i <= vlynq_rdiv8 : i >= vlynq_rdiv2;
|
||||
dev->dev_id ? i++ : i--) {
|
||||
|
||||
if (!vlynq_linked(dev))
|
||||
break;
|
||||
|
||||
vlynq_reg_write(dev->remote->control,
|
||||
(vlynq_reg_read(dev->remote->control) &
|
||||
~VLYNQ_CTRL_CLOCK_MASK) |
|
||||
VLYNQ_CTRL_CLOCK_INT |
|
||||
VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1));
|
||||
vlynq_reg_write(dev->local->control,
|
||||
((vlynq_reg_read(dev->local->control)
|
||||
& ~(VLYNQ_CTRL_CLOCK_INT |
|
||||
VLYNQ_CTRL_CLOCK_MASK)) |
|
||||
VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1)));
|
||||
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG
|
||||
"%s: using remote clock divisor %d\n",
|
||||
dev->dev.bus_id, i - vlynq_rdiv1 + 1);
|
||||
dev->divisor = i;
|
||||
return 0;
|
||||
} else {
|
||||
vlynq_reset(dev);
|
||||
}
|
||||
}
|
||||
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int __vlynq_try_local(struct vlynq_device *dev)
|
||||
{
|
||||
int i;
|
||||
|
||||
vlynq_reset(dev);
|
||||
|
||||
for (i = dev->dev_id ? vlynq_ldiv2 : vlynq_ldiv8; dev->dev_id ?
|
||||
i <= vlynq_ldiv8 : i >= vlynq_ldiv2;
|
||||
dev->dev_id ? i++ : i--) {
|
||||
|
||||
vlynq_reg_write(dev->local->control,
|
||||
(vlynq_reg_read(dev->local->control) &
|
||||
~VLYNQ_CTRL_CLOCK_MASK) |
|
||||
VLYNQ_CTRL_CLOCK_INT |
|
||||
VLYNQ_CTRL_CLOCK_DIV(i - vlynq_ldiv1));
|
||||
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG
|
||||
"%s: using local clock divisor %d\n",
|
||||
dev->dev.bus_id, i - vlynq_ldiv1 + 1);
|
||||
dev->divisor = i;
|
||||
return 0;
|
||||
} else {
|
||||
vlynq_reset(dev);
|
||||
}
|
||||
}
|
||||
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int __vlynq_try_external(struct vlynq_device *dev)
|
||||
{
|
||||
vlynq_reset(dev);
|
||||
if (!vlynq_linked(dev))
|
||||
return -ENODEV;
|
||||
|
||||
vlynq_reg_write(dev->remote->control,
|
||||
(vlynq_reg_read(dev->remote->control) &
|
||||
~VLYNQ_CTRL_CLOCK_INT));
|
||||
|
||||
vlynq_reg_write(dev->local->control,
|
||||
(vlynq_reg_read(dev->local->control) &
|
||||
~VLYNQ_CTRL_CLOCK_INT));
|
||||
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG "%s: using external clock\n",
|
||||
dev->dev.bus_id);
|
||||
dev->divisor = vlynq_div_external;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int __vlynq_enable_device(struct vlynq_device *dev)
|
||||
{
|
||||
int result;
|
||||
struct plat_vlynq_ops *ops = dev->dev.platform_data;
|
||||
|
||||
result = ops->on(dev);
|
||||
if (result)
|
||||
return result;
|
||||
|
||||
switch (dev->divisor) {
|
||||
case vlynq_div_external:
|
||||
case vlynq_div_auto:
|
||||
/* When the device is brought from reset it should have clock
|
||||
generation negotiated by hardware.
|
||||
Check which device is generating clocks and perform setup
|
||||
accordingly */
|
||||
if (vlynq_linked(dev) && vlynq_reg_read(dev->remote->control) &
|
||||
VLYNQ_CTRL_CLOCK_INT) {
|
||||
if (!__vlynq_try_remote(dev) ||
|
||||
!__vlynq_try_local(dev) ||
|
||||
!__vlynq_try_external(dev))
|
||||
return 0;
|
||||
} else {
|
||||
if (!__vlynq_try_external(dev) ||
|
||||
!__vlynq_try_local(dev) ||
|
||||
!__vlynq_try_remote(dev))
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
case vlynq_ldiv1: case vlynq_ldiv2: case vlynq_ldiv3: case vlynq_ldiv4:
|
||||
case vlynq_ldiv5: case vlynq_ldiv6: case vlynq_ldiv7: case vlynq_ldiv8:
|
||||
vlynq_reg_write(dev->local->control,
|
||||
VLYNQ_CTRL_CLOCK_INT |
|
||||
VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
|
||||
vlynq_ldiv1));
|
||||
vlynq_reg_write(dev->remote->control, 0);
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG
|
||||
"%s: using local clock divisor %d\n",
|
||||
dev->dev.bus_id, dev->divisor - vlynq_ldiv1 + 1);
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
case vlynq_rdiv1: case vlynq_rdiv2: case vlynq_rdiv3: case vlynq_rdiv4:
|
||||
case vlynq_rdiv5: case vlynq_rdiv6: case vlynq_rdiv7: case vlynq_rdiv8:
|
||||
vlynq_reg_write(dev->local->control, 0);
|
||||
vlynq_reg_write(dev->remote->control,
|
||||
VLYNQ_CTRL_CLOCK_INT |
|
||||
VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
|
||||
vlynq_rdiv1));
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG
|
||||
"%s: using remote clock divisor %d\n",
|
||||
dev->dev.bus_id, dev->divisor - vlynq_rdiv1 + 1);
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
ops->off(dev);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
int vlynq_enable_device(struct vlynq_device *dev)
|
||||
{
|
||||
struct plat_vlynq_ops *ops = dev->dev.platform_data;
|
||||
int result = -ENODEV;
|
||||
|
||||
result = __vlynq_enable_device(dev);
|
||||
if (result)
|
||||
return result;
|
||||
|
||||
result = vlynq_setup_irq(dev);
|
||||
if (result)
|
||||
ops->off(dev);
|
||||
|
||||
dev->enabled = !result;
|
||||
return result;
|
||||
}
|
||||
EXPORT_SYMBOL(vlynq_enable_device);
|
||||
|
||||
|
||||
void vlynq_disable_device(struct vlynq_device *dev)
|
||||
{
|
||||
struct plat_vlynq_ops *ops = dev->dev.platform_data;
|
||||
|
||||
dev->enabled = 0;
|
||||
free_irq(dev->irq, dev);
|
||||
ops->off(dev);
|
||||
}
|
||||
EXPORT_SYMBOL(vlynq_disable_device);
|
||||
|
||||
int vlynq_set_local_mapping(struct vlynq_device *dev, u32 tx_offset,
|
||||
struct vlynq_mapping *mapping)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!dev->enabled)
|
||||
return -ENXIO;
|
||||
|
||||
vlynq_reg_write(dev->local->tx_offset, tx_offset);
|
||||
for (i = 0; i < 4; i++) {
|
||||
vlynq_reg_write(dev->local->rx_mapping[i].offset,
|
||||
mapping[i].offset);
|
||||
vlynq_reg_write(dev->local->rx_mapping[i].size,
|
||||
mapping[i].size);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(vlynq_set_local_mapping);
|
||||
|
||||
int vlynq_set_remote_mapping(struct vlynq_device *dev, u32 tx_offset,
|
||||
struct vlynq_mapping *mapping)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!dev->enabled)
|
||||
return -ENXIO;
|
||||
|
||||
vlynq_reg_write(dev->remote->tx_offset, tx_offset);
|
||||
for (i = 0; i < 4; i++) {
|
||||
vlynq_reg_write(dev->remote->rx_mapping[i].offset,
|
||||
mapping[i].offset);
|
||||
vlynq_reg_write(dev->remote->rx_mapping[i].size,
|
||||
mapping[i].size);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(vlynq_set_remote_mapping);
|
||||
|
||||
int vlynq_set_local_irq(struct vlynq_device *dev, int virq)
|
||||
{
|
||||
int irq = dev->irq_start + virq;
|
||||
if (dev->enabled)
|
||||
return -EBUSY;
|
||||
|
||||
if ((irq < dev->irq_start) || (irq > dev->irq_end))
|
||||
return -EINVAL;
|
||||
|
||||
if (virq == dev->remote_irq)
|
||||
return -EINVAL;
|
||||
|
||||
dev->local_irq = virq;
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(vlynq_set_local_irq);
|
||||
|
||||
int vlynq_set_remote_irq(struct vlynq_device *dev, int virq)
|
||||
{
|
||||
int irq = dev->irq_start + virq;
|
||||
if (dev->enabled)
|
||||
return -EBUSY;
|
||||
|
||||
if ((irq < dev->irq_start) || (irq > dev->irq_end))
|
||||
return -EINVAL;
|
||||
|
||||
if (virq == dev->local_irq)
|
||||
return -EINVAL;
|
||||
|
||||
dev->remote_irq = virq;
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(vlynq_set_remote_irq);
|
||||
|
||||
static int vlynq_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct vlynq_device *dev;
|
||||
struct resource *regs_res, *mem_res, *irq_res;
|
||||
int len, result;
|
||||
|
||||
regs_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
|
||||
if (!regs_res)
|
||||
return -ENODEV;
|
||||
|
||||
mem_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mem");
|
||||
if (!mem_res)
|
||||
return -ENODEV;
|
||||
|
||||
irq_res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "devirq");
|
||||
if (!irq_res)
|
||||
return -ENODEV;
|
||||
|
||||
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
||||
if (!dev) {
|
||||
printk(KERN_ERR
|
||||
"vlynq: failed to allocate device structure\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
dev->id = pdev->id;
|
||||
dev->dev.bus = &vlynq_bus_type;
|
||||
dev->dev.parent = &pdev->dev;
|
||||
snprintf(dev->dev.bus_id, BUS_ID_SIZE, "vlynq%d", dev->id);
|
||||
dev->dev.bus_id[BUS_ID_SIZE - 1] = 0;
|
||||
dev->dev.platform_data = pdev->dev.platform_data;
|
||||
dev->dev.release = vlynq_device_release;
|
||||
|
||||
dev->regs_start = regs_res->start;
|
||||
dev->regs_end = regs_res->end;
|
||||
dev->mem_start = mem_res->start;
|
||||
dev->mem_end = mem_res->end;
|
||||
|
||||
len = regs_res->end - regs_res->start;
|
||||
if (!request_mem_region(regs_res->start, len, dev->dev.bus_id)) {
|
||||
printk(KERN_ERR "%s: Can't request vlynq registers\n",
|
||||
dev->dev.bus_id);
|
||||
result = -ENXIO;
|
||||
goto fail_request;
|
||||
}
|
||||
|
||||
dev->local = ioremap(regs_res->start, len);
|
||||
if (!dev->local) {
|
||||
printk(KERN_ERR "%s: Can't remap vlynq registers\n",
|
||||
dev->dev.bus_id);
|
||||
result = -ENXIO;
|
||||
goto fail_remap;
|
||||
}
|
||||
|
||||
dev->remote = (struct vlynq_regs *)((void *)dev->local +
|
||||
VLYNQ_REMOTE_OFFSET);
|
||||
|
||||
dev->irq = platform_get_irq_byname(pdev, "irq");
|
||||
dev->irq_start = irq_res->start;
|
||||
dev->irq_end = irq_res->end;
|
||||
dev->local_irq = dev->irq_end - dev->irq_start;
|
||||
dev->remote_irq = dev->local_irq - 1;
|
||||
|
||||
if (device_register(&dev->dev))
|
||||
goto fail_register;
|
||||
platform_set_drvdata(pdev, dev);
|
||||
|
||||
printk(KERN_INFO "%s: regs 0x%p, irq %d, mem 0x%p\n",
|
||||
dev->dev.bus_id, (void *)dev->regs_start, dev->irq,
|
||||
(void *)dev->mem_start);
|
||||
|
||||
dev->dev_id = 0;
|
||||
dev->divisor = vlynq_div_auto;
|
||||
result = __vlynq_enable_device(dev);
|
||||
if (result == 0) {
|
||||
dev->dev_id = vlynq_reg_read(dev->remote->chip);
|
||||
((struct plat_vlynq_ops *)(dev->dev.platform_data))->off(dev);
|
||||
}
|
||||
if (dev->dev_id)
|
||||
printk(KERN_INFO "Found a VLYNQ device: %08x\n", dev->dev_id);
|
||||
|
||||
return 0;
|
||||
|
||||
fail_register:
|
||||
iounmap(dev->local);
|
||||
fail_remap:
|
||||
fail_request:
|
||||
release_mem_region(regs_res->start, len);
|
||||
kfree(dev);
|
||||
return result;
|
||||
}
|
||||
|
||||
static int vlynq_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct vlynq_device *dev = platform_get_drvdata(pdev);
|
||||
|
||||
device_unregister(&dev->dev);
|
||||
iounmap(dev->local);
|
||||
release_mem_region(dev->regs_start, dev->regs_end - dev->regs_start);
|
||||
|
||||
kfree(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver vlynq_platform_driver = {
|
||||
.driver.name = "vlynq",
|
||||
.probe = vlynq_probe,
|
||||
.remove = __devexit_p(vlynq_remove),
|
||||
};
|
||||
|
||||
struct bus_type vlynq_bus_type = {
|
||||
.name = "vlynq",
|
||||
.match = vlynq_device_match,
|
||||
.probe = vlynq_device_probe,
|
||||
.remove = vlynq_device_remove,
|
||||
};
|
||||
EXPORT_SYMBOL(vlynq_bus_type);
|
||||
|
||||
static int __devinit vlynq_init(void)
|
||||
{
|
||||
int res = 0;
|
||||
|
||||
res = bus_register(&vlynq_bus_type);
|
||||
if (res)
|
||||
goto fail_bus;
|
||||
|
||||
res = platform_driver_register(&vlynq_platform_driver);
|
||||
if (res)
|
||||
goto fail_platform;
|
||||
|
||||
return 0;
|
||||
|
||||
fail_platform:
|
||||
bus_unregister(&vlynq_bus_type);
|
||||
fail_bus:
|
||||
return res;
|
||||
}
|
||||
|
||||
static void __devexit vlynq_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&vlynq_platform_driver);
|
||||
bus_unregister(&vlynq_bus_type);
|
||||
}
|
||||
|
||||
module_init(vlynq_init);
|
||||
module_exit(vlynq_exit);
|
@ -1,200 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2006,2007 Felix Fietkau <nbd@openwrt.org>
|
||||
* Copyright (C) 2006,2007 Eugene Konev <ejka@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef __AR7_H__
|
||||
#define __AR7_H__
|
||||
|
||||
#include <linux/delay.h>
|
||||
#include <asm/addrspace.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#define AR7_REGS_BASE 0x08610000
|
||||
|
||||
#define AR7_REGS_MAC0 (AR7_REGS_BASE + 0x0000)
|
||||
#define AR7_REGS_GPIO (AR7_REGS_BASE + 0x0900)
|
||||
/* 0x08610A00 - 0x08610BFF (512 bytes, 128 bytes / clock) */
|
||||
#define AR7_REGS_POWER (AR7_REGS_BASE + 0x0a00)
|
||||
#define AR7_REGS_UART0 (AR7_REGS_BASE + 0x0e00)
|
||||
#define AR7_REGS_USB (AR7_REGS_BASE + 0x1200)
|
||||
#define AR7_REGS_RESET (AR7_REGS_BASE + 0x1600)
|
||||
#define AR7_REGS_VLYNQ0 (AR7_REGS_BASE + 0x1800)
|
||||
#define AR7_REGS_DCL (AR7_REGS_BASE + 0x1a00)
|
||||
#define AR7_REGS_VLYNQ1 (AR7_REGS_BASE + 0x1c00)
|
||||
#define AR7_REGS_MDIO (AR7_REGS_BASE + 0x1e00)
|
||||
#define AR7_REGS_IRQ (AR7_REGS_BASE + 0x2400)
|
||||
#define AR7_REGS_MAC1 (AR7_REGS_BASE + 0x2800)
|
||||
|
||||
#define AR7_REGS_WDT (AR7_REGS_BASE + 0x1f00)
|
||||
#define UR8_REGS_WDT (AR7_REGS_BASE + 0x0b00)
|
||||
#define UR8_REGS_UART1 (AR7_REGS_BASE + 0x0f00)
|
||||
|
||||
#define TITAN_REGS_ESWITCH_BASE (0x08640000)
|
||||
#define TITAN_REGS_MAC0 (TITAN_REGS_ESWITCH_BASE + 0)
|
||||
#define TITAN_REGS_MAC1 (TITAN_REGS_ESWITCH_BASE + 0x0800)
|
||||
#define TITAN_REGS_MDIO (TITAN_REGS_ESWITCH_BASE + 0x02000)
|
||||
#define TITAN_REGS_VLYNQ0 (AR7_REGS_BASE + 0x1c00)
|
||||
#define TITAN_REGS_VLYNQ1 (AR7_REGS_BASE + 0x1300)
|
||||
|
||||
#define AR7_RESET_PEREPHERIAL 0x0
|
||||
#define AR7_RESET_SOFTWARE 0x4
|
||||
#define AR7_RESET_STATUS 0x8
|
||||
|
||||
#define AR7_RESET_BIT_CPMAC_LO 17
|
||||
#define AR7_RESET_BIT_CPMAC_HI 21
|
||||
#define AR7_RESET_BIT_MDIO 22
|
||||
#define AR7_RESET_BIT_EPHY 26
|
||||
|
||||
#define TITAN_RESET_BIT_EPHY1 28
|
||||
|
||||
/* GPIO control registers */
|
||||
#define AR7_GPIO_INPUT 0x0
|
||||
#define AR7_GPIO_OUTPUT 0x4
|
||||
#define AR7_GPIO_DIR 0x8
|
||||
#define AR7_GPIO_ENABLE 0xc
|
||||
#define TITAN_GPIO_INPUT_0 0x0
|
||||
#define TITAN_GPIO_INPUT_1 0x4
|
||||
#define TITAN_GPIO_OUTPUT_0 0x8
|
||||
#define TITAN_GPIO_OUTPUT_1 0xc
|
||||
#define TITAN_GPIO_DIR_0 0x10
|
||||
#define TITAN_GPIO_DIR_1 0x14
|
||||
#define TITAN_GPIO_ENBL_0 0x18
|
||||
#define TITAN_GPIO_ENBL_1 0x1c
|
||||
|
||||
#define AR7_CHIP_7100 0x18
|
||||
#define AR7_CHIP_7200 0x2b
|
||||
#define AR7_CHIP_7300 0x05
|
||||
#define AR7_CHIP_TITAN 0x07
|
||||
#define TITAN_CHIP_1050 0x0f
|
||||
#define TITAN_CHIP_1055 0x0e
|
||||
#define TITAN_CHIP_1056 0x0d
|
||||
#define TITAN_CHIP_1060 0x07
|
||||
|
||||
/* Interrupts */
|
||||
#define AR7_IRQ_UART0 15
|
||||
#define AR7_IRQ_UART1 16
|
||||
|
||||
/* Clocks */
|
||||
#define AR7_AFE_CLOCK 35328000
|
||||
#define AR7_REF_CLOCK 25000000
|
||||
#define AR7_XTAL_CLOCK 24000000
|
||||
|
||||
struct plat_cpmac_data {
|
||||
int reset_bit;
|
||||
int power_bit;
|
||||
u32 phy_mask;
|
||||
char dev_addr[6];
|
||||
};
|
||||
|
||||
struct plat_dsl_data {
|
||||
int reset_bit_dsl;
|
||||
int reset_bit_sar;
|
||||
};
|
||||
|
||||
extern int ar7_cpu_clock, ar7_bus_clock, ar7_dsp_clock;
|
||||
|
||||
static inline int ar7_is_titan(void)
|
||||
{
|
||||
return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x24)) & 0xffff) ==
|
||||
AR7_CHIP_TITAN;
|
||||
}
|
||||
|
||||
static inline u16 ar7_chip_id(void)
|
||||
{
|
||||
return ar7_is_titan() ? AR7_CHIP_TITAN : (readl((void *)
|
||||
KSEG1ADDR(AR7_REGS_GPIO + 0x14)) & 0xffff);
|
||||
}
|
||||
|
||||
static inline u8 ar7_chip_rev(void)
|
||||
{
|
||||
return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + (ar7_is_titan() ? 0x24 :
|
||||
0x14))) >> 16) & 0xff;
|
||||
}
|
||||
|
||||
static inline int ar7_cpu_freq(void)
|
||||
{
|
||||
return ar7_cpu_clock;
|
||||
}
|
||||
|
||||
static inline int ar7_bus_freq(void)
|
||||
{
|
||||
return ar7_bus_clock;
|
||||
}
|
||||
|
||||
static inline int ar7_vbus_freq(void)
|
||||
{
|
||||
return ar7_bus_clock / 2;
|
||||
}
|
||||
#define ar7_cpmac_freq ar7_vbus_freq
|
||||
|
||||
static inline int ar7_dsp_freq(void)
|
||||
{
|
||||
return ar7_dsp_clock;
|
||||
}
|
||||
|
||||
static inline int ar7_has_high_cpmac(void)
|
||||
{
|
||||
u16 chip_id = ar7_chip_id();
|
||||
switch (chip_id) {
|
||||
case AR7_CHIP_7100:
|
||||
case AR7_CHIP_7200:
|
||||
return 0;
|
||||
default:
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
#define ar7_has_high_vlynq ar7_has_high_cpmac
|
||||
#define ar7_has_second_uart ar7_has_high_cpmac
|
||||
|
||||
static inline void ar7_device_enable(u32 bit)
|
||||
{
|
||||
void *reset_reg =
|
||||
(void *)KSEG1ADDR(AR7_REGS_RESET + AR7_RESET_PEREPHERIAL);
|
||||
writel(readl(reset_reg) | (1 << bit), reset_reg);
|
||||
mdelay(20);
|
||||
}
|
||||
|
||||
static inline void ar7_device_disable(u32 bit)
|
||||
{
|
||||
void *reset_reg =
|
||||
(void *)KSEG1ADDR(AR7_REGS_RESET + AR7_RESET_PEREPHERIAL);
|
||||
writel(readl(reset_reg) & ~(1 << bit), reset_reg);
|
||||
mdelay(20);
|
||||
}
|
||||
|
||||
static inline void ar7_device_reset(u32 bit)
|
||||
{
|
||||
ar7_device_disable(bit);
|
||||
ar7_device_enable(bit);
|
||||
}
|
||||
|
||||
static inline void ar7_device_on(u32 bit)
|
||||
{
|
||||
void *power_reg = (void *)KSEG1ADDR(AR7_REGS_POWER);
|
||||
writel(readl(power_reg) | (1 << bit), power_reg);
|
||||
mdelay(20);
|
||||
}
|
||||
|
||||
static inline void ar7_device_off(u32 bit)
|
||||
{
|
||||
void *power_reg = (void *)KSEG1ADDR(AR7_REGS_POWER);
|
||||
writel(readl(power_reg) & ~(1 << bit), power_reg);
|
||||
mdelay(20);
|
||||
}
|
||||
|
||||
#endif /* __AR7_H__ */
|
@ -1,269 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef __AR7_GPIO_H__
|
||||
#define __AR7_GPIO_H__
|
||||
#include <asm/ar7/ar7.h>
|
||||
#ifndef __AR7_TITAN_H__
|
||||
#include <asm/ar7/titan.h>
|
||||
#endif
|
||||
|
||||
#define AR7_GPIO_MAX 32
|
||||
#define TITAN_GPIO_MAX 51
|
||||
|
||||
extern int gpio_request(unsigned gpio, const char *label);
|
||||
extern void gpio_free(unsigned gpio);
|
||||
|
||||
/* Common GPIO layer */
|
||||
static inline int gpio_get_value_ar7(unsigned gpio)
|
||||
{
|
||||
void __iomem *gpio_in =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
|
||||
|
||||
return readl(gpio_in) & (1 << gpio);
|
||||
}
|
||||
|
||||
static inline int gpio_get_value_titan(unsigned gpio)
|
||||
{
|
||||
void __iomem *gpio_in0 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_0);
|
||||
void __iomem *gpio_in1 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_1);
|
||||
|
||||
return readl(gpio >> 5 ? gpio_in1 : gpio_in0) & (1 << (gpio & 0x1f));
|
||||
}
|
||||
|
||||
static inline int gpio_get_value(unsigned gpio)
|
||||
{
|
||||
return ar7_is_titan() ? gpio_get_value_titan(gpio) :
|
||||
gpio_get_value_ar7(gpio);
|
||||
}
|
||||
|
||||
static inline void gpio_set_value_ar7(unsigned gpio, int value)
|
||||
{
|
||||
void __iomem *gpio_out =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
|
||||
unsigned tmp;
|
||||
|
||||
tmp = readl(gpio_out) & ~(1 << gpio);
|
||||
if (value)
|
||||
tmp |= 1 << gpio;
|
||||
writel(tmp, gpio_out);
|
||||
}
|
||||
|
||||
static inline void gpio_set_value_titan(unsigned gpio, int value)
|
||||
{
|
||||
void __iomem *gpio_out0 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_OUTPUT_0);
|
||||
void __iomem *gpio_out1 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_OUTPUT_1);
|
||||
unsigned tmp;
|
||||
|
||||
tmp = readl(gpio >> 5 ? gpio_out1 : gpio_out0) & ~(1 << (gpio & 0x1f));
|
||||
if (value)
|
||||
tmp |= 1 << (gpio & 0x1f);
|
||||
writel(tmp, gpio >> 5 ? gpio_out1 : gpio_out0);
|
||||
}
|
||||
|
||||
static inline void gpio_set_value(unsigned gpio, int value)
|
||||
{
|
||||
if (ar7_is_titan())
|
||||
gpio_set_value_titan(gpio, value);
|
||||
else
|
||||
gpio_set_value_ar7(gpio, value);
|
||||
}
|
||||
|
||||
static inline int gpio_direction_input_ar7(unsigned gpio)
|
||||
{
|
||||
void __iomem *gpio_dir =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
|
||||
|
||||
if (gpio >= AR7_GPIO_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
writel(readl(gpio_dir) | (1 << gpio), gpio_dir);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int gpio_direction_input_titan(unsigned gpio)
|
||||
{
|
||||
void __iomem *gpio_dir0 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_DIR_0);
|
||||
void __iomem *gpio_dir1 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_DIR_1);
|
||||
|
||||
if (gpio >= TITAN_GPIO_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
writel(readl(gpio >> 5 ? gpio_dir1 : gpio_dir0) | (1 << (gpio & 0x1f)),
|
||||
gpio >> 5 ? gpio_dir1 : gpio_dir0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int gpio_direction_input(unsigned gpio)
|
||||
{
|
||||
return ar7_is_titan() ? gpio_direction_input_titan(gpio) :
|
||||
gpio_direction_input_ar7(gpio);
|
||||
}
|
||||
|
||||
static inline int gpio_direction_output_ar7(unsigned gpio, int value)
|
||||
{
|
||||
void __iomem *gpio_dir =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
|
||||
|
||||
if (gpio >= AR7_GPIO_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
gpio_set_value(gpio, value);
|
||||
writel(readl(gpio_dir) & ~(1 << gpio), gpio_dir);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int gpio_direction_output_titan(unsigned gpio, int value)
|
||||
{
|
||||
void __iomem *gpio_dir0 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_DIR_0);
|
||||
void __iomem *gpio_dir1 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_DIR_1);
|
||||
|
||||
if (gpio >= TITAN_GPIO_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
gpio_set_value_titan(gpio, value);
|
||||
writel(readl(gpio >> 5 ? gpio_dir1 : gpio_dir0) & ~(1 <<
|
||||
(gpio & 0x1f)), gpio >> 5 ? gpio_dir1 : gpio_dir0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int gpio_direction_output(unsigned gpio, int value)
|
||||
{
|
||||
return ar7_is_titan() ? gpio_direction_output_titan(gpio, value) :
|
||||
gpio_direction_output_ar7(gpio, value);
|
||||
}
|
||||
|
||||
static inline int gpio_to_irq(unsigned gpio)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static inline int irq_to_gpio(unsigned irq)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Board specific GPIO functions */
|
||||
static inline int ar7_gpio_enable_ar7(unsigned gpio)
|
||||
{
|
||||
void __iomem *gpio_en =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);
|
||||
|
||||
writel(readl(gpio_en) | (1 << gpio), gpio_en);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int ar7_gpio_enable_titan(unsigned gpio)
|
||||
{
|
||||
void __iomem *gpio_en0 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_ENBL_0);
|
||||
void __iomem *gpio_en1 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_ENBL_1);
|
||||
|
||||
writel(readl(gpio >> 5 ? gpio_en1 : gpio_en0) | (1 << (gpio & 0x1f)),
|
||||
gpio >> 5 ? gpio_en1 : gpio_en0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int ar7_gpio_enable(unsigned gpio)
|
||||
{
|
||||
return ar7_is_titan() ? ar7_gpio_enable_titan(gpio) :
|
||||
ar7_gpio_enable_ar7(gpio);
|
||||
}
|
||||
|
||||
static inline int ar7_gpio_disable_ar7(unsigned gpio)
|
||||
{
|
||||
void __iomem *gpio_en =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);
|
||||
|
||||
writel(readl(gpio_en) & ~(1 << gpio), gpio_en);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int ar7_gpio_disable_titan(unsigned gpio)
|
||||
{
|
||||
void __iomem *gpio_en0 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_ENBL_0);
|
||||
void __iomem *gpio_en1 =
|
||||
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_ENBL_1);
|
||||
|
||||
writel(readl(gpio >> 5 ? gpio_en1 : gpio_en0) & ~(1 << (gpio & 0x1f)),
|
||||
gpio >> 5 ? gpio_en1 : gpio_en0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int ar7_gpio_disable(unsigned gpio)
|
||||
{
|
||||
return ar7_is_titan() ? ar7_gpio_disable_titan(gpio) :
|
||||
ar7_gpio_disable_ar7(gpio);
|
||||
}
|
||||
|
||||
static inline int ar7_init_titan_variant( void )
|
||||
{
|
||||
/*UINT32 new_val;*/
|
||||
unsigned new_val;
|
||||
|
||||
/* set GPIO 44 - 47 as input */
|
||||
/*PAL_sysGpioCtrl(const int, GPIO_PIN, GPIO_INPUT_PIN); */
|
||||
/*define titan_gpio_ctrl in titan.h*/
|
||||
titan_gpio_ctrl(44, GPIO_PIN, GPIO_INPUT_PIN);
|
||||
titan_gpio_ctrl(45, GPIO_PIN, GPIO_INPUT_PIN);
|
||||
titan_gpio_ctrl(46, GPIO_PIN, GPIO_INPUT_PIN);
|
||||
titan_gpio_ctrl(47, GPIO_PIN, GPIO_INPUT_PIN);
|
||||
|
||||
/* read GPIO to get Titan variant type */
|
||||
/*fix this*/
|
||||
titan_sysGpioInValue( &new_val, 1 );
|
||||
|
||||
new_val >>= 12;
|
||||
new_val &= 0x0f;
|
||||
|
||||
switch ( new_val )
|
||||
{
|
||||
case TITAN_CHIP_1050:
|
||||
case TITAN_CHIP_1055:
|
||||
case TITAN_CHIP_1056:
|
||||
case TITAN_CHIP_1060:
|
||||
return new_val;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
/* In case we get an invalid value, return the default Titan chip */
|
||||
return TITAN_CHIP_1050;
|
||||
}
|
||||
|
||||
#include <asm-generic/gpio.h>
|
||||
|
||||
#endif
|
@ -1,16 +0,0 @@
|
||||
/*
|
||||
* 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.
|
||||
*
|
||||
* Shamelessly copied from asm-mips/mach-emma2rh/
|
||||
* Copyright (C) 2003 by Ralf Baechle
|
||||
*/
|
||||
#ifndef __ASM_AR7_IRQ_H
|
||||
#define __ASM_AR7_IRQ_H
|
||||
|
||||
#define NR_IRQS 256
|
||||
|
||||
#include_next <irq.h>
|
||||
|
||||
#endif /* __ASM_AR7_IRQ_H */
|
@ -1,26 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2006, 2007 Florian Fainelli <florian@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef __PROM_H__
|
||||
#define __PROM_H__
|
||||
|
||||
extern char *prom_getenv(const char *name);
|
||||
extern void prom_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
|
||||
extern void prom_meminit(void);
|
||||
|
||||
#endif /* __PROM_H__ */
|
@ -1,32 +0,0 @@
|
||||
/*
|
||||
* 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) 1994 - 1999, 2000, 03, 04 Ralf Baechle
|
||||
* Copyright (C) 2000, 2002 Maciej W. Rozycki
|
||||
* Copyright (C) 1990, 1999, 2000 Silicon Graphics, Inc.
|
||||
*/
|
||||
#ifndef _ASM_AR7_SPACES_H
|
||||
#define _ASM_AR7_SPACES_H
|
||||
|
||||
#define CAC_BASE 0x80000000
|
||||
#define IO_BASE 0xa0000000
|
||||
#define UNCAC_BASE 0xa0000000
|
||||
#define MAP_BASE 0xc0000000
|
||||
|
||||
/*
|
||||
* This handles the memory map.
|
||||
* We handle pages at KSEG0 for kernels with 32 bit address space.
|
||||
*/
|
||||
#define PAGE_OFFSET 0x94000000UL
|
||||
#define PHYS_OFFSET 0x14000000UL
|
||||
|
||||
/*
|
||||
* Memory above this physical address will be considered highmem.
|
||||
*/
|
||||
#ifndef HIGHMEM_START
|
||||
#define HIGHMEM_START 0x40000000UL
|
||||
#endif
|
||||
|
||||
#endif /* __ASM_AR7_SPACES_H */
|
@ -1,178 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Stanley Pinchak <stanley_dot_pinchak_at_gmail_dot_com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
#ifndef __AR7_TITAN_H__
|
||||
#define __AR7_TITAN_H__
|
||||
|
||||
#ifndef __AR7_GPIO_H__
|
||||
#include <asm/ar7/gpio.h>
|
||||
#endif
|
||||
|
||||
typedef enum TITAN_GPIO_PIN_MODE_tag
|
||||
{
|
||||
FUNCTIONAL_PIN = 0,
|
||||
GPIO_PIN = 1
|
||||
} TITAN_GPIO_PIN_MODE_T;
|
||||
|
||||
typedef enum TITAN_GPIO_PIN_DIRECTION_tag
|
||||
{
|
||||
GPIO_OUTPUT_PIN = 0,
|
||||
GPIO_INPUT_PIN = 1
|
||||
} TITAN_GPIO_PIN_DIRECTION_T;
|
||||
|
||||
/**********************************************************************
|
||||
* GPIO Control
|
||||
**********************************************************************/
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int pinSelReg;
|
||||
int shift;
|
||||
int func;
|
||||
|
||||
} GPIO_CFG;
|
||||
|
||||
static GPIO_CFG gptable[]= {
|
||||
/* PIN_SEL_REG, START_BIT, GPIO_CFG_MUX_VALUE */
|
||||
{4,24,1},
|
||||
{4,26,1},
|
||||
{4,28,1},
|
||||
{4,30,1},
|
||||
{5,6,1},
|
||||
{5,8,1},
|
||||
{5,10,1},
|
||||
{5,12,1},
|
||||
{7,14,3},
|
||||
{7,16,3},
|
||||
{7,18,3},
|
||||
{7,20,3},
|
||||
{7,22,3},
|
||||
{7,26,3},
|
||||
{7,28,3},
|
||||
{7,30,3},
|
||||
{8,0,3},
|
||||
{8,2,3},
|
||||
{8,4,3},
|
||||
{8,10,3},
|
||||
{8,14,3},
|
||||
{8,16,3},
|
||||
{8,18,3},
|
||||
{8,20,3},
|
||||
{9,8,3},
|
||||
{9,10,3},
|
||||
{9,12,3},
|
||||
{9,14,3},
|
||||
{9,18,3},
|
||||
{9,20,3},
|
||||
{9,24,3},
|
||||
{9,26,3},
|
||||
{9,28,3},
|
||||
{9,30,3},
|
||||
{10,0,3},
|
||||
{10,2,3},
|
||||
{10,8,3},
|
||||
{10,10,3},
|
||||
{10,12,3},
|
||||
{10,14,3},
|
||||
{13,12,3},
|
||||
{13,14,3},
|
||||
{13,16,3},
|
||||
{13,18,3},
|
||||
{13,24,3},
|
||||
{13,26,3},
|
||||
{13,28,3},
|
||||
{13,30,3},
|
||||
{14,2,3},
|
||||
{14,6,3},
|
||||
{14,8,3},
|
||||
{14,12,3}
|
||||
};
|
||||
|
||||
typedef struct
|
||||
{
|
||||
volatile unsigned int reg[21];
|
||||
}
|
||||
PIN_SEL_REG_ARRAY_T;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
unsigned int data_in [2];
|
||||
unsigned int data_out[2];
|
||||
unsigned int dir[2];
|
||||
unsigned int enable[2];
|
||||
|
||||
} TITAN_GPIO_CONTROL_T;
|
||||
|
||||
#define AVALANCHE_PIN_SEL_BASE 0xA861160C /*replace with KSEG1ADDR()*/
|
||||
|
||||
static inline int titan_gpio_ctrl(unsigned int gpio_pin, TITAN_GPIO_PIN_MODE_T pin_mode,
|
||||
TITAN_GPIO_PIN_DIRECTION_T pin_direction)
|
||||
{
|
||||
int reg_index = 0;
|
||||
int mux_status;
|
||||
GPIO_CFG gpio_cfg;
|
||||
volatile PIN_SEL_REG_ARRAY_T *pin_sel_array = (PIN_SEL_REG_ARRAY_T*) AVALANCHE_PIN_SEL_BASE;
|
||||
volatile TITAN_GPIO_CONTROL_T *gpio_cntl = (TITAN_GPIO_CONTROL_T*) KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_0);
|
||||
|
||||
if (gpio_pin > 51 )
|
||||
return(-1);
|
||||
|
||||
gpio_cfg = gptable[gpio_pin];
|
||||
mux_status = (pin_sel_array->reg[gpio_cfg.pinSelReg - 1] >> gpio_cfg.shift) & 0x3;
|
||||
if(!((mux_status == 0 /* tri-stated */ ) || (mux_status == gpio_cfg.func /*GPIO functionality*/)))
|
||||
{
|
||||
return(-1); /* Pin have been configured for non GPIO funcs. */
|
||||
}
|
||||
|
||||
/* Set the pin to be used as GPIO. */
|
||||
pin_sel_array->reg[gpio_cfg.pinSelReg - 1] |= ((gpio_cfg.func & 0x3) << gpio_cfg.shift);
|
||||
|
||||
/* Check whether gpio refers to the first GPIO reg or second. */
|
||||
if(gpio_pin > 31)
|
||||
{
|
||||
reg_index = 1;
|
||||
gpio_pin -= 32;
|
||||
}
|
||||
|
||||
if(pin_mode)
|
||||
gpio_cntl->enable[reg_index] |= (1 << gpio_pin); /* Enable */
|
||||
else
|
||||
gpio_cntl->enable[reg_index] &= ~(1 << gpio_pin);
|
||||
|
||||
if(pin_direction)
|
||||
gpio_cntl->dir[reg_index] |= (1 << gpio_pin); /* Input */
|
||||
else
|
||||
gpio_cntl->dir[reg_index] &= ~(1 << gpio_pin);
|
||||
|
||||
return(0);
|
||||
|
||||
}/* end of function titan_gpio_ctrl */
|
||||
|
||||
static inline int titan_sysGpioInValue(unsigned int *in_val, unsigned int reg_index)
|
||||
{
|
||||
volatile TITAN_GPIO_CONTROL_T *gpio_cntl = (TITAN_GPIO_CONTROL_T*) KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_0);
|
||||
|
||||
if(reg_index > 1)
|
||||
return (-1);
|
||||
|
||||
*in_val = gpio_cntl->data_in[reg_index];
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
@ -1,25 +0,0 @@
|
||||
/*
|
||||
* 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) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
|
||||
*/
|
||||
#ifndef __ASM_MIPS_MACH_BCM947XX_WAR_H
|
||||
#define __ASM_MIPS_MACH_BCM947XX_WAR_H
|
||||
|
||||
#define R4600_V1_INDEX_ICACHEOP_WAR 0
|
||||
#define R4600_V1_HIT_CACHEOP_WAR 0
|
||||
#define R4600_V2_HIT_CACHEOP_WAR 0
|
||||
#define R5432_CP0_INTERRUPT_WAR 0
|
||||
#define BCM1250_M3_WAR 0
|
||||
#define SIBYTE_1956_WAR 0
|
||||
#define MIPS4K_ICACHE_REFILL_WAR 0
|
||||
#define MIPS_CACHE_SYNC_WAR 0
|
||||
#define TX49XX_ICACHE_INDEX_INV_WAR 0
|
||||
#define RM9000_CDEX_SMP_WAR 0
|
||||
#define ICACHE_REFILLS_WORKAROUND_WAR 0
|
||||
#define R10000_LLSC_WAR 0
|
||||
#define MIPS34K_MISSED_ITLB_WAR 0
|
||||
|
||||
#endif /* __ASM_MIPS_MACH_BCM947XX_WAR_H */
|
@ -1,161 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2006, 2007 Eugene Konev <ejka@openwrt.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef __VLYNQ_H__
|
||||
#define __VLYNQ_H__
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#define VLYNQ_NUM_IRQS 32
|
||||
|
||||
struct vlynq_mapping {
|
||||
u32 size;
|
||||
u32 offset;
|
||||
};
|
||||
|
||||
enum vlynq_divisor {
|
||||
vlynq_div_auto = 0,
|
||||
vlynq_ldiv1,
|
||||
vlynq_ldiv2,
|
||||
vlynq_ldiv3,
|
||||
vlynq_ldiv4,
|
||||
vlynq_ldiv5,
|
||||
vlynq_ldiv6,
|
||||
vlynq_ldiv7,
|
||||
vlynq_ldiv8,
|
||||
vlynq_rdiv1,
|
||||
vlynq_rdiv2,
|
||||
vlynq_rdiv3,
|
||||
vlynq_rdiv4,
|
||||
vlynq_rdiv5,
|
||||
vlynq_rdiv6,
|
||||
vlynq_rdiv7,
|
||||
vlynq_rdiv8,
|
||||
vlynq_div_external
|
||||
};
|
||||
|
||||
struct vlynq_device_id {
|
||||
u32 id;
|
||||
enum vlynq_divisor divisor;
|
||||
unsigned long driver_data;
|
||||
};
|
||||
|
||||
struct vlynq_regs;
|
||||
struct vlynq_device {
|
||||
u32 id, dev_id;
|
||||
int local_irq;
|
||||
int remote_irq;
|
||||
enum vlynq_divisor divisor;
|
||||
u32 regs_start, regs_end;
|
||||
u32 mem_start, mem_end;
|
||||
u32 irq_start, irq_end;
|
||||
int irq;
|
||||
int enabled;
|
||||
struct vlynq_regs *local;
|
||||
struct vlynq_regs *remote;
|
||||
struct device dev;
|
||||
};
|
||||
|
||||
struct vlynq_driver {
|
||||
char *name;
|
||||
struct vlynq_device_id *id_table;
|
||||
int (*probe)(struct vlynq_device *dev, struct vlynq_device_id *id);
|
||||
void (*remove)(struct vlynq_device *dev);
|
||||
struct device_driver driver;
|
||||
};
|
||||
|
||||
struct plat_vlynq_ops {
|
||||
int (*on)(struct vlynq_device *dev);
|
||||
void (*off)(struct vlynq_device *dev);
|
||||
};
|
||||
|
||||
static inline struct vlynq_driver *to_vlynq_driver(struct device_driver *drv)
|
||||
{
|
||||
return container_of(drv, struct vlynq_driver, driver);
|
||||
}
|
||||
|
||||
static inline struct vlynq_device *to_vlynq_device(struct device *device)
|
||||
{
|
||||
return container_of(device, struct vlynq_device, dev);
|
||||
}
|
||||
|
||||
extern struct bus_type vlynq_bus_type;
|
||||
|
||||
extern int __vlynq_register_driver(struct vlynq_driver *driver,
|
||||
struct module *owner);
|
||||
|
||||
static inline int vlynq_register_driver(struct vlynq_driver *driver)
|
||||
{
|
||||
return __vlynq_register_driver(driver, THIS_MODULE);
|
||||
}
|
||||
|
||||
static inline void *vlynq_get_drvdata(struct vlynq_device *dev)
|
||||
{
|
||||
return dev_get_drvdata(&dev->dev);
|
||||
}
|
||||
|
||||
static inline void vlynq_set_drvdata(struct vlynq_device *dev, void *data)
|
||||
{
|
||||
dev_set_drvdata(&dev->dev, data);
|
||||
}
|
||||
|
||||
static inline u32 vlynq_mem_start(struct vlynq_device *dev)
|
||||
{
|
||||
return dev->mem_start;
|
||||
}
|
||||
|
||||
static inline u32 vlynq_mem_end(struct vlynq_device *dev)
|
||||
{
|
||||
return dev->mem_end;
|
||||
}
|
||||
|
||||
static inline u32 vlynq_mem_len(struct vlynq_device *dev)
|
||||
{
|
||||
return dev->mem_end - dev->mem_start + 1;
|
||||
}
|
||||
|
||||
static inline int vlynq_virq_to_irq(struct vlynq_device *dev, int virq)
|
||||
{
|
||||
int irq = dev->irq_start + virq;
|
||||
if ((irq < dev->irq_start) || (irq > dev->irq_end))
|
||||
return -EINVAL;
|
||||
|
||||
return irq;
|
||||
}
|
||||
|
||||
static inline int vlynq_irq_to_virq(struct vlynq_device *dev, int irq)
|
||||
{
|
||||
if ((irq < dev->irq_start) || (irq > dev->irq_end))
|
||||
return -EINVAL;
|
||||
|
||||
return irq - dev->irq_start;
|
||||
}
|
||||
|
||||
extern void vlynq_unregister_driver(struct vlynq_driver *driver);
|
||||
extern int vlynq_enable_device(struct vlynq_device *dev);
|
||||
extern void vlynq_disable_device(struct vlynq_device *dev);
|
||||
extern int vlynq_set_local_mapping(struct vlynq_device *dev, u32 tx_offset,
|
||||
struct vlynq_mapping *mapping);
|
||||
extern int vlynq_set_remote_mapping(struct vlynq_device *dev, u32 tx_offset,
|
||||
struct vlynq_mapping *mapping);
|
||||
extern int vlynq_set_local_irq(struct vlynq_device *dev, int virq);
|
||||
extern int vlynq_set_remote_irq(struct vlynq_device *dev, int virq);
|
||||
|
||||
#endif /* __VLYNQ_H__ */
|
@ -1,86 +0,0 @@
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -19,6 +19,24 @@ choice
|
||||
prompt "System type"
|
||||
default SGI_IP22
|
||||
|
||||
+config AR7
|
||||
+ bool "Texas Instruments AR7"
|
||||
+ select BOOT_ELF32
|
||||
+ select DMA_NONCOHERENT
|
||||
+ select CEVT_R4K
|
||||
+ select CSRC_R4K
|
||||
+ select IRQ_CPU
|
||||
+ select NO_EXCEPT_FILL
|
||||
+ select SWAP_IO_SPACE
|
||||
+ select SYS_HAS_CPU_MIPS32_R1
|
||||
+ select SYS_HAS_EARLY_PRINTK
|
||||
+ select SYS_SUPPORTS_32BIT_KERNEL
|
||||
+ select SYS_SUPPORTS_KGDB
|
||||
+ select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||
+ select SYS_SUPPORTS_BIG_ENDIAN
|
||||
+ select GENERIC_GPIO
|
||||
+ select GENERIC_HARDIRQS_NO__DO_IRQ
|
||||
+
|
||||
config MACH_ALCHEMY
|
||||
bool "Alchemy processor based machines"
|
||||
|
||||
--- a/arch/mips/kernel/traps.c
|
||||
+++ b/arch/mips/kernel/traps.c
|
||||
@@ -1256,9 +1256,22 @@ void *set_except_vector(int n, void *add
|
||||
|
||||
exception_handlers[n] = handler;
|
||||
if (n == 0 && cpu_has_divec) {
|
||||
- *(u32 *)(ebase + 0x200) = 0x08000000 |
|
||||
- (0x03ffffff & (handler >> 2));
|
||||
- local_flush_icache_range(ebase + 0x200, ebase + 0x204);
|
||||
+ if ((handler ^ (ebase + 4)) & 0xfc000000) {
|
||||
+ /* lui k0, 0x0000 */
|
||||
+ *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
|
||||
+ /* ori k0, 0x0000 */
|
||||
+ *(u32 *)(ebase + 0x204) =
|
||||
+ 0x375a0000 | (handler & 0xffff);
|
||||
+ /* jr k0 */
|
||||
+ *(u32 *)(ebase + 0x208) = 0x03400008;
|
||||
+ /* nop */
|
||||
+ *(u32 *)(ebase + 0x20C) = 0x00000000;
|
||||
+ flush_icache_range(ebase + 0x200, ebase + 0x210);
|
||||
+ } else {
|
||||
+ *(u32 *)(ebase + 0x200) =
|
||||
+ 0x08000000 | (0x03ffffff & (handler >> 2));
|
||||
+ flush_icache_range(ebase + 0x200, ebase + 0x204);
|
||||
+ }
|
||||
}
|
||||
return (void *)old_handler;
|
||||
}
|
||||
--- a/arch/mips/Makefile
|
||||
+++ b/arch/mips/Makefile
|
||||
@@ -174,6 +174,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s
|
||||
#
|
||||
|
||||
#
|
||||
+# Texas Instruments AR7
|
||||
+#
|
||||
+core-$(CONFIG_AR7) += arch/mips/ar7/
|
||||
+cflags-$(CONFIG_AR7) += -Iinclude/asm-mips/ar7
|
||||
+load-$(CONFIG_AR7) += 0xffffffff94100000
|
||||
+
|
||||
+#
|
||||
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
|
||||
#
|
||||
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
|
||||
--- a/arch/mips/include/asm/page.h
|
||||
+++ b/arch/mips/include/asm/page.h
|
||||
@@ -185,8 +185,10 @@ typedef struct { unsigned long pgprot; }
|
||||
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
|
||||
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
|
||||
|
||||
-#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
|
||||
-#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)
|
||||
+#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE + \
|
||||
+ PHYS_OFFSET)
|
||||
+#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET - \
|
||||
+ PHYS_OFFSET)
|
||||
|
||||
#include <asm-generic/memory_model.h>
|
||||
#include <asm-generic/page.h>
|
@ -1,11 +0,0 @@
|
||||
--- a/drivers/mtd/maps/physmap.c
|
||||
+++ b/drivers/mtd/maps/physmap.c
|
||||
@@ -80,7 +80,7 @@ static const char *rom_probe_types[] = {
|
||||
"map_rom",
|
||||
NULL };
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
-static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
|
||||
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "ar7part", NULL };
|
||||
#endif
|
||||
|
||||
static int physmap_flash_probe(struct platform_device *dev)
|
@ -1,28 +0,0 @@
|
||||
--- a/drivers/char/Kconfig
|
||||
+++ b/drivers/char/Kconfig
|
||||
@@ -974,6 +974,15 @@ config MWAVE
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called mwave.
|
||||
|
||||
+config AR7_GPIO
|
||||
+ tristate "TI AR7 GPIO Support"
|
||||
+ depends on AR7
|
||||
+ help
|
||||
+ Give userspace access to the GPIO pins on the Texas Instruments AR7
|
||||
+ processors.
|
||||
+
|
||||
+ If compiled as a module, it will be called ar7_gpio.
|
||||
+
|
||||
config SCx200_GPIO
|
||||
tristate "NatSemi SCx200 GPIO Support"
|
||||
depends on SCx200
|
||||
--- a/drivers/char/Makefile
|
||||
+++ b/drivers/char/Makefile
|
||||
@@ -90,6 +90,7 @@ obj-$(CONFIG_HW_RANDOM) += hw_random/
|
||||
obj-$(CONFIG_PPDEV) += ppdev.o
|
||||
obj-$(CONFIG_NWBUTTON) += nwbutton.o
|
||||
obj-$(CONFIG_NWFLASH) += nwflash.o
|
||||
+obj-$(CONFIG_AR7_GPIO) += ar7_gpio.o
|
||||
obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
|
||||
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
|
||||
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
|
@ -1,21 +0,0 @@
|
||||
--- a/drivers/Kconfig
|
||||
+++ b/drivers/Kconfig
|
||||
@@ -104,6 +104,8 @@ source "drivers/auxdisplay/Kconfig"
|
||||
|
||||
source "drivers/uio/Kconfig"
|
||||
|
||||
+source "drivers/vlynq/Kconfig"
|
||||
+
|
||||
source "drivers/xen/Kconfig"
|
||||
|
||||
source "drivers/staging/Kconfig"
|
||||
--- a/drivers/Makefile
|
||||
+++ b/drivers/Makefile
|
||||
@@ -103,6 +103,7 @@ obj-$(CONFIG_DCA) += dca/
|
||||
obj-$(CONFIG_HID) += hid/
|
||||
obj-$(CONFIG_PPC_PS3) += ps3/
|
||||
obj-$(CONFIG_OF) += of/
|
||||
+obj-$(CONFIG_VLYNQ) += vlynq/
|
||||
obj-$(CONFIG_SSB) += ssb/
|
||||
obj-$(CONFIG_VIRTIO) += virtio/
|
||||
obj-$(CONFIG_STAGING) += staging/
|
@ -1,548 +0,0 @@
|
||||
--- a/drivers/vlynq/vlynq.c
|
||||
+++ b/drivers/vlynq/vlynq.c
|
||||
@@ -14,6 +14,9 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ *
|
||||
+ * Parts of the VLYNQ specification can be found here:
|
||||
+ * http://www.ti.com/litv/pdf/sprue36a
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
@@ -25,7 +28,6 @@
|
||||
#include <linux/errno.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/interrupt.h>
|
||||
-#include <linux/device.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
@@ -73,15 +75,11 @@ struct vlynq_regs {
|
||||
u32 int_device[8];
|
||||
};
|
||||
|
||||
-#define vlynq_reg_read(reg) readl(&(reg))
|
||||
-#define vlynq_reg_write(reg, val) writel(val, &(reg))
|
||||
-
|
||||
-static int __vlynq_enable_device(struct vlynq_device *dev);
|
||||
-
|
||||
-#ifdef VLYNQ_DEBUG
|
||||
+#ifdef CONFIG_VLYNQ_DEBUG
|
||||
static void vlynq_dump_regs(struct vlynq_device *dev)
|
||||
{
|
||||
int i;
|
||||
+
|
||||
printk(KERN_DEBUG "VLYNQ local=%p remote=%p\n",
|
||||
dev->local, dev->remote);
|
||||
for (i = 0; i < 32; i++) {
|
||||
@@ -95,20 +93,23 @@ static void vlynq_dump_regs(struct vlynq
|
||||
static void vlynq_dump_mem(u32 *base, int count)
|
||||
{
|
||||
int i;
|
||||
+
|
||||
for (i = 0; i < (count + 3) / 4; i++) {
|
||||
- if (i % 4 == 0) printk(KERN_DEBUG "\nMEM[0x%04x]:", i * 4);
|
||||
+ if (i % 4 == 0)
|
||||
+ printk(KERN_DEBUG "\nMEM[0x%04x]:", i * 4);
|
||||
printk(KERN_DEBUG " 0x%08x", *(base + i));
|
||||
}
|
||||
printk(KERN_DEBUG "\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
-int vlynq_linked(struct vlynq_device *dev)
|
||||
+/* Check the VLYNQ link status with a given device */
|
||||
+static int vlynq_linked(struct vlynq_device *dev)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 100; i++)
|
||||
- if (vlynq_reg_read(dev->local->status) & VLYNQ_STATUS_LINK)
|
||||
+ if (readl(&dev->local->status) & VLYNQ_STATUS_LINK)
|
||||
return 1;
|
||||
else
|
||||
cpu_relax();
|
||||
@@ -118,17 +119,15 @@ int vlynq_linked(struct vlynq_device *de
|
||||
|
||||
static void vlynq_reset(struct vlynq_device *dev)
|
||||
{
|
||||
- vlynq_reg_write(dev->local->control,
|
||||
- vlynq_reg_read(dev->local->control) |
|
||||
- VLYNQ_CTRL_RESET);
|
||||
+ writel(readl(&dev->local->control) | VLYNQ_CTRL_RESET,
|
||||
+ &dev->local->control);
|
||||
|
||||
/* Wait for the devices to finish resetting */
|
||||
msleep(5);
|
||||
|
||||
/* Remove reset bit */
|
||||
- vlynq_reg_write(dev->local->control,
|
||||
- vlynq_reg_read(dev->local->control) &
|
||||
- ~VLYNQ_CTRL_RESET);
|
||||
+ writel(readl(&dev->local->control) & ~VLYNQ_CTRL_RESET,
|
||||
+ &dev->local->control);
|
||||
|
||||
/* Give some time for the devices to settle */
|
||||
msleep(5);
|
||||
@@ -142,9 +141,9 @@ static void vlynq_irq_unmask(unsigned in
|
||||
|
||||
BUG_ON(!dev);
|
||||
virq = irq - dev->irq_start;
|
||||
- val = vlynq_reg_read(dev->remote->int_device[virq >> 2]);
|
||||
+ val = readl(&dev->remote->int_device[virq >> 2]);
|
||||
val |= (VINT_ENABLE | virq) << VINT_OFFSET(virq);
|
||||
- vlynq_reg_write(dev->remote->int_device[virq >> 2], val);
|
||||
+ writel(val, &dev->remote->int_device[virq >> 2]);
|
||||
}
|
||||
|
||||
static void vlynq_irq_mask(unsigned int irq)
|
||||
@@ -155,9 +154,9 @@ static void vlynq_irq_mask(unsigned int
|
||||
|
||||
BUG_ON(!dev);
|
||||
virq = irq - dev->irq_start;
|
||||
- val = vlynq_reg_read(dev->remote->int_device[virq >> 2]);
|
||||
+ val = readl(&dev->remote->int_device[virq >> 2]);
|
||||
val &= ~(VINT_ENABLE << VINT_OFFSET(virq));
|
||||
- vlynq_reg_write(dev->remote->int_device[virq >> 2], val);
|
||||
+ writel(val, &dev->remote->int_device[virq >> 2]);
|
||||
}
|
||||
|
||||
static int vlynq_irq_type(unsigned int irq, unsigned int flow_type)
|
||||
@@ -168,7 +167,7 @@ static int vlynq_irq_type(unsigned int i
|
||||
|
||||
BUG_ON(!dev);
|
||||
virq = irq - dev->irq_start;
|
||||
- val = vlynq_reg_read(dev->remote->int_device[virq >> 2]);
|
||||
+ val = readl(&dev->remote->int_device[virq >> 2]);
|
||||
switch (flow_type & IRQ_TYPE_SENSE_MASK) {
|
||||
case IRQ_TYPE_EDGE_RISING:
|
||||
case IRQ_TYPE_EDGE_FALLING:
|
||||
@@ -187,28 +186,30 @@ static int vlynq_irq_type(unsigned int i
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
- vlynq_reg_write(dev->remote->int_device[virq >> 2], val);
|
||||
+ writel(val, &dev->remote->int_device[virq >> 2]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vlynq_local_ack(unsigned int irq)
|
||||
{
|
||||
struct vlynq_device *dev = get_irq_chip_data(irq);
|
||||
- u32 status = vlynq_reg_read(dev->local->status);
|
||||
- if (printk_ratelimit())
|
||||
- printk(KERN_DEBUG "%s: local status: 0x%08x\n",
|
||||
- dev->dev.bus_id, status);
|
||||
- vlynq_reg_write(dev->local->status, status);
|
||||
+
|
||||
+ u32 status = readl(&dev->local->status);
|
||||
+
|
||||
+ pr_debug("%s: local status: 0x%08x\n",
|
||||
+ dev_name(&dev->dev), status);
|
||||
+ writel(status, &dev->local->status);
|
||||
}
|
||||
|
||||
static void vlynq_remote_ack(unsigned int irq)
|
||||
{
|
||||
struct vlynq_device *dev = get_irq_chip_data(irq);
|
||||
- u32 status = vlynq_reg_read(dev->remote->status);
|
||||
- if (printk_ratelimit())
|
||||
- printk(KERN_DEBUG "%s: remote status: 0x%08x\n",
|
||||
- dev->dev.bus_id, status);
|
||||
- vlynq_reg_write(dev->remote->status, status);
|
||||
+
|
||||
+ u32 status = readl(&dev->remote->status);
|
||||
+
|
||||
+ pr_debug("%s: remote status: 0x%08x\n",
|
||||
+ dev_name(&dev->dev), status);
|
||||
+ writel(status, &dev->remote->status);
|
||||
}
|
||||
|
||||
static irqreturn_t vlynq_irq(int irq, void *dev_id)
|
||||
@@ -217,8 +218,8 @@ static irqreturn_t vlynq_irq(int irq, vo
|
||||
u32 status;
|
||||
int virq = 0;
|
||||
|
||||
- status = vlynq_reg_read(dev->local->int_status);
|
||||
- vlynq_reg_write(dev->local->int_status, status);
|
||||
+ status = readl(&dev->local->int_status);
|
||||
+ writel(status, &dev->local->int_status);
|
||||
|
||||
if (unlikely(!status))
|
||||
spurious_interrupt();
|
||||
@@ -262,28 +263,28 @@ static int vlynq_setup_irq(struct vlynq_
|
||||
if (dev->local_irq == dev->remote_irq) {
|
||||
printk(KERN_ERR
|
||||
"%s: local vlynq irq should be different from remote\n",
|
||||
- dev->dev.bus_id);
|
||||
+ dev_name(&dev->dev));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Clear local and remote error bits */
|
||||
- vlynq_reg_write(dev->local->status, vlynq_reg_read(dev->local->status));
|
||||
- vlynq_reg_write(dev->remote->status,
|
||||
- vlynq_reg_read(dev->remote->status));
|
||||
+ writel(readl(&dev->local->status), &dev->local->status);
|
||||
+ writel(readl(&dev->remote->status), &dev->remote->status);
|
||||
|
||||
/* Now setup interrupts */
|
||||
val = VLYNQ_CTRL_INT_VECTOR(dev->local_irq);
|
||||
val |= VLYNQ_CTRL_INT_ENABLE | VLYNQ_CTRL_INT_LOCAL |
|
||||
VLYNQ_CTRL_INT2CFG;
|
||||
- val |= vlynq_reg_read(dev->local->control);
|
||||
- vlynq_reg_write(dev->local->int_ptr, VLYNQ_INT_OFFSET);
|
||||
- vlynq_reg_write(dev->local->control, val);
|
||||
+ val |= readl(&dev->local->control);
|
||||
+ writel(VLYNQ_INT_OFFSET, &dev->local->int_ptr);
|
||||
+ writel(val, &dev->local->control);
|
||||
|
||||
val = VLYNQ_CTRL_INT_VECTOR(dev->remote_irq);
|
||||
val |= VLYNQ_CTRL_INT_ENABLE;
|
||||
- val |= vlynq_reg_read(dev->remote->control);
|
||||
- vlynq_reg_write(dev->remote->int_ptr, VLYNQ_INT_OFFSET);
|
||||
- vlynq_reg_write(dev->remote->control, val);
|
||||
+ val |= readl(&dev->remote->control);
|
||||
+ writel(VLYNQ_INT_OFFSET, &dev->remote->int_ptr);
|
||||
+ writel(val, &dev->remote->int_ptr);
|
||||
+ writel(val, &dev->remote->control);
|
||||
|
||||
for (i = dev->irq_start; i <= dev->irq_end; i++) {
|
||||
virq = i - dev->irq_start;
|
||||
@@ -299,12 +300,13 @@ static int vlynq_setup_irq(struct vlynq_
|
||||
set_irq_chip_and_handler(i, &vlynq_irq_chip,
|
||||
handle_simple_irq);
|
||||
set_irq_chip_data(i, dev);
|
||||
- vlynq_reg_write(dev->remote->int_device[virq >> 2], 0);
|
||||
+ writel(0, &dev->remote->int_device[virq >> 2]);
|
||||
}
|
||||
}
|
||||
|
||||
if (request_irq(dev->irq, vlynq_irq, IRQF_SHARED, "vlynq", dev)) {
|
||||
- printk(KERN_ERR "%s: request_irq failed\n", dev->dev.bus_id);
|
||||
+ printk(KERN_ERR "%s: request_irq failed\n",
|
||||
+ dev_name(&dev->dev));
|
||||
return -EAGAIN;
|
||||
}
|
||||
|
||||
@@ -328,11 +330,11 @@ static int vlynq_device_match(struct dev
|
||||
if (ids->id == vdev->dev_id) {
|
||||
vdev->divisor = ids->divisor;
|
||||
vlynq_set_drvdata(vdev, ids);
|
||||
- printk(KERN_INFO "Driver found for VLYNQ " \
|
||||
+ printk(KERN_INFO "Driver found for VLYNQ "
|
||||
"device: %08x\n", vdev->dev_id);
|
||||
return 1;
|
||||
}
|
||||
- printk(KERN_DEBUG "Not using the %08x VLYNQ device's driver" \
|
||||
+ printk(KERN_DEBUG "Not using the %08x VLYNQ device's driver"
|
||||
" for VLYNQ device: %08x\n", ids->id, vdev->dev_id);
|
||||
ids++;
|
||||
}
|
||||
@@ -346,8 +348,7 @@ static int vlynq_device_probe(struct dev
|
||||
struct vlynq_device_id *id = vlynq_get_drvdata(vdev);
|
||||
int result = -ENODEV;
|
||||
|
||||
- get_device(dev);
|
||||
- if (drv && drv->probe)
|
||||
+ if (drv->probe)
|
||||
result = drv->probe(vdev, id);
|
||||
if (result)
|
||||
put_device(dev);
|
||||
@@ -357,9 +358,10 @@ static int vlynq_device_probe(struct dev
|
||||
static int vlynq_device_remove(struct device *dev)
|
||||
{
|
||||
struct vlynq_driver *drv = to_vlynq_driver(dev->driver);
|
||||
- if (drv && drv->remove)
|
||||
+
|
||||
+ if (drv->remove)
|
||||
drv->remove(to_vlynq_device(dev));
|
||||
- put_device(dev);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -377,6 +379,14 @@ void vlynq_unregister_driver(struct vlyn
|
||||
}
|
||||
EXPORT_SYMBOL(vlynq_unregister_driver);
|
||||
|
||||
+/*
|
||||
+ * A VLYNQ remote device can clock the VLYNQ bus master
|
||||
+ * using a dedicated clock line. In that case, both the
|
||||
+ * remove device and the bus master should have the same
|
||||
+ * serial clock dividers configured. Iterate through the
|
||||
+ * 8 possible dividers until we actually link with the
|
||||
+ * device.
|
||||
+ */
|
||||
static int __vlynq_try_remote(struct vlynq_device *dev)
|
||||
{
|
||||
int i;
|
||||
@@ -389,21 +399,21 @@ static int __vlynq_try_remote(struct vly
|
||||
if (!vlynq_linked(dev))
|
||||
break;
|
||||
|
||||
- vlynq_reg_write(dev->remote->control,
|
||||
- (vlynq_reg_read(dev->remote->control) &
|
||||
+ writel((readl(&dev->remote->control) &
|
||||
~VLYNQ_CTRL_CLOCK_MASK) |
|
||||
VLYNQ_CTRL_CLOCK_INT |
|
||||
- VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1));
|
||||
- vlynq_reg_write(dev->local->control,
|
||||
- ((vlynq_reg_read(dev->local->control)
|
||||
+ VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1),
|
||||
+ &dev->remote->control);
|
||||
+ writel((readl(&dev->local->control)
|
||||
& ~(VLYNQ_CTRL_CLOCK_INT |
|
||||
VLYNQ_CTRL_CLOCK_MASK)) |
|
||||
- VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1)));
|
||||
+ VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1),
|
||||
+ &dev->local->control);
|
||||
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG
|
||||
"%s: using remote clock divisor %d\n",
|
||||
- dev->dev.bus_id, i - vlynq_rdiv1 + 1);
|
||||
+ dev_name(&dev->dev), i - vlynq_rdiv1 + 1);
|
||||
dev->divisor = i;
|
||||
return 0;
|
||||
} else {
|
||||
@@ -414,26 +424,33 @@ static int __vlynq_try_remote(struct vly
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * A VLYNQ remote device can be clocked by the VLYNQ bus
|
||||
+ * master using a dedicated clock line. In that case, only
|
||||
+ * the bus master configures the serial clock divider.
|
||||
+ * Iterate through the 8 possible dividers until we
|
||||
+ * actually get a link with the device.
|
||||
+ */
|
||||
static int __vlynq_try_local(struct vlynq_device *dev)
|
||||
{
|
||||
int i;
|
||||
-
|
||||
+
|
||||
vlynq_reset(dev);
|
||||
|
||||
for (i = dev->dev_id ? vlynq_ldiv2 : vlynq_ldiv8; dev->dev_id ?
|
||||
i <= vlynq_ldiv8 : i >= vlynq_ldiv2;
|
||||
dev->dev_id ? i++ : i--) {
|
||||
|
||||
- vlynq_reg_write(dev->local->control,
|
||||
- (vlynq_reg_read(dev->local->control) &
|
||||
+ writel((readl(&dev->local->control) &
|
||||
~VLYNQ_CTRL_CLOCK_MASK) |
|
||||
VLYNQ_CTRL_CLOCK_INT |
|
||||
- VLYNQ_CTRL_CLOCK_DIV(i - vlynq_ldiv1));
|
||||
+ VLYNQ_CTRL_CLOCK_DIV(i - vlynq_ldiv1),
|
||||
+ &dev->local->control);
|
||||
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG
|
||||
"%s: using local clock divisor %d\n",
|
||||
- dev->dev.bus_id, i - vlynq_ldiv1 + 1);
|
||||
+ dev_name(&dev->dev), i - vlynq_ldiv1 + 1);
|
||||
dev->divisor = i;
|
||||
return 0;
|
||||
} else {
|
||||
@@ -444,27 +461,33 @@ static int __vlynq_try_local(struct vlyn
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * When using external clocking method, serial clock
|
||||
+ * is supplied by an external oscillator, therefore we
|
||||
+ * should mask the local clock bit in the clock control
|
||||
+ * register for both the bus master and the remote device.
|
||||
+ */
|
||||
static int __vlynq_try_external(struct vlynq_device *dev)
|
||||
{
|
||||
vlynq_reset(dev);
|
||||
if (!vlynq_linked(dev))
|
||||
return -ENODEV;
|
||||
|
||||
- vlynq_reg_write(dev->remote->control,
|
||||
- (vlynq_reg_read(dev->remote->control) &
|
||||
- ~VLYNQ_CTRL_CLOCK_INT));
|
||||
-
|
||||
- vlynq_reg_write(dev->local->control,
|
||||
- (vlynq_reg_read(dev->local->control) &
|
||||
- ~VLYNQ_CTRL_CLOCK_INT));
|
||||
+ writel((readl(&dev->remote->control) &
|
||||
+ ~VLYNQ_CTRL_CLOCK_INT),
|
||||
+ &dev->remote->control);
|
||||
+
|
||||
+ writel((readl(&dev->local->control) &
|
||||
+ ~VLYNQ_CTRL_CLOCK_INT),
|
||||
+ &dev->local->control);
|
||||
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG "%s: using external clock\n",
|
||||
- dev->dev.bus_id);
|
||||
+ dev_name(&dev->dev));
|
||||
dev->divisor = vlynq_div_external;
|
||||
return 0;
|
||||
}
|
||||
-
|
||||
+
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -481,10 +504,10 @@ static int __vlynq_enable_device(struct
|
||||
case vlynq_div_external:
|
||||
case vlynq_div_auto:
|
||||
/* When the device is brought from reset it should have clock
|
||||
- generation negotiated by hardware.
|
||||
- Check which device is generating clocks and perform setup
|
||||
- accordingly */
|
||||
- if (vlynq_linked(dev) && vlynq_reg_read(dev->remote->control) &
|
||||
+ * generation negotiated by hardware.
|
||||
+ * Check which device is generating clocks and perform setup
|
||||
+ * accordingly */
|
||||
+ if (vlynq_linked(dev) && readl(&dev->remote->control) &
|
||||
VLYNQ_CTRL_CLOCK_INT) {
|
||||
if (!__vlynq_try_remote(dev) ||
|
||||
!__vlynq_try_local(dev) ||
|
||||
@@ -497,31 +520,43 @@ static int __vlynq_enable_device(struct
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
- case vlynq_ldiv1: case vlynq_ldiv2: case vlynq_ldiv3: case vlynq_ldiv4:
|
||||
- case vlynq_ldiv5: case vlynq_ldiv6: case vlynq_ldiv7: case vlynq_ldiv8:
|
||||
- vlynq_reg_write(dev->local->control,
|
||||
- VLYNQ_CTRL_CLOCK_INT |
|
||||
- VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
|
||||
- vlynq_ldiv1));
|
||||
- vlynq_reg_write(dev->remote->control, 0);
|
||||
+ case vlynq_ldiv1:
|
||||
+ case vlynq_ldiv2:
|
||||
+ case vlynq_ldiv3:
|
||||
+ case vlynq_ldiv4:
|
||||
+ case vlynq_ldiv5:
|
||||
+ case vlynq_ldiv6:
|
||||
+ case vlynq_ldiv7:
|
||||
+ case vlynq_ldiv8:
|
||||
+ writel(VLYNQ_CTRL_CLOCK_INT |
|
||||
+ VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
|
||||
+ vlynq_ldiv1), &dev->local->control);
|
||||
+ writel(0, &dev->remote->control);
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG
|
||||
- "%s: using local clock divisor %d\n",
|
||||
- dev->dev.bus_id, dev->divisor - vlynq_ldiv1 + 1);
|
||||
+ "%s: using local clock divisor %d\n",
|
||||
+ dev_name(&dev->dev),
|
||||
+ dev->divisor - vlynq_ldiv1 + 1);
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
- case vlynq_rdiv1: case vlynq_rdiv2: case vlynq_rdiv3: case vlynq_rdiv4:
|
||||
- case vlynq_rdiv5: case vlynq_rdiv6: case vlynq_rdiv7: case vlynq_rdiv8:
|
||||
- vlynq_reg_write(dev->local->control, 0);
|
||||
- vlynq_reg_write(dev->remote->control,
|
||||
- VLYNQ_CTRL_CLOCK_INT |
|
||||
- VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
|
||||
- vlynq_rdiv1));
|
||||
+ case vlynq_rdiv1:
|
||||
+ case vlynq_rdiv2:
|
||||
+ case vlynq_rdiv3:
|
||||
+ case vlynq_rdiv4:
|
||||
+ case vlynq_rdiv5:
|
||||
+ case vlynq_rdiv6:
|
||||
+ case vlynq_rdiv7:
|
||||
+ case vlynq_rdiv8:
|
||||
+ writel(0, &dev->local->control);
|
||||
+ writel(VLYNQ_CTRL_CLOCK_INT |
|
||||
+ VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
|
||||
+ vlynq_rdiv1), &dev->remote->control);
|
||||
if (vlynq_linked(dev)) {
|
||||
printk(KERN_DEBUG
|
||||
- "%s: using remote clock divisor %d\n",
|
||||
- dev->dev.bus_id, dev->divisor - vlynq_rdiv1 + 1);
|
||||
+ "%s: using remote clock divisor %d\n",
|
||||
+ dev_name(&dev->dev),
|
||||
+ dev->divisor - vlynq_rdiv1 + 1);
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
@@ -568,12 +603,10 @@ int vlynq_set_local_mapping(struct vlynq
|
||||
if (!dev->enabled)
|
||||
return -ENXIO;
|
||||
|
||||
- vlynq_reg_write(dev->local->tx_offset, tx_offset);
|
||||
+ writel(tx_offset, &dev->local->tx_offset);
|
||||
for (i = 0; i < 4; i++) {
|
||||
- vlynq_reg_write(dev->local->rx_mapping[i].offset,
|
||||
- mapping[i].offset);
|
||||
- vlynq_reg_write(dev->local->rx_mapping[i].size,
|
||||
- mapping[i].size);
|
||||
+ writel(mapping[i].offset, &dev->local->rx_mapping[i].offset);
|
||||
+ writel(mapping[i].size, &dev->local->rx_mapping[i].size);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -587,12 +620,10 @@ int vlynq_set_remote_mapping(struct vlyn
|
||||
if (!dev->enabled)
|
||||
return -ENXIO;
|
||||
|
||||
- vlynq_reg_write(dev->remote->tx_offset, tx_offset);
|
||||
+ writel(tx_offset, &dev->remote->tx_offset);
|
||||
for (i = 0; i < 4; i++) {
|
||||
- vlynq_reg_write(dev->remote->rx_mapping[i].offset,
|
||||
- mapping[i].offset);
|
||||
- vlynq_reg_write(dev->remote->rx_mapping[i].size,
|
||||
- mapping[i].size);
|
||||
+ writel(mapping[i].offset, &dev->remote->rx_mapping[i].offset);
|
||||
+ writel(mapping[i].size, &dev->remote->rx_mapping[i].size);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -662,8 +693,7 @@ static int vlynq_probe(struct platform_d
|
||||
dev->id = pdev->id;
|
||||
dev->dev.bus = &vlynq_bus_type;
|
||||
dev->dev.parent = &pdev->dev;
|
||||
- snprintf(dev->dev.bus_id, BUS_ID_SIZE, "vlynq%d", dev->id);
|
||||
- dev->dev.bus_id[BUS_ID_SIZE - 1] = 0;
|
||||
+ dev_set_name(&dev->dev, "vlynq%d", dev->id);
|
||||
dev->dev.platform_data = pdev->dev.platform_data;
|
||||
dev->dev.release = vlynq_device_release;
|
||||
|
||||
@@ -673,9 +703,9 @@ static int vlynq_probe(struct platform_d
|
||||
dev->mem_end = mem_res->end;
|
||||
|
||||
len = regs_res->end - regs_res->start;
|
||||
- if (!request_mem_region(regs_res->start, len, dev->dev.bus_id)) {
|
||||
+ if (!request_mem_region(regs_res->start, len, dev_name(&dev->dev))) {
|
||||
printk(KERN_ERR "%s: Can't request vlynq registers\n",
|
||||
- dev->dev.bus_id);
|
||||
+ dev_name(&dev->dev));
|
||||
result = -ENXIO;
|
||||
goto fail_request;
|
||||
}
|
||||
@@ -683,7 +713,7 @@ static int vlynq_probe(struct platform_d
|
||||
dev->local = ioremap(regs_res->start, len);
|
||||
if (!dev->local) {
|
||||
printk(KERN_ERR "%s: Can't remap vlynq registers\n",
|
||||
- dev->dev.bus_id);
|
||||
+ dev_name(&dev->dev));
|
||||
result = -ENXIO;
|
||||
goto fail_remap;
|
||||
}
|
||||
@@ -702,14 +732,14 @@ static int vlynq_probe(struct platform_d
|
||||
platform_set_drvdata(pdev, dev);
|
||||
|
||||
printk(KERN_INFO "%s: regs 0x%p, irq %d, mem 0x%p\n",
|
||||
- dev->dev.bus_id, (void *)dev->regs_start, dev->irq,
|
||||
+ dev_name(&dev->dev), (void *)dev->regs_start, dev->irq,
|
||||
(void *)dev->mem_start);
|
||||
|
||||
dev->dev_id = 0;
|
||||
dev->divisor = vlynq_div_auto;
|
||||
result = __vlynq_enable_device(dev);
|
||||
if (result == 0) {
|
||||
- dev->dev_id = vlynq_reg_read(dev->remote->chip);
|
||||
+ dev->dev_id = readl(&dev->remote->chip);
|
||||
((struct plat_vlynq_ops *)(dev->dev.platform_data))->off(dev);
|
||||
}
|
||||
if (dev->dev_id)
|
@ -1,31 +0,0 @@
|
||||
--- a/drivers/watchdog/ar7_wdt.c
|
||||
+++ b/drivers/watchdog/ar7_wdt.c
|
||||
@@ -298,14 +298,28 @@ static struct miscdevice ar7_wdt_miscdev
|
||||
.fops = &ar7_wdt_fops,
|
||||
};
|
||||
|
||||
+#define AR7_WDT_HARDWARE_ENABLE 0x10
|
||||
+
|
||||
static int __init ar7_wdt_init(void)
|
||||
{
|
||||
int rc;
|
||||
+ u32 *bootcr;
|
||||
+ u32 bootcr_value;
|
||||
|
||||
spin_lock_init(&wdt_lock);
|
||||
|
||||
ar7_wdt_get_regs();
|
||||
|
||||
+ /* arch/mips/ar7/clocks.c is the only other thing that reads this */
|
||||
+ bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
|
||||
+ bootcr_value = *bootcr;
|
||||
+ iounmap(bootcr);
|
||||
+
|
||||
+ if (!(bootcr_value & AR7_WDT_HARDWARE_ENABLE)) {
|
||||
+ printk(KERN_INFO DRVNAME ": watchdog disabled in hardware (bootcr=%#x)\n", bootcr_value);
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
if (!request_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt),
|
||||
LONGNAME)) {
|
||||
printk(KERN_WARNING DRVNAME ": watchdog I/O region busy\n");
|
@ -1,11 +0,0 @@
|
||||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
@@ -1883,7 +1883,7 @@ config SC92031
|
||||
|
||||
config CPMAC
|
||||
tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
|
||||
- depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN
|
||||
+ depends on NET_ETHERNET && EXPERIMENTAL && AR7
|
||||
select PHYLIB
|
||||
help
|
||||
TI AR7 CPMAC Ethernet support
|
@ -1,47 +0,0 @@
|
||||
--- a/arch/mips/ar7/platform.c
|
||||
+++ b/arch/mips/ar7/platform.c
|
||||
@@ -33,6 +33,8 @@
|
||||
#include <linux/vlynq.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/string.h>
|
||||
+#include <linux/phy.h>
|
||||
+#include <linux/phy_fixed.h>
|
||||
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/ar7/ar7.h>
|
||||
@@ -205,6 +207,13 @@ static struct physmap_flash_data physmap
|
||||
.width = 2,
|
||||
};
|
||||
|
||||
+/* lets assume this is suitable for both high and low cpmacs links */
|
||||
+static struct fixed_phy_status fixed_phy_status __initdata = {
|
||||
+ .link = 1,
|
||||
+ .speed = 100,
|
||||
+ .duplex = 1,
|
||||
+};
|
||||
+
|
||||
static struct plat_cpmac_data cpmac_low_data = {
|
||||
.reset_bit = 17,
|
||||
.power_bit = 20,
|
||||
@@ -506,6 +515,10 @@ static int __init ar7_register_devices(v
|
||||
}
|
||||
|
||||
if (ar7_has_high_cpmac()) {
|
||||
+ res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
|
||||
+ if (res && res != -ENODEV)
|
||||
+ return res;
|
||||
+
|
||||
cpmac_get_mac(1, cpmac_high_data.dev_addr);
|
||||
res = platform_device_register(&cpmac_high);
|
||||
if (res)
|
||||
@@ -514,6 +527,10 @@ static int __init ar7_register_devices(v
|
||||
cpmac_low_data.phy_mask = 0xffffffff;
|
||||
}
|
||||
|
||||
+ res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
|
||||
+ if (res && res != -ENODEV)
|
||||
+ return res;
|
||||
+
|
||||
cpmac_get_mac(0, cpmac_low_data.dev_addr);
|
||||
res = platform_device_register(&cpmac_low);
|
||||
if (res)
|
@ -1,38 +0,0 @@
|
||||
--- a/drivers/serial/8250.c
|
||||
+++ b/drivers/serial/8250.c
|
||||
@@ -287,6 +287,13 @@ static const struct serial8250_config ua
|
||||
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
|
||||
.flags = UART_CAP_FIFO,
|
||||
},
|
||||
+ [PORT_AR7] = {
|
||||
+ .name = "TI-AR7",
|
||||
+ .fifo_size = 16,
|
||||
+ .tx_loadsz = 16,
|
||||
+ .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
|
||||
+ .flags = UART_CAP_FIFO | UART_CAP_AFE,
|
||||
+ },
|
||||
};
|
||||
|
||||
#if defined (CONFIG_SERIAL_8250_AU1X00)
|
||||
@@ -2702,7 +2709,11 @@ static void serial8250_console_putchar(s
|
||||
{
|
||||
struct uart_8250_port *up = (struct uart_8250_port *)port;
|
||||
|
||||
+#ifdef CONFIG_AR7
|
||||
+ wait_for_xmitr(up, BOTH_EMPTY);
|
||||
+#else
|
||||
wait_for_xmitr(up, UART_LSR_THRE);
|
||||
+#endif
|
||||
serial_out(up, UART_TX, ch);
|
||||
}
|
||||
|
||||
--- a/include/linux/serial_core.h
|
||||
+++ b/include/linux/serial_core.h
|
||||
@@ -41,6 +41,7 @@
|
||||
#define PORT_XSCALE 15
|
||||
#define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */
|
||||
#define PORT_OCTEON 17 /* Cavium OCTEON internal UART */
|
||||
+#define PORT_AR7 18 /* TI AR7 internal UART */
|
||||
#define PORT_MAX_8250 17 /* max port ID */
|
||||
|
||||
/*
|
@ -1,70 +0,0 @@
|
||||
This patch fixes the network driver cpmac.c for compilation with
|
||||
configuration option CONFIG_NETDEVICES_MULTIQUEUE.
|
||||
|
||||
These compiler warnings are fixed by the patch:
|
||||
drivers/net/cpmac.c: In function 'cpmac_end_xmit':
|
||||
drivers/net/cpmac.c:630: warning: passing argument 2 of 'netif_subqueue_stopped' makes pointer from integer without a cast
|
||||
drivers/net/cpmac.c:641: warning: passing argument 2 of 'netif_subqueue_stopped' makes pointer from integer without a cast
|
||||
drivers/net/cpmac.c: In function 'cpmac_probe':
|
||||
drivers/net/cpmac.c:1128: warning: unused variable 'i'
|
||||
|
||||
During runtime, the unpatched driver raises a fatal runtime exception.
|
||||
This is fixed by calling __netif_subqueue_stopped instead
|
||||
of netif_subqueue_stopped, too.
|
||||
|
||||
Two additional code parts were modified for CONFIG_NETDEVICES_MULTIQUEUE
|
||||
because other drivers do it in the same way.
|
||||
|
||||
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
|
||||
|
||||
--- a/drivers/net/cpmac.c
|
||||
+++ b/drivers/net/cpmac.c
|
||||
@@ -615,13 +615,13 @@ static void cpmac_end_xmit(struct net_de
|
||||
|
||||
dev_kfree_skb_irq(desc->skb);
|
||||
desc->skb = NULL;
|
||||
- if (netif_subqueue_stopped(dev, queue))
|
||||
+ if (__netif_subqueue_stopped(dev, queue))
|
||||
netif_wake_subqueue(dev, queue);
|
||||
} else {
|
||||
if (netif_msg_tx_err(priv) && net_ratelimit())
|
||||
printk(KERN_WARNING
|
||||
"%s: end_xmit: spurious interrupt\n", dev->name);
|
||||
- if (netif_subqueue_stopped(dev, queue))
|
||||
+ if (__netif_subqueue_stopped(dev, queue))
|
||||
netif_wake_subqueue(dev, queue);
|
||||
}
|
||||
}
|
||||
@@ -731,7 +731,6 @@ static void cpmac_clear_tx(struct net_de
|
||||
|
||||
static void cpmac_hw_error(struct work_struct *work)
|
||||
{
|
||||
- int i;
|
||||
struct cpmac_priv *priv =
|
||||
container_of(work, struct cpmac_priv, reset_work);
|
||||
|
||||
@@ -818,7 +817,6 @@ static irqreturn_t cpmac_irq(int irq, vo
|
||||
|
||||
static void cpmac_tx_timeout(struct net_device *dev)
|
||||
{
|
||||
- int i;
|
||||
struct cpmac_priv *priv = netdev_priv(dev);
|
||||
|
||||
spin_lock(&priv->lock);
|
||||
@@ -1097,7 +1095,7 @@ static int external_switch;
|
||||
|
||||
static int __devinit cpmac_probe(struct platform_device *pdev)
|
||||
{
|
||||
- int rc, phy_id, i;
|
||||
+ int rc, phy_id;
|
||||
char *mdio_bus_id = "0";
|
||||
struct resource *mem;
|
||||
struct cpmac_priv *priv;
|
||||
@@ -1125,6 +1123,7 @@ static int __devinit cpmac_probe(struct
|
||||
}
|
||||
|
||||
dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
|
||||
+ //~ dev = alloc_etherdev(sizeof(*priv));
|
||||
|
||||
if (!dev) {
|
||||
printk(KERN_ERR "cpmac: Unable to allocate net_device\n");
|
@ -1,90 +0,0 @@
|
||||
This is a hack to make cpmac work with the external switch on a DG834 v3; it
|
||||
should also work on other similar routers. It has not been tested on hardware
|
||||
with multiple cpmac devices or with no external switch. It may be safer to
|
||||
move external_switch to pdata rather than trying to detect it, and to set
|
||||
phy_mask correctly rather than moving the phy search loop.
|
||||
|
||||
--- a/drivers/net/cpmac.c
|
||||
+++ b/drivers/net/cpmac.c
|
||||
@@ -1096,7 +1096,7 @@ static int external_switch;
|
||||
static int __devinit cpmac_probe(struct platform_device *pdev)
|
||||
{
|
||||
int rc, phy_id;
|
||||
- char *mdio_bus_id = "0";
|
||||
+ char mdio_bus_id[BUS_ID_SIZE];
|
||||
struct resource *mem;
|
||||
struct cpmac_priv *priv;
|
||||
struct net_device *dev;
|
||||
@@ -1104,22 +1104,23 @@ static int __devinit cpmac_probe(struct
|
||||
|
||||
pdata = pdev->dev.platform_data;
|
||||
|
||||
- for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
|
||||
- if (!(pdata->phy_mask & (1 << phy_id)))
|
||||
- continue;
|
||||
- if (!cpmac_mii->phy_map[phy_id])
|
||||
- continue;
|
||||
- break;
|
||||
+ if (external_switch || dumb_switch) {
|
||||
+ strncpy(mdio_bus_id, "0", BUS_ID_SIZE); /* fixed phys bus */
|
||||
+ phy_id = pdev->id;
|
||||
+ } else {
|
||||
+ for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
|
||||
+ if (!(pdata->phy_mask & (1 << phy_id)))
|
||||
+ continue;
|
||||
+ if (!cpmac_mii->phy_map[phy_id])
|
||||
+ continue;
|
||||
+ strncpy(mdio_bus_id, cpmac_mii->id, BUS_ID_SIZE);
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (phy_id == PHY_MAX_ADDR) {
|
||||
- if (external_switch || dumb_switch) {
|
||||
- mdio_bus_id = 0; /* fixed phys bus */
|
||||
- phy_id = pdev->id;
|
||||
- } else {
|
||||
- dev_err(&pdev->dev, "no PHY present\n");
|
||||
- return -ENODEV;
|
||||
- }
|
||||
+ dev_err(&pdev->dev, "no PHY present\n");
|
||||
+ return -ENODEV;
|
||||
}
|
||||
|
||||
dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
|
||||
@@ -1160,8 +1161,10 @@ static int __devinit cpmac_probe(struct
|
||||
priv->msg_enable = netif_msg_init(debug_level, 0xff);
|
||||
memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
|
||||
|
||||
- priv->phy = phy_connect(dev, dev_name(&cpmac_mii->phy_map[phy_id]->dev),
|
||||
- &cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII);
|
||||
+ snprintf(priv->phy_name, BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
|
||||
+
|
||||
+ priv->phy = phy_connect(dev, priv->phy_name, &cpmac_adjust_link, 0,
|
||||
+ PHY_INTERFACE_MODE_MII);
|
||||
if (IS_ERR(priv->phy)) {
|
||||
if (netif_msg_drv(priv))
|
||||
printk(KERN_ERR "%s: Could not attach to PHY\n",
|
||||
@@ -1235,11 +1238,11 @@ int __devinit cpmac_init(void)
|
||||
|
||||
cpmac_mii->reset(cpmac_mii);
|
||||
|
||||
- for (i = 0; i < 300000; i++)
|
||||
+ for (i = 0; i < 300; i++)
|
||||
if ((mask = cpmac_read(cpmac_mii->priv, CPMAC_MDIO_ALIVE)))
|
||||
break;
|
||||
else
|
||||
- cpu_relax();
|
||||
+ msleep(10);
|
||||
|
||||
mask &= 0x7fffffff;
|
||||
if (mask & (mask - 1)) {
|
||||
@@ -1248,7 +1251,7 @@ int __devinit cpmac_init(void)
|
||||
}
|
||||
|
||||
cpmac_mii->phy_mask = ~(mask | 0x80000000);
|
||||
- snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "0");
|
||||
+ snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
|
||||
|
||||
res = mdiobus_register(cpmac_mii);
|
||||
if (res)
|
@ -1,248 +0,0 @@
|
||||
--- a/arch/mips/ar7/platform.c 2009-11-18 14:57:44.000000000 +0800
|
||||
+++ b/arch/mips/ar7/platform.c 2009-11-18 15:43:04.000000000 +0800
|
||||
@@ -128,6 +128,36 @@
|
||||
},
|
||||
};
|
||||
|
||||
+static struct resource cpmac_low_res_titan[] = {
|
||||
+ {
|
||||
+ .name = "regs",
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ .start = TITAN_REGS_MAC0,
|
||||
+ .end = TITAN_REGS_MAC0 + 0x7ff,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "irq",
|
||||
+ .flags = IORESOURCE_IRQ,
|
||||
+ .start = 27,
|
||||
+ .end = 27,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct resource cpmac_high_res_titan[] = {
|
||||
+ {
|
||||
+ .name = "regs",
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ .start = TITAN_REGS_MAC1,
|
||||
+ .end = TITAN_REGS_MAC1 + 0x7ff,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "irq",
|
||||
+ .flags = IORESOURCE_IRQ,
|
||||
+ .start = 41,
|
||||
+ .end = 41,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
static struct resource vlynq_low_res[] = {
|
||||
{
|
||||
.name = "regs",
|
||||
@@ -182,6 +212,60 @@
|
||||
},
|
||||
};
|
||||
|
||||
+static struct resource vlynq_low_res_titan[] = {
|
||||
+ {
|
||||
+ .name = "regs",
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ .start = TITAN_REGS_VLYNQ0,
|
||||
+ .end = TITAN_REGS_VLYNQ0 + 0xff,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "irq",
|
||||
+ .flags = IORESOURCE_IRQ,
|
||||
+ .start = 33,
|
||||
+ .end = 33,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "mem",
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ .start = 0x0c000000,
|
||||
+ .end = 0x0fffffff,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "devirq",
|
||||
+ .flags = IORESOURCE_IRQ,
|
||||
+ .start = 80,
|
||||
+ .end = 111,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct resource vlynq_high_res_titan[] = {
|
||||
+ {
|
||||
+ .name = "regs",
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ .start = TITAN_REGS_VLYNQ1,
|
||||
+ .end = TITAN_REGS_VLYNQ1 + 0xff,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "irq",
|
||||
+ .flags = IORESOURCE_IRQ,
|
||||
+ .start = 34,
|
||||
+ .end = 34,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "mem",
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ .start = 0x40000000,
|
||||
+ .end = 0x43ffffff,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "devirq",
|
||||
+ .flags = IORESOURCE_IRQ,
|
||||
+ .start = 112,
|
||||
+ .end = 143,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
static struct resource usb_res[] = {
|
||||
{
|
||||
.name = "regs",
|
||||
@@ -226,6 +310,18 @@
|
||||
.phy_mask = 0x7fffffff,
|
||||
};
|
||||
|
||||
+static struct plat_cpmac_data cpmac_low_data_titan = {
|
||||
+ .reset_bit = 17,
|
||||
+ .power_bit = 20,
|
||||
+ .phy_mask = 0x40000000,
|
||||
+};
|
||||
+
|
||||
+static struct plat_cpmac_data cpmac_high_data_titan = {
|
||||
+ .reset_bit = 21,
|
||||
+ .power_bit = 22,
|
||||
+ .phy_mask = 0x80000000,
|
||||
+};
|
||||
+
|
||||
static struct plat_vlynq_data vlynq_low_data = {
|
||||
.ops.on = vlynq_on,
|
||||
.ops.off = vlynq_off,
|
||||
@@ -240,6 +336,20 @@
|
||||
.gpio_bit = 19,
|
||||
};
|
||||
|
||||
+static struct plat_vlynq_data vlynq_low_data_titan = {
|
||||
+ .ops.on = vlynq_on,
|
||||
+ .ops.off = vlynq_off,
|
||||
+ .reset_bit = 15,
|
||||
+ .gpio_bit = 14,
|
||||
+};
|
||||
+
|
||||
+static struct plat_vlynq_data vlynq_high_data_titan = {
|
||||
+ .ops.on = vlynq_on,
|
||||
+ .ops.off = vlynq_off,
|
||||
+ .reset_bit = 16,
|
||||
+ .gpio_bit = 7,
|
||||
+};
|
||||
+
|
||||
static struct platform_device physmap_flash = {
|
||||
.id = 0,
|
||||
.name = "physmap-flash",
|
||||
@@ -273,6 +383,30 @@
|
||||
.num_resources = ARRAY_SIZE(cpmac_high_res),
|
||||
};
|
||||
|
||||
+static struct platform_device cpmac_low_titan = {
|
||||
+ .id = 0,
|
||||
+ .name = "cpmac",
|
||||
+ .dev = {
|
||||
+ .dma_mask = &cpmac_dma_mask,
|
||||
+ .coherent_dma_mask = DMA_32BIT_MASK,
|
||||
+ .platform_data = &cpmac_low_data_titan,
|
||||
+ },
|
||||
+ .resource = cpmac_low_res_titan,
|
||||
+ .num_resources = ARRAY_SIZE(cpmac_low_res_titan),
|
||||
+};
|
||||
+
|
||||
+static struct platform_device cpmac_high_titan = {
|
||||
+ .id = 1,
|
||||
+ .name = "cpmac",
|
||||
+ .dev = {
|
||||
+ .dma_mask = &cpmac_dma_mask,
|
||||
+ .coherent_dma_mask = DMA_32BIT_MASK,
|
||||
+ .platform_data = &cpmac_high_data_titan,
|
||||
+ },
|
||||
+ .resource = cpmac_high_res_titan,
|
||||
+ .num_resources = ARRAY_SIZE(cpmac_high_res_titan),
|
||||
+};
|
||||
+
|
||||
static struct platform_device vlynq_low = {
|
||||
.id = 0,
|
||||
.name = "vlynq",
|
||||
@@ -289,6 +423,22 @@
|
||||
.num_resources = ARRAY_SIZE(vlynq_high_res),
|
||||
};
|
||||
|
||||
+static struct platform_device vlynq_low_titan = {
|
||||
+ .id = 0,
|
||||
+ .name = "vlynq",
|
||||
+ .dev.platform_data = &vlynq_low_data_titan,
|
||||
+ .resource = vlynq_low_res_titan,
|
||||
+ .num_resources = ARRAY_SIZE(vlynq_low_res_titan),
|
||||
+};
|
||||
+
|
||||
+static struct platform_device vlynq_high_titan = {
|
||||
+ .id = 1,
|
||||
+ .name = "vlynq",
|
||||
+ .dev.platform_data = &vlynq_high_data_titan,
|
||||
+ .resource = vlynq_high_res_titan,
|
||||
+ .num_resources = ARRAY_SIZE(vlynq_high_res_titan),
|
||||
+};
|
||||
+
|
||||
|
||||
/* This is proper way to define uart ports, but they are then detected
|
||||
* as xscale and, obviously, don't work...
|
||||
@@ -333,6 +483,11 @@
|
||||
{ .name = "status", .gpio = 8, .active_low = 1, },
|
||||
};
|
||||
|
||||
+static struct gpio_led titan_leds[] = {
|
||||
+ { .name = "status", .gpio = 8, .active_low = 1, },
|
||||
+ { .name = "wifi", .gpio = 13, .active_low = 1, },
|
||||
+};
|
||||
+
|
||||
static struct gpio_led dsl502t_leds[] = {
|
||||
{ .name = "status", .gpio = 9, .active_low = 1, },
|
||||
{ .name = "ethernet", .gpio = 7, .active_low = 1, },
|
||||
@@ -425,7 +580,7 @@
|
||||
/* FIXME: the whole thing is unreliable */
|
||||
prId = prom_getenv("ProductID");
|
||||
usb_prod = prom_getenv("usb_prod");
|
||||
-
|
||||
+
|
||||
/* If we can't get the product id from PROM, use the default LEDs */
|
||||
if (!prId)
|
||||
return;
|
||||
@@ -442,6 +597,9 @@
|
||||
} else if (strstr(prId, "DG834")) {
|
||||
ar7_led_data.num_leds = ARRAY_SIZE(dg834g_leds);
|
||||
ar7_led_data.leds = dg834g_leds;
|
||||
+ } else if (strstr(prId, "CYWM")) {
|
||||
+ ar7_led_data.num_leds = ARRAY_SIZE(titan_leds);
|
||||
+ ar7_led_data.leds = titan_leds;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -502,14 +660,18 @@
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
- ar7_device_disable(vlynq_low_data.reset_bit);
|
||||
- res = platform_device_register(&vlynq_low);
|
||||
+ ar7_device_disable(ar7_is_titan() ? vlynq_low_data_titan.reset_bit :
|
||||
+ vlynq_low_data.reset_bit);
|
||||
+ res = platform_device_register(ar7_is_titan() ? &vlynq_low_titan :
|
||||
+ &vlynq_low);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
if (ar7_has_high_vlynq()) {
|
||||
- ar7_device_disable(vlynq_high_data.reset_bit);
|
||||
- res = platform_device_register(&vlynq_high);
|
||||
+ ar7_device_disable(ar7_is_titan() ? vlynq_high_data_titan.reset_bit :
|
||||
+ vlynq_high_data.reset_bit);
|
||||
+ res = platform_device_register(ar7_is_titan() ? &vlynq_high_titan :
|
||||
+ &vlynq_high);
|
||||
if (res)
|
||||
return res;
|
||||
}
|
@ -1,76 +0,0 @@
|
||||
--- a/arch/mips/ar7/platform.c 2010-01-25 16:11:24.000000000 +0800
|
||||
+++ b/arch/mips/ar7/platform.c 2010-01-13 14:46:16.000000000 +0800
|
||||
@@ -677,24 +677,32 @@
|
||||
}
|
||||
|
||||
if (ar7_has_high_cpmac()) {
|
||||
- res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
|
||||
+ res = fixed_phy_add(PHY_POLL, ar7_is_titan()?cpmac_high_titan.id: cpmac_high.id, &fixed_phy_status);
|
||||
if (res && res != -ENODEV)
|
||||
return res;
|
||||
|
||||
- cpmac_get_mac(1, cpmac_high_data.dev_addr);
|
||||
- res = platform_device_register(&cpmac_high);
|
||||
+ cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr:
|
||||
+ cpmac_high_data.dev_addr);
|
||||
+ res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
|
||||
+ &cpmac_high);
|
||||
if (res)
|
||||
return res;
|
||||
} else {
|
||||
- cpmac_low_data.phy_mask = 0xffffffff;
|
||||
- }
|
||||
+ if (ar7_is_titan())
|
||||
+ cpmac_low_data_titan.phy_mask = 0xffffffff;
|
||||
+ else
|
||||
+ cpmac_low_data.phy_mask = 0xffffffff;
|
||||
+ }
|
||||
|
||||
- res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
|
||||
+ res = fixed_phy_add(PHY_POLL, ar7_is_titan()?cpmac_low_titan.id:
|
||||
+ cpmac_low.id, &fixed_phy_status);
|
||||
if (res && res != -ENODEV)
|
||||
return res;
|
||||
|
||||
- cpmac_get_mac(0, cpmac_low_data.dev_addr);
|
||||
- res = platform_device_register(&cpmac_low);
|
||||
+ cpmac_get_mac(0, ar7_is_titan() ? cpmac_low_data_titan.dev_addr :
|
||||
+ cpmac_low_data.dev_addr);
|
||||
+ res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
|
||||
+ &cpmac_low);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
--- a/drivers/net/cpmac.c 2010-01-25 16:11:24.000000000 +0800
|
||||
+++ b/drivers/net/cpmac.c 2010-01-25 16:48:02.000000000 +0800
|
||||
@@ -1141,6 +1141,8 @@
|
||||
goto fail;
|
||||
}
|
||||
|
||||
+ ar7_device_reset(pdata->reset_bit);
|
||||
+
|
||||
dev->irq = platform_get_irq_byname(pdev, "irq");
|
||||
|
||||
dev->open = cpmac_open;
|
||||
@@ -1221,7 +1223,7 @@
|
||||
cpmac_mii->reset = cpmac_mdio_reset;
|
||||
cpmac_mii->irq = mii_irqs;
|
||||
|
||||
- cpmac_mii->priv = ioremap(AR7_REGS_MDIO, 256);
|
||||
+ cpmac_mii->priv = ioremap(ar7_is_titan()?TITAN_REGS_MDIO:AR7_REGS_MDIO, 256);
|
||||
|
||||
if (!cpmac_mii->priv) {
|
||||
printk(KERN_ERR "Can't ioremap mdio registers\n");
|
||||
@@ -1232,9 +1234,10 @@
|
||||
#warning FIXME: unhardcode gpio&reset bits
|
||||
ar7_gpio_disable(26);
|
||||
ar7_gpio_disable(27);
|
||||
- ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
|
||||
- ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
|
||||
ar7_device_reset(AR7_RESET_BIT_EPHY);
|
||||
+ if (ar7_is_titan()) {
|
||||
+ ar7_device_reset(TITAN_RESET_BIT_EPHY1);
|
||||
+ }
|
||||
|
||||
cpmac_mii->reset(cpmac_mii);
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- a/drivers/net/cpmac.c 2010-02-11 23:52:19.000000000 +0000
|
||||
+++ b/drivers/net/cpmac.c 2010-02-20 20:32:58.000000000 +0000
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
#define CPMAC_VERSION "0.5.0"
|
||||
/* frame size + 802.1q tag */
|
||||
-#define CPMAC_SKB_SIZE (ETH_FRAME_LEN + 4)
|
||||
+#define CPMAC_SKB_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + 4)
|
||||
#define CPMAC_QUEUES 8
|
||||
|
||||
/* Ethernet registers */
|
Loading…
Reference in New Issue
Block a user