11.11.2016 18:08, Christian Lamparter:
This patch moves the common SoC device tree entries
from the currently four supported platforms into a
common apm82181.dtsi.

Furthermore, this patch also changes the GPIO and INPUT
definitions of the supported platforms to use the defined
dt-bindings MACROs for GPIO_ACTIVE_LOW|HIGH and
KEY_WPS|RESTART|* when it's appropriate.

Signed-off-by: Christian Lamparter <chunk...@gmail.com>
---
 target/linux/apm821xx/dts/MR24.dts         | 472 +++------------
 target/linux/apm821xx/dts/apm82181.dtsi    | 466 +++++++++++++++
 target/linux/apm821xx/dts/apollo3g-duo.dts |  19 +
 target/linux/apm821xx/dts/apollo3g.dts     |  18 -
 target/linux/apm821xx/dts/apollo3g.dtsi    | 571 ++++--------------
 target/linux/apm821xx/dts/wndr4700.dts     | 915 +++++++++--------------------
 6 files changed, 989 insertions(+), 1472 deletions(-)
 create mode 100644 target/linux/apm821xx/dts/apm82181.dtsi


<snip>

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@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@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].

-                       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.

Would you please send a patch based on HEAD without local modifications.

Mathias

[0] https://www.kernel.org/doc/Documentation/devicetree/bindings/leds/leds-gpio.txt

_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Reply via email to