* [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs on SoCKit
@ 2016-03-19 23:57 Marek Vasut
2016-03-19 23:57 ` [PATCH 2/2] ARM: socfpga: Add support for HPS KEYs/SWs " Marek Vasut
2016-03-21 7:50 ` [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs " Steffen Trumtrar
0 siblings, 2 replies; 5+ messages in thread
From: Marek Vasut @ 2016-03-19 23:57 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the blue LEDs on the SoCFPGA SoCkit board.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
---
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 32 +++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
index b61f22f..1461690 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
@@ -39,6 +39,34 @@
ethernet0 = &gmac1;
};
+ leds {
+ compatible = "gpio-leds";
+
+ hps_led0 {
+ label = "hps:blue:led0";
+ gpios = <&portb 24 0>; /* HPS_GPIO53 */
+ linux,default-trigger = "heartbeat";
+ };
+
+ hps_led1 {
+ label = "hps:blue:led1";
+ gpios = <&portb 25 0>; /* HPS_GPIO54 */
+ linux,default-trigger = "heartbeat";
+ };
+
+ hps_led2 {
+ label = "hps:blue:led2";
+ gpios = <&portb 26 0>; /* HPS_GPIO55 */
+ linux,default-trigger = "heartbeat";
+ };
+
+ hps_led3 {
+ label = "hps:blue:led3";
+ gpios = <&portb 27 0>; /* HPS_GPIO56 */
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
regulator_3_3v: vcc3p3-regulator {
compatible = "regulator-fixed";
regulator-name = "VCC3P3";
@@ -61,6 +89,10 @@
rxc-skew-ps = <2000>;
};
+&gpio1 { /* GPIO 30..57 */
+ status = "okay";
+};
+
&gpio2 {
status = "okay";
};
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: socfpga: Add support for HPS KEYs/SWs on SoCKit
2016-03-19 23:57 [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs on SoCKit Marek Vasut
@ 2016-03-19 23:57 ` Marek Vasut
2016-03-21 20:41 ` Dinh Nguyen
2016-03-21 7:50 ` [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs " Steffen Trumtrar
1 sibling, 1 reply; 5+ messages in thread
From: Marek Vasut @ 2016-03-19 23:57 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the keys and flip-switches on the SoCFPGA SoCkit board.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
---
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 62 ++++++++++++++++++++++++++-
1 file changed, 61 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
index 1461690..02e22f5 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
@@ -67,6 +67,62 @@
};
};
+ gpio-keys {
+ compatible = "gpio-keys";
+
+ hps_sw0 {
+ label = "hps_sw0";
+ gpios = <&portc 20 0>; /* HPS_GPI7 */
+ linux,input-type = <5>; /* EV_SW */
+ linux,code = <0x0>; /* SW_LID */
+ };
+
+ hps_sw1 {
+ label = "hps_sw1";
+ gpios = <&portc 19 0>; /* HPS_GPI6 */
+ linux,input-type = <5>; /* EV_SW */
+ linux,code = <0x5>; /* SW_DOCK */
+ };
+
+ hps_sw2 {
+ label = "hps_sw2";
+ gpios = <&portc 18 0>; /* HPS_GPI5 */
+ linux,input-type = <5>; /* EV_SW */
+ linux,code = <0xa>; /* SW_KEYPAD_SLIDE */
+ };
+
+ hps_sw3 {
+ label = "hps_sw3";
+ gpios = <&portc 17 0>; /* HPS_GPI4 */
+ linux,input-type = <5>; /* EV_SW */
+ linux,code = <0xc>; /* SW_ROTATE_LOCK */
+ };
+
+ hps_hkey0 {
+ label = "hps_hkey0";
+ gpios = <&portc 21 1>; /* HPS_GPI8 */
+ linux,code = <187>; /* KEY_F17 */
+ };
+
+ hps_hkey1 {
+ label = "hps_hkey1";
+ gpios = <&portc 22 1>; /* HPS_GPI9 */
+ linux,code = <188>; /* KEY_F18 */
+ };
+
+ hps_hkey2 {
+ label = "hps_hkey2";
+ gpios = <&portc 23 1>; /* HPS_GPI10 */
+ linux,code = <189>; /* KEY_F19 */
+ };
+
+ hps_hkey3 {
+ label = "hps_hkey3";
+ gpios = <&portc 24 1>; /* HPS_GPI11 */
+ linux,code = <190>; /* KEY_F20 */
+ };
+ };
+
regulator_3_3v: vcc3p3-regulator {
compatible = "regulator-fixed";
regulator-name = "VCC3P3";
@@ -89,11 +145,15 @@
rxc-skew-ps = <2000>;
};
+&gpio0 { /* GPIO 0..29 */
+ status = "okay";
+};
+
&gpio1 { /* GPIO 30..57 */
status = "okay";
};
-&gpio2 {
+&gpio2 { /* GPIO 58..66 (HLGPI 0..13 at offset 13) */
status = "okay";
};
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs on SoCKit
2016-03-19 23:57 [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs on SoCKit Marek Vasut
2016-03-19 23:57 ` [PATCH 2/2] ARM: socfpga: Add support for HPS KEYs/SWs " Marek Vasut
@ 2016-03-21 7:50 ` Steffen Trumtrar
2016-03-21 10:14 ` Marek Vasut
1 sibling, 1 reply; 5+ messages in thread
From: Steffen Trumtrar @ 2016-03-21 7:50 UTC (permalink / raw)
To: linux-arm-kernel
Hi!
Marek Vasut writes:
> Add support for the blue LEDs on the SoCFPGA SoCkit board.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> ---
> arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 32 +++++++++++++++++++++++++++
> 1 file changed, 32 insertions(+)
>
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
> index b61f22f..1461690 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
> +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
> @@ -39,6 +39,34 @@
> ethernet0 = &gmac1;
> };
>
> + leds {
> + compatible = "gpio-leds";
> +
> + hps_led0 {
> + label = "hps:blue:led0";
> + gpios = <&portb 24 0>; /* HPS_GPIO53 */
> + linux,default-trigger = "heartbeat";
> + };
> +
> + hps_led1 {
> + label = "hps:blue:led1";
> + gpios = <&portb 25 0>; /* HPS_GPIO54 */
> + linux,default-trigger = "heartbeat";
> + };
> +
> + hps_led2 {
> + label = "hps:blue:led2";
> + gpios = <&portb 26 0>; /* HPS_GPIO55 */
> + linux,default-trigger = "heartbeat";
> + };
> +
> + hps_led3 {
> + label = "hps:blue:led3";
> + gpios = <&portb 27 0>; /* HPS_GPIO56 */
> + linux,default-trigger = "heartbeat";
> + };
> + };
> +
I'd personally remove the default-triggers.
Otherwise looks good to me.
Regards,
Steffen
--
Pengutronix e.K. | Steffen Trumtrar |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs on SoCKit
2016-03-21 7:50 ` [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs " Steffen Trumtrar
@ 2016-03-21 10:14 ` Marek Vasut
0 siblings, 0 replies; 5+ messages in thread
From: Marek Vasut @ 2016-03-21 10:14 UTC (permalink / raw)
To: linux-arm-kernel
On 03/21/2016 08:50 AM, Steffen Trumtrar wrote:
>
> Hi!
Hi!
> Marek Vasut writes:
>
>> Add support for the blue LEDs on the SoCFPGA SoCkit board.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
>> ---
>> arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 32 +++++++++++++++++++++++++++
>> 1 file changed, 32 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
>> index b61f22f..1461690 100644
>> --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
>> +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
>> @@ -39,6 +39,34 @@
>> ethernet0 = &gmac1;
>> };
>>
>> + leds {
>> + compatible = "gpio-leds";
>> +
>> + hps_led0 {
>> + label = "hps:blue:led0";
>> + gpios = <&portb 24 0>; /* HPS_GPIO53 */
>> + linux,default-trigger = "heartbeat";
>> + };
>> +
>> + hps_led1 {
>> + label = "hps:blue:led1";
>> + gpios = <&portb 25 0>; /* HPS_GPIO54 */
>> + linux,default-trigger = "heartbeat";
>> + };
>> +
>> + hps_led2 {
>> + label = "hps:blue:led2";
>> + gpios = <&portb 26 0>; /* HPS_GPIO55 */
>> + linux,default-trigger = "heartbeat";
>> + };
>> +
>> + hps_led3 {
>> + label = "hps:blue:led3";
>> + gpios = <&portb 27 0>; /* HPS_GPIO56 */
>> + linux,default-trigger = "heartbeat";
>> + };
>> + };
>> +
>
> I'd personally remove the default-triggers.
At least the LEDs appear to do something and are not completely dead,
but either way is fine with me. The heartbeat effect is also not amusing.
> Otherwise looks good to me.
Thanks for the review :)
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: socfpga: Add support for HPS KEYs/SWs on SoCKit
2016-03-19 23:57 ` [PATCH 2/2] ARM: socfpga: Add support for HPS KEYs/SWs " Marek Vasut
@ 2016-03-21 20:41 ` Dinh Nguyen
0 siblings, 0 replies; 5+ messages in thread
From: Dinh Nguyen @ 2016-03-21 20:41 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, 19 Mar 2016, Marek Vasut wrote:
> Add support for the keys and flip-switches on the SoCFPGA SoCkit board.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> ---
> arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 62 ++++++++++++++++++++++++++-
> 1 file changed, 61 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
> index 1461690..02e22f5 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
> +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
Both patches applied!
Thanks,
Dinh
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-21 20:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-19 23:57 [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs on SoCKit Marek Vasut
2016-03-19 23:57 ` [PATCH 2/2] ARM: socfpga: Add support for HPS KEYs/SWs " Marek Vasut
2016-03-21 20:41 ` Dinh Nguyen
2016-03-21 7:50 ` [PATCH 1/2] ARM: socfpga: Add support for HPS LEDs " Steffen Trumtrar
2016-03-21 10:14 ` Marek Vasut
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).