[kernel] r22233 - in dists/sid/linux/debian: . patches patches/features/arm

Ian James Campbell ijc at moszumanska.debian.org
Mon Dec 29 23:16:33 UTC 2014 

Author: ijc
Date: Mon Dec 29 23:16:33 2014
New Revision: 22233

Log:
[arhmf] Add device-tree for LinkSprite pcDuino V3.

Patch from Karsten Merker (Closes: #774067)

Added:
   dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-board-support-for-LinkSprite-pcDuino-V3.patch
   dists/sid/linux/debian/patches/features/arm/dts-sun7i-pcduino3-Relicense-the-device-tree-under-GPLv2-X11.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Mon Dec 29 01:50:33 2014	(r22232)
+++ dists/sid/linux/debian/changelog	Mon Dec 29 23:16:33 2014	(r22233)
@@ -32,6 +32,8 @@
     - [/ixp4xx,orion5x]: Disable RD_LZO
     - [/ixp4xx,orion5x]: Disable PROFILING
     - [/orion5x]: Make SERIO and dependants modular
+  * [arhmf] Add device-tree for LinkSprite pcDuino V3. Patch from Karsten
+    Merker (Closes: #774067)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 13 Dec 2014 11:45:48 +0000
 

Added: dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-board-support-for-LinkSprite-pcDuino-V3.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/arm/dts-sun7i-Add-board-support-for-LinkSprite-pcDuino-V3.patch	Mon Dec 29 23:16:33 2014	(r22233)
@@ -0,0 +1,206 @@
+From 04089927981f295b42cd695485383b2d11283d59 Mon Sep 17 00:00:00 2001
+From: Zoltan HERPAI <wigyori at uid0.hu>
+Date: Mon, 30 Jun 2014 23:57:56 +0200
+Subject: ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3
+Origin: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=04089927981f295b42cd695485383b2d11283d59
+
+The LinkSprite pcDuino V3 is an A20 based development board featuring
+arduino compatible io headers, 1G RAM, 4G nand, sata, rtl8188cus usb wifi
+and 100 Mbit ethernet using an ip101a phy:
+
+http://www.pcduino.com/pcduino-v3/
+
+Signed-off-by: Zoltan HERPAI <wigyori at uid0.hu>
+[hdegoede at redhat.com: Various cleanups, correct led pins]
+[hdegoede at redhat.com: Add axp209, ir and gpio-keys nodes]
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -381,7 +381,8 @@
+ 	sun7i-a20-cubietruck.dtb \
+ 	sun7i-a20-i12-tvbox.dtb \
+ 	sun7i-a20-olinuxino-lime.dtb \
+-	sun7i-a20-olinuxino-micro.dtb
++	sun7i-a20-olinuxino-micro.dtb \
++	sun7i-a20-pcduino3.dtb
+ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
+ 	tegra20-iris-512.dtb \
+ 	tegra20-medcom-wide.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+@@ -0,0 +1,173 @@
++/*
++ * Copyright 2014 Zoltan HERPAI
++ * Zoltan HERPAI <wigyori at uid0.hu>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "sun7i-a20.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++
++/ {
++	model = "LinkSprite pcDuino3";
++	compatible = "linksprite,pcduino3", "allwinner,sun7i-a20";
++
++	soc at 01c00000 {
++		mmc0: mmc at 01c0f000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
++			vmmc-supply = <&reg_vcc3v3>;
++			bus-width = <4>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			cd-inverted;
++			status = "okay";
++		};
++
++		usbphy: phy at 01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb at 01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb at 01c14400 {
++			status = "okay";
++		};
++
++		ahci: sata at 01c18000 {
++			target-supply = <&reg_ahci_5v>;
++			status = "okay";
++		};
++
++		ehci1: usb at 01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb at 01c1c400 {
++			status = "okay";
++		};
++
++		pinctrl at 01c20800 {
++			ahci_pwr_pin_a: ahci_pwr_pin at 0 {
++				allwinner,pins = "PH2";
++			};
++
++			led_pins_pcduino3: led_pins at 0 {
++				allwinner,pins = "PH15", "PH16";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			key_pins_pcduino3: key_pins at 0 {
++				allwinner,pins = "PH17", "PH18", "PH19";
++				allwinner,function = "gpio_in";
++				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";
++		};
++
++		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>;
++			};
++		};
++
++		gmac: ethernet at 01c50000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&gmac_pins_mii_a>;
++			phy = <&phy1>;
++			phy-mode = "mii";
++			status = "okay";
++
++			phy1: ethernet-phy at 1 {
++				reg = <1>;
++			};
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&led_pins_pcduino3>;
++
++		tx {
++			label = "pcduino3:green:tx";
++			gpios = <&pio 7 15 GPIO_ACTIVE_LOW>;
++		};
++
++		rx {
++			label = "pcduino3:green:rx";
++			gpios = <&pio 7 16 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	gpio_keys {
++		compatible = "gpio-keys";
++		pinctrl-names = "default";
++		pinctrl-0 = <&key_pins_pcduino3>;
++		#address-cells = <1>;
++		#size-cells = <0>;
++		button at 0 {
++			label = "Key Back";
++			linux,code = <KEY_BACK>;
++			gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;
++		};
++		button at 1 {
++			label = "Key Home";
++			linux,code = <KEY_HOME>;
++			gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;
++		};
++		button at 2 {
++			label = "Key Menu";
++			linux,code = <KEY_MENU>;
++			gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
++
++	reg_ahci_5v: ahci-5v {
++		gpio = <&pio 7 2 0>;
++		status = "okay";
++	};
++};

Added: dists/sid/linux/debian/patches/features/arm/dts-sun7i-pcduino3-Relicense-the-device-tree-under-GPLv2-X11.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/arm/dts-sun7i-pcduino3-Relicense-the-device-tree-under-GPLv2-X11.patch	Mon Dec 29 23:16:33 2014	(r22233)
@@ -0,0 +1,74 @@
+From ca4ee84ccac71eb05fe3bedff9283cf52d4b4aa7 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard at free-electrons.com>
+Date: Tue, 2 Sep 2014 19:25:26 +0200
+Subject: ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11
+Origin: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=ca4ee84ccac71eb05fe3bedff9283cf52d4b4aa7
+
+The current GPL only licensing on the DTSI makes it very impractical for other
+software components licensed under another license.
+
+In order to make it easier for them to reuse our device trees, relicense our
+device trees under a GPL/X11 dual-license.
+
+Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
+Acked-by: Zoltan HERPAI <wigyori at uid0.hu>
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+index 046dfc0..8dca49b 100644
+--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
++++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+@@ -2,12 +2,48 @@
+  * Copyright 2014 Zoltan HERPAI
+  * Zoltan HERPAI <wigyori at uid0.hu>
+  *
+- * The code contained herein is licensed under the GNU General Public
+- * License. You may obtain a copy of the GNU General Public License
+- * Version 2 or later at the following locations:
++ * 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.
+  *
+- * http://www.opensource.org/licenses/gpl-license.html
+- * http://www.gnu.org/copyleft/gpl.html
++ *  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.
++ *
++ *     You should have received a copy of the GNU General Public
++ *     License along with this file; 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/;
+

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Mon Dec 29 01:50:33 2014	(r22232)
+++ dists/sid/linux/debian/patches/series	Mon Dec 29 23:16:33 2014	(r22233)
@@ -110,6 +110,8 @@
 features/arm/dts-sun7i-Add-Banana-Pi-board.patch
 features/arm/dts-sunxi-Banana-Pi-increase-startup-delay-for-the-GMAC-PHY-regulator.patch
 features/arm/dts-sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME.patch
+features/arm/dts-sun7i-Add-board-support-for-LinkSprite-pcDuino-V3.patch
+features/arm/dts-sun7i-pcduino3-Relicense-the-device-tree-under-GPLv2-X11.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