提交 3c563a78 编写于 作者: S Stefan Wahren 提交者: Zheng Zengkai

ARM: dts: bcm283x: Fix up GPIO LED node names

stable inclusion
from stable-5.10.53
commit fc71d8df58070018fc013b091ed60cc464fd6313
bugzilla: 175574 https://gitee.com/openeuler/kernel/issues/I4DTUX

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fc71d8df58070018fc013b091ed60cc464fd6313

--------------------------------

[ Upstream commit 5f30dacf ]

Fix the node names for the GPIO LEDs to conform to the standard node
name led-..
Signed-off-by: NStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1622981777-5023-6-git-send-email-stefan.wahren@i2se.comSigned-off-by: NNicolas Saenz Julienne <nsaenz@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 d1d91893
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
}; };
pwr { led-pwr {
label = "PWR"; label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep"; default-state = "keep";
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
}; };
pwr { led-pwr {
label = "PWR"; label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep"; default-state = "keep";
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
}; };
}; };
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
}; };
pwr { led-pwr {
label = "PWR"; label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep"; default-state = "keep";
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
}; };
}; };
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
}; };
}; };
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
/ { / {
leds { leds {
act { led-act {
gpios = <&gpio 47 GPIO_ACTIVE_LOW>; gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
}; };
}; };
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 47 GPIO_ACTIVE_LOW>; gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
}; };
}; };
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
act { led-act {
label = "ACT"; label = "ACT";
default-state = "keep"; default-state = "keep";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
}; };
pwr { led-pwr {
label = "PWR"; label = "PWR";
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
default-state = "keep"; default-state = "keep";
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>; gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
}; };
pwr { led-pwr {
label = "PWR"; label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep"; default-state = "keep";
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
}; };
leds { leds {
act { led-act {
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>; gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
}; };
pwr { led-pwr {
label = "PWR"; label = "PWR";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
default-state = "keep"; default-state = "keep";
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
}; };
leds { leds {
act { led-act {
gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>; gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* Since there is no upstream GPIO driver yet, * Since there is no upstream GPIO driver yet,
* remove the incomplete node. * remove the incomplete node.
*/ */
/delete-node/ act; /delete-node/ led-act;
}; };
reg_3v3: fixed-regulator { reg_3v3: fixed-regulator {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册