Skip to contentSkip to conversation

FAILED: patch "[PATCH] phy: Add Tegra XUSB pad controller support" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 1, 2018

Subsystems (5)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 53d2a715c24034ee4017f3c15c82bb4a53a07da5 Mon Sep 17 00:00:00 2001

From: Thierry Reding <[email protected]>
Date: Wed, 11 Nov 2015 18:24:21 +0100
Subject: [PATCH] phy: Add Tegra XUSB pad controller support

Add a new driver for the XUSB pad controller found on NVIDIA Tegra SoCs. This hardware block used to be exposed as a pin controller, but it turns out that this isn't a good fit. The new driver and DT binding much more accurately describe the hardware and are more flexible in supporting new SoC generations.

drivers/phy/Kconfig +2 -0
index 26566db09de0..27e5f6ee9a2a 100644
@@ -421,4 +421,6 @@ config PHY_CYGNUS_PCIE
 	  Enable this to support the Broadcom Cygnus PCIe PHY.
 	  If unsure, say N.
 
+source "drivers/phy/tegra/Kconfig"
+
 endmenu
drivers/phy/Makefile +2 -0
index 24596a96a887..d4f06e69fd9a 100644
@@ -52,3 +52,5 @@ obj-$(CONFIG_PHY_TUSB1210)		+= phy-tusb1210.o
 obj-$(CONFIG_PHY_BRCMSTB_SATA)		+= phy-brcmstb-sata.o
 obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
 obj-$(CONFIG_PHY_CYGNUS_PCIE)		+= phy-bcm-cygnus-pcie.o
+
+obj-$(CONFIG_ARCH_TEGRA) += tegra/
drivers/phy/tegra/Kconfig new file +8 -0
new file mode 100644
index 000000000000..a3b1de953fb7
@@ -0,0 +1,8 @@
+config PHY_TEGRA_XUSB
+	tristate "NVIDIA Tegra XUSB pad controller driver"
+	depends on ARCH_TEGRA
+	help
+	  Choose this option if you have an NVIDIA Tegra SoC.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called phy-tegra-xusb.
drivers/phy/tegra/Makefile new file +5 -0
new file mode 100644
index 000000000000..31150b4337cd
@@ -0,0 +1,5 @@
+obj-$(CONFIG_PHY_TEGRA_XUSB) += phy-tegra-xusb.o
+
+phy-tegra-xusb-y += xusb.o
+phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_124_SOC) += xusb-tegra124.o
+phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_132_SOC) += xusb-tegra124.o
drivers/phy/tegra/xusb-tegra124.c new file +1752 -0

1,752 lines not on this page · raw message

drivers/phy/tegra/xusb.c new file +1021 -0

1,021 lines not on this page · raw message

drivers/phy/tegra/xusb.h new file +421 -0

203 lines not on this page · raw message

drivers/pinctrl/tegra/pinctrl-tegra-xusb.c +4 -16
index 2f06029c9405..946cda3fee35 100644

Lines of this file are not shown. View the raw message.

include/linux/phy/tegra/xusb.h new file +30 -0
new file mode 100644
index 000000000000..8e1a57a78d9f

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.