Changeset 18224

Timestamp:

01/19/12 17:27:49 (16 months ago)

Author:

BrainSlayer

Message:

other drivers for lantiq

Location:

src/linux/universal/linux-3.2/drivers

Files:

• gpio/gpiolib.c (modified) (4 diffs)
• i2c/busses/Kconfig (modified) (1 diff)
• i2c/busses/Makefile (modified) (1 diff)
• i2c/busses/i2c-falcon.c (added)
• mtd/maps/Makefile (modified) (1 diff)
• mtd/maps/lantiq-flash.c (modified) (5 diffs)
• mtd/mtdpart.c (modified) (1 diff)
• mtd/nand/plat_nand.c (modified) (1 diff)
• spi/Kconfig (modified) (2 diffs)
• spi/Makefile (modified) (1 diff)
• spi/spi-falcon.c (added)
• spi/spi-xway.c (added)
• usb/Kconfig (modified) (1 diff)
• usb/Makefile (modified) (1 diff)
• usb/core/hub.c (modified) (1 diff)
• usb/dwc/Kconfig (modified) (1 diff)
• usb/dwc_otg (added)
• usb/dwc_otg/Kconfig (added)
• usb/dwc_otg/Makefile (added)
• usb/dwc_otg/dwc_otg_attr.c (added)
• usb/dwc_otg/dwc_otg_attr.h (added)
• usb/dwc_otg/dwc_otg_cil.c (added)
• usb/dwc_otg/dwc_otg_cil.h (added)
• usb/dwc_otg/dwc_otg_cil_ifx.h (added)
• usb/dwc_otg/dwc_otg_cil_intr.c (added)
• usb/dwc_otg/dwc_otg_driver.c (added)
• usb/dwc_otg/dwc_otg_driver.h (added)
• usb/dwc_otg/dwc_otg_hcd.c (added)
• usb/dwc_otg/dwc_otg_hcd.h (added)
• usb/dwc_otg/dwc_otg_hcd_intr.c (added)
• usb/dwc_otg/dwc_otg_hcd_queue.c (added)
• usb/dwc_otg/dwc_otg_ifx.c (added)
• usb/dwc_otg/dwc_otg_ifx.h (added)
• usb/dwc_otg/dwc_otg_plat.h (added)
• usb/dwc_otg/dwc_otg_regs.h (added)
• watchdog/lantiq_wdt.c (modified) (1 diff)

src/linux/universal/linux-3.2/drivers/gpio/gpiolib.c

@@ -65 +65 @@
 #define GPIO_TRIGGER_MASK       (BIT(FLAG_TRIG_FALL) | BIT(FLAG_TRIG_RISE))
 
-#ifdef CONFIG_DEBUG_FS
+//#ifdef CONFIG_DEBUG_FS
         const char              *label;
-#endif
+//#endif
 };
 static struct gpio_desc gpio_desc[ARCH_NR_GPIOS];
@@ -77 +77 @@
 static inline void desc_set_label(struct gpio_desc *d, const char *label)
 {
-#ifdef CONFIG_DEBUG_FS
+//#ifdef CONFIG_DEBUG_FS
         d->label = label;
-#endif
+//#endif
 }
 
@@ -728 +728 @@
         if (desc->chip->names && desc->chip->names[gpio - desc->chip->base])
                 ioname = desc->chip->names[gpio - desc->chip->base];
-
+        else
+                ioname = gpio_desc[gpio].label;
         if (status == 0) {
                 struct device   *dev;
@@ -1348 +1349 @@
         if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0)
                 return NULL;
-#ifdef CONFIG_DEBUG_FS
+//#ifdef CONFIG_DEBUG_FS
         return gpio_desc[gpio].label;
-#else
-        return "?";
-#endif
+//#else
+//      return "?";
+//#endif
 }
 EXPORT_SYMBOL_GPL(gpiochip_is_requested);

src/linux/universal/linux-3.2/drivers/i2c/busses/Kconfig

@@ -284 +284 @@
 comment "I2C system bus drivers (mostly embedded / system-on-chip)"
 
+config I2C_FALCON
+        tristate "Falcon I2C interface"
+#       depends on SOC_FALCON
+
 config I2C_AT91
         tristate "Atmel AT91 I2C Two-Wire interface (TWI)"

