[linux] 01/01: [arm64] Remove patches in 4.8-rc1

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Sun Aug 28 20:31:05 UTC 2016


This is an automated email from the git hooks/post-receive script.

tbm pushed a commit to branch master
in repository linux.

commit 7d47a94178ee2d926f3f3abc91c6bc281cbe6b5a
Author: Martin Michlmayr <tbm at cyrius.com>
Date:   Sun Aug 28 13:30:32 2016 -0700

    [arm64] Remove patches in 4.8-rc1
---
 .../arm64-tegra-add-tegra210-xusb-controller.patch | 64 ----------------------
 ...a-correct-tegra210-xusb-mailbox-interrupt.patch | 33 -----------
 debian/patches/series                              |  3 -
 3 files changed, 100 deletions(-)

diff --git a/debian/patches/features/arm/arm64-tegra-add-tegra210-xusb-controller.patch b/debian/patches/features/arm/arm64-tegra-add-tegra210-xusb-controller.patch
deleted file mode 100644
index f26eb88..0000000
--- a/debian/patches/features/arm/arm64-tegra-add-tegra210-xusb-controller.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-Taken from the Linux Tegra tree.  Patch has been accepted for 4.8-rc1
-
-Origin: https://git.kernel.org/cgit/linux/kernel/git/tegra/linux.git/log/?h=for-4.8/arm64/dt
-
-
-commit e7a99ac299924b714e2b7c9f36e435b89c035b3b
-Author: Thierry Reding <treding at nvidia.com>
-Date:   Thu Nov 12 11:28:36 2015 +0100
-
-    arm64: tegra: Add Tegra210 XUSB controller
-    
-    Add a device tree node for the Tegra XUSB controller. It contains a
-    phandle to the XUSB pad controller for control of the PHYs assigned
-    to the USB ports.
-    
-    Signed-off-by: Thierry Reding <treding at nvidia.com>
-
-diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
-index 694228b..ac1fb88 100644
---- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
-+++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
-@@ -621,6 +621,41 @@
- 		status = "disabled";
- 	};
- 
-+	usb at 70090000 {
-+		compatible = "nvidia,tegra210-xusb";
-+		reg = <0x0 0x70090000 0x0 0x8000>,
-+		      <0x0 0x70098000 0x0 0x1000>,
-+		      <0x0 0x70099000 0x0 0x1000>;
-+		reg-names = "hcd", "fpci", "ipfs";
-+
-+		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
-+			     <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
-+
-+		clocks = <&tegra_car TEGRA210_CLK_XUSB_HOST>,
-+			 <&tegra_car TEGRA210_CLK_XUSB_HOST_SRC>,
-+			 <&tegra_car TEGRA210_CLK_XUSB_FALCON_SRC>,
-+			 <&tegra_car TEGRA210_CLK_XUSB_SS>,
-+			 <&tegra_car TEGRA210_CLK_XUSB_SS_DIV2>,
-+			 <&tegra_car TEGRA210_CLK_XUSB_SS_SRC>,
-+			 <&tegra_car TEGRA210_CLK_XUSB_HS_SRC>,
-+			 <&tegra_car TEGRA210_CLK_XUSB_FS_SRC>,
-+			 <&tegra_car TEGRA210_CLK_PLL_U_480M>,
-+			 <&tegra_car TEGRA210_CLK_CLK_M>,
-+			 <&tegra_car TEGRA210_CLK_PLL_E>;
-+		clock-names = "xusb_host", "xusb_host_src",
-+			      "xusb_falcon_src", "xusb_ss",
-+			      "xusb_ss_div2", "xusb_ss_src",
-+			      "xusb_hs_src", "xusb_fs_src",
-+			      "pll_u_480m", "clk_m", "pll_e";
-+		resets = <&tegra_car 89>, <&tegra_car 156>,
-+			 <&tegra_car 143>;
-+		reset-names = "xusb_host", "xusb_ss", "xusb_src";
-+
-+		nvidia,xusb-padctl = <&padctl>;
-+
-+		status = "disabled";
-+	};
-+
- 	padctl: padctl at 7009f000 {
- 		compatible = "nvidia,tegra210-xusb-padctl";
- 		reg = <0x0 0x7009f000 0x0 0x1000>;
diff --git a/debian/patches/features/arm/arm64-tegra-correct-tegra210-xusb-mailbox-interrupt.patch b/debian/patches/features/arm/arm64-tegra-correct-tegra210-xusb-mailbox-interrupt.patch
deleted file mode 100644
index eb83452..0000000
--- a/debian/patches/features/arm/arm64-tegra-correct-tegra210-xusb-mailbox-interrupt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-Taken from the Linux Tegra tree.  Patch has been accepted for 4.8-rc1
-
-Origin: https://git.kernel.org/cgit/linux/kernel/git/tegra/linux.git/log/?h=for-4.8/arm64/dt
-
-
-commit 9168e1db754383ea16b75ffcc1efbb9b09cfae64
-Author: Jon Hunter <jonathanh at nvidia.com>
-Date:   Wed Jun 29 12:07:33 2016 +0100
-
-    arm64: tegra: Correct Tegra210 XUSB mailbox interrupt
-    
-    The XUSB mailbox interrupt for Tegra210 is 40 and not 49 which is for
-    the XUSB pad controller. For some Tegra210 boards, this is causing USB
-    connect and disconnect events to go undetected. Fix this by changing the
-    interrupt number for the XUSB mailbox to 40.
-    
-    Signed-off-by: Jon Hunter <jonathanh at nvidia.com>
-    Signed-off-by: Thierry Reding <treding at nvidia.com>
-
-diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
-index ac1fb88..b731880 100644
---- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
-+++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
-@@ -629,7 +629,7 @@
- 		reg-names = "hcd", "fpci", "ipfs";
- 
- 		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
--			     <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
-+			     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
- 
- 		clocks = <&tegra_car TEGRA210_CLK_XUSB_HOST>,
- 			 <&tegra_car TEGRA210_CLK_XUSB_HOST_SRC>,
diff --git a/debian/patches/series b/debian/patches/series
index f4c1eb0..8583c2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -52,9 +52,6 @@ features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
 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
-# USB for Jetson TX1: is in 4.8-rc1
-features/arm/arm64-tegra-add-tegra210-xusb-controller.patch
-features/arm/arm64-tegra-correct-tegra210-xusb-mailbox-interrupt.patch
 
 # Miscellaneous bug fixes
 bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git



More information about the Kernel-svn-changes mailing list