Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Author: davem330

Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt

@@ -32,8 +32,8 @@ Example:
 touchscreen-fuzz-x = <4>;
 touchscreen-fuzz-y = <7>;
 touchscreen-fuzz-pressure = <2>;
-touchscreen-max-x = <4096>;
-touchscreen-max-y = <4096>;
+touchscreen-size-x = <4096>;
+touchscreen-size-y = <4096>;
 touchscreen-max-pressure = <2048>;
 
 ti,x-plate-ohms = <280>;

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

@@ -15,10 +15,8 @@ Optional properties:
  - phys: phandle + phy specifier pair
  - phy-names: must be "usb"
  - dmas: Must contain a list of references to DMA specifiers.
- - dma-names : Must contain a list of DMA names:
- - tx0 ... tx<n>
- - rx0 ... rx<n>
- - This <n> means DnFIFO in USBHS module.
+ - dma-names : named "ch%d", where %d is the channel number ranging from zero
+ to the number of channels (DnFIFOs) minus one.
 
 Example:
 usbhs: usb@e6590000 {

MAINTAINERS

@@ -51,9 +51,9 @@ trivial patch so apply some common sense.
 or does something very odd once a month document it.
 
 PLEASE remember that submissions must be made under the terms
-of the OSDL certificate of contribution and should include a
-Signed-off-by: line. The current version of this "Developer's
-Certificate of Origin" (DCO) is listed in the file
+of the Linux Foundation certificate of contribution and should
+include a Signed-off-by: line. The current version of this
+"Developer's Certificate of Origin" (DCO) is listed in the file
 Documentation/SubmittingPatches.
 
 6.	Make sure you have the right to send any changes you make. If you
@@ -7587,6 +7587,7 @@ F:	drivers/pci/host/pci-exynos.c
 
 PCI DRIVER FOR SYNOPSIS DESIGNWARE
 M:	Jingoo Han <jingoohan1@gmail.com>
+M:	Pratyush Anand <pratyush.anand@gmail.com>
 L:	linux-pci@vger.kernel.org
 S:	Maintained
 F:	drivers/pci/host/*designware*
@@ -7600,8 +7601,9 @@ F:	Documentation/devicetree/bindings/pci/host-generic-pci.txt
 F:	drivers/pci/host/pci-host-generic.c
 
 PCIE DRIVER FOR ST SPEAR13XX
+M:	Pratyush Anand <pratyush.anand@gmail.com>
 L:	linux-pci@vger.kernel.org
-S:Orphan
+S:Maintained
 F:	drivers/pci/host/*spear*
 
 PCMCIA SUBSYSTEM

Makefile

@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 1
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
 NAME = Hurr durr I'ma sheep
 
 # *DOCUMENTATION*

arch/arm/boot/dts/am335x-bone-common.dtsi

@@ -223,6 +223,25 @@
 /include/ "tps65217.dtsi"
 
 &tps {
+/*
+ * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
+ * mode") at poweroff. Most BeagleBone versions do not support RTC-only
+ * mode and risk hardware damage if this mode is entered.
+ *
+ * For details, see linux-omap mailing list May 2015 thread
+ *	[PATCH] ARM: dts: am335x-bone* enable pmic-shutdown-controller
+ * In particular, messages:
+ *	http://www.spinics.net/lists/linux-omap/msg118585.html
+ *	http://www.spinics.net/lists/linux-omap/msg118615.html
+ *
+ * You can override this later with
+ *	&tps { /delete-property/ ti,pmic-shutdown-controller; }
+ * if you want to use RTC-only mode and made sure you are not affected
+ * by the hardware problems. (Tip: double-check by performing a current
+ * measurement after shutdown: it should be less than 1 mA.)
+ */
+ti,pmic-shutdown-controller;
+
 regulators {
 dcdc1_reg: regulator@0 {
 regulator-name = "vdds_dpr";

arch/arm/boot/dts/am35xx-clocks.dtsi

@@ -12,55 +12,55 @@
 #clock-cells = <0>;
 compatible = "ti,am35xx-gate-clock";
 clocks = <&ipss_ick>;
-reg = <0x059c>;
+reg = <0x032c>;
 ti,bit-shift = <1>;
 };
 
 emac_fck: emac_fck {
 #clock-cells = <0>;
 compatible = "ti,gate-clock";
 clocks = <&rmii_ck>;
-reg = <0x059c>;
+reg = <0x032c>;
 ti,bit-shift = <9>;
 };
 
 vpfe_ick: vpfe_ick {
 #clock-cells = <0>;
 compatible = "ti,am35xx-gate-clock";
 clocks = <&ipss_ick>;
-reg = <0x059c>;
+reg = <0x032c>;
 ti,bit-shift = <2>;
 };
 
 vpfe_fck: vpfe_fck {
 #clock-cells = <0>;
 compatible = "ti,gate-clock";
 clocks = <&pclk_ck>;
-reg = <0x059c>;
+reg = <0x032c>;
 ti,bit-shift = <10>;
 };
 
 hsotgusb_ick_am35xx: hsotgusb_ick_am35xx {
 #clock-cells = <0>;
 compatible = "ti,am35xx-gate-clock";
 clocks = <&ipss_ick>;
-reg = <0x059c>;
+reg = <0x032c>;
 ti,bit-shift = <0>;
 };
 
 hsotgusb_fck_am35xx: hsotgusb_fck_am35xx {
 #clock-cells = <0>;
 compatible = "ti,gate-clock";
 clocks = <&sys_ck>;
-reg = <0x059c>;
+reg = <0x032c>;
 ti,bit-shift = <8>;
 };
 
 hecc_ck: hecc_ck {
 #clock-cells = <0>;
 compatible = "ti,am35xx-gate-clock";
 clocks = <&sys_ck>;
-reg = <0x059c>;
+reg = <0x032c>;
 ti,bit-shift = <3>;
 };
 };

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

@@ -95,6 +95,11 @@
 
 internal-regs {
 
+rtc@10300 {
+/* No crystal connected to the internal RTC */
+status = "disabled";
+};
+
 /* J10: VCC, NC, RX, NC, TX, GND */
 serial@12000 {
 status = "okay";

arch/arm/boot/dts/dm816x.dtsi

@@ -382,7 +382,7 @@
 ti,hwmods = "usb_otg_hs";
 
 usb0: usb@47401000 {
-compatible = "ti,musb-am33xx";
+compatible = "ti,musb-dm816";
 reg = <0x47401400 0x400
  0x47401000 0x200>;
 reg-names = "mc", "control";
@@ -422,7 +422,7 @@
 };
 
 usb1: usb@47401800 {
-compatible = "ti,musb-am33xx";
+compatible = "ti,musb-dm816";
 reg = <0x47401c00 0x400
  0x47401800 0x200>;
 reg-names = "mc", "control";

arch/arm/boot/dts/omap3-n900.dts

@@ -832,8 +832,8 @@
 touchscreen-fuzz-x = <4>;
 touchscreen-fuzz-y = <7>;
 touchscreen-fuzz-pressure = <2>;
-touchscreen-max-x = <4096>;
-touchscreen-max-y = <4096>;
+touchscreen-size-x = <4096>;
+touchscreen-size-y = <4096>;
 touchscreen-max-pressure = <2048>;
 
 ti,x-plate-ohms = <280>;

arch/arm/mach-exynos/suspend.c

@@ -87,8 +87,8 @@ static unsigned int exynos_pmu_spare3;
 static u32 exynos_irqwake_intmask = 0xffffffff;
 
 static const struct exynos_wkup_irq exynos3250_wkup_irq[] = {
-{ 105, BIT(1) }, /* RTC alarm */
-{ 106, BIT(2) }, /* RTC tick */
+{ 73, BIT(1) }, /* RTC alarm */
+{ 74, BIT(2) }, /* RTC tick */
 { /* sentinel */ },
 };