adm5120: make patches apply again and refresh them
SVN-Revision: 24800
This commit is contained in:
parent
72ca63488b
commit
22d8dcbf44
@ -10,7 +10,7 @@
|
|||||||
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
|
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
|
||||||
--- a/include/linux/pci_ids.h
|
--- a/include/linux/pci_ids.h
|
||||||
+++ b/include/linux/pci_ids.h
|
+++ b/include/linux/pci_ids.h
|
||||||
@@ -1748,6 +1748,9 @@
|
@@ -1752,6 +1752,9 @@
|
||||||
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
|
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
|
||||||
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
|
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
--- a/drivers/leds/Kconfig
|
--- a/drivers/leds/Kconfig
|
||||||
+++ b/drivers/leds/Kconfig
|
+++ b/drivers/leds/Kconfig
|
||||||
@@ -315,4 +315,12 @@ config LEDS_TRIGGER_NETDEV
|
@@ -322,4 +322,12 @@ config LEDS_TRIGGER_USBDEV
|
||||||
This allows LEDs to be controlled by network device activity.
|
This allows LEDs to be controlled by the presence/activity of
|
||||||
If unsure, say Y.
|
an USB device. If unsure, say N.
|
||||||
|
|
||||||
+config LEDS_TRIGGER_ADM5120_SWITCH
|
+config LEDS_TRIGGER_ADM5120_SWITCH
|
||||||
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
||||||
@ -15,8 +15,8 @@
|
|||||||
endif # NEW_LEDS
|
endif # NEW_LEDS
|
||||||
--- a/drivers/leds/Makefile
|
--- a/drivers/leds/Makefile
|
||||||
+++ b/drivers/leds/Makefile
|
+++ b/drivers/leds/Makefile
|
||||||
@@ -42,3 +42,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt
|
@@ -43,3 +43,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) +=
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
||||||
|
obj-$(CONFIG_LEDS_TRIGGER_USBDEV) += ledtrig-usbdev.o
|
||||||
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
config MACH_ALCHEMY
|
config MACH_ALCHEMY
|
||||||
bool "Alchemy processor based machines"
|
bool "Alchemy processor based machines"
|
||||||
select SYS_SUPPORTS_ZBOOT
|
select SYS_SUPPORTS_ZBOOT
|
||||||
@@ -681,6 +696,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
@@ -683,6 +698,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
@ -32,7 +32,7 @@
|
|||||||
source "arch/mips/jazz/Kconfig"
|
source "arch/mips/jazz/Kconfig"
|
||||||
--- a/arch/mips/Makefile
|
--- a/arch/mips/Makefile
|
||||||
+++ b/arch/mips/Makefile
|
+++ b/arch/mips/Makefile
|
||||||
@@ -214,6 +214,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre
|
@@ -227,6 +227,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre
|
||||||
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
|
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
|
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
|
||||||
--- a/include/linux/pci_ids.h
|
--- a/include/linux/pci_ids.h
|
||||||
+++ b/include/linux/pci_ids.h
|
+++ b/include/linux/pci_ids.h
|
||||||
@@ -1752,6 +1752,9 @@
|
@@ -1753,6 +1753,9 @@
|
||||||
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
|
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
|
||||||
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
|
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
--- a/drivers/leds/Kconfig
|
--- a/drivers/leds/Kconfig
|
||||||
+++ b/drivers/leds/Kconfig
|
+++ b/drivers/leds/Kconfig
|
||||||
@@ -365,4 +365,12 @@ config LEDS_TRIGGER_NETDEV
|
@@ -372,4 +372,12 @@ config LEDS_TRIGGER_USBDEV
|
||||||
This allows LEDs to be controlled by network device activity.
|
This allows LEDs to be controlled by the presence/activity of
|
||||||
If unsure, say Y.
|
an USB device. If unsure, say N.
|
||||||
|
|
||||||
+config LEDS_TRIGGER_ADM5120_SWITCH
|
+config LEDS_TRIGGER_ADM5120_SWITCH
|
||||||
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
||||||
@ -15,8 +15,8 @@
|
|||||||
endif # NEW_LEDS
|
endif # NEW_LEDS
|
||||||
--- a/drivers/leds/Makefile
|
--- a/drivers/leds/Makefile
|
||||||
+++ b/drivers/leds/Makefile
|
+++ b/drivers/leds/Makefile
|
||||||
@@ -48,3 +48,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt
|
@@ -49,3 +49,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) +=
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
||||||
|
obj-$(CONFIG_LEDS_TRIGGER_USBDEV) += ledtrig-usbdev.o
|
||||||
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
@@ -53,6 +53,12 @@
|
@@ -52,6 +52,12 @@
|
||||||
|
#define SST49LF008A 0x005a
|
||||||
#define AT49BV6416 0x00d6
|
#define AT49BV6416 0x00d6
|
||||||
#define MANUFACTURER_SAMSUNG 0x00ec
|
|
||||||
|
|
||||||
+/* Macronix */
|
+/* Macronix */
|
||||||
+#define MX29LV160B 0x2249 /* MX29LV160 Bottom-boot chip */
|
+#define MX29LV160B 0x2249 /* MX29LV160 Bottom-boot chip */
|
||||||
@ -13,7 +13,7 @@
|
|||||||
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
|
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_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 *);
|
static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
||||||
@@ -283,6 +289,41 @@ static void fixup_s29gl032n_sectors(stru
|
@@ -282,6 +288,41 @@ static void fixup_s29gl032n_sectors(stru
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -55,7 +55,7 @@
|
|||||||
static struct cfi_fixup cfi_fixup_table[] = {
|
static struct cfi_fixup cfi_fixup_table[] = {
|
||||||
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
|
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
|
||||||
#ifdef AMD_BOOTLOC_BUG
|
#ifdef AMD_BOOTLOC_BUG
|
||||||
@@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] =
|
@@ -318,6 +359,9 @@ static struct cfi_fixup fixup_table[] =
|
||||||
*/
|
*/
|
||||||
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
|
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
|
||||||
{ CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
|
{ CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
depends on MTD_PARTITIONS
|
depends on MTD_PARTITIONS
|
||||||
--- a/drivers/mtd/Makefile
|
--- a/drivers/mtd/Makefile
|
||||||
+++ b/drivers/mtd/Makefile
|
+++ b/drivers/mtd/Makefile
|
||||||
@@ -8,6 +8,7 @@ mtd-y := mtdcore.o mtdsuper.o mtdbdi.
|
@@ -8,6 +8,7 @@ mtd-y := mtdcore.o mtdsuper.o
|
||||||
mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
|
mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
|
||||||
|
|
||||||
obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
|
obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
config MACH_ALCHEMY
|
config MACH_ALCHEMY
|
||||||
bool "Alchemy processor based machines"
|
bool "Alchemy processor based machines"
|
||||||
select SYS_SUPPORTS_ZBOOT
|
select SYS_SUPPORTS_ZBOOT
|
||||||
@@ -681,6 +696,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
@@ -683,6 +698,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
@ -32,7 +32,7 @@
|
|||||||
source "arch/mips/jazz/Kconfig"
|
source "arch/mips/jazz/Kconfig"
|
||||||
--- a/arch/mips/Makefile
|
--- a/arch/mips/Makefile
|
||||||
+++ b/arch/mips/Makefile
|
+++ b/arch/mips/Makefile
|
||||||
@@ -214,6 +214,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre
|
@@ -227,6 +227,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre
|
||||||
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
|
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
|
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
|
||||||
--- a/include/linux/pci_ids.h
|
--- a/include/linux/pci_ids.h
|
||||||
+++ b/include/linux/pci_ids.h
|
+++ b/include/linux/pci_ids.h
|
||||||
@@ -1752,6 +1752,9 @@
|
@@ -1756,6 +1756,9 @@
|
||||||
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
|
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
|
||||||
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
|
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
--- a/drivers/leds/Kconfig
|
--- a/drivers/leds/Kconfig
|
||||||
+++ b/drivers/leds/Kconfig
|
+++ b/drivers/leds/Kconfig
|
||||||
@@ -365,4 +365,12 @@ config LEDS_TRIGGER_NETDEV
|
@@ -389,4 +389,12 @@ config LEDS_TRIGGER_USBDEV
|
||||||
This allows LEDs to be controlled by network device activity.
|
This allows LEDs to be controlled by the presence/activity of
|
||||||
If unsure, say Y.
|
an USB device. If unsure, say N.
|
||||||
|
|
||||||
+config LEDS_TRIGGER_ADM5120_SWITCH
|
+config LEDS_TRIGGER_ADM5120_SWITCH
|
||||||
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
||||||
@ -15,8 +15,8 @@
|
|||||||
endif # NEW_LEDS
|
endif # NEW_LEDS
|
||||||
--- a/drivers/leds/Makefile
|
--- a/drivers/leds/Makefile
|
||||||
+++ b/drivers/leds/Makefile
|
+++ b/drivers/leds/Makefile
|
||||||
@@ -48,3 +48,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt
|
@@ -51,3 +51,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) +=
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
||||||
|
obj-$(CONFIG_LEDS_TRIGGER_USBDEV) += ledtrig-usbdev.o
|
||||||
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
@@ -53,6 +53,12 @@
|
@@ -49,6 +49,12 @@
|
||||||
|
#define SST49LF008A 0x005a
|
||||||
#define AT49BV6416 0x00d6
|
#define AT49BV6416 0x00d6
|
||||||
#define MANUFACTURER_SAMSUNG 0x00ec
|
|
||||||
|
|
||||||
+/* Macronix */
|
+/* Macronix */
|
||||||
+#define MX29LV160B 0x2249 /* MX29LV160 Bottom-boot chip */
|
+#define MX29LV160B 0x2249 /* MX29LV160 Bottom-boot chip */
|
||||||
@ -13,9 +13,9 @@
|
|||||||
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
|
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_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 *);
|
static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
||||||
@@ -283,6 +289,41 @@ static void fixup_s29gl032n_sectors(stru
|
@@ -329,6 +335,41 @@ static struct cfi_fixup cfi_nopri_fixup_
|
||||||
}
|
{ 0, 0, NULL, NULL }
|
||||||
}
|
};
|
||||||
|
|
||||||
+#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC
|
+#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC
|
||||||
+/*
|
+/*
|
||||||
@ -55,7 +55,7 @@
|
|||||||
static struct cfi_fixup cfi_fixup_table[] = {
|
static struct cfi_fixup cfi_fixup_table[] = {
|
||||||
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
|
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
|
||||||
#ifdef AMD_BOOTLOC_BUG
|
#ifdef AMD_BOOTLOC_BUG
|
||||||
@@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] =
|
@@ -365,6 +406,9 @@ static struct cfi_fixup fixup_table[] =
|
||||||
*/
|
*/
|
||||||
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
|
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
|
||||||
{ CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
|
{ CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/mtd/chips/jedec_probe.c
|
--- a/drivers/mtd/chips/jedec_probe.c
|
||||||
+++ b/drivers/mtd/chips/jedec_probe.c
|
+++ b/drivers/mtd/chips/jedec_probe.c
|
||||||
@@ -133,6 +133,10 @@
|
@@ -116,6 +116,10 @@
|
||||||
#define UPD29F064115 0x221C
|
#define UPD29F064115 0x221C
|
||||||
|
|
||||||
/* PMC */
|
/* PMC */
|
||||||
@ -11,7 +11,7 @@
|
|||||||
#define PM49FL002 0x006D
|
#define PM49FL002 0x006D
|
||||||
#define PM49FL004 0x006E
|
#define PM49FL004 0x006E
|
||||||
#define PM49FL008 0x006A
|
#define PM49FL008 0x006A
|
||||||
@@ -1275,6 +1279,54 @@ static const struct amd_flash_info jedec
|
@@ -1273,6 +1277,54 @@ static const struct amd_flash_info jedec
|
||||||
ERASEINFO(0x02000,2),
|
ERASEINFO(0x02000,2),
|
||||||
ERASEINFO(0x04000,1),
|
ERASEINFO(0x04000,1),
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
depends on MTD_PARTITIONS
|
depends on MTD_PARTITIONS
|
||||||
--- a/drivers/mtd/Makefile
|
--- a/drivers/mtd/Makefile
|
||||||
+++ b/drivers/mtd/Makefile
|
+++ b/drivers/mtd/Makefile
|
||||||
@@ -8,6 +8,7 @@ mtd-y := mtdcore.o mtdsuper.o mtdbdi.
|
@@ -8,6 +8,7 @@ mtd-y := mtdcore.o mtdsuper.o
|
||||||
mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
|
mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
|
||||||
|
|
||||||
obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
|
obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
obj-$(CONFIG_PATA_ACPI) += pata_acpi.o
|
obj-$(CONFIG_PATA_ACPI) += pata_acpi.o
|
||||||
--- a/drivers/ata/Kconfig
|
--- a/drivers/ata/Kconfig
|
||||||
+++ b/drivers/ata/Kconfig
|
+++ b/drivers/ata/Kconfig
|
||||||
@@ -604,6 +604,15 @@ config PATA_RADISYS
|
@@ -778,6 +778,15 @@ config PATA_QDI
|
||||||
|
help
|
||||||
If unsure, say N.
|
Support for QDI 6500 and 6580 PATA controllers on VESA local bus.
|
||||||
|
|
||||||
+config PATA_RB153_CF
|
+config PATA_RB153_CF
|
||||||
+ tristate "RouterBOARD 153 Compact Flash support"
|
+ tristate "RouterBOARD 153 Compact Flash support"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/leds/leds-gpio.c
|
--- a/drivers/leds/leds-gpio.c
|
||||||
+++ b/drivers/leds/leds-gpio.c
|
+++ b/drivers/leds/leds-gpio.c
|
||||||
@@ -45,13 +45,17 @@ static void gpio_led_set(struct led_clas
|
@@ -52,13 +52,17 @@ static void gpio_led_set(struct led_clas
|
||||||
container_of(led_cdev, struct gpio_led_data, cdev);
|
container_of(led_cdev, struct gpio_led_data, cdev);
|
||||||
int level;
|
int level;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/watchdog/Kconfig
|
--- a/drivers/watchdog/Kconfig
|
||||||
+++ b/drivers/watchdog/Kconfig
|
+++ b/drivers/watchdog/Kconfig
|
||||||
@@ -807,6 +807,18 @@ config RC32434_WDT
|
@@ -825,6 +825,18 @@ config RC32434_WDT
|
||||||
To compile this driver as a module, choose M here: the
|
To compile this driver as a module, choose M here: the
|
||||||
module will be called rc32434_wdt.
|
module will be called rc32434_wdt.
|
||||||
|
|
||||||
@ -21,7 +21,7 @@
|
|||||||
depends on SGI_HAS_INDYDOG
|
depends on SGI_HAS_INDYDOG
|
||||||
--- a/drivers/watchdog/Makefile
|
--- a/drivers/watchdog/Makefile
|
||||||
+++ b/drivers/watchdog/Makefile
|
+++ b/drivers/watchdog/Makefile
|
||||||
@@ -113,6 +113,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
|
@@ -114,6 +114,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
|
||||||
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
|
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
|
||||||
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
|
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
|
||||||
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
|
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -25,6 +25,21 @@ choice
|
@@ -26,6 +26,21 @@ choice
|
||||||
prompt "System type"
|
prompt "System type"
|
||||||
default SGI_IP22
|
default SGI_IP22
|
||||||
|
|
||||||
@ -22,7 +22,7 @@
|
|||||||
config MIPS_ALCHEMY
|
config MIPS_ALCHEMY
|
||||||
bool "Alchemy processor based machines"
|
bool "Alchemy processor based machines"
|
||||||
select 64BIT_PHYS_ADDR
|
select 64BIT_PHYS_ADDR
|
||||||
@@ -707,6 +722,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
@@ -708,6 +723,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/Kconfig
|
--- a/drivers/net/Kconfig
|
||||||
+++ b/drivers/net/Kconfig
|
+++ b/drivers/net/Kconfig
|
||||||
@@ -491,6 +491,10 @@ config MIPS_AU1X00_ENET
|
@@ -614,6 +614,10 @@ config MIPS_AU1X00_ENET
|
||||||
If you have an Alchemy Semi AU1X00 based system
|
If you have an Alchemy Semi AU1X00 based system
|
||||||
say Y. Otherwise, say N.
|
say Y. Otherwise, say N.
|
||||||
|
|
||||||
@ -13,7 +13,7 @@
|
|||||||
depends on PCI && SGI_IP27
|
depends on PCI && SGI_IP27
|
||||||
--- a/drivers/net/Makefile
|
--- a/drivers/net/Makefile
|
||||||
+++ b/drivers/net/Makefile
|
+++ b/drivers/net/Makefile
|
||||||
@@ -212,6 +212,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
|
@@ -213,6 +213,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
|
||||||
# This is also a 82596 and should probably be merged
|
# This is also a 82596 and should probably be merged
|
||||||
obj-$(CONFIG_LP486E) += lp486e.o
|
obj-$(CONFIG_LP486E) += lp486e.o
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
--- a/drivers/leds/Kconfig
|
--- a/drivers/leds/Kconfig
|
||||||
+++ b/drivers/leds/Kconfig
|
+++ b/drivers/leds/Kconfig
|
||||||
@@ -391,4 +391,12 @@ config LEDS_TRIGGER_NETDEV
|
@@ -398,4 +398,12 @@ config LEDS_TRIGGER_USBDEV
|
||||||
This allows LEDs to be controlled by network device activity.
|
This allows LEDs to be controlled by the presence/activity of
|
||||||
If unsure, say Y.
|
an USB device. If unsure, say N.
|
||||||
|
|
||||||
+config LEDS_TRIGGER_ADM5120_SWITCH
|
+config LEDS_TRIGGER_ADM5120_SWITCH
|
||||||
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
||||||
@ -15,8 +15,8 @@
|
|||||||
endif # NEW_LEDS
|
endif # NEW_LEDS
|
||||||
--- a/drivers/leds/Makefile
|
--- a/drivers/leds/Makefile
|
||||||
+++ b/drivers/leds/Makefile
|
+++ b/drivers/leds/Makefile
|
||||||
@@ -51,3 +51,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt
|
@@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) +=
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
||||||
|
obj-$(CONFIG_LEDS_TRIGGER_USBDEV) += ledtrig-usbdev.o
|
||||||
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/mtd/chips/jedec_probe.c
|
--- a/drivers/mtd/chips/jedec_probe.c
|
||||||
+++ b/drivers/mtd/chips/jedec_probe.c
|
+++ b/drivers/mtd/chips/jedec_probe.c
|
||||||
@@ -115,6 +115,10 @@
|
@@ -116,6 +116,10 @@
|
||||||
#define UPD29F064115 0x221C
|
#define UPD29F064115 0x221C
|
||||||
|
|
||||||
/* PMC */
|
/* PMC */
|
||||||
@ -11,7 +11,7 @@
|
|||||||
#define PM49FL002 0x006D
|
#define PM49FL002 0x006D
|
||||||
#define PM49FL004 0x006E
|
#define PM49FL004 0x006E
|
||||||
#define PM49FL008 0x006A
|
#define PM49FL008 0x006A
|
||||||
@@ -1259,6 +1263,54 @@ static const struct amd_flash_info jedec
|
@@ -1273,6 +1277,54 @@ static const struct amd_flash_info jedec
|
||||||
ERASEINFO(0x02000,2),
|
ERASEINFO(0x02000,2),
|
||||||
ERASEINFO(0x04000,1),
|
ERASEINFO(0x04000,1),
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
--- a/drivers/leds/Kconfig
|
--- a/drivers/leds/Kconfig
|
||||||
+++ b/drivers/leds/Kconfig
|
+++ b/drivers/leds/Kconfig
|
||||||
@@ -400,4 +400,12 @@ config LEDS_TRIGGER_NETDEV
|
@@ -322,4 +322,12 @@ config LEDS_TRIGGER_USBDEV
|
||||||
This allows LEDs to be controlled by network device activity.
|
This allows LEDs to be controlled by the presence/activity of
|
||||||
If unsure, say Y.
|
an USB device. If unsure, say N.
|
||||||
|
|
||||||
+config LEDS_TRIGGER_ADM5120_SWITCH
|
+config LEDS_TRIGGER_ADM5120_SWITCH
|
||||||
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
+ tristate "LED ADM5120 Switch Port Status Trigger"
|
||||||
@ -15,8 +15,8 @@
|
|||||||
endif # NEW_LEDS
|
endif # NEW_LEDS
|
||||||
--- a/drivers/leds/Makefile
|
--- a/drivers/leds/Makefile
|
||||||
+++ b/drivers/leds/Makefile
|
+++ b/drivers/leds/Makefile
|
||||||
@@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt
|
@@ -43,3 +43,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) +=
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
||||||
|
obj-$(CONFIG_LEDS_TRIGGER_USBDEV) += ledtrig-usbdev.o
|
||||||
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
|
||||||
|
Loading…
x
Reference in New Issue
Block a user