diff options
Diffstat (limited to 'target/linux/adm5120/patches')
14 files changed, 66 insertions, 70 deletions
diff --git a/target/linux/adm5120/patches/001-adm5120.patch b/target/linux/adm5120/patches/001-adm5120.patch index 26c0265049..84d0a8d2fc 100644 --- a/target/linux/adm5120/patches/001-adm5120.patch +++ b/target/linux/adm5120/patches/001-adm5120.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -16,6 +16,20 @@ +@@ -18,6 +18,20 @@ prompt "System type" default SGI_IP22 @@ -21,17 +21,17 @@ config MACH_ALCHEMY bool "Alchemy processor based machines" -@@ -689,6 +703,7 @@ +@@ -683,6 +697,7 @@ endchoice +source "arch/mips/adm5120/Kconfig" source "arch/mips/au1000/Kconfig" + source "arch/mips/basler/excite/Kconfig" source "arch/mips/jazz/Kconfig" - source "arch/mips/lasat/Kconfig" --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -166,6 +166,16 @@ +@@ -174,6 +174,16 @@ load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000 # @@ -50,9 +50,9 @@ core-$(CONFIG_SOC_AU1X00) += arch/mips/au1000/common/ --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h -@@ -198,6 +198,58 @@ - #define MACH_GROUP_BRCM 23 /* Broadcom */ - #define MACH_BCM47XX 1 /* Broadcom BCM47XX */ +@@ -94,6 +94,58 @@ + #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ + #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ +/* + * Valid machtype for group ADMtek ADM5120 @@ -108,4 +108,4 @@ + #define CL_SIZE COMMAND_LINE_SIZE - const char *get_system_type(void); + extern char *system_type; diff --git a/target/linux/adm5120/patches/002-adm5120_flash.patch b/target/linux/adm5120/patches/002-adm5120_flash.patch index d2326fa959..143952321a 100644 --- a/target/linux/adm5120/patches/002-adm5120_flash.patch +++ b/target/linux/adm5120/patches/002-adm5120_flash.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig -@@ -597,5 +597,9 @@ +@@ -590,5 +590,9 @@ This selection automatically selects the map_ram driver. @@ -12,7 +12,7 @@ --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile -@@ -45,6 +45,7 @@ +@@ -44,6 +44,7 @@ obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o obj-$(CONFIG_MTD_PCI) += pci.o obj-$(CONFIG_MTD_ALCHEMY) += alchemy-flash.o diff --git a/target/linux/adm5120/patches/003-adm5120_switch.patch b/target/linux/adm5120/patches/003-adm5120_switch.patch index 1d2e428dde..20718119fa 100644 --- a/target/linux/adm5120/patches/003-adm5120_switch.patch +++ b/target/linux/adm5120/patches/003-adm5120_switch.patch @@ -1,6 +1,6 @@ --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -601,6 +601,10 @@ +@@ -606,6 +606,10 @@ If you have an Alchemy Semi AU1X00 based system say Y. Otherwise, say N. @@ -13,7 +13,7 @@ depends on PCI && SGI_IP27 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -183,6 +183,7 @@ +@@ -187,6 +187,7 @@ # This is also a 82596 and should probably be merged obj-$(CONFIG_LP486E) += lp486e.o diff --git a/target/linux/adm5120/patches/005-adm5120_usb.patch b/target/linux/adm5120/patches/005-adm5120_usb.patch index ef9a4fd9d3..4ab31dd980 100644 --- a/target/linux/adm5120/patches/005-adm5120_usb.patch +++ b/target/linux/adm5120/patches/005-adm5120_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig -@@ -261,3 +261,6 @@ +@@ -260,3 +260,6 @@ To compile this driver as a module, choose M here: the module will be called r8a66597-hcd. diff --git a/target/linux/adm5120/patches/006-adm5120_leds.patch b/target/linux/adm5120/patches/006-adm5120_leds.patch index 6c8886da5c..ac108e512f 100644 --- a/target/linux/adm5120/patches/006-adm5120_leds.patch +++ b/target/linux/adm5120/patches/006-adm5120_leds.patch @@ -1,8 +1,8 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -18,6 +18,21 @@ - - comment "LED drivers" +@@ -25,6 +25,21 @@ + This option enables support for LEDs driven using outputs + of the dedicated PWM controller found on newer Atmel SOCs. +config LEDS_ADM5120 + tristate "LED Support for ADM5120 GPIO LEDs" @@ -29,6 +29,6 @@ # LED Platform Drivers +obj-$(CONFIG_LEDS_ADM5120) += leds-adm5120.o + obj-$(CONFIG_LEDS_ATMEL_PWM) += leds-atmel-pwm.o obj-$(CONFIG_LEDS_CORGI) += leds-corgi.o obj-$(CONFIG_LEDS_LOCOMO) += leds-locomo.o - obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o diff --git a/target/linux/adm5120/patches/007-adm5120_pci.patch b/target/linux/adm5120/patches/007-adm5120_pci.patch index 540b7d90ec..75d3be65c4 100644 --- a/target/linux/adm5120/patches/007-adm5120_pci.patch +++ b/target/linux/adm5120/patches/007-adm5120_pci.patch @@ -7,7 +7,7 @@ +obj-$(CONFIG_PCI_ADM5120) += pci-adm5120.o --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h -@@ -1703,6 +1703,9 @@ +@@ -1705,6 +1705,9 @@ #define PCI_VENDOR_ID_ESDGMBH 0x12fe #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 diff --git a/target/linux/adm5120/patches/009-adm5120_leds_switch_trigger.patch b/target/linux/adm5120/patches/009-adm5120_leds_switch_trigger.patch index bb04038753..18280ed85e 100644 --- a/target/linux/adm5120/patches/009-adm5120_leds_switch_trigger.patch +++ b/target/linux/adm5120/patches/009-adm5120_leds_switch_trigger.patch @@ -1,6 +1,6 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -178,4 +178,12 @@ +@@ -213,4 +213,12 @@ This allows LEDs to be initialised in the ON state. If unsure, say Y. @@ -15,7 +15,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -28,3 +28,4 @@ +@@ -30,3 +30,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o diff --git a/target/linux/adm5120/patches/100-mtd_myloder_partition_parser.patch b/target/linux/adm5120/patches/100-mtd_myloder_partition_parser.patch index fe9c45b092..f5188936da 100644 --- a/target/linux/adm5120/patches/100-mtd_myloder_partition_parser.patch +++ b/target/linux/adm5120/patches/100-mtd_myloder_partition_parser.patch @@ -1,8 +1,8 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -160,6 +160,22 @@ - for your particular device. It won't happen automatically. The - 'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example. +@@ -168,6 +168,22 @@ + the partition map from the children of the flash node, + as described in Documentation/powerpc/booting-without-of.txt. +config MTD_MYLOADER_PARTS + tristate "MyLoader partition parsing" @@ -25,10 +25,10 @@ config MTD_CHAR --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile -@@ -11,6 +11,7 @@ - obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o +@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o + obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o +obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o # 'Users' - code which presents functionality to userspace. diff --git a/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch index 9acb626bb5..9179088934 100644 --- a/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch +++ b/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch @@ -20,8 +20,8 @@ static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); -@@ -217,6 +224,41 @@ - mtd->flags |= MTD_STUPID_LOCK; +@@ -221,6 +228,41 @@ + mtd->flags |= MTD_POWERUP_LOCK; } +#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC @@ -60,18 +60,18 @@ +#endif /* CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC */ + static struct cfi_fixup cfi_fixup_table[] = { - #ifdef AMD_BOOTLOC_BUG - { CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL }, -@@ -231,6 +273,9 @@ - { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, }, - #endif { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL }, + #ifdef AMD_BOOTLOC_BUG +@@ -252,6 +294,9 @@ + */ + { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL }, + { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL }, +#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC + { MANUFACTURER_MACRONIX, CFI_ID_ANY, fixup_macronix_bootloc, NULL, }, +#endif { 0, 0, NULL, NULL } }; - static struct cfi_fixup jedec_fixup_table[] = { + --- a/drivers/mtd/chips/Kconfig +++ b/drivers/mtd/chips/Kconfig @@ -196,6 +196,14 @@ diff --git a/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch b/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch index 0c512ea6a4..7f352f67ec 100644 --- a/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch +++ b/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch @@ -11,7 +11,7 @@ #define PM49FL002 0x006D #define PM49FL004 0x006E #define PM49FL008 0x006A -@@ -1264,6 +1268,58 @@ +@@ -1170,6 +1174,54 @@ ERASEINFO(0x02000,2), ERASEINFO(0x04000,1), } @@ -19,12 +19,11 @@ + .mfr_id = MANUFACTURER_PMC, + .dev_id = PM39LV512, + .name = "PMC Pm39LV512", -+ .uaddr = { -+ [0] = MTD_UADDR_0x0555_0x02AA /* x8 */ -+ }, -+ .DevSize = SIZE_64KiB, -+ .CmdSet = P_ID_AMD_STD, -+ .NumEraseRegions= 1, ++ .devtypes = CFI_DEVICETYPE_X8, ++ .uaddr = MTD_UADDR_0x0555_0x02AA, ++ .dev_size = SIZE_64KiB, ++ .cmd_set = P_ID_AMD_STD, ++ .nr_regions = 1, + .regions = { + ERASEINFO(0x01000,16), + } @@ -32,12 +31,11 @@ + .mfr_id = MANUFACTURER_PMC, + .dev_id = PM39LV010, + .name = "PMC Pm39LV010", -+ .uaddr = { -+ [0] = MTD_UADDR_0x0555_0x02AA /* x8 */ -+ }, -+ .DevSize = SIZE_128KiB, -+ .CmdSet = P_ID_AMD_STD, -+ .NumEraseRegions= 1, ++ .devtypes = CFI_DEVICETYPE_X8, ++ .uaddr = MTD_UADDR_0x0555_0x02AA, ++ .dev_size = SIZE_128KiB, ++ .cmd_set = P_ID_AMD_STD, ++ .nr_regions = 1, + .regions = { + ERASEINFO(0x01000,32), + } @@ -45,12 +43,11 @@ + .mfr_id = MANUFACTURER_PMC, + .dev_id = PM39LV020, + .name = "PMC Pm39LV020", -+ .uaddr = { -+ [0] = MTD_UADDR_0x0555_0x02AA /* x8 */ -+ }, -+ .DevSize = SIZE_256KiB, -+ .CmdSet = P_ID_AMD_STD, -+ .NumEraseRegions= 1, ++ .devtypes = CFI_DEVICETYPE_X8, ++ .uaddr = MTD_UADDR_0x0555_0x02AA, ++ .dev_size = SIZE_256KiB, ++ .cmd_set = P_ID_AMD_STD, ++ .nr_regions = 1, + .regions = { + ERASEINFO(0x01000,64), + } @@ -58,12 +55,11 @@ + .mfr_id = MANUFACTURER_PMC, + .dev_id = PM39LV040, + .name = "PMC Pm39LV040", -+ .uaddr = { -+ [0] = MTD_UADDR_0x0555_0x02AA /* x8 */ -+ }, -+ .DevSize = SIZE_512KiB, -+ .CmdSet = P_ID_AMD_STD, -+ .NumEraseRegions= 1, ++ .devtypes = CFI_DEVICETYPE_X8, ++ .uaddr = MTD_UADDR_0x0555_0x02AA, ++ .dev_size = SIZE_512KiB, ++ .cmd_set = P_ID_AMD_STD, ++ .nr_regions = 1, + .regions = { + ERASEINFO(0x01000,128), + } diff --git a/target/linux/adm5120/patches/120-rb153_cf_driver.patch b/target/linux/adm5120/patches/120-rb153_cf_driver.patch index ad07b7a8a7..6f371e340b 100644 --- a/target/linux/adm5120/patches/120-rb153_cf_driver.patch +++ b/target/linux/adm5120/patches/120-rb153_cf_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile -@@ -69,6 +69,7 @@ +@@ -71,6 +71,7 @@ obj-$(CONFIG_PATA_PLATFORM) += pata_platform.o obj-$(CONFIG_PATA_OF_PLATFORM) += pata_of_platform.o obj-$(CONFIG_PATA_ICSIDE) += pata_icside.o @@ -10,7 +10,7 @@ # Should be last but one libata driver --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig -@@ -660,4 +660,13 @@ +@@ -679,4 +679,13 @@ If unsure, say N. diff --git a/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch index 13142add37..25149885a5 100644 --- a/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch +++ b/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch @@ -15,15 +15,15 @@ default y --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -23,6 +23,7 @@ - #include <linux/acpi.h> +@@ -24,6 +24,7 @@ + #include <linux/kallsyms.h> #include "pci.h" +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS /* The Mellanox Tavor device gives false positive parity errors * Mark this device with a broken_parity_status, to allow * PCI scanning code to "skip" this now blacklisted device. -@@ -1480,6 +1481,7 @@ +@@ -1495,6 +1496,7 @@ } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -31,7 +31,7 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) { -@@ -1543,6 +1545,7 @@ +@@ -1562,6 +1564,7 @@ } EXPORT_SYMBOL(pci_fixup_device); @@ -39,7 +39,7 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -1756,3 +1759,4 @@ +@@ -1875,3 +1878,4 @@ quirk_msi_intx_disable_bug); #endif /* CONFIG_PCI_MSI */ diff --git a/target/linux/adm5120/patches/203-gpio_leds_brightness.patch b/target/linux/adm5120/patches/203-gpio_leds_brightness.patch index 3e9f5271c5..06394da295 100644 --- a/target/linux/adm5120/patches/203-gpio_leds_brightness.patch +++ b/target/linux/adm5120/patches/203-gpio_leds_brightness.patch @@ -23,5 +23,5 @@ + break; + } - /* setting GPIOs with I2C/etc requires a preemptible task context */ - if (led_dat->can_sleep) { + /* Setting GPIOs with I2C/etc requires a task context, and we don't + * seem to have a reliable way to know if we're already in one; so diff --git a/target/linux/adm5120/patches/310-adm5120_wdt.patch b/target/linux/adm5120/patches/310-adm5120_wdt.patch index 1136ee8e65..78eb62862d 100644 --- a/target/linux/adm5120/patches/310-adm5120_wdt.patch +++ b/target/linux/adm5120/patches/310-adm5120_wdt.patch @@ -1,6 +1,6 @@ --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -607,6 +607,18 @@ +@@ -619,6 +619,18 @@ # MIPS Architecture @@ -18,10 +18,10 @@ + config INDYDOG tristate "Indy/I2 Hardware Watchdog" - depends on SGI_IP22 + depends on SGI_HAS_INDYDOG --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile -@@ -89,6 +89,7 @@ +@@ -90,6 +90,7 @@ # M68KNOMMU Architecture # MIPS Architecture |