summaryrefslogtreecommitdiff
path: root/target/linux/brcm2708/patches-3.18/0080-I2C-Only-register-the-I2C-device-for-the-current-boa.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0080-I2C-Only-register-the-I2C-device-for-the-current-boa.patch')
-rwxr-xr-xtarget/linux/brcm2708/patches-3.18/0080-I2C-Only-register-the-I2C-device-for-the-current-boa.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0080-I2C-Only-register-the-I2C-device-for-the-current-boa.patch b/target/linux/brcm2708/patches-3.18/0080-I2C-Only-register-the-I2C-device-for-the-current-boa.patch
new file mode 100755
index 0000000..aba4202
--- /dev/null
+++ b/target/linux/brcm2708/patches-3.18/0080-I2C-Only-register-the-I2C-device-for-the-current-boa.patch
@@ -0,0 +1,49 @@
+From 6a63fb6bd7120af9a760fa0f2db9461bfcf29791 Mon Sep 17 00:00:00 2001
+From: Serge Schneider <serge@raspberrypi.org>
+Date: Wed, 3 Sep 2014 14:44:22 +0100
+Subject: [PATCH 080/114] I2C: Only register the I2C device for the current
+ board revision
+
+---
+ arch/arm/mach-bcm2708/bcm2708.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
+index 2c6a29d..b36037b 100644
+--- a/arch/arm/mach-bcm2708/bcm2708.c
++++ b/arch/arm/mach-bcm2708/bcm2708.c
+@@ -93,6 +93,7 @@ static unsigned disk_led_active_low = 1;
+ static unsigned reboot_part = 0;
+ static unsigned w1_gpio_pin = W1_GPIO;
+ static unsigned w1_gpio_pullup = W1_PULLUP;
++static bool vc_i2c_override = false;
+
+ static unsigned use_dt = 0;
+
+@@ -862,8 +863,15 @@ void __init bcm2708_init(void)
+ bcm_register_device(&bcm2835_thermal_device);
+
+ bcm_register_device_dt(&bcm2708_spi_device);
+- bcm_register_device_dt(&bcm2708_bsc0_device);
+- bcm_register_device_dt(&bcm2708_bsc1_device);
++
++ if (vc_i2c_override) {
++ bcm_register_device_dt(&bcm2708_bsc0_device);
++ bcm_register_device_dt(&bcm2708_bsc1_device);
++ } else if ((boardrev & 0xffffff) == 0x2 || (boardrev & 0xffffff) == 0x3) {
++ bcm_register_device_dt(&bcm2708_bsc0_device);
++ } else {
++ bcm_register_device_dt(&bcm2708_bsc1_device);
++ }
+
+ #if defined(CONFIG_SND_BCM2708_SOC_I2S) || defined(CONFIG_SND_BCM2708_SOC_I2S_MODULE)
+ bcm_register_device_dt(&bcm2708_i2s_device);
+@@ -1093,3 +1101,5 @@ module_param(disk_led_active_low, uint, 0644);
+ module_param(reboot_part, uint, 0644);
+ module_param(w1_gpio_pin, uint, 0644);
+ module_param(w1_gpio_pullup, uint, 0644);
++module_param(vc_i2c_override, bool, 0644);
++MODULE_PARM_DESC(vc_i2c_override, "Allow the use of VC's I2C peripheral.");
+--
+1.8.3.2
+