src/linux/universal/linux-3.2/drivers/i2c/busses/Makefile

@@ -88 +88 @@
 obj-$(CONFIG_SCx200_ACB)        += scx200_acb.o
 obj-$(CONFIG_SCx200_I2C)        += scx200_i2c.o
+obj-$(CONFIG_I2C_FALCON)        += i2c-falcon.o
 
 ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG

src/linux/universal/linux-3.2/drivers/mtd/maps/Makefile

@@ -63 +63 @@
 obj-$(CONFIG_MACH_AR7240)       += nvram_kernel.o
 obj-$(CONFIG_MACH_GW2388)       += nvram_kernel.o
+obj-$(CONFIG_LANTIQ)            += nvram_kernel.o
 obj-$(CONFIG_ARCH_IXP4XX)       += nvram_kernel.o
 obj-$(CONFIG_X86)               += nvram_kernel_x86.o

src/linux/universal/linux-3.2/drivers/mtd/maps/lantiq-flash.c

@@ -19 +19 @@
 #include <linux/mtd/cfi.h>
 #include <linux/platform_device.h>
+#include <linux/squashfs_fs.h>
 #include <linux/mtd/physmap.h>
+
+#include "../mtdcore.h"
 
 #include <lantiq_soc.h>
@@ -33 +36 @@
  * unlock addresses to ensure that access to the NOR device works correctly.
  */
+
+static struct mtd_partition ifxmips_partitions[] = {
+        {
+                .name = "uboot",
+                .offset = 0x00000000,
+                .size = 0x00020000,
+        },
+        {
+                .name = "uboot-env",
+                .offset = 0x00020000,
+                .size = 0x0,
+        },
+        {
+                .name = "kernel",
+                .offset = 0x0,
+                .size = 0x0,
+        },
+        {
+                .name = "rootfs",
+                .offset = 0x0,
+                .size = 0x0,
+        },
+        {
+                .name = "nvram",
+                .offset = 0x0,
+                .size = 0x0,
+        },
+        {
+                .name = "board_config",
+                .offset = 0x0,
+                .size = 0x0,
+        },
+        {
+                .name = "fullflash",
+                .offset = 0x0,
+                .size = 0x0,
+        },
+        {
+                .name = "ddwrt",
+                .offset = 0x0,
+                .size = 0x0,
+        },
+};
+
+static struct mtd_partition ifxmips_meta_partition = {
+        .name = "linux",
+        .offset = 0x00030000,
+        .size = 0x0,
+};
+
+
+static unsigned long
+find_uImage_size(struct map_info *map, unsigned long offset)
+{
+#define UBOOT_MAGIC     0x56190527
+        unsigned long magic;
+        unsigned long temp;
+        map->copy_from(map, &magic, offset, 4);
+        if (le32_to_cpu(magic) != UBOOT_MAGIC)
+                return 0;
+        map->copy_from(map, &temp, offset + 12, 4);
+        printk("uImage size %X\n",temp + 0x40);
+        return temp + 0x40;
+}
+
+static int
+detect_squashfs_partition(struct map_info *map, unsigned long offset)
+{
+        unsigned long temp;
+        map->copy_from(map, &temp, offset, 4);
+        return le32_to_cpu(temp) == SQUASHFS_MAGIC;
+}
+
+#ifdef CONFIG_AR9
+#define RESERVE 6
+#else
+#define RESERVE 3
+#endif
 
 enum {
@@ -107 +188 @@
         spin_unlock_irqrestore(&ebu_lock, flags);
 }
+static const char *part_probe_types[] = { "cmdlinepart", NULL };
+
 
 static int __init
@@ -113 +196 @@
         struct physmap_flash_data *ltq_mtd_data = dev_get_platdata(&pdev->dev);
         struct ltq_mtd *ltq_mtd;
+        struct mtd_partition *parts = NULL;
         struct resource *res;
+        int nr_parts = 0;
+        unsigned long uimage_size;
         struct cfi_private *cfi;
