mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-10-31 14:04:26 -04:00 
			
		
		
		
	
		
			
				
	
	
		
			913 lines
		
	
	
		
			23 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			913 lines
		
	
	
		
			23 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From c5aec5611aec8fb1ca68f68e41acaefccfc93c16 Mon Sep 17 00:00:00 2001
 | |
| From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 | |
| Date: Thu, 9 Jun 2022 13:39:30 +0200
 | |
| Subject: [PATCH] ARM: dts: broadcom: align gpio-key node names with dtschema
 | |
| 
 | |
| The node names should be generic and DT schema expects certain pattern
 | |
| (e.g. with key/button/switch).
 | |
| 
 | |
| Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 | |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 | |
| ---
 | |
|  arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts          |  6 +++---
 | |
|  arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts          |  8 ++++----
 | |
|  .../boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 10 +++++-----
 | |
|  arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts    | 10 +++++-----
 | |
|  arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts      |  4 ++--
 | |
|  arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts      |  4 ++--
 | |
|  arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts         |  2 +-
 | |
|  arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts         |  2 +-
 | |
|  arch/arm/boot/dts/bcm4708-netgear-r6250.dts          |  6 +++---
 | |
|  arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts       |  6 +++---
 | |
|  arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts        |  6 +++---
 | |
|  arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts          |  4 ++--
 | |
|  arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts   |  8 ++++----
 | |
|  arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts    |  2 +-
 | |
|  arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts        |  2 +-
 | |
|  arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts        |  2 +-
 | |
|  arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts   |  4 ++--
 | |
|  arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts          |  4 ++--
 | |
|  arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts    | 12 ++++++------
 | |
|  arch/arm/boot/dts/bcm4709-linksys-ea9200.dts         |  4 ++--
 | |
|  arch/arm/boot/dts/bcm4709-netgear-r7000.dts          |  6 +++---
 | |
|  arch/arm/boot/dts/bcm4709-netgear-r8000.dts          |  8 ++++----
 | |
|  arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts    |  4 ++--
 | |
|  arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts         |  8 ++++----
 | |
|  arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts        |  6 +++---
 | |
|  arch/arm/boot/dts/bcm47094-linksys-panamera.dts      |  6 +++---
 | |
|  arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts        |  2 +-
 | |
|  arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts        |  2 +-
 | |
|  arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts        |  2 +-
 | |
|  arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts        |  2 +-
 | |
|  arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts        |  2 +-
 | |
|  arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts     |  2 +-
 | |
|  arch/arm/boot/dts/bcm47094-netgear-r8500.dts         |  8 ++++----
 | |
|  arch/arm/boot/dts/bcm47094-phicomm-k3.dts            |  2 +-
 | |
|  arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts        |  2 +-
 | |
|  arch/arm/boot/dts/bcm47189-luxul-xap-810.dts         |  2 +-
 | |
|  arch/arm/boot/dts/bcm47189-tenda-ac9.dts             |  6 +++---
 | |
|  arch/arm/boot/dts/bcm53016-meraki-mr32.dts           |  2 +-
 | |
|  arch/arm/boot/dts/bcm911360_entphn.dts               |  4 ++--
 | |
|  arch/arm/boot/dts/bcm947189acdbmr.dts                |  4 ++--
 | |
|  arch/arm/boot/dts/bcm953012er.dts                    |  4 ++--
 | |
|  arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi        |  2 +-
 | |
|  arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi      |  2 +-
 | |
|  43 files changed, 97 insertions(+), 97 deletions(-)
 | |
| 
 | |
| --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 | |
| @@ -70,19 +70,19 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
 | |
