From 2520508d321719626b6123ed753c594c031408fd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 12 Apr 2016 05:04:11 -0300 Subject: linux-libre-lts{,-knock}: minor fix --- .../0001-ARM-sunxi-Add-R8-support.patch | 81 +++++++ .../0001-ARM-sunxi-add-R8-support.patch | 81 ------- .../0002-ARM-sun5i-Add-CHIP-DTS.patch | 256 +++++++++++++++++++++ .../0002-ARM-sun5i-add-CHIP-DTS.patch | 256 --------------------- .../0003-ARM-sun5i-Add-R8-DTSI.patch | 86 +++++++ .../0003-ARM-sun5i-add-R8-DTSI.patch | 86 ------- libre/linux-libre-lts/PKGBUILD | 12 +- 7 files changed, 429 insertions(+), 429 deletions(-) create mode 100644 libre/linux-libre-lts/0001-ARM-sunxi-Add-R8-support.patch delete mode 100644 libre/linux-libre-lts/0001-ARM-sunxi-add-R8-support.patch create mode 100644 libre/linux-libre-lts/0002-ARM-sun5i-Add-CHIP-DTS.patch delete mode 100644 libre/linux-libre-lts/0002-ARM-sun5i-add-CHIP-DTS.patch create mode 100644 libre/linux-libre-lts/0003-ARM-sun5i-Add-R8-DTSI.patch delete mode 100644 libre/linux-libre-lts/0003-ARM-sun5i-add-R8-DTSI.patch (limited to 'libre/linux-libre-lts') 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 +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 +Reviewed-by: Hans de Goede +Reviewed-by: Chen-Yu Tsai +Acked-by: Stephen Boyd +--- + 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-ARM-sunxi-add-R8-support.patch b/libre/linux-libre-lts/0001-ARM-sunxi-add-R8-support.patch deleted file mode 100644 index 9f685790e..000000000 --- a/libre/linux-libre-lts/0001-ARM-sunxi-add-R8-support.patch +++ /dev/null @@ -1,81 +0,0 @@ -From bef6229f36c1c2ddae186f4e328c2359c1dad18d Mon Sep 17 00:00:00 2001 -From: Maxime Ripard -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 -Reviewed-by: Hans de Goede -Reviewed-by: Chen-Yu Tsai -Acked-by: Stephen Boyd ---- - 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/0002-ARM-sun5i-Add-CHIP-DTS.patch b/libre/linux-libre-lts/0002-ARM-sun5i-Add-CHIP-DTS.patch new file mode 100644 index 000000000..2ca192730 --- /dev/null +++ b/libre/linux-libre-lts/0002-ARM-sun5i-Add-CHIP-DTS.patch @@ -0,0 +1,256 @@ +From 465a225fb2afb3ebf1becbe76d46b084d46f30a5 Mon Sep 17 00:00:00 2001 +From: Maxime Ripard +Date: Tue, 9 Jun 2015 19:38:43 +0200 +Subject: [PATCH 2/3] ARM: sun5i: Add C.H.I.P DTS + +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: Maxime Ripard +Reviewed-by: Hans de Goede +Acked-by: Chen-Yu Tsai +Reviewed-by: André Silva +--- + 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 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -540,7 +540,8 @@ dtb-$(CONFIG_MACH_SUN5I) += \ + sun5i-a10s-r7-tv-dongle.dtb \ + sun5i-a13-hsg-h702.dtb \ + sun5i-a13-olinuxino.dtb \ +- sun5i-a13-olinuxino-micro.dtb ++ sun5i-a13-olinuxino-micro.dtb \ ++ sun5i-r8-chip.dtb + dtb-$(CONFIG_MACH_SUN6I) += \ + sun6i-a31-app4-evb1.dtb \ + 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..abf3ccb +--- /dev/null ++++ b/arch/arm/boot/dts/sun5i-r8-chip.dts +@@ -0,0 +1,214 @@ ++/* ++ * Copyright 2015 Free Electrons ++ * Copyright 2015 NextThing Co ++ * ++ * Maxime Ripard ++ * ++ * 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. ++ */ ++ ++/dts-v1/; ++#include "sun5i-r8.dtsi" ++#include "sunxi-common-regulators.dtsi" ++ ++#include ++#include ++ ++/ { ++ model = "NextThing C.H.I.P."; ++ compatible = "nextthing,chip", "allwinner,sun5i-r8"; ++ ++ aliases { ++ i2c0 = &i2c0; ++ i2c2 = &i2c2; ++ serial0 = &uart1; ++ serial1 = &uart3; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++}; ++ ++&ehci0 { ++ status = "okay"; ++}; ++ ++&i2c0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c0_pins_a>; ++ status = "okay"; ++ ++ axp209: pmic@34 { ++ reg = <0x34>; ++ ++ /* ++ * The interrupt is routed through the "External Fast ++ * Interrupt Request" pin (ball G13 of the module) ++ * directly to the main interrupt controller, without ++ * any other controller interfering. ++ */ ++ interrupts = <0>; ++ }; ++}; ++ ++#include "axp209.dtsi" ++ ++&i2c2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c2_pins_a>; ++ status = "okay"; ++ ++ xio: gpio@38 { ++ compatible = "nxp,pcf8574a"; ++ reg = <0x38>; ++ ++ gpio-controller; ++ #gpio-cells = <2>; ++ ++ interrupt-parent = <&pio>; ++ interrupts = <6 0 IRQ_TYPE_EDGE_FALLING>; ++ interrupt-controller; ++ #interrupt-cells = <2>; ++ }; ++}; ++ ++&mmc0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc0_pins_a>; ++ vmmc-supply = <®_vcc3v3>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++}; ++ ++&ohci0 { ++ status = "okay"; ++}; ++ ++&otg_sram { ++ status = "okay"; ++}; ++ ++&pio { ++ chip_vbus_pin: chip_vbus_pin@0 { ++ allwinner,pins = "PB10"; ++ allwinner,function = "gpio_out"; ++ allwinner,drive = ; ++ allwinner,pull = ; ++ }; ++ ++ chip_id_det_pin: chip_id_det_pin@0 { ++ allwinner,pins = "PG2"; ++ allwinner,function = "gpio_in"; ++ allwinner,drive = ; ++ allwinner,pull = ; ++ }; ++}; ++ ++®_dcdc2 { ++ regulator-min-microvolt = <1000000>; ++ regulator-max-microvolt = <1400000>; ++ regulator-name = "cpuvdd"; ++ regulator-always-on; ++}; ++ ++®_dcdc3 { ++ regulator-min-microvolt = <1000000>; ++ regulator-max-microvolt = <1300000>; ++ regulator-name = "corevdd"; ++ regulator-always-on; ++}; ++ ++®_ldo1 { ++ regulator-name = "rtcvdd"; ++}; ++ ++®_ldo2 { ++ regulator-min-microvolt = <2700000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "avcc"; ++ regulator-always-on; ++}; ++ ++®_ldo5 { ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "vcc-1v8"; ++}; ++ ++®_usb0_vbus { ++ pinctrl-0 = <&chip_vbus_pin>; ++ vin-supply = <®_vcc5v0>; ++ gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */ ++ status = "okay"; ++}; ++ ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart1_pins_b>; ++ status = "okay"; ++}; ++ ++&uart3 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart3_pins_a>, ++ <&uart3_pins_cts_rts_a>; ++ status = "okay"; ++}; ++ ++&usb_otg { ++ dr_mode = "otg"; ++ status = "okay"; ++}; ++ ++&usb_power_supply { ++ status = "okay"; ++}; ++ ++&usbphy { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&chip_id_det_pin>; ++ status = "okay"; ++ ++ usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ ++ usb0_vbus_power-supply = <&usb_power_supply>; ++ usb0_vbus-supply = <®_usb0_vbus>; ++ usb1_vbus-supply = <®_vcc5v0>; ++}; +-- +cgit v0.12 + diff --git a/libre/linux-libre-lts/0002-ARM-sun5i-add-CHIP-DTS.patch b/libre/linux-libre-lts/0002-ARM-sun5i-add-CHIP-DTS.patch deleted file mode 100644 index 2ca192730..000000000 --- a/libre/linux-libre-lts/0002-ARM-sun5i-add-CHIP-DTS.patch +++ /dev/null @@ -1,256 +0,0 @@ -From 465a225fb2afb3ebf1becbe76d46b084d46f30a5 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard -Date: Tue, 9 Jun 2015 19:38:43 +0200 -Subject: [PATCH 2/3] ARM: sun5i: Add C.H.I.P DTS - -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: Maxime Ripard -Reviewed-by: Hans de Goede -Acked-by: Chen-Yu Tsai -Reviewed-by: André Silva ---- - 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 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -540,7 +540,8 @@ dtb-$(CONFIG_MACH_SUN5I) += \ - sun5i-a10s-r7-tv-dongle.dtb \ - sun5i-a13-hsg-h702.dtb \ - sun5i-a13-olinuxino.dtb \ -- sun5i-a13-olinuxino-micro.dtb -+ sun5i-a13-olinuxino-micro.dtb \ -+ sun5i-r8-chip.dtb - dtb-$(CONFIG_MACH_SUN6I) += \ - sun6i-a31-app4-evb1.dtb \ - 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..abf3ccb ---- /dev/null -+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts -@@ -0,0 +1,214 @@ -+/* -+ * Copyright 2015 Free Electrons -+ * Copyright 2015 NextThing Co -+ * -+ * Maxime Ripard -+ * -+ * 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. -+ */ -+ -+/dts-v1/; -+#include "sun5i-r8.dtsi" -+#include "sunxi-common-regulators.dtsi" -+ -+#include -+#include -+ -+/ { -+ model = "NextThing C.H.I.P."; -+ compatible = "nextthing,chip", "allwinner,sun5i-r8"; -+ -+ aliases { -+ i2c0 = &i2c0; -+ i2c2 = &i2c2; -+ serial0 = &uart1; -+ serial1 = &uart3; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+}; -+ -+&ehci0 { -+ status = "okay"; -+}; -+ -+&i2c0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c0_pins_a>; -+ status = "okay"; -+ -+ axp209: pmic@34 { -+ reg = <0x34>; -+ -+ /* -+ * The interrupt is routed through the "External Fast -+ * Interrupt Request" pin (ball G13 of the module) -+ * directly to the main interrupt controller, without -+ * any other controller interfering. -+ */ -+ interrupts = <0>; -+ }; -+}; -+ -+#include "axp209.dtsi" -+ -+&i2c2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c2_pins_a>; -+ status = "okay"; -+ -+ xio: gpio@38 { -+ compatible = "nxp,pcf8574a"; -+ reg = <0x38>; -+ -+ gpio-controller; -+ #gpio-cells = <2>; -+ -+ interrupt-parent = <&pio>; -+ interrupts = <6 0 IRQ_TYPE_EDGE_FALLING>; -+ interrupt-controller; -+ #interrupt-cells = <2>; -+ }; -+}; -+ -+&mmc0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc0_pins_a>; -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+}; -+ -+&ohci0 { -+ status = "okay"; -+}; -+ -+&otg_sram { -+ status = "okay"; -+}; -+ -+&pio { -+ chip_vbus_pin: chip_vbus_pin@0 { -+ allwinner,pins = "PB10"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = ; -+ allwinner,pull = ; -+ }; -+ -+ chip_id_det_pin: chip_id_det_pin@0 { -+ allwinner,pins = "PG2"; -+ allwinner,function = "gpio_in"; -+ allwinner,drive = ; -+ allwinner,pull = ; -+ }; -+}; -+ -+®_dcdc2 { -+ regulator-min-microvolt = <1000000>; -+ regulator-max-microvolt = <1400000>; -+ regulator-name = "cpuvdd"; -+ regulator-always-on; -+}; -+ -+®_dcdc3 { -+ regulator-min-microvolt = <1000000>; -+ regulator-max-microvolt = <1300000>; -+ regulator-name = "corevdd"; -+ regulator-always-on; -+}; -+ -+®_ldo1 { -+ regulator-name = "rtcvdd"; -+}; -+ -+®_ldo2 { -+ regulator-min-microvolt = <2700000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-name = "avcc"; -+ regulator-always-on; -+}; -+ -+®_ldo5 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-name = "vcc-1v8"; -+}; -+ -+®_usb0_vbus { -+ pinctrl-0 = <&chip_vbus_pin>; -+ vin-supply = <®_vcc5v0>; -+ gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */ -+ status = "okay"; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart1_pins_b>; -+ status = "okay"; -+}; -+ -+&uart3 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart3_pins_a>, -+ <&uart3_pins_cts_rts_a>; -+ status = "okay"; -+}; -+ -+&usb_otg { -+ dr_mode = "otg"; -+ status = "okay"; -+}; -+ -+&usb_power_supply { -+ status = "okay"; -+}; -+ -+&usbphy { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&chip_id_det_pin>; -+ status = "okay"; -+ -+ usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ -+ usb0_vbus_power-supply = <&usb_power_supply>; -+ usb0_vbus-supply = <®_usb0_vbus>; -+ usb1_vbus-supply = <®_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 +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 +Reviewed-by: Chen-Yu Tsai +Reviewed-by: Hans de Goede +--- + 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 ++ * ++ * 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/0003-ARM-sun5i-add-R8-DTSI.patch b/libre/linux-libre-lts/0003-ARM-sun5i-add-R8-DTSI.patch deleted file mode 100644 index bfa01eaa8..000000000 --- a/libre/linux-libre-lts/0003-ARM-sun5i-add-R8-DTSI.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 49e4f3c3271e7eff2800596ba168c932d7d702b8 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard -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 -Reviewed-by: Chen-Yu Tsai -Reviewed-by: Hans de Goede ---- - 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 -+ * -+ * 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 bd962fecc..366d1c97e 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -50,9 +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-ARM-sunxi-add-R8-support.patch' - '0002-ARM-sun5i-add-CHIP-DTS.patch' - '0003-ARM-sun5i-add-R8-DTSI.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' @@ -121,9 +121,9 @@ prepare() { git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch" # Parabola patches - 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" + 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" -- cgit v1.2.3-54-g00ecf