From: Rafał Miłecki Date: Tue, 3 Mar 2015 23:15:55 +0000 (+0000) Subject: bcm53xx: switch to IRQ buttons (keys) X-Git-Tag: reboot~4130 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c2cf1abf8f3d1a4a16d44000c8823213d009081b;p=openwrt%2Fstaging%2Fchunkeey.git bcm53xx: switch to IRQ buttons (keys) Now bcma provides IRQ domain we don't have to poll anymore. Signed-off-by: Rafał Miłecki SVN-Revision: 44596 --- diff --git a/target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch b/target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch deleted file mode 100644 index 35cbb695a6..0000000000 --- a/target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 983e3532c2de15df70aaf80b8906be2d0734dc37 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Fri, 5 Dec 2014 12:16:12 +0100 -Subject: [PATCH] ARM: BCM5301X: Switch DT files to "gpio-keys-polled" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We don't support GPIO interrupts yet, so use this as a workaround. - -Signed-off-by: Rafał Miłecki ---- - arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 2 +- - arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- - arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 2 +- - arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 2 +- - arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - ---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -92,9 +92,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - restart { - label = "Reset"; ---- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -@@ -69,9 +69,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - wps { - label = "WPS"; ---- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -@@ -59,9 +59,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - wps { - label = "WPS"; ---- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -@@ -59,9 +59,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - restart { - label = "Reset"; ---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -@@ -92,9 +92,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - aoss { - label = "AOSS"; ---- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -@@ -47,9 +47,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - restart { - label = "Reset"; ---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -@@ -25,9 +25,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - restart { - label = "Reset"; diff --git a/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch b/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch index ceff9e121c..fe7e0a1607 100644 --- a/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch +++ b/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch @@ -31,7 +31,7 @@ Signed-off-by: Rafał Miłecki + }; + gpio-keys { - compatible = "gpio-keys-polled"; + compatible = "gpio-keys"; #address-cells = <1>; --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts @@ -126,7 +126,7 @@ Signed-off-by: Rafał Miłecki + }; + gpio-keys { - compatible = "gpio-keys-polled"; + compatible = "gpio-keys"; #address-cells = <1>; --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts diff --git a/target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch b/target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch deleted file mode 100644 index 35cbb695a6..0000000000 --- a/target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 983e3532c2de15df70aaf80b8906be2d0734dc37 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Fri, 5 Dec 2014 12:16:12 +0100 -Subject: [PATCH] ARM: BCM5301X: Switch DT files to "gpio-keys-polled" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We don't support GPIO interrupts yet, so use this as a workaround. - -Signed-off-by: Rafał Miłecki ---- - arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 2 +- - arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- - arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 2 +- - arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 2 +- - arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - ---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -92,9 +92,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - restart { - label = "Reset"; ---- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -@@ -69,9 +69,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - wps { - label = "WPS"; ---- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -@@ -59,9 +59,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - wps { - label = "WPS"; ---- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -@@ -59,9 +59,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - restart { - label = "Reset"; ---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -@@ -92,9 +92,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - aoss { - label = "AOSS"; ---- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -@@ -47,9 +47,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - restart { - label = "Reset"; ---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -@@ -25,9 +25,10 @@ - }; - - gpio-keys { -- compatible = "gpio-keys"; -+ compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; -+ poll-interval = <200>; - - restart { - label = "Reset"; diff --git a/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch b/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch index a237bacdd8..8782341507 100644 --- a/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch +++ b/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch @@ -126,7 +126,7 @@ Signed-off-by: Rafał Miłecki + }; + gpio-keys { - compatible = "gpio-keys-polled"; + compatible = "gpio-keys"; #address-cells = <1>; --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts