diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2014-11-21 18:42:43 +0000 |
---|---|---|
committer | Zoltan Herpai <wigyori@uid0.hu> | 2014-11-21 18:42:43 +0000 |
commit | 9c54f7f312c189c4cfaec68675589a666d37306c (patch) | |
tree | 16d9f9beb213e24e138cf9cf941aecc40d3e059a /target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch | |
parent | c84fe94b0df1f3f98a128e929e79d63ab7f4de54 (diff) | |
download | upstream-9c54f7f312c189c4cfaec68675589a666d37306c.tar.gz upstream-9c54f7f312c189c4cfaec68675589a666d37306c.tar.bz2 upstream-9c54f7f312c189c4cfaec68675589a666d37306c.zip |
sunxi: add initial 3.18 support
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 43337
Diffstat (limited to 'target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch')
-rw-r--r-- | target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch | 175 |
1 files changed, 175 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch b/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch new file mode 100644 index 0000000000..22dfe51be7 --- /dev/null +++ b/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch @@ -0,0 +1,175 @@ +From 3bf1194692f3a275e0776d3c0b6f17826cc01baa Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Wed, 1 Jan 2014 19:50:33 +0100 +Subject: [PATCH] ARM: dts: sun5i: Add lradc node + +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + 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(-) + +diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +index ea9519d..0b82d20 100644 +--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts ++++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +@@ -12,8 +12,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"; +@@ -98,6 +99,46 @@ + }; + }; + ++ 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 = "Enter"; ++ linux,code = <KEY_ENTER>; ++ channel = <0>; ++ voltage = <795090>; ++ }; ++ ++ button@987 { ++ label = "Home"; ++ linux,code = <KEY_HOMEPAGE>; ++ channel = <0>; ++ voltage = <987387>; ++ }; ++ }; ++ + uart0: serial@01c28000 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; +diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi +index 531272c..7c6c883 100644 +--- a/arch/arm/boot/dts/sun5i-a10s.dtsi ++++ b/arch/arm/boot/dts/sun5i-a10s.dtsi +@@ -520,6 +520,13 @@ + reg = <0x01c20c90 0x10>; + }; + ++ lradc: lradc@01c22800 { ++ compatible = "allwinner,sun4i-a10-lradc-keys"; ++ reg = <0x01c22800 0x100>; ++ interrupts = <31>; ++ status = "disabled"; ++ }; ++ + sid: eeprom@01c23800 { + compatible = "allwinner,sun4i-a10-sid"; + reg = <0x01c23800 0x10>; +diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts +index 429994e..b4ec8eb 100644 +--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts ++++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts +@@ -12,8 +12,9 @@ + */ + + /dts-v1/; +-/include/ "sun5i-a13.dtsi" +-/include/ "sunxi-common-regulators.dtsi" ++#include "sun5i-a13.dtsi" ++#include "sunxi-common-regulators.dtsi" ++#include <dt-bindings/input/input.h> + + / { + model = "Olimex A13-Olinuxino"; +@@ -66,6 +67,46 @@ + }; + }; + ++ 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 = "Enter"; ++ linux,code = <KEY_ENTER>; ++ channel = <0>; ++ voltage = <795090>; ++ }; ++ ++ button@987 { ++ label = "Home"; ++ linux,code = <KEY_HOMEPAGE>; ++ channel = <0>; ++ voltage = <987387>; ++ }; ++ }; ++ + uart1: serial@01c28400 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins_b>; +diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi +index b131068..aa0482c 100644 +--- a/arch/arm/boot/dts/sun5i-a13.dtsi ++++ b/arch/arm/boot/dts/sun5i-a13.dtsi +@@ -468,6 +468,13 @@ + reg = <0x01c20c90 0x10>; + }; + ++ lradc: lradc@01c22800 { ++ compatible = "allwinner,sun4i-a10-lradc-keys"; ++ reg = <0x01c22800 0x100>; ++ interrupts = <31>; ++ status = "disabled"; ++ }; ++ + sid: eeprom@01c23800 { + compatible = "allwinner,sun4i-a10-sid"; + reg = <0x01c23800 0x10>; |