From: Stefan Riedmueller <s.riedmueller@phytec.de>
To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org,
mark.rutland@arm.com
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, martyn.welch@collabora.com,
kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com
Subject: [PATCH 04/10] ARM: dts: imx6ul: segin: Fix LED naming for phyCORE and PEB-EVAL-01
Date: Tue, 9 Jul 2019 09:19:21 +0200 [thread overview]
Message-ID: <1562656767-273566-5-git-send-email-s.riedmueller@phytec.de> (raw)
In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de>
Fix node name for the user LEDs to prevent the pinctrl of the phyCORE's
leds node from being overwritten. Also use more generic names for user
LEDs.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 3 +--
arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi | 16 +++++++++-------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
index 1b745582911c..73266b4a889b 100644
--- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
@@ -31,8 +31,7 @@
pinctrl-0 = <&pinctrl_gpioleds_som>;
compatible = "gpio-leds";
- led_green {
- label = "phycore:green";
+ phycore-green {
gpios = <&gpio5 4 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi
index e2f38f39a6ad..2f3fd32a1167 100644
--- a/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi
+++ b/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi
@@ -21,20 +21,22 @@
};
};
- user_leds: leds {
+ user_leds: user-leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_user_leds>;
status = "disabled";
- led_yellow {
- gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "default-on";
+ user-led1 {
+ gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "gpio";
+ default-state = "on";
};
- led_red {
- gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "default-on";
+ user-led2 {
+ gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "gpio";
+ default-state = "on";
};
};
};
--
2.7.4
next prev parent reply other threads:[~2019-07-09 7:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-09 7:19 [PATCH 00/10] Add further support for PHYTEC phyBOARD-Segin Stefan Riedmueller
2019-07-09 7:19 ` [PATCH 01/10] ARM: dts: imx6ul: phyboard-segin: Rename dts to PHYTEC name scheme Stefan Riedmueller
2019-07-09 7:19 ` [PATCH 02/10] ARM: dts: imx6ul: segin: Add boot media to dts filename Stefan Riedmueller
2019-07-23 3:10 ` Shawn Guo
2019-07-09 7:19 ` [PATCH 03/10] ARM: dts: imx6ul: segin: Reduce eth drive strength Stefan Riedmueller
2019-07-09 7:19 ` Stefan Riedmueller [this message]
2019-07-09 7:19 ` [PATCH 05/10] ARM: dts: imx6ul: segin: Make FEC and ethphy configurable in dts Stefan Riedmueller
2019-07-09 7:19 ` [PATCH 06/10] ARM: dts: imx6ul: segin: Only enable NAND if it is populated Stefan Riedmueller
2019-07-09 7:19 ` [PATCH 07/10] ARM: dts: imx6ul: phycore: Add eMMC at usdhc2 Stefan Riedmueller
2019-07-09 7:19 ` [PATCH 08/10] ARM: dts: imx6ul: segin: Move ECSPI interface to board include file Stefan Riedmueller
2019-07-09 7:19 ` [PATCH 09/10] ARM: dts: imx6ul: segin: Move machine include to dts files Stefan Riedmueller
2019-07-09 7:19 ` [PATCH 10/10] ARM: dts: imx6ull: Add support for PHYTEC phyBOARD-Segin with i.MX 6ULL Stefan Riedmueller
2019-07-23 5:39 ` [PATCH 00/10] Add further support for PHYTEC phyBOARD-Segin Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1562656767-273566-5-git-send-email-s.riedmueller@phytec.de \
--to=s.riedmueller@phytec.de \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=martyn.welch@collabora.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).