summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-10 18:44:44 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-10 18:44:44 +0000
commit13145164645808ea6d4394a00b9300d827b05841 (patch)
tree3e24a9ca7627cc9526d22cf5fb27e33ba8f2fa7a
parentd531754b838a68f07dca3e835c385d3201ebc746 (diff)
[rdc] remove 2.6.32 files, out of sync and going to be replaced differently
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20787 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/rdc/files-2.6.32/arch/x86/include/asm/rdc321x_gpio.h16
-rw-r--r--target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/Makefile5
-rw-r--r--target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/gpio.c158
-rw-r--r--target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/platform.c290
4 files changed, 0 insertions, 469 deletions
diff --git a/target/linux/rdc/files-2.6.32/arch/x86/include/asm/rdc321x_gpio.h b/target/linux/rdc/files-2.6.32/arch/x86/include/asm/rdc321x_gpio.h
deleted file mode 100644
index adb75aff2..000000000
--- a/target/linux/rdc/files-2.6.32/arch/x86/include/asm/rdc321x_gpio.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ASM_X86_MACH_RDC321X_GPIO_H
-#define _ASM_X86_MACH_RDC321X_GPIO_H
-
-#include <linux/kernel.h>
-
-#define gpio_to_irq(gpio) NULL
-
-#define gpio_get_value __gpio_get_value
-#define gpio_set_value __gpio_set_value
-
-#define gpio_cansleep __gpio_cansleep
-
-/* For cansleep */
-#include <asm-generic/gpio.h>
-
-#endif /* _ASM_X86_MACH_RDC321X_GPIO_H */
diff --git a/target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/Makefile b/target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/Makefile
deleted file mode 100644
index 8325b4ca4..000000000
--- a/target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the RDC321x specific parts of the kernel
-#
-obj-$(CONFIG_X86_RDC321X) := gpio.o platform.o
-
diff --git a/target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/gpio.c b/target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/gpio.c
deleted file mode 100644
index c99b3b223..000000000
--- a/target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/gpio.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * GPIO support for RDC SoC R3210/R8610
- *
- * Copyright (C) 2007, Florian Fainelli <florian@openwrt.org>
- * Copyright (C) 2008, Volker Weiss <dev@tintuc.de>
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/gpio.h>
-
-#include <asm/rdc321x_gpio.h>
-#include <asm/rdc321x_defs.h>
-
-
-/* spin lock to protect our private copy of GPIO data register plus
- the access to PCI conf registers. */
-static DEFINE_SPINLOCK(gpio_lock);
-
-/* copy of GPIO data registers */
-static u32 gpio_data_reg1;
-static u32 gpio_data_reg2;
-
-static inline void rdc321x_conf_write(unsigned addr, u32 value)
-{
- outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR);
- outl(value, RDC3210_CFGREG_DATA);
-}
-
-static inline void rdc321x_conf_or(unsigned addr, u32 value)
-{
- outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR);
- value |= inl(RDC3210_CFGREG_DATA);
- outl(value, RDC3210_CFGREG_DATA);
-}
-
-static inline u32 rdc321x_conf_read(unsigned addr)
-{
- outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR);
-
- return inl(RDC3210_CFGREG_DATA);
-}
-
-/* configure pin as GPIO */
-static void rdc321x_configure_gpio(unsigned gpio)
-{
- unsigned long flags;
-
- spin_lock_irqsave(&gpio_lock, flags);
- rdc321x_conf_or(gpio < 32
- ? RDC321X_GPIO_CTRL_REG1 : RDC321X_GPIO_CTRL_REG2,
- 1 << (gpio & 0x1f));
- spin_unlock_irqrestore(&gpio_lock, flags);
-}
-
-/* read GPIO pin */
-static int rdc_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
-{
- u32 reg;
- unsigned long flags;
-
- spin_lock_irqsave(&gpio_lock, flags);
- reg = rdc321x_conf_read(gpio < 32
- ? RDC321X_GPIO_DATA_REG1 : RDC321X_GPIO_DATA_REG2);
- spin_unlock_irqrestore(&gpio_lock, flags);
-
- return (1 << (gpio & 0x1f)) & reg ? 1 : 0;
-}
-
-/* set GPIO pin to value */
-static void rdc_gpio_set_value(struct gpio_chip *chip,
- unsigned gpio, int value)
-{
- unsigned long flags;
- u32 reg;
-
- reg = 1 << (gpio & 0x1f);
- if (gpio < 32) {
- spin_lock_irqsave(&gpio_lock, flags);
- if (value)
- gpio_data_reg1 |= reg;
- else
- gpio_data_reg1 &= ~reg;
- rdc321x_conf_write(RDC321X_GPIO_DATA_REG1, gpio_data_reg1);
- spin_unlock_irqrestore(&gpio_lock, flags);
- } else {
- spin_lock_irqsave(&gpio_lock, flags);
- if (value)
- gpio_data_reg2 |= reg;
- else
- gpio_data_reg2 &= ~reg;
- rdc321x_conf_write(RDC321X_GPIO_DATA_REG2, gpio_data_reg2);
- spin_unlock_irqrestore(&gpio_lock, flags);
- }
-}
-
-/* configure GPIO pin as input */
-static int rdc_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
-{
- rdc321x_configure_gpio(gpio);
-
- return 0;
-}
-
-/* configure GPIO pin as output and set value */
-static int rdc_gpio_direction_output(struct gpio_chip *chip,
- unsigned gpio, int value)
-{
- rdc321x_configure_gpio(gpio);
- gpio_set_value(gpio, value);
-
- return 0;
-}
-
-static struct gpio_chip rdc321x_gpio_chip = {
- .label = "rdc321x-gpio",
- .direction_input = rdc_gpio_direction_input,
- .direction_output = rdc_gpio_direction_output,
- .get = rdc_gpio_get_value,
- .set = rdc_gpio_set_value,
- .base = 0,
- .ngpio = RDC321X_MAX_GPIO,
-};
-
-/* initially setup the 2 copies of the gpio data registers.
- This function is called before the platform setup code. */
-static int __init rdc321x_gpio_setup(void)
-{
- /* this might not be, what others (BIOS, bootloader, etc.)
- wrote to these registers before, but it's a good guess. Still
- better than just using 0xffffffff. */
-
- gpio_data_reg1 = rdc321x_conf_read(RDC321X_GPIO_DATA_REG1);
- gpio_data_reg2 = rdc321x_conf_read(RDC321X_GPIO_DATA_REG2);
-
- printk(KERN_INFO "rdc321x: registering %d GPIOs\n", rdc321x_gpio_chip.ngpio);
- return gpiochip_add(&rdc321x_gpio_chip);
-}
-
-arch_initcall(rdc321x_gpio_setup);
diff --git a/target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/platform.c b/target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/platform.c
deleted file mode 100644
index 3c2cec721..000000000
--- a/target/linux/rdc/files-2.6.32/arch/x86/mach-rdc321x/platform.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Generic RDC321x platform devices
- *
- * Copyright (C) 2007-2009 OpenWrt.org
- * Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
- * Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
- *
- * 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 Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/version.h>
-#include <linux/leds.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/physmap.h>
-#include <linux/root_dev.h>
-
-#include <asm/rdc321x_gpio.h>
-
-/* Flash */
-#ifdef CONFIG_MTD_R8610
-#define CONFIG_MTD_RDC3210 1
-#elif defined CONFIG_MTD_RDC3210
-static struct resource rdc_flash_resource[] = {
- [0] = {
- .start = (u32)-CONFIG_MTD_RDC3210_SIZE,
- .end = (u32)-1,
- .flags = IORESOURCE_MEM,
- },
-};
-
-static struct platform_device rdc_flash_device = {
- .name = "rdc321x-flash",
- .id = -1,
- .num_resources = ARRAY_SIZE(rdc_flash_resource),
- .resource = rdc_flash_resource,
-};
-#else
-static struct mtd_partition rdc_flash_parts[15];
-
-static struct resource rdc_flash_resource = {
- .end = (u32)-1,
- .flags = IORESOURCE_MEM,
-};
-
-static struct physmap_flash_data rdc_flash_data = {
- .parts = rdc_flash_parts,
-};
-
-static struct platform_device rdc_flash_device = {
- .name = "physmap-flash",
- .id = -1,
- .resource = &rdc_flash_resource,
- .num_resources = 1,
- .dev.platform_data = &rdc_flash_data,
-};
-#endif
-
-/* LEDS */
-static struct gpio_led default_leds[] = {
- { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1},
-};
-
-static struct gpio_led_platform_data rdc321x_led_data = {
- .num_leds = ARRAY_SIZE(default_leds),
- .leds = default_leds,
-};
-
-static struct platform_device rdc321x_leds = {
- .name = "leds-gpio",
- .id = -1,
- .dev = {
- .platform_data = &rdc321x_led_data,
- }
-};
-
-/* Watchdog */
-static struct platform_device rdc321x_wdt = {
- .name = "rdc321x-wdt",
- .id = -1,
- .num_resources = 0,
-};
-
-/* Button */
-static struct gpio_keys_button rdc321x_gpio_btn[] = {
- {
- .gpio = 0,
- .code = BTN_0,
- .desc = "Reset",
- .active_low = 1,
- }
-};
-
-static struct gpio_keys_platform_data rdc321x_gpio_btn_data = {
- .buttons = rdc321x_gpio_btn,
- .nbuttons = ARRAY_SIZE(rdc321x_gpio_btn),
-};
-
-static struct platform_device rdc321x_button = {
- .name = "gpio-keys",
- .id = -1,
- .dev = {
- .platform_data = &rdc321x_gpio_btn_data,
- }
-};
-
-static struct platform_device *rdc321x_devs[] = {
- &rdc_flash_device,
- &rdc321x_leds,
- &rdc321x_wdt,
- &rdc321x_button,
-};
-
-static int probe_flash_start(struct map_info *the_map)
-{
- struct mtd_info *res;
-
- the_map->virt = ioremap(the_map->phys, the_map->size);
- if (the_map->virt == NULL)
- return 1;
- for (the_map->bankwidth = 32; the_map->bankwidth; the_map->bankwidth
- >>= 1) {
- res = do_map_probe("cfi_probe", the_map);
- if (res == NULL)
- res = do_map_probe("jedec_probe", the_map);
- if (res != NULL)
- break;
- }
- iounmap(the_map->virt);
- if (res != NULL)
- the_map->phys = (u32)-(s32)(the_map->size = res->size);
- return res == NULL;
-}
-
-static int __init rdc_board_setup(void)
-{
-#ifndef CONFIG_MTD_RDC3210
- struct map_info rdc_map_info;
- u32 the_header[8];
-
- ROOT_DEV = 0;
- rdc_map_info.name = rdc_flash_device.name;
- rdc_map_info.size = 0x800000; //8MB
- rdc_map_info.phys = (u32) -rdc_map_info.size;
- rdc_map_info.bankwidth = 2;
- rdc_map_info.set_vpp = NULL;
- simple_map_init(&rdc_map_info);
- while (probe_flash_start(&rdc_map_info)) {
- if (rdc_map_info.size /= 2 < 0x100000) //1MB
- panic("Could not find start of flash!");
- rdc_map_info.phys = (u32) -rdc_map_info.size;
- }
- rdc_flash_resource.start = rdc_map_info.phys;
- rdc_flash_data.width = rdc_map_info.bankwidth;
- rdc_map_info.virt = ioremap_nocache(rdc_map_info.phys, 0x10);
- if (rdc_map_info.virt == NULL)
- panic("Could not ioremap to read device magic!");
- the_header[0] = ((u32 *)rdc_map_info.virt)[0];
- the_header[1] = ((u32 *)rdc_map_info.virt)[1];
- the_header[2] = ((u32 *)rdc_map_info.virt)[2];
- the_header[3] = ((u32 *)rdc_map_info.virt)[3];
- iounmap(rdc_map_info.virt);
- rdc_map_info.virt = ioremap_nocache(rdc_map_info.phys + 0x8000, 0x10);
- if (rdc_map_info.virt == NULL)
- panic("Could not ioremap to read device magic!");
- the_header[4] = ((u32 *)rdc_map_info.virt)[0];
- the_header[5] = ((u32 *)rdc_map_info.virt)[1];
- the_header[6] = ((u32 *)rdc_map_info.virt)[2];
- the_header[7] = ((u32 *)rdc_map_info.virt)[3];
- iounmap(rdc_map_info.virt);
- if (!memcmp(the_header, "GMTK", 4)) { /* Gemtek */
- /* TODO */
- } else if (!memcmp(the_header + 4, "CSYS", 4)) { /* Sitecom */
- rdc_flash_parts[0].name = "system";
- rdc_flash_parts[0].offset = 0;
- rdc_flash_parts[0].size = rdc_map_info.size - 0x10000;
- rdc_flash_parts[1].name = "config";
- rdc_flash_parts[1].offset = 0;
- rdc_flash_parts[1].size = 0x8000;
- rdc_flash_parts[2].name = "magic";
- rdc_flash_parts[2].offset = 0x8000;
- rdc_flash_parts[2].size = 0x14;
- rdc_flash_parts[3].name = "kernel";
- rdc_flash_parts[3].offset = 0x8014;
- rdc_flash_parts[3].size = the_header[5];
- rdc_flash_parts[4].name = "rootfs";
- rdc_flash_parts[4].offset = 0x8014 + the_header[5];
- rdc_flash_parts[4].size = rdc_flash_parts[0].size - rdc_flash_parts[4].offset;
- rdc_flash_parts[5].name = "bootloader";
- rdc_flash_parts[5].offset = rdc_flash_parts[0].size;
- rdc_flash_parts[5].size = 0x10000;
- rdc_flash_data.nr_parts = 6;
- } else if (!memcmp(((u8 *)the_header) + 14, "Li", 2)) { /* AMIT */
- rdc_flash_parts[0].name = "kernel_parthdr";
- rdc_flash_parts[0].offset = 0;
- rdc_flash_parts[0].size = 0x10;
- rdc_flash_parts[1].name = "kernel";
- rdc_flash_parts[1].offset = 0x10;
- rdc_flash_parts[1].size = 0xffff0;
- rdc_flash_parts[2].name = "rootfs_parthdr";
- rdc_flash_parts[2].offset = 0x100000;
- rdc_flash_parts[2].size = 0x10;
- rdc_flash_parts[3].name = "rootfs";
- rdc_flash_parts[3].offset = 0x100010;
- rdc_flash_parts[3].size = rdc_map_info.size - 0x160010;
- rdc_flash_parts[4].name = "config_parthdr";
- rdc_flash_parts[4].offset = rdc_map_info.size - 0x60000;
- rdc_flash_parts[4].size = 0x10;
- rdc_flash_parts[5].name = "config";
- rdc_flash_parts[5].offset = rdc_map_info.size - 0x5fff0;
- rdc_flash_parts[5].size = 0xfff0;
- rdc_flash_parts[6].name = "recoveryfs_parthdr";
- rdc_flash_parts[6].offset = rdc_map_info.size - 0x50000;
- rdc_flash_parts[6].size = 0x10;
- rdc_flash_parts[7].name = "recoveryfs";
- rdc_flash_parts[7].offset = rdc_map_info.size - 0x4fff0;
- rdc_flash_parts[7].size = 0x3fff0;
- rdc_flash_parts[8].name = "recovery_parthdr";
- rdc_flash_parts[8].offset = rdc_map_info.size - 0x10000;
- rdc_flash_parts[8].size = 0x10;
- rdc_flash_parts[9].name = "recovery";
- rdc_flash_parts[9].offset = rdc_map_info.size - 0xfff0;
- rdc_flash_parts[9].size = 0x7ff0;
- rdc_flash_parts[10].name = "productinfo_parthdr";
- rdc_flash_parts[10].offset = rdc_map_info.size - 0x8000;
- rdc_flash_parts[10].size = 0x10;
- rdc_flash_parts[11].name = "productinfo";
- rdc_flash_parts[11].offset = rdc_map_info.size - 0x7ff0;
- rdc_flash_parts[11].size = 0x1ff0;
- rdc_flash_parts[12].name = "bootloader_parthdr";
- rdc_flash_parts[12].offset = rdc_map_info.size - 0x6000;
- rdc_flash_parts[12].size = 0x10;
- rdc_flash_parts[13].name = "bootloader";
- rdc_flash_parts[13].offset = rdc_map_info.size - 0x5ff0;
- rdc_flash_parts[13].size = 0x5ff0;
- rdc_flash_parts[14].name = "everything";
- rdc_flash_parts[14].offset = 0;
- rdc_flash_parts[14].size = rdc_map_info.size;
- rdc_flash_data.nr_parts = 15;
- } else { /* ZyXEL */
- rdc_flash_parts[0].name = "kernel";
- rdc_flash_parts[0].offset = 0;
- rdc_flash_parts[0].size = 0x100000;
- rdc_flash_parts[1].name = "rootfs";
- rdc_flash_parts[1].offset = 0x100000;
- rdc_flash_parts[1].size = rdc_map_info.size - 0x140000;
- rdc_flash_parts[2].name = "linux";
- rdc_flash_parts[2].offset = 0;
- rdc_flash_parts[2].size = rdc_map_info.size - 0x40000;
- rdc_flash_parts[3].name = "config";
- rdc_flash_parts[3].offset = rdc_map_info.size - 0x40000;
- rdc_flash_parts[3].size = 0x10000;
- rdc_flash_parts[4].name = "productinfo";
- rdc_flash_parts[4].offset = rdc_map_info.size - 0x30000;
- rdc_flash_parts[4].size = 0x10000;
- rdc_flash_parts[5].name = "bootloader";
- rdc_flash_parts[5].offset = rdc_map_info.size - 0x20000;
- rdc_flash_parts[5].size = 0x20000;
- rdc_flash_data.nr_parts = 6;
- }
-#endif
- return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs));
-}
-
-#ifdef CONFIG_MTD_RDC3210
-arch_initcall(rdc_board_setup);
-#else
-late_initcall(rdc_board_setup);
-#endif