On Tue, Jun 23, 2009 at 11:28:27AM +0200, Florian Fainelli wrote:
AR7 time again - the platform pending longest ... Let's see:
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index b29f028..dde11bb 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -22,6 +22,27 @@ choice
> config MACH_ALCHEMY
> bool "Alchemy processor based machines"
>
> +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 GENERIC_GPIO
> + select GCD
> + select VLYNQ
> + help
> + Support for the Texas Instruments AR7 System-on-a-Chip
> + family: TNETD7100, 7200 and 7300.
> +
> config BASLER_EXCITE
> bool "Basler eXcite smart camera"
> select CEVT_R4K
> diff --git a/arch/mips/Makefile b/arch/mips/Makefile
> index 807572a..861da51 100644
> --- a/arch/mips/Makefile
> +++ b/arch/mips/Makefile
> @@ -173,6 +173,13 @@ libs-y += arch/mips/fw/lib/
> #
>
> #
> +# Texas Instruments AR7
> +#
> +core-$(CONFIG_AR7) += arch/mips/ar7/
> +cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/include/asm/mach-ar7
> +load-$(CONFIG_AR7) += 0xffffffff94100000
> +
> +#
> # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
> #
> core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
> diff --git a/arch/mips/ar7/Makefile b/arch/mips/ar7/Makefile
> new file mode 100644
> index 0000000..7435e44
> --- /dev/null
> +++ b/arch/mips/ar7/Makefile
> @@ -0,0 +1,10 @@
> +
> +obj-y := \
> + prom.o \
> + setup.o \
> + memory.o \
> + irq.o \
> + time.o \
> + platform.o \
> + gpio.o \
> + clock.o
> diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c
> new file mode 100644
> index 0000000..072f848
> --- /dev/null
> +++ b/arch/mips/ar7/clock.c
> @@ -0,0 +1,447 @@
> +/*
> + * Copyright (C) 2007 Felix Fietkau <nbd@xxxxxxxxxxx>
> + * Copyright (C) 2007 Eugene Konev <ejka@xxxxxxxxxxx>
> + *
> + * 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/kernel.h>
> +#include <linux/init.h>
> +#include <linux/types.h>
> +#include <linux/module.h>
> +#include <linux/delay.h>
> +#include <linux/gcd.h>
> +#include <linux/io.h>
> +
> +#include <asm/addrspace.h>
> +#include <asm/mach-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 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);
This function is called by a time when BogoMIPS hasn't run yet, so
udelay, mdelay and ndelay won't do the right thing. Since the kernel is
running fine for you this suggests that the delay may not be required or
other initialization code is providing the 75ms.
If you find it is ok to run this function at a later stage as a normal
initcall you may want to consider using msleep() instead of mdelay().
> +}
> +
> +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;
> +
> + 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);
> +
> + ar7_dsp_clock = ar7_cpu_clock;
> +
> + iounmap(clocks);
> + iounmap(bootcr);
> +}
> +
> +void __init ar7_init_clocks(void)
> +{
> + switch (ar7_chip_id()) {
> + case AR7_CHIP_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;
> + }
> +}
> diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c
> new file mode 100644
> index 0000000..74e14a3
> --- /dev/null
> +++ b/arch/mips/ar7/gpio.c
> @@ -0,0 +1,48 @@
> +/*
> + * Copyright (C) 2007 Felix Fietkau <nbd@xxxxxxxxxxx>
> + * Copyright (C) 2007 Eugene Konev <ejka@xxxxxxxxxxx>
> + *
> + * 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/mach-ar7/gpio.h>
> +
> +static const char *ar7_gpio_list[AR7_GPIO_MAX];
> +
> +int gpio_request(unsigned gpio, const char *label)
> +{
> + if (gpio >= 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);
> diff --git a/arch/mips/ar7/irq.c b/arch/mips/ar7/irq.c
> new file mode 100644
> index 0000000..fb3756f
> --- /dev/null
> +++ b/arch/mips/ar7/irq.c
> @@ -0,0 +1,184 @@
> +/*
> + * Copyright (C) 2006,2007 Felix Fietkau <nbd@xxxxxxxxxxx>
> + * Copyright (C) 2006,2007 Eugene Konev <ejka@xxxxxxxxxxx>
> + *
> + * 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/mach-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,
> +};
If you move these two structure definitions below the functions they're
refering to, you can get rid of all the prototypes.
> +
> +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();
> +}
> diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c
> new file mode 100644
> index 0000000..8c24581
> --- /dev/null
> +++ b/arch/mips/ar7/memory.c
> @@ -0,0 +1,72 @@
> +/*
> + * Copyright (C) 2007 Felix Fietkau <nbd@xxxxxxxxxxx>
> + * Copyright (C) 2007 Eugene Konev <ejka@xxxxxxxxxxx>
> + *
> + * 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/mach-ar7/ar7.h>
> +#include <asm/mips-boards/prom.h>
> +
> +static int __init memsize(void)
> +{
> + u32 size = (64 << 20);
> + u32 *addr = (u32 *)KSEG1ADDR(AR7_SDRAM_BASE + 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;
Useless return statement.
> +}
> diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
> new file mode 100644
> index 0000000..dc48b13
> --- /dev/null
> +++ b/arch/mips/ar7/platform.c
> @@ -0,0 +1,486 @@
> +/*
> + * Copyright (C) 2006,2007 Felix Fietkau <nbd@xxxxxxxxxxx>
> + * Copyright (C) 2006,2007 Eugene Konev <ejka@xxxxxxxxxxx>
> + *
> + * 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 <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 <linux/etherdevice.h>
> +
> +#include <asm/addrspace.h>
> +#include <asm/mach-ar7/ar7.h>
> +#include <asm/mach-ar7/gpio.h>
> +#include <asm/mach-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;
> +
> + result = gpio_request(pdata->gpio_bit, "vlynq");
> + if (result)
> + goto out;
> +
> + ar7_device_reset(pdata->reset_bit);
> +
> + result = ar7_gpio_disable(pdata->gpio_bit);
> + if (result)
> + goto out_enabled;
> +
> + result = ar7_gpio_enable(pdata->gpio_bit);
> + if (result)
> + goto out_enabled;
> +
> + result = gpio_direction_output(pdata->gpio_bit, 0);
> + if (result)
> + goto out_gpio_enabled;
> +
> + mdelay(50);
Consider using msleep(50).
> +
> + gpio_set_value(pdata->gpio_bit, 1);
> + mdelay(50);
Ditto - consider using msleep(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),
> +};
> +
> +
> +static struct gpio_led default_leds[] = {
> + { .name = "status", .gpio = 8, .active_low = 1, },
Please initialize one field per line only - as above for vlynq_high, for
example.
> +};
> +
> +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[ETH_ALEN], *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) {
> + random_ether_addr(default_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;
Linux coding style - please don't use CamelStyle names for identifiers.
> +
> + /* 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;
> + static struct uart_port uart_port[2];
> +
> + memset(uart_port, 0, sizeof(struct uart_port) * 2);
> +
> + uart_port[0].type = PORT_16550A;
> + 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_MEM32;
> + uart_port[0].mapbase = AR7_REGS_UART0;
> + uart_port[0].membase = ioremap(uart_port[0].mapbase, 256);
> + uart_port[0].regshift = 2;
> + 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_16550A;
> + 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_MEM32;
> + uart_port[1].mapbase = UR8_REGS_UART1;
> + uart_port[1].membase = ioremap(uart_port[1].mapbase, 256);
> + uart_port[1].regshift = 2;
> + res = early_serial_setup(&uart_port[1]);
> + if (res)
> + return res;
> + }
> +
> + 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);
> diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c
> new file mode 100644
> index 0000000..9fca789
> --- /dev/null
> +++ b/arch/mips/ar7/prom.c
> @@ -0,0 +1,330 @@
> +/*
> + * Carsten Langgaard, carstenl@xxxxxxxx
> + * 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/mach-ar7/ar7.h>
> +#include <asm/mach-ar7/prom.h>
> +
> +#define MAX_ENTRY 80
> +
> +struct env_var {
> + char *name;
> + char *value;
> +};
> +
> +static struct env_var adam2_env[MAX_ENTRY] = { { 0, }, };
Don't initialize global variables to zero. That just bloats the file.
> +
> +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
> +
> + s = prom_getenv("modetty0");
> + if (s) {
> + 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 readl((void *)PORT(offset));
> +}
> +
> +static inline void serial_out(int offset, int value)
> +{
> + writel(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, ...)
As above - I see no users of prom_printf() - and it seems to duplicate
early printk anyway, so can you drop it?
> +{
> + 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
putDebugChar and getDebugChar are dead code.
> diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c
> new file mode 100644
> index 0000000..de8c937
> --- /dev/null
> +++ b/arch/mips/ar7/setup.c
> @@ -0,0 +1,107 @@
> +/*
> + * Carsten Langgaard, carstenl@xxxxxxxx
> + * 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 <linux/time.h>
> +
> +#include <asm/reboot.h>
> +#include <asm/mach-ar7/ar7.h>
> +#include <asm/mach-ar7/prom.h>
> +
> +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);
^^^^^^^
Unnecessary cast.
> + 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)";
> + 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;
That's looking fishy ... Out of curity, do you have anything that's using
ioports (cat /proc/ioports) on AR7 systems at all? If not then you can
just drop this.
> + iomem_resource.start = 0;
> + iomem_resource.end = ~0;
This iomem_resource initialization is not needed. The same values are
already the default; see kernel/resource.c.
> +
> + 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);
> diff --git a/arch/mips/ar7/time.c b/arch/mips/ar7/time.c
> new file mode 100644
> index 0000000..a1fba89
> --- /dev/null
> +++ b/arch/mips/ar7/time.c
> @@ -0,0 +1,30 @@
> +/*
> + * Carsten Langgaard, carstenl@xxxxxxxx
> + * 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/init.h>
> +#include <linux/time.h>
> +
> +#include <asm/time.h>
> +#include <asm/mach-ar7/ar7.h>
> +
> +void __init plat_time_init(void)
> +{
> + mips_hpt_frequency = ar7_cpu_freq() / 2;
> +}
> diff --git a/arch/mips/include/asm/mach-ar7/ar7.h b/arch/mips/include/asm/mach-ar7/ar7.h
> new file mode 100644
> index 0000000..b8686ee
> --- /dev/null
> +++ b/arch/mips/include/asm/mach-ar7/ar7.h
> @@ -0,0 +1,172 @@
> +/*
> + * Copyright (C) 2006,2007 Felix Fietkau <nbd@xxxxxxxxxxx>
> + * Copyright (C) 2006,2007 Eugene Konev <ejka@xxxxxxxxxxx>
> + *
> + * 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_SDRAM_BASE 0x14000000
> +
> +#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 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
> +
> +/* GPIO control registers */
> +#define AR7_GPIO_INPUT 0x0
> +#define AR7_GPIO_OUTPUT 0x4
> +#define AR7_GPIO_DIR 0x8
> +#define AR7_GPIO_ENABLE 0xc
> +
> +#define AR7_CHIP_7100 0x18
> +#define AR7_CHIP_7200 0x2b
> +#define AR7_CHIP_7300 0x05
> +
> +/* 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 u16 ar7_chip_id(void)
> +{
> + return readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x14)) & 0xffff;
> +}
> +
> +static inline u8 ar7_chip_rev(void)
> +{
> + return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 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);
Consider using msleep(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);
Ditto - consider using msleep(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);
Ditto - consider using msleep(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);
Ditto - consider using msleep(20).
> +}
> +
> +#endif /* __AR7_H__ */
> diff --git a/arch/mips/include/asm/mach-ar7/gpio.h b/arch/mips/include/asm/mach-ar7/gpio.h
> new file mode 100644
> index 0000000..cbe9c4f
> --- /dev/null
> +++ b/arch/mips/include/asm/mach-ar7/gpio.h
> @@ -0,0 +1,110 @@
> +/*
> + * Copyright (C) 2007 Florian Fainelli <florian@xxxxxxxxxxx>
> + *
> + * 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/mach-ar7/ar7.h>
> +
> +#define AR7_GPIO_MAX 32
> +
> +extern int gpio_request(unsigned gpio, const char *label);
> +extern void gpio_free(unsigned gpio);
> +
> +/* Common GPIO layer */
> +static inline int gpio_get_value(unsigned gpio)
> +{
> + void __iomem *gpio_in =
> + (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
> +
> + return readl(gpio_in) & (1 << gpio);
> +}
> +
> +static inline void gpio_set_value(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 int gpio_direction_input(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_output(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_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(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(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;
> +}
> +
> +#include <asm-generic/gpio.h>
> +
> +#endif
> diff --git a/arch/mips/include/asm/mach-ar7/irq.h b/arch/mips/include/asm/mach-ar7/irq.h
> new file mode 100644
> index 0000000..39e9757
> --- /dev/null
> +++ b/arch/mips/include/asm/mach-ar7/irq.h
> @@ -0,0 +1,16 @@
> +/*
> + * 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 */
> diff --git a/arch/mips/include/asm/mach-ar7/prom.h b/arch/mips/include/asm/mach-ar7/prom.h
> new file mode 100644
> index 0000000..55f5939
> --- /dev/null
> +++ b/arch/mips/include/asm/mach-ar7/prom.h
> @@ -0,0 +1,26 @@
> +/*
> + * Copyright (C) 2006, 2007 Florian Fainelli <florian@xxxxxxxxxxx>
> + *
> + * 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)));
I see no users of prom_printf() - and it seems to duplicate early printk
anyway, so can you drop it?
> +extern void prom_meminit(void);
> +
> +#endif /* __PROM_H__ */
> diff --git a/arch/mips/include/asm/mach-ar7/spaces.h b/arch/mips/include/asm/mach-ar7/spaces.h
> new file mode 100644
> index 0000000..ac28f27
> --- /dev/null
> +++ b/arch/mips/include/asm/mach-ar7/spaces.h
> @@ -0,0 +1,22 @@
> +/*
> + * 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
> +
> +/*
> + * 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
> +
> +#include <asm/mach-generic/spaces.h>
> +
> +#endif /* __ASM_AR7_SPACES_H */
> diff --git a/arch/mips/include/asm/mach-ar7/war.h b/arch/mips/include/asm/mach-ar7/war.h
> new file mode 100644
> index 0000000..f4862b5
> --- /dev/null
> +++ b/arch/mips/include/asm/mach-ar7/war.h
> @@ -0,0 +1,25 @@
> +/*
> + * 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@xxxxxxxxxxxxxx>
> + */
> +#ifndef __ASM_MIPS_MACH_AR7_WAR_H
> +#define __ASM_MIPS_MACH_AR7_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_AR7_WAR_H */
Ralf
