aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.18/0097-bcm2709-Port-pps-gpio-and-i2c-patches.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-02-13 07:38:27 +0000
committerJohn Crispin <blogic@openwrt.org>2015-02-13 07:38:27 +0000
commit50a4aa688be2e05464d250686df0d4272b3c8c17 (patch)
tree2b2acdd9795e115eaece266c0323367885de17bd /target/linux/brcm2708/patches-3.18/0097-bcm2709-Port-pps-gpio-and-i2c-patches.patch
parentdb3443e8953c04280ecfefba9b36aed9176c4abc (diff)
downloadmaster-187ad058-50a4aa688be2e05464d250686df0d4272b3c8c17.tar.gz
master-187ad058-50a4aa688be2e05464d250686df0d4272b3c8c17.tar.bz2
master-187ad058-50a4aa688be2e05464d250686df0d4272b3c8c17.zip
brcm2708: refresh patches
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44433 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0097-bcm2709-Port-pps-gpio-and-i2c-patches.patch')
-rw-r--r--[-rwxr-xr-x]target/linux/brcm2708/patches-3.18/0097-bcm2709-Port-pps-gpio-and-i2c-patches.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0097-bcm2709-Port-pps-gpio-and-i2c-patches.patch b/target/linux/brcm2708/patches-3.18/0097-bcm2709-Port-pps-gpio-and-i2c-patches.patch
index 2b12829eac..ff3973de0f 100755..100644
--- a/target/linux/brcm2708/patches-3.18/0097-bcm2709-Port-pps-gpio-and-i2c-patches.patch
+++ b/target/linux/brcm2708/patches-3.18/0097-bcm2709-Port-pps-gpio-and-i2c-patches.patch
@@ -7,8 +7,6 @@ Subject: [PATCH 097/114] bcm2709: Port pps-gpio and i2c patches
arch/arm/mach-bcm2709/bcm2709.c | 41 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 39 insertions(+), 2 deletions(-)
-diff --git a/arch/arm/mach-bcm2709/bcm2709.c b/arch/arm/mach-bcm2709/bcm2709.c
-index 5d73b73..f009aeb 100644
--- a/arch/arm/mach-bcm2709/bcm2709.c
+++ b/arch/arm/mach-bcm2709/bcm2709.c
@@ -37,6 +37,7 @@
@@ -28,7 +26,7 @@ index 5d73b73..f009aeb 100644
static unsigned use_dt = 0;
-@@ -283,6 +286,19 @@ static struct platform_device w1_device = {
+@@ -283,6 +286,19 @@ static struct platform_device w1_device
};
#endif
@@ -83,7 +81,7 @@ index 5d73b73..f009aeb 100644
#if defined(CONFIG_SND_BCM2708_SOC_I2S) || defined(CONFIG_SND_BCM2708_SOC_I2S_MODULE)
bcm_register_device_dt(&bcm2708_i2s_device);
-@@ -1245,3 +1278,7 @@ module_param(disk_led_active_low, uint, 0644);
+@@ -1245,3 +1278,7 @@ module_param(disk_led_active_low, uint,
module_param(reboot_part, uint, 0644);
module_param(w1_gpio_pin, uint, 0644);
module_param(w1_gpio_pullup, uint, 0644);
@@ -91,6 +89,3 @@ index 5d73b73..f009aeb 100644
+MODULE_PARM_DESC(pps_gpio_pin, "Set GPIO pin to reserve for PPS");
+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
-