[kernel] r21930 - in dists/sid/linux/debian: . patches patches/features/arm
Ian James Campbell
ijc at moszumanska.debian.org
Fri Oct 3 22:01:31 UTC 2014
Author: ijc
Date: Fri Oct 3 22:01:31 2014
New Revision: 21930
Log:
[armhf] Backport BananaPi device tree files. Patch from Karsten Merker (Closes: #763897)
Added:
dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-Banana-Pi-board.patch
dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-spi0_pins_a-pinctrl-setting.patch
dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch
dists/sid/linux/debian/patches/features/arm/dts-sunxi-Add-pins-for-IR-controller-on-A20-to-dtsi.patch
Modified:
dists/sid/linux/debian/changelog
dists/sid/linux/debian/patches/series
Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog Fri Oct 3 19:46:25 2014 (r21929)
+++ dists/sid/linux/debian/changelog Fri Oct 3 22:01:31 2014 (r21930)
@@ -24,6 +24,10 @@
RTC_DRV_S5M, RTC_DRV_SUNXI, RTC_DRV_VT8500 from modules to built-ins for
the same reason as above.
+ [ Ian Campbell ]
+ * [armhf] Backport BananaPi device tree files. Patch from Karsten
+ Merker (Closes: #763897).
+
-- Ian Campbell <ijc at debian.org> Sun, 21 Sep 2014 12:09:24 +0100
linux (3.16.3-2) unstable; urgency=medium
Added: dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-Banana-Pi-board.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-Banana-Pi-board.patch Fri Oct 3 22:01:31 2014 (r21930)
@@ -0,0 +1,244 @@
+From: Hans de Goede <hdegoede at redhat.com>
+Subject: [PATCH v2 3/3] ARM: dts: sun7i: Add Banana Pi board
+Date: Wed, 1 Oct 2014 09:26:06 +0200
+
+The Banana Pi is an A20 based development board using Raspberry Pi compatible
+IO headers. It comes with 1 GB RAM, 1 Gb ethernet, 2x USB host, sata, hdmi
+and stereo audio out + various expenansion headers:
+
+http://www.lemaker.org/
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 214 +++++++++++++++++++++++++++++++
+ 2 files changed, 215 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -376,6 +376,7 @@
+ sun6i-a31-colombus.dtb \
+ sun6i-a31-m9.dtb
+ dtb-$(CONFIG_MACH_SUN7I) += \
++ sun7i-a20-bananapi.dtb \
+ sun7i-a20-cubieboard2.dtb \
+ sun7i-a20-cubietruck.dtb \
+ sun7i-a20-i12-tvbox.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+@@ -0,0 +1,214 @@
++/*
++ * Copyright 2014 Hans de Goede <hdegoede at redhat.com>
++ *
++ * Hans de Goede <hdegoede at redhat.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 library 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 library 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.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this library; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ *
++ * 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/ "sun7i-a20.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
++
++/ {
++ model = "LeMaker Banana Pi";
++ compatible = "lemaker,bananapi", "allwinner,sun7i-a20";
++
++ soc at 01c00000 {
++ spi0: spi at 01c05000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&spi0_pins_a>;
++ status = "okay";
++ };
++
++ mmc0: mmc at 01c0f000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
++ vmmc-supply = <®_vcc3v3>;
++ bus-width = <4>;
++ cd-gpios = <&pio 7 10 0>; /* PH10 */
++ cd-inverted;
++ status = "okay";
++ };
++
++ usbphy: phy at 01c13400 {
++ usb1_vbus-supply = <®_usb1_vbus>;
++ usb2_vbus-supply = <®_usb2_vbus>;
++ status = "okay";
++ };
++
++ ehci0: usb at 01c14000 {
++ status = "okay";
++ };
++
++ ohci0: usb at 01c14400 {
++ status = "okay";
++ };
++
++ ahci: sata at 01c18000 {
++ status = "okay";
++ };
++
++ ehci1: usb at 01c1c000 {
++ status = "okay";
++ };
++
++ ohci1: usb at 01c1c400 {
++ status = "okay";
++ };
++
++ pinctrl at 01c20800 {
++ mmc0_cd_pin_bananapi: mmc0_cd_pin at 0 {
++ allwinner,pins = "PH10";
++ allwinner,function = "gpio_in";
++ allwinner,drive = <0>;
++ allwinner,pull = <1>;
++ };
++
++ gmac_power_pin_bananapi: gmac_power_pin at 0 {
++ allwinner,pins = "PH23";
++ allwinner,function = "gpio_out";
++ allwinner,drive = <0>;
++ allwinner,pull = <0>;
++ };
++
++ led_pins_bananapi: led_pins at 0 {
++ allwinner,pins = "PH24";
++ allwinner,function = "gpio_out";
++ allwinner,drive = <0>;
++ allwinner,pull = <0>;
++ };
++ };
++
++ ir0: ir at 01c21800 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&ir0_pins_a>;
++ status = "okay";
++ };
++
++ uart0: serial at 01c28000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&uart0_pins_a>;
++ status = "okay";
++ };
++
++ uart3: serial at 01c28c00 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&uart3_pins_b>;
++ status = "okay";
++ };
++
++ uart7: serial at 01c29c00 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&uart7_pins_a>;
++ status = "okay";
++ };
++
++ i2c0: i2c at 01c2ac00 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&i2c0_pins_a>;
++ status = "okay";
++
++ axp209: pmic at 34 {
++ compatible = "x-powers,axp209";
++ reg = <0x34>;
++ interrupt-parent = <&nmi_intc>;
++ interrupts = <0 8>;
++
++ interrupt-controller;
++ #interrupt-cells = <1>;
++ };
++ };
++
++ i2c2: i2c at 01c2b400 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&i2c2_pins_a>;
++ status = "okay";
++ };
++
++ gmac: ethernet at 01c50000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&gmac_pins_rgmii_a>;
++ phy = <&phy1>;
++ phy-mode = "rgmii";
++ phy-supply = <®_gmac_3v3>;
++ status = "okay";
++
++ phy1: ethernet-phy at 1 {
++ reg = <1>;
++ };
++ };
++ };
++
++ leds {
++ compatible = "gpio-leds";
++ pinctrl-names = "default";
++ pinctrl-0 = <&led_pins_bananapi>;
++
++ green {
++ label = "bananapi:green:usr";
++ gpios = <&pio 7 24 0>;
++ };
++ };
++
++ reg_usb1_vbus: usb1-vbus {
++ status = "okay";
++ };
++
++ reg_usb2_vbus: usb2-vbus {
++ status = "okay";
++ };
++
++ reg_gmac_3v3: gmac-3v3 {
++ compatible = "regulator-fixed";
++ pinctrl-names = "default";
++ pinctrl-0 = <&gmac_power_pin_bananapi>;
++ regulator-name = "gmac-3v3";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ startup-delay-us = <50000>;
++ enable-active-high;
++ gpio = <&pio 7 23 0>;
++ };
++};
Added: dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-spi0_pins_a-pinctrl-setting.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-spi0_pins_a-pinctrl-setting.patch Fri Oct 3 22:01:31 2014 (r21930)
@@ -0,0 +1,27 @@
+From: Hans de Goede <hdegoede at redhat.com>
+Subject: [PATCH v2 1/3] ARM: dts: sun7i: Add spi0_pins_a pinctrl setting
+Date: Wed, 1 Oct 2014 09:26:04 +0200
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+Index: linux-3.16.3/arch/arm/boot/dts/sun7i-a20.dtsi
+===================================================================
+--- linux-3.16.3.orig/arch/arm/boot/dts/sun7i-a20.dtsi
++++ linux-3.16.3/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -704,6 +704,13 @@
+ allwinner,pull = <0>;
+ };
+
++ spi0_pins_a: spi0 at 0 {
++ allwinner,pins = "PI10", "PI11", "PI12", "PI13", "PI14";
++ allwinner,function = "spi0";
++ allwinner,drive = <0>;
++ allwinner,pull = <0>;
++ };
++
+ spi1_pins_a: spi1 at 0 {
+ allwinner,pins = "PI16", "PI17", "PI18", "PI19";
+ allwinner,function = "spi1";
Added: dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch Fri Oct 3 22:01:31 2014 (r21930)
@@ -0,0 +1,28 @@
+From: Hans de Goede <hdegoede at redhat.com>
+Subject: [PATCH v2 2/3] ARM: dts: sun7i: Add uart3_pins_b pinctrl setting
+Date: Wed, 1 Oct 2014 09:26:05 +0200
+
+The uart3_pins_a multiplexes the uart3 pins to port G, add a pinctrl entry
+for mapping them to port H (as used on the Bananapi).
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -618,6 +618,13 @@
+ allwinner,pull = <0>;
+ };
+
++ uart3_pins_b: uart3 at 1 {
++ allwinner,pins = "PH0", "PH1";
++ allwinner,function = "uart3";
++ allwinner,drive = <0>;
++ allwinner,pull = <0>;
++ };
++
+ uart6_pins_a: uart6 at 0 {
+ allwinner,pins = "PI12", "PI13";
+ allwinner,function = "uart6";
Added: dists/sid/linux/debian/patches/features/arm/dts-sunxi-Add-pins-for-IR-controller-on-A20-to-dtsi.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/arm/dts-sunxi-Add-pins-for-IR-controller-on-A20-to-dtsi.patch Fri Oct 3 22:01:31 2014 (r21930)
@@ -0,0 +1,39 @@
+From 0fc2b7af8cd5918c0101dfb178b5a3a4b021a50b Mon Sep 17 00:00:00 2001
+From: Alexander Bersenev <bay at hackerdom.ru>
+Date: Mon, 9 Jun 2014 00:08:11 +0600
+Subject: ARM: sunxi: Add pins for IR controller on A20 to dtsi
+
+This patch adds pins for two IR controllers on A20
+
+Signed-off-by: Alexander Bersenev <bay at hackerdom.ru>
+Signed-off-by: Alexsey Shestacov <wingrime at linux-sunxi.org>
+Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
+
+diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
+index 01e9466..656d7d3 100644
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -738,6 +738,20 @@
+ allwinner,drive = <2>;
+ allwinner,pull = <0>;
+ };
++
++ ir0_pins_a: ir0 at 0 {
++ allwinner,pins = "PB3","PB4";
++ allwinner,function = "ir0";
++ allwinner,drive = <0>;
++ allwinner,pull = <0>;
++ };
++
++ ir1_pins_a: ir1 at 0 {
++ allwinner,pins = "PB22","PB23";
++ allwinner,function = "ir1";
++ allwinner,drive = <0>;
++ allwinner,pull = <0>;
++ };
+ };
+
+ timer at 01c20c00 {
+--
+cgit v0.10.1
+
Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series Fri Oct 3 19:46:25 2014 (r21929)
+++ dists/sid/linux/debian/patches/series Fri Oct 3 22:01:31 2014 (r21930)
@@ -96,6 +96,10 @@
features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
features/x86/x86-make-x32-syscall-support-conditional.patch
features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
+features/arm/dts-sunxi-Add-pins-for-IR-controller-on-A20-to-dtsi.patch
+features/arm/dts-sun7i-Add-spi0_pins_a-pinctrl-setting.patch
+features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch
+features/arm/dts-sun7i-Add-Banana-Pi-board.patch
features/arm64/drivers-net-Add-APM-X-Gene-SoC-ethernet-driver-suppo.patch
features/arm64/drivers-net-NET_XGENE-should-depend-on-HAS_DMA.patch
features/arm64/net-xgene-Check-negative-return-value-of-xgene_enet_.patch
More information about the Kernel-svn-changes
mailing list