diff mbox

ARM: dts: imx27-phytec-phycore-*: Add diagnostic PMIC LEDs

Message ID 1392464118-3353-1-git-send-email-shc_work@mail.ru (mailing list archive)
State New, archived
Headers show

Commit Message

Alexander Shiyan Feb. 15, 2014, 11:35 a.m. UTC
PCM-038 module have three triple LEDs connected to PMIC which
can be used for diagnostic purposes. This patch adds support
for these LEDs for PCM-038 SOM and adds basic LED-triggers for
these LEDs for PCM-970 RDK, the remaining LEDs are available
for use from userspace.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts  | 50 +++++++++++++++++++++++++
 arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi |  6 +++
 2 files changed, 56 insertions(+)

Comments

Shawn Guo Feb. 17, 2014, 2:55 a.m. UTC | #1
On Sat, Feb 15, 2014 at 03:35:18PM +0400, Alexander Shiyan wrote:
> PCM-038 module have three triple LEDs connected to PMIC which
> can be used for diagnostic purposes. This patch adds support
> for these LEDs for PCM-038 SOM and adds basic LED-triggers for
> these LEDs for PCM-970 RDK, the remaining LEDs are available
> for use from userspace.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts  | 50 +++++++++++++++++++++++++
>  arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi |  6 +++
>  2 files changed, 56 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
> index 9f8ad51..9a07543 100644
> --- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
> +++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
> @@ -96,6 +96,56 @@
>  	status = "okay";
>  };
>  
> +&pmicleds {
> +	ledr1: led@3 {
> +		reg = <3>;
> +		label = "system:red1:user";
> +	};
> +
> +	ledg1: led@4 {
> +		reg = <4>;
> +		label = "system:green1:user";
> +	};
> +
> +	ledb1: led@5 {
> +		reg = <5>;
> +		label = "system:blue1:user";
> +	};
> +
> +	ledr2: led@6 {
> +		reg = <6>;
> +		label = "system:red2:user";
> +	};
> +
> +	ledg2: led@7 {
> +		reg = <7>;
> +		label = "system:green2:user";
> +	};
> +
> +	ledb2: led@8 {
> +		reg = <8>;
> +		label = "system:blue2:user";
> +	};
> +
> +	ledr3: led@9 {
> +		reg = <9>;
> +		label = "system:red3:nand";
> +		linux,default-trigger = "nand-disk";
> +	};
> +
> +	ledg3: led@10 {
> +		reg = <10>;
> +		label = "system:green3:live";
> +		linux,default-trigger = "heartbeat";
> +	};
> +
> +	ledb3: led@11 {
> +		reg = <11>;
> +		label = "system:blue3:cpu";
> +		linux,default-trigger = "cpu0";


I do not see this trigger and above "nand-disk" in
Documentation/devicetree/bindings/leds/common.txt.
So they're just missing from bindings doc and kernel actually supports
them?

> +	};
> +};
> +
>  &sdhci2 {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&pinctrl_sdhc2>;
> diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
> index 230cfaf..258eafa 100644
> --- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
> +++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
> @@ -69,6 +69,12 @@
>  		fsl,mc13xxx-uses-adc;
>  		fsl,mc13xxx-uses-rtc;
>  
> +		pmicleds: leds {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			led-control = <0x001 0x000 0x000 0x000 0x000 0x000>;

I can only see led-control mentioned in
Documentation/devicetree/bindings/mfd/mc13xxx.txt as below.

- leds : Contain the led nodes and initial register values in property
  "led-control".

But I failed to see where this property is actually defined.

Shawn

> +		};
> +
>  		regulators {
>  			/* SW1A and SW1B joined operation */
>  			sw1_reg: sw1a {
> -- 
> 1.8.3.2
>
Alexander Shiyan Feb. 17, 2014, 4:35 a.m. UTC | #2
???????????, 17 ??????? 2014, 10:55 +08:00 ?? Shawn Guo <shawn.guo@linaro.org>:
> On Sat, Feb 15, 2014 at 03:35:18PM +0400, Alexander Shiyan wrote:
> > PCM-038 module have three triple LEDs connected to PMIC which
> > can be used for diagnostic purposes. This patch adds support
> > for these LEDs for PCM-038 SOM and adds basic LED-triggers for
> > these LEDs for PCM-970 RDK, the remaining LEDs are available
> > for use from userspace.
> > 
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> > ---
> >  arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts  | 50
> +++++++++++++++++++++++++
> >  arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi |  6 +++
> >  2 files changed, 56 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
> b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
> > index 9f8ad51..9a07543 100644
> > --- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
...
> > +	ledr3: led@9 {
> > +		reg = <9>;
> > +		label = "system:red3:nand";
> > +		linux,default-trigger = "nand-disk";
> > +	};
> > +
> > +	ledg3: led@10 {
> > +		reg = <10>;
> > +		label = "system:green3:live";
> > +		linux,default-trigger = "heartbeat";
> > +	};
> > +
> > +	ledb3: led@11 {
> > +		reg = <11>;
> > +		label = "system:blue3:cpu";
> > +		linux,default-trigger = "cpu0";
> 
> 
> I do not see this trigger and above "nand-disk" in
> Documentation/devicetree/bindings/leds/common.txt.
> So they're just missing from bindings doc and kernel actually supports
> them?

Yes, seems this is undocumented yet.
Defined in drivers/mtd/nand/nand_base.c: nand_base_init().
Present in the mainline kernel.

...
> > +++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
> > @@ -69,6 +69,12 @@
> >  		fsl,mc13xxx-uses-adc;
> >  		fsl,mc13xxx-uses-rtc;
> >  
> > +		pmicleds: leds {
> > +			#address-cells = <1>;
> > +			#size-cells = <0>;
> > +			led-control = <0x001 0x000 0x000 0x000 0x000 0x000>;
> 
> I can only see led-control mentioned in
> Documentation/devicetree/bindings/mfd/mc13xxx.txt as below.
> 
> - leds : Contain the led nodes and initial register values in property
> "led-control".
> 
> But I failed to see where this property is actually defined.

Not quite understand the question. Please rephrase.

---
Shawn Guo Feb. 17, 2014, 5:23 a.m. UTC | #3
On Mon, Feb 17, 2014 at 08:35:43AM +0400, Alexander Shiyan wrote:
> > > +++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
> > > @@ -69,6 +69,12 @@
> > >  		fsl,mc13xxx-uses-adc;
> > >  		fsl,mc13xxx-uses-rtc;
> > >  
> > > +		pmicleds: leds {
> > > +			#address-cells = <1>;
> > > +			#size-cells = <0>;
> > > +			led-control = <0x001 0x000 0x000 0x000 0x000 0x000>;
> > 
> > I can only see led-control mentioned in
> > Documentation/devicetree/bindings/mfd/mc13xxx.txt as below.
> > 
> > - leds : Contain the led nodes and initial register values in property
> > "led-control".
> > 
> > But I failed to see where this property is actually defined.
> 
> Not quite understand the question. Please rephrase.

The documentation of property "led-control" isn't so clear to me.  But
anyway it's not a problem of this patch.  Patch applied.

Shawn
diff mbox

Patch

diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index 9f8ad51..9a07543 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -96,6 +96,56 @@ 
 	status = "okay";
 };
 
+&pmicleds {
+	ledr1: led@3 {
+		reg = <3>;
+		label = "system:red1:user";
+	};
+
+	ledg1: led@4 {
+		reg = <4>;
+		label = "system:green1:user";
+	};
+
+	ledb1: led@5 {
+		reg = <5>;
+		label = "system:blue1:user";
+	};
+
+	ledr2: led@6 {
+		reg = <6>;
+		label = "system:red2:user";
+	};
+
+	ledg2: led@7 {
+		reg = <7>;
+		label = "system:green2:user";
+	};
+
+	ledb2: led@8 {
+		reg = <8>;
+		label = "system:blue2:user";
+	};
+
+	ledr3: led@9 {
+		reg = <9>;
+		label = "system:red3:nand";
+		linux,default-trigger = "nand-disk";
+	};
+
+	ledg3: led@10 {
+		reg = <10>;
+		label = "system:green3:live";
+		linux,default-trigger = "heartbeat";
+	};
+
+	ledb3: led@11 {
+		reg = <11>;
+		label = "system:blue3:cpu";
+		linux,default-trigger = "cpu0";
+	};
+};
+
 &sdhci2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_sdhc2>;
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
index 230cfaf..258eafa 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
@@ -69,6 +69,12 @@ 
 		fsl,mc13xxx-uses-adc;
 		fsl,mc13xxx-uses-rtc;
 
+		pmicleds: leds {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			led-control = <0x001 0x000 0x000 0x000 0x000 0x000>;
+		};
+
 		regulators {
 			/* SW1A and SW1B joined operation */
 			sw1_reg: sw1a {