From efa1960abb390d696704d029507dff671cc271fd Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 13 Jul 2016 12:07:08 +0200 Subject: kernel: update kernel 4.4 to version 4.4.15 Signed-off-by: Hauke Mehrtens --- ...-ns-usb2-new-driver-for-USB-2.0-PHY-on-Norths.patch | 18 ------------------ ...2-phy-bcm-ns-usb2-checking-the-wrong-variable.patch | 7 +------ ...b-xhci-plat-fix-adding-usb3-lpm-capable-quirk.patch | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) (limited to 'target/linux/bcm53xx') diff --git a/target/linux/bcm53xx/patches-4.4/089-0001-phy-bcm-ns-usb2-new-driver-for-USB-2.0-PHY-on-Norths.patch b/target/linux/bcm53xx/patches-4.4/089-0001-phy-bcm-ns-usb2-new-driver-for-USB-2.0-PHY-on-Norths.patch index 870bcb8d7a..c12cdb1861 100644 --- a/target/linux/bcm53xx/patches-4.4/089-0001-phy-bcm-ns-usb2-new-driver-for-USB-2.0-PHY-on-Norths.patch +++ b/target/linux/bcm53xx/patches-4.4/089-0001-phy-bcm-ns-usb2-new-driver-for-USB-2.0-PHY-on-Norths.patch @@ -30,9 +30,6 @@ Signed-off-by: Kishon Vijay Abraham I create mode 100644 drivers/phy/phy-bcm-ns-usb2.c create mode 100644 include/linux/bcma/bcma_driver_arm_c9.h -diff --git a/Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.txt b/Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.txt -new file mode 100644 -index 0000000..a7aee9e --- /dev/null +++ b/Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.txt @@ -0,0 +1,21 @@ @@ -57,8 +54,6 @@ index 0000000..a7aee9e + clocks = <&genpll BCM_NSP_GENPLL_USB_PHY_REF_CLK>; + clock-names = "phy-ref-clk"; + }; -diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig -index f6ff76e..f2b458f 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -15,6 +15,15 @@ config GENERIC_PHY @@ -77,8 +72,6 @@ index f6ff76e..f2b458f 100644 config PHY_BERLIN_USB tristate "Marvell Berlin USB PHY Driver" depends on ARCH_BERLIN && RESET_CONTROLLER && HAS_IOMEM && OF -diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile -index f03fa1f..0de09e1 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -3,6 +3,7 @@ @@ -89,9 +82,6 @@ index f03fa1f..0de09e1 100644 obj-$(CONFIG_PHY_BERLIN_USB) += phy-berlin-usb.o obj-$(CONFIG_PHY_BERLIN_SATA) += phy-berlin-sata.o obj-$(CONFIG_PHY_DM816X_USB) += phy-dm816x-usb.o -diff --git a/drivers/phy/phy-bcm-ns-usb2.c b/drivers/phy/phy-bcm-ns-usb2.c -new file mode 100644 -index 0000000..95ab6b2 --- /dev/null +++ b/drivers/phy/phy-bcm-ns-usb2.c @@ -0,0 +1,137 @@ @@ -232,8 +222,6 @@ index 0000000..95ab6b2 +module_platform_driver(bcm_ns_usb2_driver); + +MODULE_LICENSE("GPL v2"); -diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h -index 0367c63..e6b41f4 100644 --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h @@ -4,6 +4,7 @@ @@ -244,9 +232,6 @@ index 0367c63..e6b41f4 100644 #include #include #include -diff --git a/include/linux/bcma/bcma_driver_arm_c9.h b/include/linux/bcma/bcma_driver_arm_c9.h -new file mode 100644 -index 0000000..93bd73d --- /dev/null +++ b/include/linux/bcma/bcma_driver_arm_c9.h @@ -0,0 +1,15 @@ @@ -265,6 +250,3 @@ index 0000000..93bd73d +#define BCMA_DMU_CRU_STRAPS_CTRL_4BYTE 0x00008000 + +#endif /* LINUX_BCMA_DRIVER_ARM_C9_H_ */ --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-4.4/089-0002-phy-bcm-ns-usb2-checking-the-wrong-variable.patch b/target/linux/bcm53xx/patches-4.4/089-0002-phy-bcm-ns-usb2-checking-the-wrong-variable.patch index 81144dc2b3..ae3462f43e 100644 --- a/target/linux/bcm53xx/patches-4.4/089-0002-phy-bcm-ns-usb2-checking-the-wrong-variable.patch +++ b/target/linux/bcm53xx/patches-4.4/089-0002-phy-bcm-ns-usb2-checking-the-wrong-variable.patch @@ -12,11 +12,9 @@ Signed-off-by: Kishon Vijay Abraham I drivers/phy/phy-bcm-ns-usb2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/phy/phy-bcm-ns-usb2.c b/drivers/phy/phy-bcm-ns-usb2.c -index 95ab6b2..58dff80 100644 --- a/drivers/phy/phy-bcm-ns-usb2.c +++ b/drivers/phy/phy-bcm-ns-usb2.c -@@ -109,8 +109,8 @@ static int bcm_ns_usb2_probe(struct platform_device *pdev) +@@ -109,8 +109,8 @@ static int bcm_ns_usb2_probe(struct plat } usb2->phy = devm_phy_create(dev, NULL, &ops); @@ -27,6 +25,3 @@ index 95ab6b2..58dff80 100644 phy_set_drvdata(usb2->phy, usb2); platform_set_drvdata(pdev, usb2); --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-4.4/190-usb-xhci-plat-fix-adding-usb3-lpm-capable-quirk.patch b/target/linux/bcm53xx/patches-4.4/190-usb-xhci-plat-fix-adding-usb3-lpm-capable-quirk.patch index c120829495..e3e132cb9c 100644 --- a/target/linux/bcm53xx/patches-4.4/190-usb-xhci-plat-fix-adding-usb3-lpm-capable-quirk.patch +++ b/target/linux/bcm53xx/patches-4.4/190-usb-xhci-plat-fix-adding-usb3-lpm-capable-quirk.patch @@ -50,7 +50,7 @@ Signed-off-by: Hauke Mehrtens const struct hc_driver *driver; struct xhci_hcd *xhci; struct resource *res; -@@ -155,10 +161,6 @@ static int xhci_plat_probe(struct platfo +@@ -158,10 +164,6 @@ static int xhci_plat_probe(struct platfo goto disable_clk; } -- cgit v1.2.3