From d0a757147bcfb1813585638b08ee8e6a8d743254 Mon Sep 17 00:00:00 2001 From: Zoltan Herpai Date: Sun, 12 Jan 2014 19:23:29 +0000 Subject: 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 SVN-Revision: 39263 --- .../137-4-dt-sun5i-update-hstimer-entry.patch | 29 ++++++++++++++++++++++ .../sunxi/patches-3.12/232-dt-add-cubietruck.patch | 10 ++++++++ 2 files changed, 39 insertions(+) create mode 100644 target/linux/sunxi/patches-3.12/137-4-dt-sun5i-update-hstimer-entry.patch create mode 100644 target/linux/sunxi/patches-3.12/232-dt-add-cubietruck.patch (limited to 'target/linux/sunxi/patches-3.12') 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 0000000..df36274 --- /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 +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 +--- + 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 0000000..662d17d --- /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 \ -- cgit v1.1