6918ea2484
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 9f49a38c6a2e2966982f307fab54c8a27f88d13b Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Thu, 19 Dec 2013 18:05:31 +0000
|
|
Subject: [PATCH 130/196] 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(+)
|
|
|
|
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
|
|
index 90debb4..46586d8 100644
|
|
--- 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);
|
|
--
|
|
1.9.1
|
|
|