diff mbox

[OpenWrt-Devel] lantiq: P2812HNUFX - move usb leds to P2812HNU-F1

Message ID 1451036599-3964-1-git-send-email-openwrt@kresin.me
State Superseded, archived
Headers show

Commit Message

Mathias Kresin Dec. 25, 2015, 9:43 a.m. UTC
The P2812HNU-F3 doesn't have usb leds. Only the P2812HNU-F1 has those
leds.

Reported-by: Sylwester Petela <sscapi@gmail.com>
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
---

Hi John,

I received the report yesterday and till now, I didn't had the time to
send a v3 "switch to devicename:colour:function naming scheme" patch
series.

Since the series is already accepted in patchwork, I'm sending this
fix afterwards.

 target/linux/lantiq/dts/P2812HNUF1.dts  | 18 ++++++++++++++++++
 target/linux/lantiq/dts/P2812HNUFX.dtsi | 10 ----------
 2 files changed, 18 insertions(+), 10 deletions(-)

Comments

John Crispin Dec. 25, 2015, 3:29 p.m. UTC | #1
On 25/12/2015 10:43, Mathias Kresin wrote:
> The P2812HNU-F3 doesn't have usb leds. Only the P2812HNU-F1 has those
> leds.
> 
> Reported-by: Sylwester Petela <sscapi@gmail.com>
> Signed-off-by: Mathias Kresin <openwrt@kresin.me>
> ---
> 
> Hi John,
> 
> I received the report yesterday and till now, I didn't had the time to
> send a v3 "switch to devicename:colour:function naming scheme" patch
> series.
> 
> Since the series is already accepted in patchwork, I'm sending this
> fix afterwards.
> 

ok, i  will fold it to the existing patches. i'll get round to pushing
later on today once i have gone over some other patches.

	John

>  target/linux/lantiq/dts/P2812HNUF1.dts  | 18 ++++++++++++++++++
>  target/linux/lantiq/dts/P2812HNUFX.dtsi | 10 ----------
>  2 files changed, 18 insertions(+), 10 deletions(-)
> 
> diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/dts/P2812HNUF1.dts
> index 4dcaf27..113868e 100644
> --- a/target/linux/lantiq/dts/P2812HNUF1.dts
> +++ b/target/linux/lantiq/dts/P2812HNUF1.dts
> @@ -5,6 +5,13 @@
>  / {
>  	model = "P2812HNUF1 - ZyXEL P-2812HNU-F1";
>  
> +	chosen {
> +		leds {
> +			usb = &usb1;
> +			usb2 = &usb2;
> +		};
> +	};
> +
>  	fpi@10000000 {
>  		localbus@0 {
>  			nand-parts@0 {
> @@ -42,4 +49,15 @@
>  		compatible = "ralink,eeprom";
>  		ralink,eeprom = "RT3062.eeprom";
>  	};
> +
> +	gpio-leds {
> +		usb1: usb1 {
> +			label = "p2812hnufx:green:usb1";
> +			gpios = <&gpio 38 1>;
> +		};
> +		usb2: usb2 {
> +			label = "p2812hnufx:green:usb2";
> +			gpios = <&gpio 44 1>;
> +		};
> +	};
>  };
> diff --git a/target/linux/lantiq/dts/P2812HNUFX.dtsi b/target/linux/lantiq/dts/P2812HNUFX.dtsi
> index a626e69..06636a5 100644
> --- a/target/linux/lantiq/dts/P2812HNUFX.dtsi
> +++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi
> @@ -11,8 +11,6 @@
>  
>  			dsl = &dsl_green;
>  			internet = &internet_green;
> -			usb = &usb1;
> -			usb2 = &usb2;
>  			wifi = &wireless_green;
>  		};
>  	};
> @@ -308,14 +306,6 @@
>  			gpios = <&stp 23 1>;
>  			default-state = "keep";
>  		};
> -		usb1: usb1 {
> -			label = "p2812hnufx:green:usb1";
> -			gpios = <&gpio 38 1>;
> -		};
> -		usb2: usb2 {
> -			label = "p2812hnufx:green:usb2";
> -			gpios = <&gpio 44 1>;
> -		};
>  		phone1 {
>  			label = "p2812hnufx:green:phone";
>  			gpios = <&gpio 11 1>;
>
diff mbox

Patch

diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/dts/P2812HNUF1.dts
index 4dcaf27..113868e 100644
--- a/target/linux/lantiq/dts/P2812HNUF1.dts
+++ b/target/linux/lantiq/dts/P2812HNUF1.dts
@@ -5,6 +5,13 @@ 
 / {
 	model = "P2812HNUF1 - ZyXEL P-2812HNU-F1";
 
+	chosen {
+		leds {
+			usb = &usb1;
+			usb2 = &usb2;
+		};
+	};
+
 	fpi@10000000 {
 		localbus@0 {
 			nand-parts@0 {
@@ -42,4 +49,15 @@ 
 		compatible = "ralink,eeprom";
 		ralink,eeprom = "RT3062.eeprom";
 	};
+
+	gpio-leds {
+		usb1: usb1 {
+			label = "p2812hnufx:green:usb1";
+			gpios = <&gpio 38 1>;
+		};
+		usb2: usb2 {
+			label = "p2812hnufx:green:usb2";
+			gpios = <&gpio 44 1>;
+		};
+	};
 };
diff --git a/target/linux/lantiq/dts/P2812HNUFX.dtsi b/target/linux/lantiq/dts/P2812HNUFX.dtsi
index a626e69..06636a5 100644
--- a/target/linux/lantiq/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi
@@ -11,8 +11,6 @@ 
 
 			dsl = &dsl_green;
 			internet = &internet_green;
-			usb = &usb1;
-			usb2 = &usb2;
 			wifi = &wireless_green;
 		};
 	};
@@ -308,14 +306,6 @@ 
 			gpios = <&stp 23 1>;
 			default-state = "keep";
 		};
-		usb1: usb1 {
-			label = "p2812hnufx:green:usb1";
-			gpios = <&gpio 38 1>;
-		};
-		usb2: usb2 {
-			label = "p2812hnufx:green:usb2";
-			gpios = <&gpio 44 1>;
-		};
 		phone1 {
 			label = "p2812hnufx:green:phone";
 			gpios = <&gpio 11 1>;