-        int err;
+        int err,i;
+        int kernel_part = 2, rootfs_part = 3;
+        int num_parts = ARRAY_SIZE(ifxmips_partitions);
 
         ltq_mtd = kzalloc(sizeof(struct ltq_mtd), GFP_KERNEL);
@@ -169 +257 @@
         cfi->addr_unlock2 ^= 1;
 
-        err = mtd_device_parse_register(ltq_mtd->mtd, NULL, 0,
-                        ltq_mtd_data->parts, ltq_mtd_data->nr_parts);
-        if (err) {
-                dev_err(&pdev->dev, "failed to add partitions\n");
-                goto err_destroy;
-        }
+        nr_parts = parse_mtd_partitions(ltq_mtd->mtd, part_probe_types, &parts, 0);
+        printk(KERN_EMERG "parse_mtd returns %d\n",nr_parts);
+        if (nr_parts > 0) {
+                printk(KERN_INFO "ifxmips_mtd: found %d partitions from cmdline\n", err);
+                num_parts = err;
+                kernel_part = 0;
+                rootfs_part = 0;
+                for (i = 0; i < num_parts; i++) {
+                        if (strcmp(parts[i].name, "kernel") == 0)
+                                kernel_part = i;
+                        if (strcmp(parts[i].name, "rootfs") == 0)
+                                rootfs_part = i;
+                }
+        } else {
+                /* if the flash is 64k sectors, the kernel will reside at 0xb0030000
+                   if the flash is 128k sectors, the kernel will reside at 0xb0040000 */
+                ifxmips_partitions[1].size = ltq_mtd->mtd->erasesize;
+                ifxmips_partitions[2].offset = ifxmips_partitions[1].offset + ltq_mtd->mtd->erasesize;
+                parts = &ifxmips_partitions[0];
+        }
+
+        /* dynamic size detection only if rootfs-part follows kernel-part */
+        if (kernel_part+1 == rootfs_part) {
+                for (i=0;i<0xa0000;i+=0x10000)
+                {
+                uimage_size = find_uImage_size(ltq_mtd->map,i);
+                if (uimage_size>0)
+                    break;
+                }
+                parts[0].offset=0;
+                parts[0].size=i-ltq_mtd->mtd->erasesize;
+                parts[1].offset=parts[0].size;
+                parts[1].size=ltq_mtd->mtd->erasesize;
+                parts[kernel_part].offset=i;
+                uimage_size &= ~(4096 -1);
+                uimage_size += 4096;
+                
+                if (detect_squashfs_partition(ltq_mtd->map,parts[kernel_part].offset + uimage_size)) {
+                        printk(KERN_INFO "ltq_mtd: found a squashfs following the uImage\n");
+                }
+                
+                parts[kernel_part].size = uimage_size;
+                parts[rootfs_part].offset = parts[kernel_part].offset + parts[kernel_part].size;
+                struct squashfs_super_block sb;
+                ltq_mtd->map->copy_from(ltq_mtd->map, &sb, parts[rootfs_part].offset, sizeof(struct squashfs_super_block));
+                int jffsoffset = sb.bytes_used;
+                jffsoffset += parts[rootfs_part].offset;
+                jffsoffset += (ltq_mtd->mtd->erasesize - 1);
+                jffsoffset &= ~(ltq_mtd->mtd->erasesize - 1);
+                parts[rootfs_part].size = jffsoffset - parts[rootfs_part].offset;
+                parts[7].offset = jffsoffset;
+                parts[7].size = (ltq_mtd->mtd->size - (ltq_mtd->mtd->erasesize*RESERVE)) - jffsoffset;
+                ifxmips_meta_partition.offset = parts[kernel_part].offset;
+                ifxmips_meta_partition.size = parts[kernel_part].size + parts[rootfs_part].size + parts[7].size;
+        }
+
+        if (err <= 0) {
+//                      parts[3].size -= (ltq_mtd->erasesize*3);
+                        parts[4].offset = ltq_mtd->mtd->size - (ltq_mtd->mtd->erasesize*RESERVE);
+                        parts[4].size = ltq_mtd->mtd->erasesize;
+                        parts[5].offset = ltq_mtd->mtd->size - (ltq_mtd->mtd->erasesize);
+                        parts[5].size = ltq_mtd->mtd->erasesize;
+                        parts[6].offset = 0;
+                        parts[6].size = ltq_mtd->mtd->size;
+//                      ifxmips_meta_partition.size -= lq_mtd->erasesize;
+        }
+
+        add_mtd_partitions(ltq_mtd->mtd, parts, num_parts);
+        add_mtd_partitions(ltq_mtd->mtd, &ifxmips_meta_partition, 1);
 
         return 0;

