60 files changed, 339 insertions, 392 deletions

diff --git a/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt b/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt
index cb44918f01a8..ce1cb72d5345 100644
--- a/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt
@@ -3,10 +3,15 @@ Ingenic Watchdog Timer (WDT) Controller for JZ4740 & JZ4780
 Required properties:
 compatible: "ingenic,jz4740-watchdog" or "ingenic,jz4780-watchdog"
 reg: Register address and length for watchdog registers
+clocks: phandle to the RTC clock
+clock-names: should be "rtc"
 
 Example:
 
 watchdog: jz4740-watchdog@10002000 {
         compatible = "ingenic,jz4740-watchdog";
-        reg = <0x10002000 0x100>;
+        reg = <0x10002000 0x10>;
+
+        clocks = <&cgu JZ4740_CLK_RTC>;
+        clock-names = "rtc";
 };
diff --git a/MAINTAINERS b/MAINTAINERS
index 12b27679ae0c..def2850a1b19 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9417,10 +9417,12 @@ F:	drivers/usb/image/microtek.*
 
 MIPS
 M:      Ralf Baechle <ralf@linux-mips.org>
+M:      Paul Burton <paul.burton@mips.com>
 M:      James Hogan <jhogan@kernel.org>
 L:      linux-mips@linux-mips.org
 W:      http://www.linux-mips.org/
 T:      git git://git.linux-mips.org/pub/scm/ralf/linux.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
 Q:      http://patchwork.linux-mips.org/project/linux-mips/list/
 S:      Supported
 F:      Documentation/devicetree/bindings/mips/
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7074b2215f36..fe98e459a416 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -22,6 +22,11 @@ config MIPS
         select GENERIC_CPU_AUTOPROBE
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
+        select GENERIC_LIB_ASHLDI3
+        select GENERIC_LIB_ASHRDI3
+        select GENERIC_LIB_CMPDI2
+        select GENERIC_LIB_LSHRDI3
+        select GENERIC_LIB_UCMPDI2
         select GENERIC_PCI_IOMAP
         select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC
         select GENERIC_SMP_IDLE_THREAD
diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
index edfaef0d73a4..a80910d2738c 100644
--- a/arch/mips/bcm47xx/board.c
+++ b/arch/mips/bcm47xx/board.c
@@ -172,6 +172,8 @@ struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
         {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},
+        {{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T00_NETGEAR"},
+        {{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T50_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},
diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 88d400d256c4..977990a609ba 100644
--- a/arch/mips/bcm47xx/buttons.c
+++ b/arch/mips/bcm47xx/buttons.c
@@ -412,6 +412,12 @@ bcm47xx_buttons_netgear_wndr4500v1[] __initconst = {
 };
 
 static const struct gpio_keys_button
+bcm47xx_buttons_netgear_wnr1000_v3[] __initconst = {
+        BCM47XX_GPIO_KEY(2, KEY_WPS_BUTTON),
+        BCM47XX_GPIO_KEY(3, KEY_RESTART),
+};
+
+static const struct gpio_keys_button
 bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
         BCM47XX_GPIO_KEY(4, KEY_RESTART),
         BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
@@ -670,6 +676,9 @@ int __init bcm47xx_buttons_register(void)
         case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
                 break;
+        case BCM47XX_BOARD_NETGEAR_WNR1000_V3:
+                err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr1000_v3);
+                break;
         case BCM47XX_BOARD_NETGEAR_WNR3500L:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
                 break;
diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c
index 34a7b3fbdfd9..d85fcdac8bf0 100644
--- a/arch/mips/bcm47xx/leds.c
+++ b/arch/mips/bcm47xx/leds.c
@@ -498,6 +498,12 @@ bcm47xx_leds_netgear_wndr4500v1[] __initconst = {
 };
 
 static const struct gpio_led
+bcm47xx_leds_netgear_wnr1000_v3[] __initconst = {
+        BCM47XX_GPIO_LED(0, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(1, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
+};