| @@ -54,25 +54,25 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		brightness {
 | |
| +		button-brightness {
 | |
|  			label = "Backlight";
 | |
|  			linux,code = <KEY_BRIGHTNESS_ZERO>;
 | |
|  			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
 | |
| +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
 | |
| @@ -104,33 +104,33 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		aoss {
 | |
| +		button-aoss {
 | |
|  			label = "AOSS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
|  		/* Commit mode set by switch? */
 | |
| -		mode {
 | |
| +		button-mode {
 | |
|  			label = "Mode";
 | |
|  			linux,code = <KEY_SETUP>;
 | |
|  			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
|  		/* Switch: AP mode */
 | |
| -		sw_ap {
 | |
| +		button-sw-ap {
 | |
|  			label = "AP";
 | |
|  			linux,code = <BTN_0>;
 | |
|  			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		eject {
 | |
| +		button-eject {
 | |
|  			label = "USB eject";
 | |
|  			linux,code = <KEY_EJECTCD>;
 | |
|  			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 | |
| @@ -100,33 +100,33 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		aoss {
 | |
| +		button-aoss {
 | |
|  			label = "AOSS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
|  		/* Commit mode set by switch? */
 | |
| -		mode {
 | |
| +		button-mode {
 | |
|  			label = "Mode";
 | |
|  			linux,code = <KEY_SETUP>;
 | |
|  			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
|  		/* Switch: AP mode */
 | |
| -		sw_ap {
 | |
| +		button-sw-ap {
 | |
|  			label = "AP";
 | |
|  			linux,code = <BTN_0>;
 | |
|  			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		eject {
 | |
| +		button-eject {
 | |
|  			label = "USB eject";
 | |
|  			linux,code = <KEY_EJECTCD>;
 | |
|  			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
 | |
| @@ -29,13 +29,13 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
 | |
| @@ -25,13 +25,13 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
 | |
| @@ -45,7 +45,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
 | |
| @@ -52,7 +52,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 | |
| @@ -63,19 +63,19 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 | |
| @@ -59,19 +59,19 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 | |
| @@ -94,19 +94,19 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
 | |
| @@ -60,13 +60,13 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
 | |
| @@ -91,26 +91,26 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		aoss {
 | |
| +		button-aoss {
 | |
|  			label = "AOSS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
|  		/* Switch device mode? */
 | |
| -		mode {
 | |
| +		button-mode {
 | |
|  			label = "Mode";
 | |
|  			linux,code = <KEY_SETUP>;
 | |
|  			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		eject {
 | |
| +		button-eject {
 | |
|  			label = "USB eject";
 | |
|  			linux,code = <KEY_EJECTCD>;
 | |
|  			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
 | |
| @@ -96,7 +96,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
 | |
| @@ -45,7 +45,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
 | |
| @@ -94,7 +94,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
 | |
| @@ -77,13 +77,13 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
 | |
| @@ -50,13 +50,13 @@
 | |
|  		#address-cells = <1>;
 | |
|  		#size-cells = <0>;
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 | |
| @@ -80,39 +80,39 @@
 | |
|  		#address-cells = <1>;
 | |
|  		#size-cells = <0>;
 | |
|  
 | |
| -		power {
 | |
| +		button-power {
 | |
|  			label = "Power";
 | |
|  			linux,code = <KEY_POWER>;
 | |
|  			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		aoss {
 | |
| +		button-aoss {
 | |
|  			label = "AOSS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
|  		/* Commit mode set by switch? */
 | |
| -		mode {
 | |
| +		button-mode {
 | |
|  			label = "Mode";
 | |
|  			linux,code = <KEY_SETUP>;
 | |
|  			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
|  		/* Switch: AP mode */
 | |
| -		sw_ap {
 | |
| +		button-sw-ap {
 | |
|  			label = "AP";
 | |
|  			linux,code = <BTN_0>;
 | |
|  			gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		eject {
 | |
| +		button-eject {
 | |
|  			label = "USB eject";
 | |
|  			linux,code = <KEY_EJECTCD>;
 | |
|  			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
 | |
| @@ -32,13 +32,13 @@
 | |
|  		#address-cells = <1>;
 | |
|  		#size-cells = <0>;
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
 | |
| @@ -75,19 +75,19 @@
 | |
|  		#address-cells = <1>;
 | |
|  		#size-cells = <0>;
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
 | |
| @@ -102,25 +102,25 @@
 | |
|  		#address-cells = <1>;
 | |
|  		#size-cells = <0>;
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		brightness {
 | |
| +		button-brightness {
 | |
|  			label = "Backlight";
 | |
|  			linux,code = <KEY_BRIGHTNESS_ZERO>;
 | |
|  			gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
 | |
| +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
 | |
| @@ -80,13 +80,13 @@
 | |
|  		#address-cells = <1>;
 | |
|  		#size-cells = <0>;
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
 | |
| @@ -72,25 +72,25 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		reset {
 | |
| +		button-reset {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		wifi {
 | |
| +		button-wifi {
 | |
|  			label = "Wi-Fi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		led {
 | |
| +		button-led {
 | |
|  			label = "Backlight";
 | |
|  			linux,code = <KEY_BRIGHTNESS_ZERO>;
 | |
|  			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
 | |
| @@ -86,20 +86,20 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
|  		/* Switch: router / extender */
 | |
| -		extender {
 | |
| +		button-extender {
 | |
|  			label = "Extender";
 | |
|  			linux,code = <BTN_0>;
 | |
|  			gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
 | |
| @@ -30,19 +30,19 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  				label = "WiFi";
 | |
|  				linux,code = <KEY_RFKILL>;
 | |
|  				gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		reset {
 | |
| +		button-reset {
 | |
|  				label = "Reset";
 | |
|  				linux,code = <KEY_RESTART>;
 | |
|  				gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
 | |
| @@ -49,7 +49,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
 | |
| @@ -43,7 +43,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
 | |
| @@ -49,7 +49,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
 | |
| @@ -37,7 +37,7 @@
 | |
|  		#address-cells = <1>;
 | |
|  		#size-cells = <0>;
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
 | |
| @@ -89,7 +89,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
 | |
| @@ -67,7 +67,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
 | |
| @@ -65,25 +65,25 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		brightness {
 | |
| +		button-brightness {
 | |
|  			label = "Backlight";
 | |
|  			linux,code = <KEY_BRIGHTNESS_ZERO>;
 | |
|  			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
 | |
| @@ -22,7 +22,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
 | |
| @@ -39,7 +39,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
 | |
| @@ -49,7 +49,7 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
 | |
| +++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
 | |
| @@ -59,19 +59,19 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		rfkill {
 | |
| +		button-rfkill {
 | |
|  			label = "WiFi";
 | |
|  			linux,code = <KEY_RFKILL>;
 | |
|  			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
 | |
| +++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
 | |
| @@ -50,7 +50,7 @@
 | |
|  		#address-cells = <1>;
 | |
|  		#size-cells = <0>;
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 21 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm911360_entphn.dts
 | |
| +++ b/arch/arm/boot/dts/bcm911360_entphn.dts
 | |
| @@ -47,10 +47,10 @@
 | |
|  		stdout-path = "serial0:115200n8";
 | |
|  	};
 | |
|  
 | |
| -	gpio_keys {
 | |
| +	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		hook {
 | |
| +		button-hook {
 | |
|  			label = "HOOK";
 | |
|  			linux,code = <KEY_O>;
 | |
|  			gpios = <&gpio_asiu 48 0>;
 | |
| --- a/arch/arm/boot/dts/bcm947189acdbmr.dts
 | |
| +++ b/arch/arm/boot/dts/bcm947189acdbmr.dts
 | |
| @@ -44,13 +44,13 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
 | |
|  		};
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm953012er.dts
 | |
| +++ b/arch/arm/boot/dts/bcm953012er.dts
 | |
| @@ -47,13 +47,13 @@
 | |
|  	gpio-keys {
 | |
|  		compatible = "gpio-keys";
 | |
|  
 | |
| -		wps {
 | |
| +		button-wps {
 | |
|  			label = "WPS";
 | |
|  			linux,code = <KEY_WPS_BUTTON>;
 | |
|  			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
 | |
|  		};
 | |
|  
 | |
| -		restart {
 | |
| +		button-restart {
 | |
|  			label = "Reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
 | |
| +++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
 | |
| @@ -13,7 +13,7 @@
 | |
|  		autorepeat;
 | |
|  		poll-interval = <20>;
 | |
|  
 | |
| -		reset {
 | |
| +		button-reset {
 | |
|  			label = "reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&gpioa 8 GPIO_ACTIVE_LOW>;
 | |
| --- a/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
 | |
| +++ b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
 | |
| @@ -14,7 +14,7 @@
 | |
|  		autorepeat;
 | |
|  		poll-interval = <20>;
 | |
|  
 | |
| -		reset {
 | |
| +		button-reset {
 | |
|  			label = "reset";
 | |
|  			linux,code = <KEY_RESTART>;
 | |
|  			gpios = <&gpioa 6 GPIO_ACTIVE_LOW>;
 |