* [PATCH RESEND v3 2/2] ARM: LPC32xx: Make platform use key driver
@ 2012-05-05 12:01 Roland Stigge
0 siblings, 0 replies; 3+ messages in thread
From: Roland Stigge @ 2012-05-05 12:01 UTC (permalink / raw)
To: dmitry.torokhov, axel.lin, riyer, michael.hennerich, grant.likely,
linux-input, linux-kernel, linux-arm-kernel, kevin.wells,
srinivas.bakki, devicetree-discuss, rob.herring
Cc: Roland Stigge
This patch connects the lpc32xx-key driver to the LPC32xx platform (via
lpc32xx.dtsi), and more specifically to the reference board via its dts file.
The clock.c file needs to be changed to match the automatic device name to its
clock.
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
Applies to v3.4-rc5 + LPC32xx DT patches
Please pick this patch for the arm-soc subsystem.
Changes since v2:
* DT: Use "keypad,num-rows", "keypad,num-columns" and "linux,keymap" properties
arch/arm/boot/dts/lpc32xx.dtsi | 2 ++
arch/arm/boot/dts/phy3250.dts | 9 +++++++++
arch/arm/mach-lpc32xx/clock.c | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
--- linux-2.6.orig/arch/arm/boot/dts/lpc32xx.dtsi
+++ linux-2.6/arch/arm/boot/dts/lpc32xx.dtsi
@@ -285,6 +285,8 @@
key@40050000 {
compatible = "nxp,lpc3220-key";
reg = <0x40050000 0x1000>;
+ interrupts = <54 0>;
+ status = "disable";
};
};
--- linux-2.6.orig/arch/arm/boot/dts/phy3250.dts
+++ linux-2.6/arch/arm/boot/dts/phy3250.dts
@@ -135,6 +135,15 @@
tsc@40048000 {
status = "okay";
};
+
+ key@40050000 {
+ status = "okay";
+ keypad,num-rows = <1>;
+ keypad,num-columns = <1>;
+ nxp,debounce-delay-ms = <3>;
+ nxp,scan-delay-ms = <34>;
+ linux,keymap = <0x00000002>;
+ };
};
};
--- linux-2.6.orig/arch/arm/mach-lpc32xx/clock.c
+++ linux-2.6/arch/arm/mach-lpc32xx/clock.c
@@ -1131,7 +1131,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_INIT("31020300.i2c", NULL, &clk_i2c2),
CLKDEV_INIT("dev:ssp0", NULL, &clk_ssp0),
CLKDEV_INIT("dev:ssp1", NULL, &clk_ssp1),
- CLKDEV_INIT("lpc32xx_keys.0", NULL, &clk_kscan),
+ CLKDEV_INIT("40050000.key", NULL, &clk_kscan),
CLKDEV_INIT("lpc32xx-nand.0", "nand_ck", &clk_nand),
CLKDEV_INIT("200b0000.flash", "nand_ck_mlc", &clk_nand_mlc),
CLKDEV_INIT("40048000.adc", NULL, &clk_adc),
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH RESEND v3 2/2] ARM: LPC32xx: Make platform use key driver
2012-05-16 20:25 [PATCH RESEND v3 1/2] input: keyboard: Add keys driver for the LPC32xx SoC Roland Stigge
@ 2012-05-16 20:25 ` Roland Stigge
2012-05-17 23:32 ` Rob Herring
0 siblings, 1 reply; 3+ messages in thread
From: Roland Stigge @ 2012-05-16 20:25 UTC (permalink / raw)
To: dmitry.torokhov, axel.lin, riyer, michael.hennerich, grant.likely,
linux-input, linux-kernel, linux-arm-kernel, kevin.wells,
srinivas.bakki, devicetree-discuss, rob.herring
Cc: Roland Stigge
This patch connects the lpc32xx-key driver to the LPC32xx platform (via
lpc32xx.dtsi), and more specifically to the reference board via its dts file.
The clock.c file needs to be changed to match the automatic device name to its
clock.
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
Applies to v3.4-rc7 + LPC32xx DT patches
Please pick this patch for the arm-soc subsystem.
Changes since v2:
* DT: Use "keypad,num-rows", "keypad,num-columns" and "linux,keymap" properties
arch/arm/boot/dts/lpc32xx.dtsi | 2 ++
arch/arm/boot/dts/phy3250.dts | 9 +++++++++
arch/arm/mach-lpc32xx/clock.c | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
--- linux-2.6.orig/arch/arm/boot/dts/lpc32xx.dtsi
+++ linux-2.6/arch/arm/boot/dts/lpc32xx.dtsi
@@ -249,6 +249,8 @@
key@40050000 {
compatible = "nxp,lpc3220-key";
reg = <0x40050000 0x1000>;
+ interrupts = <54 0>;
+ status = "disable";
};
};
--- linux-2.6.orig/arch/arm/boot/dts/phy3250.dts
+++ linux-2.6/arch/arm/boot/dts/phy3250.dts
@@ -135,6 +135,15 @@
tsc@40048000 {
status = "okay";
};
+
+ key@40050000 {
+ status = "okay";
+ keypad,num-rows = <1>;
+ keypad,num-columns = <1>;
+ nxp,debounce-delay-ms = <3>;
+ nxp,scan-delay-ms = <34>;
+ linux,keymap = <0x00000002>;
+ };
};
};
--- linux-2.6.orig/arch/arm/mach-lpc32xx/clock.c
+++ linux-2.6/arch/arm/mach-lpc32xx/clock.c
@@ -1134,7 +1134,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_INIT("31020300.i2c", NULL, &clk_i2c2),
CLKDEV_INIT("dev:ssp0", NULL, &clk_ssp0),
CLKDEV_INIT("dev:ssp1", NULL, &clk_ssp1),
- CLKDEV_INIT("lpc32xx_keys.0", NULL, &clk_kscan),
+ CLKDEV_INIT("40050000.key", NULL, &clk_kscan),
CLKDEV_INIT("20020000.flash", NULL, &clk_nand),
CLKDEV_INIT("200a8000.flash", NULL, &clk_nand_mlc),
CLKDEV_INIT("40048000.adc", NULL, &clk_adc),
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND v3 2/2] ARM: LPC32xx: Make platform use key driver
2012-05-16 20:25 ` [PATCH RESEND v3 2/2] ARM: LPC32xx: Make platform use key driver Roland Stigge
@ 2012-05-17 23:32 ` Rob Herring
0 siblings, 0 replies; 3+ messages in thread
From: Rob Herring @ 2012-05-17 23:32 UTC (permalink / raw)
To: Roland Stigge
Cc: dmitry.torokhov, axel.lin, riyer, michael.hennerich, grant.likely,
linux-input, linux-kernel, linux-arm-kernel, kevin.wells,
srinivas.bakki, devicetree-discuss, rob.herring
On 05/16/2012 03:25 PM, Roland Stigge wrote:
> This patch connects the lpc32xx-key driver to the LPC32xx platform (via
> lpc32xx.dtsi), and more specifically to the reference board via its dts file.
> The clock.c file needs to be changed to match the automatic device name to its
> clock.
>
> Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Rob Herring <rob.herring@calxeda.com>
>
> ---
> Applies to v3.4-rc7 + LPC32xx DT patches
>
> Please pick this patch for the arm-soc subsystem.
>
> Changes since v2:
> * DT: Use "keypad,num-rows", "keypad,num-columns" and "linux,keymap" properties
>
> arch/arm/boot/dts/lpc32xx.dtsi | 2 ++
> arch/arm/boot/dts/phy3250.dts | 9 +++++++++
> arch/arm/mach-lpc32xx/clock.c | 2 +-
> 3 files changed, 12 insertions(+), 1 deletion(-)
>
> --- linux-2.6.orig/arch/arm/boot/dts/lpc32xx.dtsi
> +++ linux-2.6/arch/arm/boot/dts/lpc32xx.dtsi
> @@ -249,6 +249,8 @@
> key@40050000 {
> compatible = "nxp,lpc3220-key";
> reg = <0x40050000 0x1000>;
> + interrupts = <54 0>;
> + status = "disable";
> };
>
> };
> --- linux-2.6.orig/arch/arm/boot/dts/phy3250.dts
> +++ linux-2.6/arch/arm/boot/dts/phy3250.dts
> @@ -135,6 +135,15 @@
> tsc@40048000 {
> status = "okay";
> };
> +
> + key@40050000 {
> + status = "okay";
> + keypad,num-rows = <1>;
> + keypad,num-columns = <1>;
> + nxp,debounce-delay-ms = <3>;
> + nxp,scan-delay-ms = <34>;
> + linux,keymap = <0x00000002>;
> + };
> };
> };
>
> --- linux-2.6.orig/arch/arm/mach-lpc32xx/clock.c
> +++ linux-2.6/arch/arm/mach-lpc32xx/clock.c
> @@ -1134,7 +1134,7 @@ static struct clk_lookup lookups[] = {
> CLKDEV_INIT("31020300.i2c", NULL, &clk_i2c2),
> CLKDEV_INIT("dev:ssp0", NULL, &clk_ssp0),
> CLKDEV_INIT("dev:ssp1", NULL, &clk_ssp1),
> - CLKDEV_INIT("lpc32xx_keys.0", NULL, &clk_kscan),
> + CLKDEV_INIT("40050000.key", NULL, &clk_kscan),
> CLKDEV_INIT("20020000.flash", NULL, &clk_nand),
> CLKDEV_INIT("200a8000.flash", NULL, &clk_nand_mlc),
> CLKDEV_INIT("40048000.adc", NULL, &clk_adc),
> _______________________________________________
> devicetree-discuss mailing list
> devicetree-discuss@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/devicetree-discuss
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-17 23:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-05 12:01 [PATCH RESEND v3 2/2] ARM: LPC32xx: Make platform use key driver Roland Stigge
-- strict thread matches above, loose matches on Subject: below --
2012-05-16 20:25 [PATCH RESEND v3 1/2] input: keyboard: Add keys driver for the LPC32xx SoC Roland Stigge
2012-05-16 20:25 ` [PATCH RESEND v3 2/2] ARM: LPC32xx: Make platform use key driver Roland Stigge
2012-05-17 23:32 ` Rob Herring
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).