From 14d25476b83a67bd0ac4eaaae5020880c31a9c5a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 16 Feb 2015 03:57:44 +0000 Subject: [PATCH] [armhf] Drop sun7i device tree patches which are included in 3.19 (fixes FTBFS) svn path=/dists/trunk/linux/; revision=22391 --- debian/changelog | 7 +++++ ...un7i-Add-spi0_pins_a-pinctrl-setting.patch | 29 ------------------ ...n7i-Add-uart3_pins_b-pinctrl-setting.patch | 30 ------------------- debian/patches/series | 2 -- 4 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 debian/patches/features/arm/dts-sun7i-Add-spi0_pins_a-pinctrl-setting.patch delete mode 100644 debian/patches/features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch diff --git a/debian/changelog b/debian/changelog index 87d2060f8..f9c2b4526 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (3.19-1~exp2) UNRELEASED; urgency=medium + + * [armhf] Drop sun7i device tree patches which are included in 3.19 + (fixes FTBFS) + + -- Ben Hutchings Mon, 16 Feb 2015 03:57:08 +0000 + linux (3.19-1~exp1) experimental; urgency=medium * New upstream release: http://kernelnewbies.org/Linux_3.19 diff --git a/debian/patches/features/arm/dts-sun7i-Add-spi0_pins_a-pinctrl-setting.patch b/debian/patches/features/arm/dts-sun7i-Add-spi0_pins_a-pinctrl-setting.patch deleted file mode 100644 index adb0d58e5..000000000 --- a/debian/patches/features/arm/dts-sun7i-Add-spi0_pins_a-pinctrl-setting.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Hans de Goede -Subject: [PATCH v2 1/3] ARM: dts: sun7i: Add spi0_pins_a pinctrl setting -Date: Wed, 1 Oct 2014 09:26:04 +0200 -Origin: https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=a99eb770b4ab561434c9049b7b09cf40e27d3a55 - -Signed-off-by: Hans de Goede -Signed-off-by: Maxime Ripard ---- - 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@0 { -+ allwinner,pins = "PI10", "PI11", "PI12", "PI13", "PI14"; -+ allwinner,function = "spi0"; -+ allwinner,drive = <0>; -+ allwinner,pull = <0>; -+ }; -+ - spi1_pins_a: spi1@0 { - allwinner,pins = "PI16", "PI17", "PI18", "PI19"; - allwinner,function = "spi1"; diff --git a/debian/patches/features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch b/debian/patches/features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch deleted file mode 100644 index fc8259fcd..000000000 --- a/debian/patches/features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Hans de Goede -Subject: [PATCH v2 2/3] ARM: dts: sun7i: Add uart3_pins_b pinctrl setting -Date: Wed, 1 Oct 2014 09:26:05 +0200 -Origin: https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=46e9fd407fad0e9442d0feb9b678d81839ea29a1 - -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 -Signed-off-by: Maxime Ripard ---- - 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@1 { -+ allwinner,pins = "PH0", "PH1"; -+ allwinner,function = "uart3"; -+ allwinner,drive = <0>; -+ allwinner,pull = <0>; -+ }; -+ - uart6_pins_a: uart6@0 { - allwinner,pins = "PI12", "PI13"; - allwinner,function = "uart6"; diff --git a/debian/patches/series b/debian/patches/series index b867c96c1..a5a073a94 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -49,8 +49,6 @@ features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch 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-sun7i-Add-spi0_pins_a-pinctrl-setting.patch -features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch # Miscellaneous bug fixes bugfix/all/misc-bmp085-Enable-building-as-a-module.patch