Skip to contentSkip to conversation

ARM: dts: sunxi: Add lradc nodes

PATCH RESEND New Hans de Goede 2 participants 5 messages Dec 23, 2014 – Jan 6, 2015

Subsystems (2)
Device tree bindings Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Hans de Goede

author
#0 lore raw

cover ARM: dts: sunxi: Add lradc nodes

Hi Maxime, et al,

Here is a resend of the sun4i-lradc dts bits, which seems to have fallen through the cracks. This is a resend of the last version (I don't remember what version we were at). The kernel bits have been queued up for merging by Dmitry in the mean time, so these should be ready to get queued up too, let me know if you want any changes.

Regards,

Hans

author
#1 lore raw

PATCH RESEND 1/3 ARM: dts: sun4i: Add lradc node

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun4i-a10.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/boot/dts/sun4i-a10.dtsi +7 -0
index 952a56c..e8cd6db 100644
@@ -688,6 +688,13 @@
 			status = "disabled";
 		};
 
+		lradc: lradc at 01c22800 {
+			compatible = "allwinner,sun4i-a10-lradc-keys";
+			reg = <0x01c22800 0x100>;
+			interrupts = <31>;
+			status = "disabled";
+		};
+
 		sid: eeprom at 01c23800 {
 			compatible = "allwinner,sun4i-a10-sid";
 			reg = <0x01c23800 0x10>;
Signature · 1 line
2.1.0
author
#2 lore raw

PATCH RESEND 2/3 ARM: dts: sun5i: Add lradc node

In reply to Hans de Goede
Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 45 ++++++++++++++++++++++--
 arch/arm/boot/dts/sun5i-a10s.dtsi                |  7 ++++
 arch/arm/boot/dts/sun5i-a13-olinuxino.dts        | 45 ++++++++++++++++++++++--
 arch/arm/boot/dts/sun5i-a13.dtsi                 |  7 ++++
 4 files changed, 100 insertions(+), 4 deletions(-)
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +43 -2
index fe3c559..dac9d49 100644
@@ -48,8 +48,9 @@
  */
 
 /dts-v1/;
-/include/ "sun5i-a10s.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun5i-a10s.dtsi"
+#include "sunxi-common-regulators.dtsi"
+#include <dt-bindings/input/input.h>
 
 / {
 	model = "Olimex A10s-Olinuxino Micro";

@@ -134,6 +135,46 @@
 			};
 		};
 
+		lradc: lradc at 01c22800 {
+			vref-supply = <&reg_vcc3v0>;
+			status = "okay";
+
+			button at 191 {
+				label = "Volume Up";
+				linux,code = <KEY_VOLUMEUP>;
+				channel = <0>;
+				voltage = <191274>;
+			};
+
+			button at 392 {
+				label = "Volume Down";
+				linux,code = <KEY_VOLUMEDOWN>;
+				channel = <0>;
+				voltage = <392644>;
+			};
+
+			button at 601 {
+				label = "Menu";
+				linux,code = <KEY_MENU>;
+				channel = <0>;
+				voltage = <601151>;
+			};
+
+			button at 795 {
+				label = "Enter";
+				linux,code = <KEY_ENTER>;
+				channel = <0>;
+				voltage = <795090>;
+			};
+
+			button at 987 {
+				label = "Home";
+				linux,code = <KEY_HOMEPAGE>;
+				channel = <0>;
+				voltage = <987387>;
+			};
+		};
+
 		uart0: serial at 01c28000 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&uart0_pins_a>;
arch/arm/boot/dts/sun5i-a10s.dtsi +7 -0
index 1b76667..58a9666 100644
@@ -526,6 +526,13 @@
 			reg = <0x01c20c90 0x10>;
 		};
 
