Update to 2.6.35-rc5; remove patches merged upstream
svn path=/dists/trunk/linux-2.6/; revision=15980
This commit is contained in:
Ben Hutchings
parent
5bf27afcc9
commit
ef5d525c90
|
|
@ -1,3 +1,9 @@
|
|||
linux-2.6 (2.6.35~rc5-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream release candidate
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Tue, 13 Jul 2010 00:50:20 +0100
|
||||
|
||||
linux-2.6 (2.6.35~rc4-1~experimental.1) experimental; urgency=low
|
||||
|
||||
* New upstream snapshot
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
From 9a657f2733d7ea94da555fb0c2faa16db41db885 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Wed, 7 Jul 2010 04:08:25 +0100
|
||||
Subject: [PATCH] kbuild: Fix setlocalversion invocation when objtree != srctree
|
||||
|
||||
The scripts directory may not exist under the current directory.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 914e5f5..f9835c8 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -886,7 +886,7 @@ $(vmlinux-dirs): prepare scripts
|
||||
# Store (new) KERNELRELASE string in include/config/kernel.release
|
||||
include/config/kernel.release: include/config/auto.conf FORCE
|
||||
$(Q)rm -f $@
|
||||
- $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@
|
||||
+ $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@
|
||||
|
||||
|
||||
# Things we need to do before we recursively start building the kernel
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
@ -39,8 +39,6 @@ rm drivers/media/dvb/dvb-usb/af9005-script.h
|
|||
|
||||
unifdef drivers/media/dvb/frontends/lgs8gxx.c -UREMOVE_DFSG
|
||||
|
||||
rm drivers/infiniband/hw/qib/qib_sd7220_img.c
|
||||
|
||||
rm drivers/net/appletalk/cops.c
|
||||
rm drivers/net/appletalk/cops.h
|
||||
rm drivers/net/appletalk/cops_ffdrv.h
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ index 1c00d05..3bf888d 100644
|
|||
fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
|
||||
cis/DP83903.cis cis/NE2K.cis \
|
||||
cis/tamarack.cis cis/PE-200.cis \
|
||||
@@ -77,66 +32,8 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
|
||||
@@ -77,67 +32,8 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
|
||||
cis/COMpad2.cis cis/COMpad4.cis \
|
||||
cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
|
||||
cis/SW_8xx_SER.cis
|
||||
|
|
@ -66,6 +66,7 @@ index 1c00d05..3bf888d 100644
|
|||
-fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \
|
||||
- qlogic/12160.bin
|
||||
-fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin
|
||||
-fw-shipped-$(CONFIG_INFINIBAND_QIB) += qlogic/sd7220.fw
|
||||
-fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin
|
||||
-fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
|
||||
-fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Mon, 17 Aug 2009 02:17:09 +0100
|
||||
Subject: [PATCH] ib_qib: disable use of SD7220
|
||||
|
||||
--- a/drivers/infiniband/hw/qib/Makefile
|
||||
+++ b/drivers/infiniband/hw/qib/Makefile
|
||||
@@ -6,7 +6,7 @@ ib_qib-y := qib_cq.o qib_diag.o qib_dma.o qib_driver.o qib_eeprom.o \
|
||||
qib_qp.o qib_qsfp.o qib_rc.o qib_ruc.o qib_sdma.o qib_srq.o \
|
||||
qib_sysfs.o qib_twsi.o qib_tx.o qib_uc.o qib_ud.o \
|
||||
qib_user_pages.o qib_user_sdma.o qib_verbs_mcast.o qib_iba7220.o \
|
||||
- qib_sd7220.o qib_sd7220_img.o qib_iba7322.o qib_verbs.o
|
||||
+ qib_sd7220.o qib_iba7322.o qib_verbs.o
|
||||
|
||||
# 6120 has no fallback if no MSI interrupts, others can do INTx
|
||||
ib_qib-$(CONFIG_PCI_MSI) += qib_iba6120.o
|
||||
--- a/drivers/infiniband/hw/qib/qib_sd7220.c
|
||||
+++ b/drivers/infiniband/hw/qib/qib_sd7220.c
|
||||
@@ -881,6 +902,18 @@ int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
|
||||
return errors ? -errors : sofar;
|
||||
}
|
||||
|
||||
+int
|
||||
+qib_sd7220_ib_load(struct qib_devdata *dd)
|
||||
+{
|
||||
+ return -1;
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+qib_sd7220_ib_vfy(struct qib_devdata *dd)
|
||||
+{
|
||||
+ return -1;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* IRQ not set up at this point in init, so we poll.
|
||||
*/
|
||||
|
|
@ -1,178 +0,0 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Mon, 17 Aug 2009 02:17:09 +0100
|
||||
Subject: [PATCH] ib_qib: use request_firmware() to load SD7220 firmware
|
||||
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
--- a/drivers/infiniband/hw/qib/qib_7220.h
|
||||
+++ b/drivers/infiniband/hw/qib/qib_7220.h
|
||||
@@ -109,10 +109,6 @@ struct qib_chippport_specific {
|
||||
*/
|
||||
int qib_sd7220_presets(struct qib_devdata *dd);
|
||||
int qib_sd7220_init(struct qib_devdata *dd);
|
||||
-int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum, u8 *img,
|
||||
- int len, int offset);
|
||||
-int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum, const u8 *img,
|
||||
- int len, int offset);
|
||||
void qib_sd7220_clr_ibpar(struct qib_devdata *);
|
||||
/*
|
||||
* Below used for sdnum parameter, selecting one of the two sections
|
||||
@@ -121,9 +117,6 @@ void qib_sd7220_clr_ibpar(struct qib_devdata *);
|
||||
*/
|
||||
#define IB_7220_SERDES 2
|
||||
|
||||
-int qib_sd7220_ib_load(struct qib_devdata *dd);
|
||||
-int qib_sd7220_ib_vfy(struct qib_devdata *dd);
|
||||
-
|
||||
static inline u32 qib_read_kreg32(const struct qib_devdata *dd,
|
||||
const u16 regno)
|
||||
{
|
||||
--- a/drivers/infiniband/hw/qib/qib_sd7220.c
|
||||
+++ b/drivers/infiniband/hw/qib/qib_sd7220.c
|
||||
@@ -37,10 +37,14 @@
|
||||
|
||||
#include <linux/pci.h>
|
||||
#include <linux/delay.h>
|
||||
+#include <linux/firmware.h>
|
||||
|
||||
#include "qib.h"
|
||||
#include "qib_7220.h"
|
||||
|
||||
+#define SD7220_FW_NAME "qlogic/sd7220.fw"
|
||||
+MODULE_FIRMWARE(SD7220_FW_NAME);
|
||||
+
|
||||
/*
|
||||
* Same as in qib_iba7220.c, but just the registers needed here.
|
||||
* Could move whole set to qib_7220.h, but decided better to keep
|
||||
@@ -74,6 +78,11 @@
|
||||
#define PCIE_SERDES0 0
|
||||
#define PCIE_SERDES1 1
|
||||
|
||||
+static int
|
||||
+qib_sd7220_ib_load(struct qib_devdata *dd, const struct firmware *fw);
|
||||
+static int
|
||||
+qib_sd7220_ib_vfy(struct qib_devdata *dd, const struct firmware *fw);
|
||||
+
|
||||
/*
|
||||
* The EPB requires addressing in a particular form. EPB_LOC() is intended
|
||||
* to make #definitions a little more readable.
|
||||
@@ -110,10 +119,12 @@ static int epb_access(struct qib_devdata *dd, int sdnum, int claim);
|
||||
* state of the reset "pin", is no longer valid. Instead, we check for the
|
||||
* actual uC code having been loaded.
|
||||
*/
|
||||
-static int qib_ibsd_ucode_loaded(struct qib_pportdata *ppd)
|
||||
+static int
|
||||
+qib_ibsd_ucode_loaded(struct qib_pportdata *ppd, const struct firmware *fw)
|
||||
{
|
||||
struct qib_devdata *dd = ppd->dd;
|
||||
- if (!dd->cspec->serdes_first_init_done && (qib_sd7220_ib_vfy(dd) > 0))
|
||||
+ if (!dd->cspec->serdes_first_init_done &&
|
||||
+ (qib_sd7220_ib_vfy(dd, fw) > 0))
|
||||
dd->cspec->serdes_first_init_done = 1;
|
||||
return dd->cspec->serdes_first_init_done;
|
||||
}
|
||||
@@ -377,6 +388,7 @@ static void qib_sd_trimdone_monitor(struct qib_devdata *dd,
|
||||
*/
|
||||
int qib_sd7220_init(struct qib_devdata *dd)
|
||||
{
|
||||
+ const struct firmware *fw;
|
||||
int ret = 1; /* default to failure */
|
||||
int first_reset, was_reset;
|
||||
|
||||
@@ -387,8 +399,15 @@ int qib_sd7220_init(struct qib_devdata *dd)
|
||||
qib_ibsd_reset(dd, 1);
|
||||
qib_sd_trimdone_monitor(dd, "Driver-reload");
|
||||
}
|
||||
+
|
||||
+ ret = request_firmware(&fw, SD7220_FW_NAME, &dd->pcidev->dev);
|
||||
+ if (ret) {
|
||||
+ qib_dev_err(dd, "Failed to load IB SERDES image\n");
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
/* Substitute our deduced value for was_reset */
|
||||
- ret = qib_ibsd_ucode_loaded(dd->pport);
|
||||
+ ret = qib_ibsd_ucode_loaded(dd->pport, fw);
|
||||
if (ret < 0)
|
||||
goto bail;
|
||||
|
||||
@@ -437,13 +456,13 @@ int qib_sd7220_init(struct qib_devdata *dd)
|
||||
int vfy;
|
||||
int trim_done;
|
||||
|
||||
- ret = qib_sd7220_ib_load(dd);
|
||||
+ ret = qib_sd7220_ib_load(dd, fw);
|
||||
if (ret < 0) {
|
||||
qib_dev_err(dd, "Failed to load IB SERDES image\n");
|
||||
goto bail;
|
||||
} else {
|
||||
/* Loaded image, try to verify */
|
||||
- vfy = qib_sd7220_ib_vfy(dd);
|
||||
+ vfy = qib_sd7220_ib_vfy(dd, fw);
|
||||
if (vfy != ret) {
|
||||
qib_dev_err(dd, "SERDES PRAM VFY failed\n");
|
||||
goto bail;
|
||||
@@ -506,6 +525,8 @@ bail:
|
||||
done:
|
||||
/* start relock timer regardless, but start at 1 second */
|
||||
set_7220_relock_poll(dd, -1);
|
||||
+
|
||||
+ release_firmware(fw);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -829,8 +850,8 @@ static int qib_sd7220_ram_xfer(struct qib_devdata *dd, int sdnum, u32 loc,
|
||||
|
||||
#define PROG_CHUNK 64
|
||||
|
||||
-int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
|
||||
- u8 *img, int len, int offset)
|
||||
+static int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
|
||||
+ const u8 *img, int len, int offset)
|
||||
{
|
||||
int cnt, sofar, req;
|
||||
|
||||
@@ -840,7 +861,7 @@ int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
|
||||
if (req > PROG_CHUNK)
|
||||
req = PROG_CHUNK;
|
||||
cnt = qib_sd7220_ram_xfer(dd, sdnum, offset + sofar,
|
||||
- img + sofar, req, 0);
|
||||
+ (u8 *)img + sofar, req, 0);
|
||||
if (cnt < req) {
|
||||
sofar = -1;
|
||||
break;
|
||||
@@ -853,8 +874,8 @@ int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
|
||||
#define VFY_CHUNK 64
|
||||
#define SD_PRAM_ERROR_LIMIT 42
|
||||
|
||||
-int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
|
||||
- const u8 *img, int len, int offset)
|
||||
+static int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
|
||||
+ const u8 *img, int len, int offset)
|
||||
{
|
||||
int cnt, sofar, req, idx, errors;
|
||||
unsigned char readback[VFY_CHUNK];
|
||||
@@ -881,16 +902,16 @@ int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
|
||||
return errors ? -errors : sofar;
|
||||
}
|
||||
|
||||
-int
|
||||
-qib_sd7220_ib_load(struct qib_devdata *dd)
|
||||
+static int
|
||||
+qib_sd7220_ib_load(struct qib_devdata *dd, const struct firmware *fw)
|
||||
{
|
||||
- return -1;
|
||||
+ return qib_sd7220_prog_ld(dd, IB_7220_SERDES, fw->data, fw->size, 0);
|
||||
}
|
||||
|
||||
-int
|
||||
-qib_sd7220_ib_vfy(struct qib_devdata *dd)
|
||||
+static int
|
||||
+qib_sd7220_ib_vfy(struct qib_devdata *dd, const struct firmware *fw)
|
||||
{
|
||||
- return -1;
|
||||
+ return qib_sd7220_prog_vfy(dd, IB_7220_SERDES, fw->data, fw->size, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
From: apatard@mandriva.com <apatard@mandriva.com>
|
||||
Date: Wed, 2 Jun 2010 00:39:54 +0200
|
||||
Subject: [PATCH] MIPS: Loongson: Define rtc device on MC146818-equipped systems
|
||||
|
||||
commit b224e7061338eb0a12793c456d008fd65560e002 upstream.
|
||||
|
||||
This patch declare the rtc device present on systems with clock compatible
|
||||
with the mc146818 and handled by rtc-cmos. Introduce a new Kconfig entry
|
||||
because there are some systems without rtc_cmos compatible clock.
|
||||
|
||||
Signed-off-by: Arnaud Patard <apatard@mandriva.com>
|
||||
To: linux-mips@linux-mips.org
|
||||
Cc: aba@not.so.argh.org
|
||||
Patchwork: http://patchwork.linux-mips.org/patch/1320/
|
||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
||||
---
|
||||
arch/mips/loongson/Kconfig | 6 +++++
|
||||
arch/mips/loongson/common/Makefile | 1 +
|
||||
arch/mips/loongson/common/rtc.c | 43 ++++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 50 insertions(+), 0 deletions(-)
|
||||
create mode 100644 arch/mips/loongson/common/rtc.c
|
||||
|
||||
diff --git a/arch/mips/loongson/Kconfig b/arch/mips/loongson/Kconfig
|
||||
index 3df1967..c97ca69 100644
|
||||
--- a/arch/mips/loongson/Kconfig
|
||||
+++ b/arch/mips/loongson/Kconfig
|
||||
@@ -23,6 +23,7 @@ config LEMOTE_FULOONG2E
|
||||
select GENERIC_HARDIRQS_NO__DO_IRQ
|
||||
select GENERIC_ISA_DMA_SUPPORT_BROKEN
|
||||
select CPU_HAS_WB
|
||||
+ select LOONGSON_MC146818
|
||||
help
|
||||
Lemote Fuloong(2e) mini-PC board based on the Chinese Loongson-2E CPU and
|
||||
an FPGA northbridge
|
||||
@@ -51,6 +52,7 @@ config LEMOTE_MACH2F
|
||||
select SYS_SUPPORTS_64BIT_KERNEL
|
||||
select SYS_SUPPORTS_HIGHMEM
|
||||
select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||
+ select LOONGSON_MC146818
|
||||
help
|
||||
Lemote Loongson 2F family machines utilize the 2F revision of
|
||||
Loongson processor and the AMD CS5536 south bridge.
|
||||
@@ -83,3 +85,7 @@ config LOONGSON_UART_BASE
|
||||
bool
|
||||
default y
|
||||
depends on EARLY_PRINTK || SERIAL_8250
|
||||
+
|
||||
+config LOONGSON_MC146818
|
||||
+ bool
|
||||
+ default n
|
||||
diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
|
||||
index cdd2e81..e526488 100644
|
||||
--- a/arch/mips/loongson/common/Makefile
|
||||
+++ b/arch/mips/loongson/common/Makefile
|
||||
@@ -12,6 +12,7 @@ obj-$(CONFIG_GENERIC_GPIO) += gpio.o
|
||||
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||
obj-$(CONFIG_SERIAL_8250) += serial.o
|
||||
obj-$(CONFIG_LOONGSON_UART_BASE) += uart_base.o
|
||||
+obj-$(CONFIG_LOONGSON_MC146818) += rtc.o
|
||||
|
||||
#
|
||||
# Enable CS5536 Virtual Support Module(VSM) to virtulize the PCI configure
|
||||
diff --git a/arch/mips/loongson/common/rtc.c b/arch/mips/loongson/common/rtc.c
|
||||
new file mode 100644
|
||||
index 0000000..a90d87c
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/loongson/common/rtc.c
|
||||
@@ -0,0 +1,43 @@
|
||||
+/*
|
||||
+ * Lemote Fuloong platform support
|
||||
+ *
|
||||
+ * Copyright(c) 2010 Arnaud Patard <apatard@mandriva.com>
|
||||
+ *
|
||||
+ * 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.
|
||||
+ */
|
||||
+
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/mc146818rtc.h>
|
||||
+
|
||||
+struct resource loongson_rtc_resources[] = {
|
||||
+ {
|
||||
+ .start = RTC_PORT(0),
|
||||
+ .end = RTC_PORT(1),
|
||||
+ .flags = IORESOURCE_IO,
|
||||
+ }, {
|
||||
+ .start = RTC_IRQ,
|
||||
+ .end = RTC_IRQ,
|
||||
+ .flags = IORESOURCE_IRQ,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device loongson_rtc_device = {
|
||||
+ .name = "rtc_cmos",
|
||||
+ .id = -1,
|
||||
+ .resource = loongson_rtc_resources,
|
||||
+ .num_resources = ARRAY_SIZE(loongson_rtc_resources),
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int __init loongson_rtc_platform_init(void)
|
||||
+{
|
||||
+ platform_device_register(&loongson_rtc_device);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+device_initcall(loongson_rtc_platform_init);
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
@ -5,7 +5,6 @@
|
|||
|
||||
+ debian/piix-disable-redundant-devids.patch
|
||||
|
||||
+ features/all/ib_qib-use-request_firmware-to-load-SD7220-firmware.patch
|
||||
+ features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
|
||||
|
||||
+ features/all/lgs8gxx-lgs8g75-request_firmware.patch
|
||||
|
|
@ -45,7 +44,6 @@
|
|||
|
||||
+ bugfix/mips/mips-ide-flush-dcache.patch
|
||||
#+ bugfix/all/thinkpad-acpi-fix-backlight.patch
|
||||
+ features/mips/MIPS-Loongson-Define-rtc-device-on-MC146818-systems.patch
|
||||
+ features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch
|
||||
+ bugfix/all/ipr-add-writeq-definition-if-needed.patch
|
||||
+ bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch
|
||||
|
|
@ -61,4 +59,3 @@
|
|||
+ bugfix/all/ipv6-Use-interface-max_desync_factor.patch
|
||||
+ bugfix/all/rtl8192su-Clean-up-in-case-of-an-error-in-mo.patch
|
||||
+ bugfix/all/rtl8192su-Fix-procfs-code-for-interfaces-not.patch
|
||||
+ bugfix/all/kbuild-Fix-setlocalversion-invocation.patch
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
+ debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
|
||||
+ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
|
||||
+ debian/dfsg/ip_qib-sd7220-disable.patch
|
||||
+ debian/dfsg/drivers-net-appletalk-cops.patch
|
||||
+ debian/dfsg/drivers-staging-otus-disable.patch
|
||||
+ debian/dfsg/rtl8192u_usb-Remove-built-in-firmware.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue