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 | 4f7246ea089f51f2e453f82cb80b8319df211be2 (patch) | |
tree | 6c0bce69b4726e8bdd17ee619efe54bb0f34d219 /target/linux/sunxi/patches-3.12 | |
parent | 8a22f204c21195c3d57ffc73ef71d527e8c5173a (diff) | |
download | master-187ad058-4f7246ea089f51f2e453f82cb80b8319df211be2.tar.gz master-187ad058-4f7246ea089f51f2e453f82cb80b8319df211be2.tar.bz2 master-187ad058-4f7246ea089f51f2e453f82cb80b8319df211be2.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39263 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.12')
-rw-r--r-- | target/linux/sunxi/patches-3.12/137-4-dt-sun5i-update-hstimer-entry.patch | 29 | ||||
-rw-r--r-- | target/linux/sunxi/patches-3.12/232-dt-add-cubietruck.patch | 10 |
2 files changed, 39 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 + diff --git a/target/linux/sunxi/patches-3.12/232-dt-add-cubietruck.patch b/target/linux/sunxi/patches-3.12/232-dt-add-cubietruck.patch new file mode 100644 index 0000000000..662d17d051 --- /dev/null +++ b/target/linux/sunxi/patches-3.12/232-dt-add-cubietruck.patch @@ -0,0 +1,10 @@ +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -235,6 +235,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ + sun5i-a13-olinuxino.dtb \ + sun6i-a31-colombus.dtb \ + sun7i-a20-cubieboard2.dtb \ ++ sun7i-a20-cubietruck.dtb \ + sun7i-a20-olinuxino-micro.dtb + dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ + tegra20-iris-512.dtb \ |