hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enabled working ar7_wdt, style cleanups

Browse Source 
SVN-Revision: 8764
master
Matteo Croce 18 years ago
parent 49bead58e6
commit 64f9a22679
10 changed files with 38 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      target/linux/ar7/config-2.6.22
  2. 3
      target/linux/ar7/files/arch/mips/ar7/vlynq-pci.c
  3. 12
      target/linux/ar7/files/arch/mips/ar7/vlynq.c
  4. 8
      target/linux/ar7/files/drivers/char/ar7_gpio.c
  5. 10
      target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
  6. 8
      target/linux/ar7/files/drivers/leds/leds-ar7.c
  7. 9
      target/linux/ar7/files/drivers/mtd/ar7part.c
  8. 6
      target/linux/ar7/files/include/asm-mips/ar7/mmzone.h
  9. 5
      target/linux/ar7/patches-2.6.22/110-flash.patch
  10. 5
      target/linux/ar7/patches-2.6.22/500-serial_kludge.patch

2
target/linux/ar7/config-2.6.22
Unescape View File

@ -3,7 +3,7 @@ CONFIG_32BIT=y
# CONFIG_64BIT_PHYS_ADDR is not set
CONFIG_AR7=y
CONFIG_AR7_GPIO=y
# CONFIG_AR7_WDT is not set
CONFIG_AR7_WDT=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set

3
target/linux/ar7/files/arch/mips/ar7/vlynq-pci.c
Unescape View File

@ -133,7 +133,8 @@ static inline u32 vlynq_get_mapped(struct vlynq_device *dev, int res)
return ret;
}
static inline u32 vlynq_read(u32 val, int size) {
static inline u32 vlynq_read(u32 val, int size)
{
switch (size) {
case 1:
return *(u8 *)&val;

12
target/linux/ar7/files/arch/mips/ar7/vlynq.c
Unescape View File

@ -438,8 +438,10 @@ void vlynq_set_local_mapping(struct vlynq_device *dev, u32 tx_offset,
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);
vlynq_reg_write(dev->local->rx_mapping[i].offset,
mapping[i].offset);
vlynq_reg_write(dev->local->rx_mapping[i].size,
mapping[i].size);
}
}
@ -450,8 +452,10 @@ void vlynq_set_remote_mapping(struct vlynq_device *dev, u32 tx_offset,
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);
vlynq_reg_write(dev->remote->rx_mapping[i].offset,
mapping[i].offset);
vlynq_reg_write(dev->remote->rx_mapping[i].size,
mapping[i].size);
}
}

8
target/linux/ar7/files/drivers/char/ar7_gpio.c
Unescape View File

@ -1,18 +1,18 @@
/*
* linux/drivers/char/ar7_gpio.c
*
*
* Copyright (C) 2007 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

10
target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
Unescape View File

@ -1,6 +1,6 @@
/*
* linux/drivers/char/ar7_wdt.c
*
*
* Copyright (C) 2007 OpenWrt.org
* Copyright (c) 2005 Enrik Berkhan <Enrik.Berkhan@akk.org>
*
@ -12,12 +12,12 @@
* 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
@ -55,8 +55,8 @@ 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))
#define READ_REG(x) readl((void __iomem *)&(x))
#define WRITE_REG(x, v) writel((v), (void __iomem *)&(x))
struct ar7_wdt {
u32 kick_lock;

8
target/linux/ar7/files/drivers/leds/leds-ar7.c
Unescape View File

@ -1,18 +1,18 @@
/*
* linux/drivers/leds/leds-ar7.c
*
*
* Copyright (C) 2007 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

9
target/linux/ar7/files/drivers/mtd/ar7part.c
Unescape View File

@ -1,16 +1,16 @@
/*
* 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
@ -137,5 +137,6 @@ static int __init ar7_parser_init(void)
module_init(ar7_parser_init);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>, Eugene Konev <ejka@openwrt.org>");
MODULE_AUTHOR( "Felix Fietkau <nbd@openwrt.org>, "
"Eugene Konev <ejka@openwrt.org>");
MODULE_DESCRIPTION("MTD partitioning for TI AR7");

6
target/linux/ar7/files/include/asm-mips/ar7/mmzone.h
Unescape View File

@ -20,8 +20,8 @@
#define _ASM_MACH_MMZONE_H
extern pg_data_t __node_data[];
#define NODE_DATA(nid) (&__node_data[nid])
#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map)
#define pa_to_nid(addr) (((addr) >= ARCH_PFN_OFFSET << PAGE_SHIFT) ? 0 : -1)
#define NODE_DATA(nid) (&__node_data[nid])
#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map)
#define pa_to_nid(addr) (((addr) >= ARCH_PFN_OFFSET << PAGE_SHIFT) ? 0 : -1)
#endif /* _ASM_MACH_MMZONE_H */

5
target/linux/ar7/patches-2.6.22/110-flash.patch
Unescape View File

@ -28,12 +28,13 @@ diff -Nru linux-2.6.19.2/drivers/mtd/Makefile linux-ar7/drivers/mtd/Makefile
diff -Nru linux-2.6.19.2/drivers/mtd/maps/physmap.c linux-ar7/drivers/mtd/maps/physmap.c
--- linux-2.6.19.2/drivers/mtd/maps/physmap.c 2006-12-12 02:32:53.000000000 +0700
+++ linux-ar7/drivers/mtd/maps/physmap.c 2007-02-03 21:57:11.000000000 +0700
@@ -74,7 +74,7 @@
@@ -74,7 +74,8 @@
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "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 };
+static const char *part_probe_types[] = {"cmdlinepart", "RedBoot",
+ "ar7part", NULL };
#endif
static int physmap_flash_probe(struct platform_device *dev)

5
target/linux/ar7/patches-2.6.22/500-serial_kludge.patch
Unescape View File

@ -38,13 +38,14 @@ diff -urN linux-2.6.22.orig/include/linux/serial_core.h linux-2.6.22/include/lin
diff -urN linux-2.6.22.orig/include/linux/serialP.h linux-2.6.22/include/linux/serialP.h
--- linux-2.6.22.orig/include/linux/serialP.h 2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22/include/linux/serialP.h 2007-07-11 03:08:57.000000000 +0200
@@ -135,6 +135,9 @@
@@ -135,6 +135,10 @@
* the interrupt line _up_ instead of down, so if we register the IRQ
* while the UART is in that state, we die in an IRQ storm. */
#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
+#elif defined(CONFIG_AR7)
+/* This is how it is set up by bootloader... */
+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 | UART_MCR_RTS | UART_MCR_DTR)
+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 \
+ | UART_MCR_RTS | UART_MCR_DTR)
#else
#define ALPHA_KLUDGE_MCR 0
#endif

Write Preview
Loading…
Cancel
Save