310b70f03e
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14 Build tested on brcm63xx and ipq806x, runtested on brcm63xx. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 45711
103 lines
2.3 KiB
Diff
103 lines
2.3 KiB
Diff
From a735a9b354ebc1a17b648ef8c3482c71fdbf40da Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Wed, 1 Jan 2014 20:26:21 +0100
|
|
Subject: [PATCH] ARM: dts: sun7i: Add lradc node
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
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(-)
|
|
|
|
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
|
|
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
|
|
@@ -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@01c22800 {
|
|
+ vref-supply = <®_vcc3v0>;
|
|
+ status = "okay";
|
|
+
|
|
+ button@191 {
|
|
+ label = "Volume Up";
|
|
+ linux,code = <KEY_VOLUMEUP>;
|
|
+ channel = <0>;
|
|
+ voltage = <191274>;
|
|
+ };
|
|
+
|
|
+ button@392 {
|
|
+ label = "Volume Down";
|
|
+ linux,code = <KEY_VOLUMEDOWN>;
|
|
+ channel = <0>;
|
|
+ voltage = <392644>;
|
|
+ };
|
|
+
|
|
+ button@601 {
|
|
+ label = "Menu";
|
|
+ linux,code = <KEY_MENU>;
|
|
+ channel = <0>;
|
|
+ voltage = <601151>;
|
|
+ };
|
|
+
|
|
+ button@795 {
|
|
+ label = "Search";
|
|
+ linux,code = <KEY_SEARCH>;
|
|
+ channel = <0>;
|
|
+ voltage = <795090>;
|
|
+ };
|
|
+
|
|
+ button@987 {
|
|
+ label = "Home";
|
|
+ linux,code = <KEY_HOMEPAGE>;
|
|
+ channel = <0>;
|
|
+ voltage = <987387>;
|
|
+ };
|
|
+
|
|
+ button@1184 {
|
|
+ label = "Esc";
|
|
+ linux,code = <KEY_ESC>;
|
|
+ channel = <0>;
|
|
+ voltage = <1184678>;
|
|
+ };
|
|
+
|
|
+ button@1398 {
|
|
+ label = "Enter";
|
|
+ linux,code = <KEY_ENTER>;
|
|
+ channel = <0>;
|
|
+ voltage = <1398804>;
|
|
+ };
|
|
+ };
|
|
+
|
|
uart0: serial@01c28000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pins_a>;
|
|
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
|
|
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
|
|
@@ -911,6 +911,13 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ lradc: lradc@01c22800 {
|
|
+ compatible = "allwinner,sun4i-a10-lradc-keys";
|
|
+ reg = <0x01c22800 0x100>;
|
|
+ interrupts = <0 31 4>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
sid: eeprom@01c23800 {
|
|
compatible = "allwinner,sun7i-a20-sid";
|
|
reg = <0x01c23800 0x200>;
|