Update KERNEL_VERSION to 4.1.33

7 files changed, 24 insertions, 54 deletions

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index d6d90e831d8239..f8c734ef446b6c 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-4.1.28
+4.1.33
diff --git a/patches.altera/0002-PCI-altera-Add-Altera-PCIe-host-controller-driver.patch b/patches.altera/0002-PCI-altera-Add-Altera-PCIe-host-controller-driver.patch
index a6f9036e0873d9..d354ca7202a60c 100644
--- a/patches.altera/0002-PCI-altera-Add-Altera-PCIe-host-controller-driver.patch
+++ b/patches.altera/0002-PCI-altera-Add-Altera-PCIe-host-controller-driver.patch
@@ -13,18 +13,15 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
 Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
 Acked-by: Rob Herring <robh@kernel.org> (DT binding)
 ---
- .../devicetree/bindings/pci/altera-pcie.txt        |  49 ++
- MAINTAINERS                                        |   8 +
- drivers/pci/host/Kconfig                           |   9 +
- drivers/pci/host/Makefile                          |   1 +
- drivers/pci/host/pcie-altera.c                     | 612 +++++++++++++++++++++
+ Documentation/devicetree/bindings/pci/altera-pcie.txt |   49 +
+ MAINTAINERS                                           |    8 
+ drivers/pci/host/Kconfig                              |    9 
+ drivers/pci/host/Makefile                             |    1 
+ drivers/pci/host/pcie-altera.c                        |  612 ++++++++++++++++++
  5 files changed, 679 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie.txt
  create mode 100644 drivers/pci/host/pcie-altera.c
 
-diff --git a/Documentation/devicetree/bindings/pci/altera-pcie.txt b/Documentation/devicetree/bindings/pci/altera-pcie.txt
-new file mode 100644
-index 000000000000..2951a6a50704
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/pci/altera-pcie.txt
 @@ -0,0 +1,49 @@
@@ -77,11 +74,9 @@ index 000000000000..2951a6a50704
 +		ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000
 +			    0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>;
 +	};
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 31535b79d7ab..05cfb55c0dc5 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -7498,6 +7498,14 @@ F:	include/linux/pci*
+@@ -7509,6 +7509,14 @@ F:	include/linux/pci*
  F:	arch/x86/pci/
  F:	arch/x86/kernel/quirks.c
  
@@ -96,8 +91,6 @@ index 31535b79d7ab..05cfb55c0dc5 100644
  PCI DRIVER FOR ARM VERSATILE PLATFORM
  M:	Rob Herring <robh@kernel.org>
  L:	linux-pci@vger.kernel.org
-diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
-index 1dfb567b3522..cfdbb72d4003 100644
 --- a/drivers/pci/host/Kconfig
 +++ b/drivers/pci/host/Kconfig
 @@ -125,4 +125,13 @@ config PCIE_IPROC_PLATFORM
@@ -114,18 +107,13 @@ index 1dfb567b3522..cfdbb72d4003 100644
 +	  FPGA.
 +
  endmenu
-diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile
-index f733b4e27642..f26e5a25ef3a 100644
 --- a/drivers/pci/host/Makefile
 +++ b/drivers/pci/host/Makefile
-@@ -15,3 +15,4 @@ obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
+@@ -15,3 +15,4 @@ obj-$(CONFIG_PCI_LAYERSCAPE) += pci-laye
  obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o
  obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o
  obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o
 +obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o
-diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c
-new file mode 100644
-index 000000000000..5d018092a484
 --- /dev/null
 +++ b/drivers/pci/host/pcie-altera.c
 @@ -0,0 +1,612 @@
@@ -741,6 +729,3 @@ index 000000000000..5d018092a484
 +MODULE_AUTHOR("Ley Foon Tan <lftan@altera.com>");
 +MODULE_DESCRIPTION("Altera PCIe host controller driver");
 +MODULE_LICENSE("GPL v2");