src/linux/universal/linux-3.2/drivers/mtd/mtdpart.c

@@ -875 +875 @@
 #endif /* CONFIG_MTD_ROOTFS_SPLIT */
 
+
+
 /*
  * This function, given a master MTD object and a partition table, creates

src/linux/universal/linux-3.2/drivers/mtd/nand/plat_nand.c

@@ -76 +76 @@
         data->chip.write_buf = pdata->ctrl.write_buf;
         data->chip.read_buf = pdata->ctrl.read_buf;
+        data->chip.read_byte = pdata->ctrl.read_byte;
         data->chip.chip_delay = pdata->chip.chip_delay;
         data->chip.options |= pdata->chip.options;

src/linux/universal/linux-3.2/drivers/spi/Kconfig

@@ -219 +219 @@
           This drivers supports the MPC52xx SPI controller in master SPI
           mode.
+
+config SPI_FALCON
+        tristate "Falcon SPI controller support"
+        depends on SOC_FALCON
 
 config SPI_MPC52xx_PSC
@@ -420 +424 @@
           SPI driver for Nuvoton NUC900 series ARM SoCs
 
+config SPI_XWAY
+        tristate "Lantiq XWAY SPI controller"
+        depends on LANTIQ && SOC_TYPE_XWAY
+        select SPI_BITBANG
+        help
+          This driver supports the Lantiq SoC SPI controller in master
+          mode.
+
 #
 # Add new SPI master controllers in alphabetical order above this line

src/linux/universal/linux-3.2/drivers/spi/Makefile

@@ -61 +61 @@
 obj-$(CONFIG_SPI_IXP4XX)                += spi-ixp4xx.o
 obj-$(CONFIG_SPI_IXP4XX)                += spi-ixp4xx-gw2355.o
+obj-$(CONFIG_SPI_XWAY)                  += spi-xway.o
+obj-$(CONFIG_SPI_FALCON)                += spi-falcon.o
+ 
 
 # special build for s3c24xx spi driver with fiq support

src/linux/universal/linux-3.2/drivers/usb/Kconfig

@@ -133 +133 @@
 source "drivers/usb/host/Kconfig"
 
+source "drivers/usb/dwc_otg/Kconfig"
+
 source "drivers/usb/musb/Kconfig"
 

src/linux/universal/linux-3.2/drivers/usb/Makefile

@@ -31 +31 @@
 obj-$(CONFIG_USB_WUSB)          += wusbcore/
 
+obj-$(CONFIG_DWC_OTG)           += dwc_otg/
+
 obj-$(CONFIG_USB_ACM)           += class/
 obj-$(CONFIG_USB_PRINTER)       += class/

src/linux/universal/linux-3.2/drivers/usb/core/hub.c

@@ -2951 +2951 @@
         } else if (udev->speed != USB_SPEED_HIGH
                         && hdev->speed == USB_SPEED_HIGH) {
-                if (!hub->tt.hub) {
+/*              if (!hub->tt.hub) {
                         dev_err(&udev->dev, "parent hub has no TT\n");
                         retval = -EINVAL;
                         goto fail;
-                }
+                }*/
                 udev->tt = &hub->tt;
                 udev->ttport = port1;

src/linux/universal/linux-3.2/drivers/usb/dwc/Kconfig

@@ -9 +9 @@
 config USB_DWC_OTG
         tristate "Synopsys DWC OTG Controller"
-        depends on USB
+        depends on USB && ARCH_CNS3XXX
         help
            This driver provides USB Device Controller support for the

src/linux/universal/linux-3.2/drivers/watchdog/lantiq_wdt.c

@@ -17 +17 @@
 #include <linux/io.h>
 
-#include <lantiq.h>
+#include <lantiq_soc.h>
 
 /* Section 3.4 of the datasheet