[LEDE-DEV] [PATCH v1 2/3] apm821xx: consolidate apm821xx device trees files

[Christian Lamparter]

On Saturday, November 12, 2016 9:53:19 AM CET Mathias Kresin wrote:
> 11.11.2016 18:08, Christian Lamparter:
> > diff --git a/target/linux/apm821xx/dts/apollo3g.dtsi b/target/linux/apm821xx/dts/apollo3g.dtsi
> > index 30a4dfe..853757b 100644
> > --- a/target/linux/apm821xx/dts/apollo3g.dtsi
> > +++ b/target/linux/apm821xx/dts/apollo3g.dtsi
> 
> <snip>
> 
> > +	gpio-leds {
> > +		compatible = "gpio-leds";
> >
> > -		SATA1: sata at bffd1800 {
> > -			compatible = "amcc,sata-460ex";
> > -			reg = <4 0xbffd1800 0x800>;
> > -			interrupt-parent = <&UIC0>;
> > -			interrupts = <27 4>;
> > -			dmas = <&AHBDMA 1 0 2>;
> > -			dma-names = "sata-dma";
> > +		power-red {
> > +			label = "mbl:red:power";
> > +			gpios = <&GPIO1 4 0>;
> > +			linux,default-trigger = "panic";
> >  		};
> >
> > -
> > -		USBOTG0: usbotg at bff80000 {
> > -			compatible = "snps,dwc2";
> > -			reg = <4 0xbff80000 0x10000>;
> > -			interrupt-parent = <&USBOTG0>;
> > -			interrupts = <0 1 2>;
> > -			#interrupt-cells = <1>;
> > -			#address-cells = <0>;
> > -			#size-cells = <0>;
> > -			interrupt-map = </* USB-OTG */ 0 &UIC2 0x1c 4
> > -					 /* HIGH-POWER */ 1 &UIC1 0x1a 8
> > -					 /* DMA */ 2 &UIC0 0xc 4>;
> > -			dr_mode = "host";
> > +		power-green {
> > +			label = "mbl:green:power";
> > +			gpios = <&GPIO1 5 0>;
> > +			linux,default-trigger = "default-on";
> 
> This one look wrong to me. Would you please fix this and use 
> default-state = "on" here[0].
Thanks. I removed it, these triggers came from a debian testing
dts. Since LEDE has out-of-the-box support for platform LEDs, 
these are not needed, since "mbl:green:power" is used as the
status LED.

> > -			gpio-leds {
> > -				compatible = "gpio-leds";
> > -				power-red {
> > -					label = "mbl:red:power";
> > -					gpios = <&gpio0 4 0>;
> > -					linux,default-trigger = "panic";
> > -				};
> > -				power-green {
> > -					label = "mbl:green:power";
> > -					gpios = <&gpio0 5 0>;
> > -					linux,default-trigger = "default-on";
> > -				};
> > -				power-blue {
> > -					label = "mbl:blue:power";
> > -					gpios = <&gpio0 6 0>;
> > -					linux,default-trigger = "disk-activity";
> 
> The patch fails do apply at this line. The default trigger is "cpu0" in 
> HEAD.
I removed this as well. The only default-trigger I left is the
panic LED. Ideally, this can be done via the panic-indicator
property [1]. however, there's no support for it in 4.4.

> Would you please send a patch based on HEAD without local modifications.
Yes, I'll submit v2 shortly.

Thanks,
Christian
 
> [0] 
> https://www.kernel.org/doc/Documentation/devicetree/bindings/leds/leds-gpio.txt
[1] <https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=80d6737b27bbdf64>