aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/0130-1-wire-Add-support-for-configuring-pin-for-w1-gpio-k.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-02-28 20:30:08 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-02-28 20:30:08 +0000
commitbb39b8d99aae1f7eb13a97bd874838da91080de6 (patch)
tree3046f53937c0bc5dc13e2b2ab7b688a1932199bf /target/linux/brcm2708/patches-3.10/0130-1-wire-Add-support-for-configuring-pin-for-w1-gpio-k.patch
parentc6c0d09f85c211560a1405441925681cfa25e8b1 (diff)
downloadupstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.gz
upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.bz2
upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.zip
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y rebased against linux-3.10.y stable (3.10.32). This should hopefully make it easier for us in the future to leverage the raspberry/rpi-* branches. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 39770
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0130-1-wire-Add-support-for-configuring-pin-for-w1-gpio-k.patch')
-rw-r--r--target/linux/brcm2708/patches-3.10/0130-1-wire-Add-support-for-configuring-pin-for-w1-gpio-k.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0130-1-wire-Add-support-for-configuring-pin-for-w1-gpio-k.patch b/target/linux/brcm2708/patches-3.10/0130-1-wire-Add-support-for-configuring-pin-for-w1-gpio-k.patch
new file mode 100644
index 0000000000..30c0128475
--- /dev/null
+++ b/target/linux/brcm2708/patches-3.10/0130-1-wire-Add-support-for-configuring-pin-for-w1-gpio-k.patch
@@ -0,0 +1,33 @@
+From 539f6945d211e91b73bd098b11270beb766c8475 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Thu, 19 Dec 2013 18:05:31 +0000
+Subject: [PATCH 130/174] 1-wire: Add support for configuring pin for w1-gpio
+ kernel module See: https://github.com/raspberrypi/linux/pull/457
+
+---
+ arch/arm/mach-bcm2708/bcm2708.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/arch/arm/mach-bcm2708/bcm2708.c
++++ b/arch/arm/mach-bcm2708/bcm2708.c
+@@ -84,6 +84,7 @@
+ static unsigned boardrev, serial;
+ static unsigned uart_clock;
+ static unsigned reboot_part = 0;
++static unsigned w1_gpio_pin = W1_GPIO;
+
+ static void __init bcm2708_init_led(void);
+
+@@ -766,6 +767,7 @@ void __init bcm2708_init(void)
+ bcm_register_device(&bcm2708_gpio_device);
+ #endif
+ #if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
++ w1_gpio_pdata.pin = w1_gpio_pin;
+ platform_device_register(&w1_device);
+ #endif
+ bcm_register_device(&bcm2708_systemtimer_device);
+@@ -983,3 +985,4 @@ module_param(boardrev, uint, 0644);
+ module_param(serial, uint, 0644);
+ module_param(uart_clock, uint, 0644);
+ module_param(reboot_part, uint, 0644);
++module_param(w1_gpio_pin, uint, 0644);