From 65731a0a8ebd0ecc5ff61b945bb80350b0ceb1e6 Mon Sep 17 00:00:00 2001 From: jow Date: Thu, 2 May 2013 11:46:53 +0000 Subject: atheros: remove static gpio_request() from board setup and include generic kmod-gpio-button-hotplug instead. This change is based on a patch by Karl Palsson See http://patchwork.openwrt.org/patch/3536/. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36513 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/atheros/Makefile | 4 ++-- target/linux/atheros/patches-3.8/100-board.patch | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index c7e9f84e4..1748f2447 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,7 +15,7 @@ LINUX_VERSION:=3.8.11 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += wpad-mini kmod-ath5k swconfig +DEFAULT_PACKAGES += wpad-mini kmod-ath5k swconfig kmod-gpio-button-hotplug define Target/Description Build firmware images for Atheros SoC boards diff --git a/target/linux/atheros/patches-3.8/100-board.patch b/target/linux/atheros/patches-3.8/100-board.patch index 56c1f6943..8663156ad 100644 --- a/target/linux/atheros/patches-3.8/100-board.patch +++ b/target/linux/atheros/patches-3.8/100-board.patch @@ -2106,7 +2106,7 @@ + --- /dev/null +++ b/arch/mips/ar231x/ar2315.c -@@ -0,0 +1,694 @@ +@@ -0,0 +1,692 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive @@ -2789,8 +2789,6 @@ + if (!is_2315()) + return; + -+ gpio_request(AR2315_RESET_GPIO, "reset"); -+ + /* Clear any lingering AHB errors */ + config = read_c0_config(); + write_c0_config(config & ~0x3); -- cgit v1.2.3