* [PATCH 3/3] ARM:dts:sun7i:ps2 added nodes for Sun7i A20 PS2 controller. added ps2 nodes in lime2 board dts.
@ 2014-12-03 23:06 vishnupatekar
2014-12-04 20:04 ` [linux-sunxi] " Hans de Goede
0 siblings, 1 reply; 2+ messages in thread
From: vishnupatekar @ 2014-12-03 23:06 UTC (permalink / raw)
To: linux-arm-kernel
---
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 10 ++++++++
arch/arm/boot/dts/sun7i-a20.dtsi | 30 ++++++++++++++++++++++-
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index ed364d5..374897b 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -112,6 +112,16 @@
pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};
+ ps20: ps2 at 0x01c2a000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&ps2_0_pins>;
+ status = "okay";
+ };
+ ps21: ps2 at 0x01c2a400 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&ps2_1_pins>;
+ status = "okay";
+ };
i2c0: i2c at 01c2ac00 {
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 8605f2b..c77635d 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -357,7 +357,7 @@
usb_clk: clk at 01c200cc {
#clock-cells = <1>;
- #reset-cells = <1>;
+ #reset-cells = <1>;
compatible = "allwinner,sun4i-a10-usb-clk";
reg = <0x01c200cc 0x4>;
clocks = <&pll6 1>;
@@ -852,6 +852,19 @@
allwinner,drive = <0>;
allwinner,pull = <0>;
};
+ ps2_0_pins: ps2_0 at 0 {
+ allwinner,pins = "PI20","PI21";
+ allwinner,function = "ps2";
+ allwinner,drive = <0>;
+ allwinner,pull = <0>;
+ };
+ ps2_1_pins: ps2_1 at 0 {
+ allwinner,pins = "PH12","PH13";
+ allwinner,function = "ps2";
+ allwinner,drive = <0>;
+ allwinner,pull = <0>;
+ };
+
};
timer at 01c20c00 {
@@ -1079,5 +1092,20 @@
#interrupt-cells = <3>;
interrupts = <1 9 0xf04>;
};
+ ps20: ps2 at 0x01c2a000 {
+ compatible = "allwinner,sun7i-a20-ps2";
+ reg = <0x01c2a000 0x400>;
+ interrupts = <0 62 4>;
+ clocks = <&apb1_gates 6>;
+ status = "disabled";
+ };
+ ps21: ps2 at 0x01c2a400 {
+ compatible = "allwinner,sun7i-a20-ps2";
+ reg = <0x01c2a400 0x400>;
+ interrupts = <0 63 4>;
+ clocks = <&apb1_gates 7>;
+ status = "disabled";
+ };
+
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* [linux-sunxi] [PATCH 3/3] ARM:dts:sun7i:ps2 added nodes for Sun7i A20 PS2 controller. added ps2 nodes in lime2 board dts.
2014-12-03 23:06 [PATCH 3/3] ARM:dts:sun7i:ps2 added nodes for Sun7i A20 PS2 controller. added ps2 nodes in lime2 board dts vishnupatekar
@ 2014-12-04 20:04 ` Hans de Goede
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Goede @ 2014-12-04 20:04 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On 12/04/2014 12:06 AM, vishnupatekar wrote:
> ---
> arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 10 ++++++++
> arch/arm/boot/dts/sun7i-a20.dtsi | 30 ++++++++++++++++++++++-
> 2 files changed, 39 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
> index ed364d5..374897b 100644
> --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
> @@ -112,6 +112,16 @@
> pinctrl-0 = <&uart0_pins_a>;
> status = "okay";
> };
> + ps20: ps2 at 0x01c2a000 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&ps2_0_pins>;
> + status = "okay";
> + };
> + ps21: ps2 at 0x01c2a400 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&ps2_1_pins>;
> + status = "okay";
> + };
I don't think this should be enabled by default, since there
is no ps2 connector on the board, and the pins can be used
in a different manner too.
I do think it is useful to have it in there as an example for people who want to use
it, but commented out, please also add a comment stating that using ps20 conflicts
with using the hdmi connector.
Regards,
Hans
>
> i2c0: i2c at 01c2ac00 {
> pinctrl-names = "default";
> diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
> index 8605f2b..c77635d 100644
> --- a/arch/arm/boot/dts/sun7i-a20.dtsi
> +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
> @@ -357,7 +357,7 @@
>
> usb_clk: clk at 01c200cc {
> #clock-cells = <1>;
> - #reset-cells = <1>;
> + #reset-cells = <1>;
> compatible = "allwinner,sun4i-a10-usb-clk";
> reg = <0x01c200cc 0x4>;
> clocks = <&pll6 1>;
> @@ -852,6 +852,19 @@
> allwinner,drive = <0>;
> allwinner,pull = <0>;
> };
> + ps2_0_pins: ps2_0 at 0 {
> + allwinner,pins = "PI20","PI21";
> + allwinner,function = "ps2";
> + allwinner,drive = <0>;
> + allwinner,pull = <0>;
> + };
> + ps2_1_pins: ps2_1 at 0 {
> + allwinner,pins = "PH12","PH13";
> + allwinner,function = "ps2";
> + allwinner,drive = <0>;
> + allwinner,pull = <0>;
> + };
> +
> };
>
> timer at 01c20c00 {
> @@ -1079,5 +1092,20 @@
> #interrupt-cells = <3>;
> interrupts = <1 9 0xf04>;
> };
> + ps20: ps2 at 0x01c2a000 {
> + compatible = "allwinner,sun7i-a20-ps2";
> + reg = <0x01c2a000 0x400>;
> + interrupts = <0 62 4>;
> + clocks = <&apb1_gates 6>;
> + status = "disabled";
> + };
> + ps21: ps2 at 0x01c2a400 {
> + compatible = "allwinner,sun7i-a20-ps2";
> + reg = <0x01c2a400 0x400>;
> + interrupts = <0 63 4>;
> + clocks = <&apb1_gates 7>;
> + status = "disabled";
> + };
> +
> };
> };
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-04 20:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-03 23:06 [PATCH 3/3] ARM:dts:sun7i:ps2 added nodes for Sun7i A20 PS2 controller. added ps2 nodes in lime2 board dts vishnupatekar
2014-12-04 20:04 ` [linux-sunxi] " Hans de Goede
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).