linux-libre-lts: add more patches for the C.H.I.P single-board computer support

4 files changed, 196 insertions, 19 deletions

diff --git a/libre/linux-libre-lts/0001-ARM-sunxi-add-R8-support.patch b/libre/linux-libre-lts/0001-ARM-sunxi-add-R8-support.patch
new file mode 100644
index 000000000..9f685790e
--- /dev/null
+++ b/libre/linux-libre-lts/0001-ARM-sunxi-add-R8-support.patch
@@ -0,0 +1,81 @@
+From bef6229f36c1c2ddae186f4e328c2359c1dad18d Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Tue, 9 Jun 2015 19:38:04 +0200
+Subject: [PATCH 1/3] ARM: sunxi: Add R8 support
+
+The R8 is a new Allwinner SoC based on the A13. While both are very
+similar, there's still a few differences. Introduce a new compatible to
+deal with them.
+
+In order to have a consistent naming, instead of mentioning the Allwinner
+A series as the machine name, switch to sun4i/sun5i like what is done for
+the other families.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+Reviewed-by: Chen-Yu Tsai <wens@csie.org>
+Acked-by: Stephen Boyd <sboyd@codeaurora.org>
+---
+ Documentation/arm/sunxi/README                  | 2 +-
+ Documentation/devicetree/bindings/arm/sunxi.txt | 1 +
+ arch/arm/mach-sunxi/sunxi.c                     | 3 ++-
+ drivers/clk/sunxi/clk-sunxi.c                   | 1 +
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README
+index 5e38e15..430d279 100644
+--- a/Documentation/arm/sunxi/README
++++ b/Documentation/arm/sunxi/README
+@@ -25,7 +25,7 @@ SunXi family
+         + Datasheet
+           http://dl.linux-sunxi.org/A10s/A10s%20Datasheet%20-%20v1.20%20%282012-03-27%29.pdf
+ 
+-      - Allwinner A13 (sun5i)
++      - Allwinner A13 / R8 (sun5i)
+         + Datasheet
+ 	  http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf
+         + User Manual
+diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt
+index 67da205..bb9b0faa 100644
+--- a/Documentation/devicetree/bindings/arm/sunxi.txt
++++ b/Documentation/devicetree/bindings/arm/sunxi.txt
+@@ -6,6 +6,7 @@ using one of the following compatible strings:
+   allwinner,sun4i-a10
+   allwinner,sun5i-a10s
+   allwinner,sun5i-a13
++  allwinner,sun5i-r8
+   allwinner,sun6i-a31
+   allwinner,sun7i-a20
+   allwinner,sun8i-a23
+diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
+index 65bab28..8583a9c 100644
+--- a/arch/arm/mach-sunxi/sunxi.c
++++ b/arch/arm/mach-sunxi/sunxi.c
+@@ -26,10 +26,11 @@ static const char * const sunxi_board_dt_compat[] = {
+ 	"allwinner,sun4i-a10",
+ 	"allwinner,sun5i-a10s",
+ 	"allwinner,sun5i-a13",
++	"allwinner,sun5i-r8",
+ 	NULL,
+ };
+ 
+-DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
++DT_MACHINE_START(SUNXI_DT, "Allwinner sun4i/sun5i Families")
+ 	.dt_compat	= sunxi_board_dt_compat,
+ 	.init_late	= sunxi_dt_cpufreq_init,
+ MACHINE_END
+diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
+index 413070d..9c79af0c 100644
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -1196,6 +1196,7 @@ static void __init sun5i_init_clocks(struct device_node *node)
+ }
+ CLK_OF_DECLARE(sun5i_a10s_clk_init, "allwinner,sun5i-a10s", sun5i_init_clocks);
+ CLK_OF_DECLARE(sun5i_a13_clk_init, "allwinner,sun5i-a13", sun5i_init_clocks);
++CLK_OF_DECLARE(sun5i_r8_clk_init, "allwinner,sun5i-r8", sun5i_init_clocks);
+ CLK_OF_DECLARE(sun7i_a20_clk_init, "allwinner,sun7i-a20", sun5i_init_clocks);
+ 
+ static const char *sun6i_critical_clocks[] __initdata = {
+-- 
+cgit v0.12
+
diff --git a/libre/linux-libre-lts/0001-CHIP-device-tree-file.patch b/libre/linux-libre-lts/0002-ARM-sun5i-add-CHIP-DTS.patch
index 61e1476f1..2ca192730 100644
--- a/libre/linux-libre-lts/0001-CHIP-device-tree-file.patch
+++ b/libre/linux-libre-lts/0002-ARM-sun5i-add-CHIP-DTS.patch
@@ -1,16 +1,21 @@
-From 45a2d06dfeaec03fd749cbe42dddf44fe1cf53e1 Mon Sep 17 00:00:00 2001
-From: André Silva <emulatorman@parabola.nu>
-Date: Sun, 10 Apr 2016 18:08:45 -0300
-Subject: [PATCH 1/1] C.H.I.P device tree file
+From 465a225fb2afb3ebf1becbe76d46b084d46f30a5 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Tue, 9 Jun 2015 19:38:43 +0200
+Subject: [PATCH 2/3] ARM: sun5i: Add C.H.I.P DTS
 
-This adds a dts file for the C.H.I.P.
+The C.H.I.P. is a small SBC with an Allwinner R8, 8GB of NAND, 512MB of
+RAM, USB host and OTG, a wifi / bluetooth combo chip, an audio/video jack
+and two connectors to plug additional boards on top of it.
 
-Signed-off-by: André Silva <emulatorman@parabola.nu>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+Acked-by: Chen-Yu Tsai <wens@csie.org>
+Reviewed-by: André Silva <emulatorman@parabola.nu>
 ---
-arch/arm/boot/dts/Makefile | 3 +-
-arch/arm/boot/dts/sun5i-r8-chip.dts | 218 ++++++++++++++++++++++++++++++++++++
-2 files changed, 220 insertions(+), 1 deletion(-)
-create mode 100644 arch/arm/boot/dts/sun5i-r8-chip.dts
+ arch/arm/boot/dts/Makefile          |   3 +-
+ arch/arm/boot/dts/sun5i-r8-chip.dts | 214 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 216 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/boot/dts/sun5i-r8-chip.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
 index 992736b..f8d18bd 100644
@@ -28,10 +33,10 @@ index 992736b..f8d18bd 100644
  	sun6i-a31-colombus.dtb \
 diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
 new file mode 100644
-index 0000000..530ab28
+index 0000000..abf3ccb
 --- /dev/null
 +++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,214 @@
 +/*
 + * Copyright 2015 Free Electrons
 + * Copyright 2015 NextThing Co
@@ -100,10 +105,6 @@ index 0000000..530ab28
 +	};
 +};
 +
-+&codec {
-+	status = "okay";
-+};
-+
 +&ehci0 {
 +	status = "okay";
 +};
@@ -250,3 +251,6 @@ index 0000000..530ab28
 +	usb0_vbus-supply = <&reg_usb0_vbus>;
 +	usb1_vbus-supply = <&reg_vcc5v0>;
 +};
+-- 
+cgit v0.12
+
diff --git a/libre/linux-libre-lts/0003-ARM-sun5i-add-R8-DTSI.patch b/libre/linux-libre-lts/0003-ARM-sun5i-add-R8-DTSI.patch
new file mode 100644
index 000000000..bfa01eaa8
--- /dev/null
+++ b/libre/linux-libre-lts/0003-ARM-sun5i-add-R8-DTSI.patch
@@ -0,0 +1,86 @@
+From 49e4f3c3271e7eff2800596ba168c932d7d702b8 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Fri, 18 Sep 2015 09:09:34 +0200
+Subject: [PATCH 3/3] ARM: sun5i: Add R8 DTSI
+
+The R8 is very close to the A13, but it still has a few differences,
+notably a composite output, which the A13 lacks.
+
+Add a DTSI based on the A13's to hold those differences.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Reviewed-by: Chen-Yu Tsai <wens@csie.org>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun5i-r8.dtsi | 59 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 59 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sun5i-r8.dtsi
+
+diff --git a/arch/arm/boot/dts/sun5i-r8.dtsi b/arch/arm/boot/dts/sun5i-r8.dtsi
+new file mode 100644
+index 0000000..0ef8656
+--- /dev/null
++++ b/arch/arm/boot/dts/sun5i-r8.dtsi
+@@ -0,0 +1,59 @@
++/*
++ * Copyright 2015 Free Electrons
++ * Copyright 2015 NextThing Co
++ *
++ * Maxime Ripard <maxime.ripard@free-electrons.com>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++#include "sun5i-a13.dtsi"
++
++/ {
++	chosen {
++		framebuffer@1 {
++			compatible = "allwinner,simple-framebuffer",
++				     "simple-framebuffer";
++			allwinner,pipeline = "de_be0-lcd0-tve0";
++			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
++				 <&ahb_gates 44>;
++			status = "disabled";
++		};
++	};
++};
+-- 
+cgit v0.12
+
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index a04315cb9..bd962fecc 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -50,7 +50,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # armv7h patches
         "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
         "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
-        '0001-CHIP-device-tree-file.patch'
+        '0001-ARM-sunxi-add-R8-support.patch'
+        '0002-ARM-sun5i-add-CHIP-DTS.patch'
+        '0003-ARM-sun5i-add-R8-DTSI.patch'
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
@@ -79,7 +81,9 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324'
             '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d'
             '3743d0478507d160f24326241831df8c4d3f2e268bcaf2f62dfe2ef5e8a69188'
             'SKIP'
-            'bb3113130feedd411bd0947bd8217c7643519659ddb9ca57f7b53a1a51fb67a0'
+            'c30f5b73d31202d1453c15eafc933a374a9087169761cd8d9404a80591ddabb2'
+            '69517e7f99bfbb8f4483162a1e76bda7f6845284476c20dbd16e074249400396'
+            '1970e32e3dc9da22c79c6ef9fe22dd4874a76a81ed1012ddfc7e83d1a2a0214b'
             '203b07cc241f2374d1e18583fc9940cc69da134f992bff65a8b376c717aa7ea7'
             '28fb8c937c2a0dc824ea755efba26ac5a4555f9a97d79f4e31f24b23c5eae59c'
             '39bfd7f6e2df0b87b52488462edb2fbcfaf9e3eb2a974fc7b3bc22147352fece'
@@ -117,7 +121,9 @@ prepare() {
     git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
 
     # Parabola patches
-    patch -p1 -i "${srcdir}/0001-CHIP-device-tree-file.patch"
+    patch -p1 -i "${srcdir}/0001-ARM-sunxi-add-R8-support.patch"
+    patch -p1 -i "${srcdir}/0002-ARM-sun5i-add-CHIP-DTS.patch"
+    patch -p1 -i "${srcdir}/0003-ARM-sun5i-add-R8-DTSI.patch"
 
     # ALARM patches
     patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"