--- 
-2.6.3
-
diff --git a/patches.altera/0003-PCI-altera-Add-Altera-PCIe-MSI-driver.patch b/patches.altera/0003-PCI-altera-Add-Altera-PCIe-MSI-driver.patch
index 5aa5193892080d..82d04a5ad96538 100644
--- a/patches.altera/0003-PCI-altera-Add-Altera-PCIe-MSI-driver.patch
+++ b/patches.altera/0003-PCI-altera-Add-Altera-PCIe-MSI-driver.patch
@@ -13,18 +13,15 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
 Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
 Acked-by: Rob Herring <robh@kernel.org>
 ---
- .../devicetree/bindings/pci/altera-pcie-msi.txt    |  28 ++
- MAINTAINERS                                        |   8 +
- drivers/pci/host/Kconfig                           |   8 +
- drivers/pci/host/Makefile                          |   1 +
- drivers/pci/host/pcie-altera-msi.c                 | 323 +++++++++++++++++++++
+ Documentation/devicetree/bindings/pci/altera-pcie-msi.txt |   28 +
+ MAINTAINERS                                               |    8 
+ drivers/pci/host/Kconfig                                  |    8 
+ drivers/pci/host/Makefile                                 |    1 
+ drivers/pci/host/pcie-altera-msi.c                        |  323 ++++++++++++++
  5 files changed, 368 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
  create mode 100644 drivers/pci/host/pcie-altera-msi.c
 
-diff --git a/Documentation/devicetree/bindings/pci/altera-pcie-msi.txt b/Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
-new file mode 100644
-index 000000000000..09cd3bc4d038
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
 @@ -0,0 +1,28 @@
