mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-03-31 14:41:55 -07:00
linux: update to linux-3.0-rc4
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
@@ -19,13 +19,13 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="linux"
|
||||
PKG_VERSION="2.6.39.1"
|
||||
PKG_VERSION="3.0-rc4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kernel.org"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="busybox linux-drivers linux-firmware"
|
||||
PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz cpio"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
Index: linux-2.6.16/scripts/gen_initramfs_list.sh
|
||||
===================================================================
|
||||
--- linux-2.6.16.orig/scripts/gen_initramfs_list.sh 2006-03-20 18:41:34.000000000 +0100
|
||||
+++ linux-2.6.16/scripts/gen_initramfs_list.sh 2006-03-20 18:42:40.000000000 +0100
|
||||
@@ -56,9 +56,7 @@
|
||||
|
||||
parse() {
|
||||
local location="$1"
|
||||
- local name="${location/${srcdir}//}"
|
||||
- # change '//' into '/'
|
||||
- name="${name//\/\///}"
|
||||
+ local name="$(echo "$location" | sed -e 's%$srcdir%%' -e 's%//*%/%g')"
|
||||
local mode="$2"
|
||||
local uid="$3"
|
||||
local gid="$4"
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: linux-2.6.16/scripts/kconfig/confdata.c
|
||||
===================================================================
|
||||
--- linux-2.6.16.orig/scripts/kconfig/confdata.c 2006-03-20 06:53:29.000000000 +0100
|
||||
+++ linux-2.6.16/scripts/kconfig/confdata.c 2006-03-20 18:47:06.000000000 +0100
|
||||
@@ -340,7 +340,7 @@
|
||||
int type, l;
|
||||
const char *str;
|
||||
time_t now;
|
||||
- int use_timestamp = 1;
|
||||
+ int use_timestamp = 0;
|
||||
char *env;
|
||||
|
||||
dirname[0] = 0;
|
||||
@@ -1,34 +0,0 @@
|
||||
From: Mauro Carvalho Chehab <mchehab@redhat.com>
|
||||
Date: Thu, 12 May 2011 01:36:47 +0000 (-0300)
|
||||
Subject: [media] Use a more consistent value for RC repeat period
|
||||
X-Git-Url: http://git.linuxtv.org/media_tree.git?a=commitdiff_plain;h=ca540c8b66874aaf704c64d43d33e39369c428fb
|
||||
|
||||
[media] Use a more consistent value for RC repeat period
|
||||
|
||||
The default REP_PERIOD is 33 ms. This doesn't make sense for IR's,
|
||||
as, in general, an IR repeat scancode is provided at every 110/115ms,
|
||||
depending on the RC protocol. So, increase its default, to do a
|
||||
better job avoiding ghost repeat events.
|
||||
|
||||
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
||||
Acked-by: Jarod Wilson <jarod@redhat.com>
|
||||
---
|
||||
|
||||
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
|
||||
index 0d4fcd9..f57cd56 100644
|
||||
--- a/drivers/media/rc/rc-main.c
|
||||
+++ b/drivers/media/rc/rc-main.c
|
||||
@@ -1078,6 +1078,13 @@ int rc_register_device(struct rc_dev *dev)
|
||||
*/
|
||||
dev->input_dev->rep[REP_DELAY] = 500;
|
||||
|
||||
+ /*
|
||||
+ * As a repeat event on protocols like RC-5 and NEC take as long as
|
||||
+ * 110/114ms, using 33ms as a repeat period is not the right thing
|
||||
+ * to do.
|
||||
+ */
|
||||
+ dev->input_dev->rep[REP_PERIOD] = 125;
|
||||
+
|
||||
path = kobject_get_path(&dev->dev.kobj, GFP_KERNEL);
|
||||
printk(KERN_INFO "%s: %s as %s\n",
|
||||
dev_name(&dev->dev),
|
||||
@@ -1,89 +0,0 @@
|
||||
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
|
||||
index d4d6449..bc5c1e2 100644
|
||||
--- a/drivers/media/rc/nuvoton-cir.c
|
||||
+++ b/drivers/media/rc/nuvoton-cir.c
|
||||
@@ -37,8 +37,6 @@
|
||||
|
||||
#include "nuvoton-cir.h"
|
||||
|
||||
-static char *chip_id = "w836x7hg";
|
||||
-
|
||||
/* write val to config reg */
|
||||
static inline void nvt_cr_write(struct nvt_dev *nvt, u8 val, u8 reg)
|
||||
{
|
||||
@@ -233,6 +231,8 @@ static int nvt_hw_detect(struct nvt_dev *nvt)
|
||||
unsigned long flags;
|
||||
u8 chip_major, chip_minor;
|
||||
int ret = 0;
|
||||
+ char chip_id[12];
|
||||
+ bool chip_unknown = false;
|
||||
|
||||
nvt_efm_enable(nvt);
|
||||
|
||||
@@ -246,15 +246,39 @@ static int nvt_hw_detect(struct nvt_dev *nvt)
|
||||
}
|
||||
|
||||
chip_minor = nvt_cr_read(nvt, CR_CHIP_ID_LO);
|
||||
- nvt_dbg("%s: chip id: 0x%02x 0x%02x", chip_id, chip_major, chip_minor);
|
||||
|
||||
- if (chip_major != CHIP_ID_HIGH ||
|
||||
- (chip_minor != CHIP_ID_LOW && chip_minor != CHIP_ID_LOW2)) {
|
||||
- nvt_pr(KERN_ERR, "%s: unsupported chip, id: 0x%02x 0x%02x",
|
||||
- chip_id, chip_major, chip_minor);
|
||||
- ret = -ENODEV;
|
||||
+ /* these are the known working chip revisions... */
|
||||
+ switch (chip_major) {
|
||||
+ case CHIP_ID_HIGH_667:
|
||||
+ strcpy(chip_id, "w83667hg\0");
|
||||
+ if (chip_minor != CHIP_ID_LOW_667)
|
||||
+ chip_unknown = true;
|
||||
+ break;
|
||||
+ case CHIP_ID_HIGH_677B:
|
||||
+ strcpy(chip_id, "w83677hg\0");
|
||||
+ if (chip_minor != CHIP_ID_LOW_677B2 &&
|
||||
+ chip_minor != CHIP_ID_LOW_677B3)
|
||||
+ chip_unknown = true;
|
||||
+ break;
|
||||
+ case CHIP_ID_HIGH_677C:
|
||||
+ strcpy(chip_id, "w83677hg-c\0");
|
||||
+ if (chip_minor != CHIP_ID_LOW_677C)
|
||||
+ chip_unknown = true;
|
||||
+ break;
|
||||
+ default:
|
||||
+ strcpy(chip_id, "w836x7hg\0");
|
||||
+ chip_unknown = true;
|
||||
+ break;
|
||||
}
|
||||
|
||||
+ /* warn, but still let the driver load, if we don't know this chip */
|
||||
+ if (chip_unknown)
|
||||
+ nvt_pr(KERN_WARNING, "%s: unknown chip, id: 0x%02x 0x%02x, "
|
||||
+ "it may not work...", chip_id, chip_major, chip_minor);
|
||||
+ else
|
||||
+ nvt_dbg("%s: chip id: 0x%02x 0x%02x",
|
||||
+ chip_id, chip_major, chip_minor);
|
||||
+
|
||||
nvt_efm_disable(nvt);
|
||||
|
||||
spin_lock_irqsave(&nvt->nvt_lock, flags);
|
||||
diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
|
||||
index 048135e..cc8cee3 100644
|
||||
--- a/drivers/media/rc/nuvoton-cir.h
|
||||
+++ b/drivers/media/rc/nuvoton-cir.h
|
||||
@@ -330,9 +330,13 @@ struct nvt_dev {
|
||||
#define EFER_EFM_DISABLE 0xaa
|
||||
|
||||
/* Chip IDs found in CR_CHIP_ID_{HI,LO} */
|
||||
-#define CHIP_ID_HIGH 0xb4
|
||||
-#define CHIP_ID_LOW 0x72
|
||||
-#define CHIP_ID_LOW2 0x73
|
||||
+#define CHIP_ID_HIGH_667 0xa5
|
||||
+#define CHIP_ID_HIGH_677B 0xb4
|
||||
+#define CHIP_ID_HIGH_677C 0xc3
|
||||
+#define CHIP_ID_LOW_667 0x13
|
||||
+#define CHIP_ID_LOW_677B2 0x72
|
||||
+#define CHIP_ID_LOW_677B3 0x73
|
||||
+#define CHIP_ID_LOW_677C 0x33
|
||||
|
||||
/* Config regs we need to care about */
|
||||
#define CR_SOFTWARE_RESET 0x02
|
||||
@@ -1,63 +0,0 @@
|
||||
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
|
||||
index bc5c1e2..5d93384 100644
|
||||
--- a/drivers/media/rc/nuvoton-cir.c
|
||||
+++ b/drivers/media/rc/nuvoton-cir.c
|
||||
@@ -291,13 +291,23 @@ static int nvt_hw_detect(struct nvt_dev *nvt)
|
||||
|
||||
static void nvt_cir_ldev_init(struct nvt_dev *nvt)
|
||||
{
|
||||
- u8 val;
|
||||
+ u8 val, psreg, psmask, psval;
|
||||
+
|
||||
+ if (nvt->chip_major == CHIP_ID_HIGH_667) {
|
||||
+ psreg = CR_MULTIFUNC_PIN_SEL;
|
||||
+ psmask = MULTIFUNC_PIN_SEL_MASK;
|
||||
+ psval = MULTIFUNC_ENABLE_CIR | MULTIFUNC_ENABLE_CIRWB;
|
||||
+ } else {
|
||||
+ psreg = CR_OUTPUT_PIN_SEL;
|
||||
+ psmask = OUTPUT_PIN_SEL_MASK;
|
||||
+ psval = OUTPUT_ENABLE_CIR | OUTPUT_ENABLE_CIRWB;
|
||||
+ }
|
||||
|
||||
- /* output pin selection (Pin95=CIRRX, Pin96=CIRTX1, WB enabled */
|
||||
- val = nvt_cr_read(nvt, CR_OUTPUT_PIN_SEL);
|
||||
- val &= OUTPUT_PIN_SEL_MASK;
|
||||
- val |= (OUTPUT_ENABLE_CIR | OUTPUT_ENABLE_CIRWB);
|
||||
- nvt_cr_write(nvt, val, CR_OUTPUT_PIN_SEL);
|
||||
+ /* output pin selection: enable CIR, with WB sensor enabled */
|
||||
+ val = nvt_cr_read(nvt, psreg);
|
||||
+ val &= psmask;
|
||||
+ val |= psval;
|
||||
+ nvt_cr_write(nvt, val, psreg);
|
||||
|
||||
/* Select CIR logical device and enable */
|
||||
nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR);
|
||||
diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
|
||||
index cc8cee3..379795d 100644
|
||||
--- a/drivers/media/rc/nuvoton-cir.h
|
||||
+++ b/drivers/media/rc/nuvoton-cir.h
|
||||
@@ -345,6 +345,7 @@ struct nvt_dev {
|
||||
#define CR_CHIP_ID_LO 0x21
|
||||
#define CR_DEV_POWER_DOWN 0x22 /* bit 2 is CIR power, default power on */
|
||||
#define CR_OUTPUT_PIN_SEL 0x27
|
||||
+#define CR_MULTIFUNC_PIN_SEL 0x2c
|
||||
#define CR_LOGICAL_DEV_EN 0x30 /* valid for all logical devices */
|
||||
/* next three regs valid for both the CIR and CIR_WAKE logical devices */
|
||||
#define CR_CIR_BASE_ADDR_HI 0x60
|
||||
@@ -368,10 +369,16 @@ struct nvt_dev {
|
||||
#define CIR_INTR_MOUSE_IRQ_BIT 0x80
|
||||
#define PME_INTR_CIR_PASS_BIT 0x08
|
||||
|
||||
+/* w83677hg CIR pin config */
|
||||
#define OUTPUT_PIN_SEL_MASK 0xbc
|
||||
#define OUTPUT_ENABLE_CIR 0x01 /* Pin95=CIRRX, Pin96=CIRTX1 */
|
||||
#define OUTPUT_ENABLE_CIRWB 0x40 /* enable wide-band sensor */
|
||||
|
||||
+/* w83667hg CIR pin config */
|
||||
+#define MULTIFUNC_PIN_SEL_MASK 0x1f
|
||||
+#define MULTIFUNC_ENABLE_CIR 0x80 /* Pin75=CIRRX, Pin76=CIRTX1 */
|
||||
+#define MULTIFUNC_ENABLE_CIRWB 0x20 /* enable wide-band sensor */
|
||||
+
|
||||
/* MCE CIR signal length, related on sample period */
|
||||
|
||||
/* MCE CIR controller signal length: about 43ms
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,14 +0,0 @@
|
||||
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
|
||||
index 43908a7..1a63d75 100644
|
||||
--- a/drivers/media/rc/ite-cir.c
|
||||
+++ b/drivers/media/rc/ite-cir.c
|
||||
@@ -1676,7 +1676,8 @@ static int ite_resume(struct pnp_dev *pdev)
|
||||
struct ite_dev *dev = pnp_get_drvdata(pdev);
|
||||
unsigned long flags;
|
||||
|
||||
- ite_dbg("%s called", __func__);
|
||||
+ ite_dbg("%s called (tx'ing: %s)", __func__,
|
||||
+ dev->transmitting ? "true" : "false");
|
||||
|
||||
spin_lock_irqsave(&dev->lock, flags);
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
|
||||
index 43908a7..8488e53 100644
|
||||
--- a/drivers/media/rc/ite-cir.c
|
||||
+++ b/drivers/media/rc/ite-cir.c
|
||||
@@ -1684,6 +1684,8 @@ static int ite_resume(struct pnp_dev *pdev)
|
||||
/* wake up the transmitter */
|
||||
wake_up_interruptible(&dev->tx_queue);
|
||||
} else {
|
||||
+ /* reinitialize hardware config registers */
|
||||
+ dev->params.init_hardware(dev);
|
||||
/* enable the receiver */
|
||||
dev->params.enable_rx(dev);
|
||||
}
|
||||
@@ -99,9 +99,9 @@ index baa25ad..abc5bd7 100644
|
||||
--- a/drivers/hid/hid-core.c
|
||||
+++ b/drivers/hid/hid-core.c
|
||||
@@ -1244,8 +1244,6 @@ static const struct hid_device_id hid_blacklist[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ACTIONSTAR, USB_DEVICE_ID_ACTIONSTAR_1011) },
|
||||
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
|
||||
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user