diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2014-01-12 19:23:29 +0000 |
---|---|---|
committer | Zoltan Herpai <wigyori@uid0.hu> | 2014-01-12 19:23:29 +0000 |
commit | d0a757147bcfb1813585638b08ee8e6a8d743254 (patch) | |
tree | 1d7314ca8a588da492b71a71dad0a4289aabd3df /target/linux/sunxi/patches-3.12/137-4-dt-sun5i-update-hstimer-entry.patch | |
parent | a248495ae9d1b041a05f9e22579fe4f113c9eaa2 (diff) | |
download | upstream-d0a757147bcfb1813585638b08ee8e6a8d743254.tar.gz upstream-d0a757147bcfb1813585638b08ee8e6a8d743254.tar.bz2 upstream-d0a757147bcfb1813585638b08ee8e6a8d743254.zip |
sunxi: various changes - rename hstimer DT on sun5i to avoid confusion - add Cubietruck support - select watchdog by default - select rtc in profiles where appropriate - cosmetic changes
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39263
Diffstat (limited to 'target/linux/sunxi/patches-3.12/137-4-dt-sun5i-update-hstimer-entry.patch')
-rw-r--r-- | target/linux/sunxi/patches-3.12/137-4-dt-sun5i-update-hstimer-entry.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.12/137-4-dt-sun5i-update-hstimer-entry.patch b/target/linux/sunxi/patches-3.12/137-4-dt-sun5i-update-hstimer-entry.patch new file mode 100644 index 0000000000..df36274190 --- /dev/null +++ b/target/linux/sunxi/patches-3.12/137-4-dt-sun5i-update-hstimer-entry.patch @@ -0,0 +1,29 @@ +From cdb1e9d50ad353833902214035a71ce08d86072a Mon Sep 17 00:00:00 2001 +From: Zoltan HERPAI <wigyori@uid0.hu> +Date: Sun, 12 Jan 2014 16:48:01 +0100 +Subject: [PATCH] ARM: sun5i: dt: update hstimer entry + +Rename the hstimer DT entry to make naming consistent with the +A20 dtsi. Also to avoid confusion when switching clocksources. + +Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> +--- + arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi +index 21900c6..e0a5cdd 100644 +--- a/arch/arm/boot/dts/sun5i-a13.dtsi ++++ b/arch/arm/boot/dts/sun5i-a13.dtsi +@@ -427,7 +427,7 @@ + status = "disabled"; + }; + +- timer@01c60000 { ++ hstimer@01c60000 { + compatible = "allwinner,sun5i-a13-hstimer"; + reg = <0x01c60000 0x1000>; + interrupts = <82>, <83>; +-- +1.7.0.4 + |