@@ -56,11 +53,9 @@ index 000000000000..09cd3bc4d038
 +	msi-controller;
 +	num-vectors = <32>;
 +};
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 05cfb55c0dc5..bff014445443 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -7607,6 +7607,14 @@ L:	linux-pci@vger.kernel.org
+@@ -7618,6 +7618,14 @@ L:	linux-pci@vger.kernel.org
  S:	Maintained
  F:	drivers/pci/host/*spear*
  
@@ -75,8 +70,6 @@ index 05cfb55c0dc5..bff014445443 100644
  PCMCIA SUBSYSTEM
  P:	Linux PCMCIA Team
  L:	linux-pcmcia@lists.infradead.org
-diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
-index cfdbb72d4003..f7cf0926b6e7 100644
 --- a/drivers/pci/host/Kconfig
 +++ b/drivers/pci/host/Kconfig
 @@ -134,4 +134,12 @@ config PCIE_ALTERA
@@ -92,18 +85,13 @@ index cfdbb72d4003..f7cf0926b6e7 100644
 +	  This MSI driver supports Altera MSI to GIC controller IP.
 +
  endmenu
-diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile
-index f26e5a25ef3a..537d3eaa0dae 100644
 --- a/drivers/pci/host/Makefile
 +++ b/drivers/pci/host/Makefile
-@@ -16,3 +16,4 @@ obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o
+@@ -16,3 +16,4 @@ obj-$(CONFIG_PCI_VERSATILE) += pci-versa
  obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o
  obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o
  obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o
 +obj-$(CONFIG_PCIE_ALTERA_MSI) += pcie-altera-msi.o
-diff --git a/drivers/pci/host/pcie-altera-msi.c b/drivers/pci/host/pcie-altera-msi.c
-new file mode 100644
-index 000000000000..6df00ac1f721
 --- /dev/null
 +++ b/drivers/pci/host/pcie-altera-msi.c
 @@ -0,0 +1,323 @@
@@ -430,6 +418,3 @@ index 000000000000..6df00ac1f721
 +MODULE_AUTHOR("Ley Foon Tan <lftan@altera.com>");
 +MODULE_DESCRIPTION("Altera PCIe MSI support");
 +MODULE_LICENSE("GPL v2");
--- 
-2.6.3
-
diff --git a/patches.altera/0005-MAINTAINERS-add-fpga-manager-framework.patch b/patches.altera/0005-MAINTAINERS-add-fpga-manager-framework.patch
index e2155bd7201f4f..67dd39e2399d1a 100644
--- a/patches.altera/0005-MAINTAINERS-add-fpga-manager-framework.patch
+++ b/patches.altera/0005-MAINTAINERS-add-fpga-manager-framework.patch
@@ -16,7 +16,7 @@ Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -4089,6 +4089,13 @@ F:	include/linux/fmc*.h
+@@ -4099,6 +4099,13 @@ F:	include/linux/fmc*.h
  F:	include/linux/ipmi-fru.h
  K:	fmc_d.*register
  
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index b1b5d1c5f736df..c8974794c23130 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 1
- SUBLEVEL = 28
+ SUBLEVEL = 33
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = Series 4800
diff --git a/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch b/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
index 568e7a22805c71..c797aa813fde87 100644
--- a/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
+++ b/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
@@ -254,7 +254,7 @@ Conflicts:
  
 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c
 +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
-@@ -1533,9 +1533,9 @@ static int chv_pinctrl_probe(struct plat
+@@ -1547,9 +1547,9 @@ static int chv_pinctrl_probe(struct plat
  	pctrl->pctldesc.npins = pctrl->community->npins;
  
  	pctrl->pctldev = pinctrl_register(&pctrl->pctldesc, &pdev->dev, pctrl);
@@ -367,7 +367,7 @@ Conflicts:
  	platform_set_drvdata(pdev, pinctrl);
 --- a/drivers/pinctrl/pinctrl-amd.c
 +++ b/drivers/pinctrl/pinctrl-amd.c
-@@ -789,9 +789,9 @@ static int amd_gpio_probe(struct platfor
+@@ -769,9 +769,9 @@ static int amd_gpio_probe(struct platfor
  	amd_pinctrl_desc.name = dev_name(&pdev->dev);
  	gpio_dev->pctrl = pinctrl_register(&amd_pinctrl_desc,
  					&pdev->dev, gpio_dev);
diff --git a/patches.renesas/0256-usb-renesas_usbhs-Allow-an-OTG-PHY-driver-to-provide.patch b/patches.renesas/0256-usb-renesas_usbhs-Allow-an-OTG-PHY-driver-to-provide.patch
index c334115a84f213..1558201f99a3e1 100644
--- a/patches.renesas/0256-usb-renesas_usbhs-Allow-an-OTG-PHY-driver-to-provide.patch
+++ b/patches.renesas/0256-usb-renesas_usbhs-Allow-an-OTG-PHY-driver-to-provide.patch
@@ -35,7 +35,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	u32	status;
  #define USBHSG_STATUS_STARTED		(1 << 0)
-@@ -877,6 +880,27 @@ static int usbhsg_try_stop(struct usbhs_
+@@ -887,6 +890,27 @@ static int usbhsg_try_stop(struct usbhs_
  }
  
  /*
@@ -63,7 +63,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
   *
   *		linux usb function
   *
-@@ -886,12 +910,28 @@ static int usbhsg_gadget_start(struct us
+@@ -896,12 +920,28 @@ static int usbhsg_gadget_start(struct us
  {
  	struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget);
  	struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
@@ -92,7 +92,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  	/* first hook up the driver ... */
  	gpriv->driver = driver;
  
-@@ -904,6 +944,10 @@ static int usbhsg_gadget_stop(struct usb
+@@ -914,6 +954,10 @@ static int usbhsg_gadget_stop(struct usb
  	struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
  
  	usbhsg_try_stop(priv, USBHSG_STATUS_REGISTERD);
@@ -103,7 +103,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  	gpriv->driver = NULL;
  
  	return 0;
-@@ -951,12 +995,26 @@ static int usbhsg_set_selfpowered(struct
+@@ -961,12 +1005,26 @@ static int usbhsg_set_selfpowered(struct
  	return 0;
  }
  
@@ -130,7 +130,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  };
  
  static int usbhsg_start(struct usbhs_priv *priv)
-@@ -998,6 +1056,10 @@ int usbhs_mod_gadget_probe(struct usbhs_
+@@ -1008,6 +1066,10 @@ int usbhs_mod_gadget_probe(struct usbhs_
  		goto usbhs_mod_gadget_probe_err_gpriv;
  	}