+		lradc: lradc at 01c22800 {
+			compatible = "allwinner,sun4i-a10-lradc-keys";
+			reg = <0x01c22800 0x100>;
+			interrupts = <31>;
+			status = "disabled";
+		};
+
 		sid: eeprom at 01c23800 {
 			compatible = "allwinner,sun4i-a10-sid";
 			reg = <0x01c23800 0x10>;
arch/arm/boot/dts/sun5i-a13-olinuxino.dts +43 -2

57 lines not on this page · raw message

arch/arm/boot/dts/sun5i-a13.dtsi +7 -0
index c35217e..061b2273 100644
@@ -460,6 +460,13 @@
 			reg = <0x01c20c90 0x10>;
 		};
 
+		lradc: lradc at 01c22800 {
+			compatible = "allwinner,sun4i-a10-lradc-keys";
+			reg = <0x01c22800 0x100>;
+			interrupts = <31>;
+			status = "disabled";
+		};
+
 		sid: eeprom at 01c23800 {
 			compatible = "allwinner,sun4i-a10-sid";
 			reg = <0x01c23800 0x10>;
Signature · 1 line
2.1.0
author
#3 lore raw

PATCH RESEND 3/3 ARM: dts: sun7i: Add lradc node

In reply to Hans de Goede
Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 59 ++++++++++++++++++++++++-
 arch/arm/boot/dts/sun7i-a20.dtsi                |  7 +++
 2 files changed, 64 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +57 -2
index 9d669cdf..c00badd 100644
@@ -12,8 +12,9 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+#include <dt-bindings/input/input.h>
 
 / {
 	model = "Olimex A20-Olinuxino Micro";

@@ -100,6 +101,60 @@
 			};
 		};
 
+		lradc: lradc at 01c22800 {
+			vref-supply = <&reg_vcc3v0>;
+			status = "okay";
+
+			button at 191 {
+				label = "Volume Up";
+				linux,code = <KEY_VOLUMEUP>;
+				channel = <0>;
+				voltage = <191274>;
+			};
+
+			button at 392 {
+				label = "Volume Down";
+				linux,code = <KEY_VOLUMEDOWN>;
+				channel = <0>;
+				voltage = <392644>;
+			};
+
+			button at 601 {
+				label = "Menu";
+				linux,code = <KEY_MENU>;
+				channel = <0>;
+				voltage = <601151>;
+			};
+
+			button at 795 {
+				label = "Search";
+				linux,code = <KEY_SEARCH>;
+				channel = <0>;
+				voltage = <795090>;
+			};
+
+			button at 987 {
+				label = "Home";
+				linux,code = <KEY_HOMEPAGE>;
+				channel = <0>;
+				voltage = <987387>;
+			};
+
+			button at 1184 {
+				label = "Esc";
+				linux,code = <KEY_ESC>;
+				channel = <0>;
+				voltage = <1184678>;
+			};
+
+			button at 1398 {
+				label = "Enter";
+				linux,code = <KEY_ENTER>;
+				channel = <0>;
+				voltage = <1398804>;
+			};
+		};
+
 		uart0: serial at 01c28000 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&uart0_pins_a>;
arch/arm/boot/dts/sun7i-a20.dtsi +7 -0
index e558125..e24f7cc 100644
@@ -930,6 +930,13 @@
 			status = "disabled";
 		};
 
+		lradc: lradc at 01c22800 {
+			compatible = "allwinner,sun4i-a10-lradc-keys";
+			reg = <0x01c22800 0x100>;
+			interrupts = <0 31 4>;
+			status = "disabled";
+		};
+
 		sid: eeprom at 01c23800 {
 			compatible = "allwinner,sun7i-a20-sid";
 			reg = <0x01c23800 0x200>;
Signature · 1 line
2.1.0
Applied
#4 lore raw

cover ARM: dts: sunxi: Add lradc nodes

In reply to Hans de Goede
Quoted 7 lines · Hans de Goede

Hi Maxime, et al,

Here is a resend of the sun4i-lradc dts bits, which seems to have fallen through the cracks. This is a resend of the last version (I don't remember what version we were at). The kernel bits have been queued up for merging by Dmitry in the mean time, so these should be ready to get queued up too, let me know if you want any changes.

Applied all three, thanks!

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150106/70fbd92d/attachment-0001.sig>