24 files changed, 176 insertions, 33 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 01645edc2388..6682420421c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1923,7 +1923,6 @@ ARM/QUALCOMM SUPPORT
 M:      Andy Gross <andy.gross@linaro.org>
 M:      David Brown <david.brown@linaro.org>
 L:      linux-arm-msm@vger.kernel.org
-L:      linux-soc@vger.kernel.org
 S:      Maintained
 F:      Documentation/devicetree/bindings/soc/qcom/
 F:      arch/arm/boot/dts/qcom-*.dts
@@ -2931,7 +2930,6 @@ F:	arch/mips/include/asm/mach-bcm47xx/*
 BROADCOM BCM5301X ARM ARCHITECTURE
 M:      Hauke Mehrtens <hauke@hauke-m.de>
 M:      Rafał Miłecki <zajec5@gmail.com>
-M:      Jon Mason <jonmason@broadcom.com>
 M:      bcm-kernel-feedback-list@broadcom.com
 L:      linux-arm-kernel@lists.infradead.org
 S:      Maintained
@@ -3077,7 +3075,6 @@ F:	drivers/net/ethernet/broadcom/genet/
 BROADCOM IPROC ARM ARCHITECTURE
 M:      Ray Jui <rjui@broadcom.com>
 M:      Scott Branden <sbranden@broadcom.com>
-M:      Jon Mason <jonmason@broadcom.com>
 M:      bcm-kernel-feedback-list@broadcom.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:      git git://github.com/broadcom/cygnus-linux.git
diff --git a/arch/arm/boot/dts/am3517-evm.dts b/arch/arm/boot/dts/am3517-evm.dts
index d4d33cd7adad..1e2bb68231ad 100644
--- a/arch/arm/boot/dts/am3517-evm.dts
+++ b/arch/arm/boot/dts/am3517-evm.dts
@@ -228,7 +228,7 @@
         vmmc-supply = <&vmmc_fixed>;
         bus-width = <4>;
         wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */
-        cd-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>; /* gpio_127 */
+        cd-gpios = <&gpio4 31 GPIO_ACTIVE_LOW>; /* gpio_127 */
 };
 
 &mmc3 {
diff --git a/arch/arm/boot/dts/am3517-som.dtsi b/arch/arm/boot/dts/am3517-som.dtsi
index dae6e458e59f..b1c988eed87c 100644
--- a/arch/arm/boot/dts/am3517-som.dtsi
+++ b/arch/arm/boot/dts/am3517-som.dtsi
@@ -163,7 +163,7 @@
                 compatible = "ti,wl1271";
                 reg = <2>;
                 interrupt-parent = <&gpio6>;
-                interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; /* gpio_170 */
+                interrupts = <10 IRQ_TYPE_EDGE_RISING>; /* gpio_170 */
                 ref-clock-frequency = <26000000>;
                 tcxo-clock-frequency = <26000000>;
         };
diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index e45a15ceb94b..69d753cac89a 100644
--- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
@@ -492,12 +492,6 @@
         pinctrl-0 = <&pinctrl_i2c2>;
         status = "okay";
 
-        eeprom@50 {
-                compatible = "atmel,24c04";
-                pagesize = <16>;
-                reg = <0x50>;
-        };
-
         hpa1: amp@60 {
                 compatible = "ti,tpa6130a2";
                 reg = <0x60>;
diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi
index ac343330d0c8..98b682a8080c 100644
--- a/arch/arm/boot/dts/logicpd-som-lv.dtsi
+++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
@@ -129,7 +129,7 @@
 };
 
 &mmc3 {
-        interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
+        interrupts-extended = <&intc 94 &omap3_pmx_core 0x136>;
         pinctrl-0 = <&mmc3_pins &wl127x_gpio>;
         pinctrl-names = "default";
         vmmc-supply = <&wl12xx_vmmc>;
diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
index 9d5d53fbe9c0..c39cf2ca54da 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
@@ -35,7 +35,7 @@
  * jumpering combinations for the long run.
  */
 &mmc3 {
-        interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
+        interrupts-extended = <&intc 94 &omap3_pmx_core 0x136>;
         pinctrl-0 = <&mmc3_pins &mmc3_core2_pins>;
         pinctrl-names = "default";
         vmmc-supply = <&wl12xx_vmmc>;
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 2075120cfc4d..d8bf939a3aff 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -10,7 +10,11 @@
 #include "rk3288.dtsi"
 
 / {
-        memory@0 {
+        /*
+         * The default coreboot on veyron devices ignores memory@0 nodes
+         * and would instead create another memory node.
+         */
+        memory {
                 device_type = "memory";
                 reg = <0x0 0x0 0x0 0x80000000>;
         };
diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 843052f14f1c..dd0dda6ed44b 100644
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -314,7 +314,7 @@
                                   0x1 0x0 0x60000000 0x10000000
                                   0x2 0x0 0x70000000 0x10000000
                                   0x3 0x0 0x80000000 0x10000000>;
-                        clocks = <&mck>;
+                        clocks = <&h32ck>;
                         status = "disabled";
 
                         nand_controller: nand-controller {
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 0bc5bd2665df..2cc9fe4c3a91 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -759,7 +759,9 @@ static struct davinci_id da830_ids[] = {
 };
 
 static struct davinci_gpio_platform_data da830_gpio_platform_data = {
-        .ngpio = 128,
+        .no_auto_base   = true,
+        .base           = 0,
+        .ngpio          = 128,
 };
 
 int __init da830_register_gpio(void)
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 4528bbf0c861..e7b78df2bfef 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -719,7 +719,9 @@ int __init da850_register_vpif_capture(struct vpif_capture_config
 }
 
 static struct davinci_gpio_platform_data da850_gpio_platform_data = {
-        .ngpio = 144,
+        .no_auto_base   = true,
+        .base           = 0,
+        .ngpio          = 144,
 };
 
 int __init da850_register_gpio(void)
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 1fd3619f6a09..cf78da5ab054 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -701,6 +701,46 @@ static struct resource da8xx_gpio_resources[] = {
         },
         { /* interrupt */
                 .start  = IRQ_DA8XX_GPIO0,
+                .end    = IRQ_DA8XX_GPIO0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO1,
+                .end    = IRQ_DA8XX_GPIO1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO2,
+                .end    = IRQ_DA8XX_GPIO2,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO3,
+                .end    = IRQ_DA8XX_GPIO3,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO4,
+                .end    = IRQ_DA8XX_GPIO4,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO5,
+                .end    = IRQ_DA8XX_GPIO5,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO6,
+                .end    = IRQ_DA8XX_GPIO6,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO7,
+                .end    = IRQ_DA8XX_GPIO7,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO8,
                 .end    = IRQ_DA8XX_GPIO8,
                 .flags  = IORESOURCE_IRQ,
         },
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 9f7d38d12c88..4c6e0bef4509 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -548,12 +548,44 @@ static struct resource dm355_gpio_resources[] = {
         },
         {       /* interrupt */
                 .start  = IRQ_DM355_GPIOBNK0,
+                .end    = IRQ_DM355_GPIOBNK0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK1,
+                .end    = IRQ_DM355_GPIOBNK1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK2,
+                .end    = IRQ_DM355_GPIOBNK2,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK3,
+                .end    = IRQ_DM355_GPIOBNK3,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK4,
+                .end    = IRQ_DM355_GPIOBNK4,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK5,
+                .end    = IRQ_DM355_GPIOBNK5,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK6,
                 .end    = IRQ_DM355_GPIOBNK6,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct davinci_gpio_platform_data dm355_gpio_platform_data = {
+        .no_auto_base   = true,
+        .base           = 0,
         .ngpio          = 104,
 };
 
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index abcf2a5ed89b..01fb2b0c82de 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -267,12 +267,49 @@ static struct resource dm365_gpio_resources[] = {
         },
         {       /* interrupt */
                 .start  = IRQ_DM365_GPIO0,
+                .end    = IRQ_DM365_GPIO0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO1,
+                .end    = IRQ_DM365_GPIO1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO2,
+                .end    = IRQ_DM365_GPIO2,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO3,
+                .end    = IRQ_DM365_GPIO3,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO4,
+                .end    = IRQ_DM365_GPIO4,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO5,
+                .end    = IRQ_DM365_GPIO5,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO6,
+                .end    = IRQ_DM365_GPIO6,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO7,
                 .end    = IRQ_DM365_GPIO7,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct davinci_gpio_platform_data dm365_gpio_platform_data = {
+        .no_auto_base   = true,
+        .base           = 0,
         .ngpio          = 104,
         .gpio_unbanked  = 8,
 };
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 0720da7809a6..38f92b7d413e 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -492,12 +492,34 @@ static struct resource dm644_gpio_resources[] = {
         },
         {       /* interrupt */
                 .start  = IRQ_GPIOBNK0,
+                .end    = IRQ_GPIOBNK0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_GPIOBNK1,
+                .end    = IRQ_GPIOBNK1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_GPIOBNK2,
+                .end    = IRQ_GPIOBNK2,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_GPIOBNK3,
+                .end    = IRQ_GPIOBNK3,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_GPIOBNK4,
                 .end    = IRQ_GPIOBNK4,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct davinci_gpio_platform_data dm644_gpio_platform_data = {
+        .no_auto_base   = true,
+        .base           = 0,
         .ngpio          = 71,
 };
 
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 6bd2ed069d0d..7dc54b2a610f 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -442,12 +442,24 @@ static struct resource dm646x_gpio_resources[] = {
         },
         {       /* interrupt */
                 .start  = IRQ_DM646X_GPIOBNK0,
+                .end    = IRQ_DM646X_GPIOBNK0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM646X_GPIOBNK1,
+                .end    = IRQ_DM646X_GPIOBNK1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM646X_GPIOBNK2,
                 .end    = IRQ_DM646X_GPIOBNK2,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct davinci_gpio_platform_data dm646x_gpio_platform_data = {
+        .no_auto_base   = true,
+        .base           = 0,
         .ngpio          = 43,
 };
 
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 3d191fd52910..17886744dbe6 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -750,6 +750,9 @@ static void modem_pm(struct uart_port *port, unsigned int state, unsigned old)
         struct modem_private_data *priv = port->private_data;
         int ret;
 
+        if (!priv)
+                return;
+
         if (IS_ERR(priv->regulator))
                 return;
 
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index 7b95729e8359..38a1be6c3694 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -351,7 +351,7 @@ static void omap44xx_prm_reconfigure_io_chain(void)
  * to occur, WAKEUPENABLE bits must be set in the pad mux registers, and
  * omap44xx_prm_reconfigure_io_chain() must be called.  No return value.
  */
-static void __init omap44xx_prm_enable_io_wakeup(void)
+static void omap44xx_prm_enable_io_wakeup(void)
 {
         s32 inst = omap4_prmst_get_prm_dev_inst();
 
diff --git a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
index b4276da1fb0d..11fd1fe8bdb5 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
@@ -241,3 +241,7 @@
                 };
         };
 };
+
+&tlmm {
+        gpio-reserved-ranges = <0 4>, <81 4>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index eedfaf8922e2..d667eee4e6d0 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -352,6 +352,10 @@
         status = "okay";
 };
 
+&tlmm {
+        gpio-reserved-ranges = <0 4>, <81 4>;
+};
+
 &uart9 {
         status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
index 2dceeea29b83..1e6a71066c16 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
@@ -153,7 +153,7 @@
 };
 
 &pcie0 {
-        ep-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_LOW>;
+        ep-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
         num-lanes = <4>;
         pinctrl-names = "default";
         pinctrl-0 = <&pcie_clkreqn_cpm>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 6c8c4ab044aa..56abbb08c133 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -57,18 +57,6 @@
                 regulator-always-on;
                 vin-supply = <&vcc_sys>;
         };
-
-        vdd_log: vdd-log {
-                compatible = "pwm-regulator";
-                pwms = <&pwm2 0 25000 0>;
-                regulator-name = "vdd_log";
-                regulator-min-microvolt = <800000>;
-                regulator-max-microvolt = <1400000>;
-                regulator-always-on;
-                regulator-boot-on;
-                vin-supply = <&vcc_sys>;
-        };
-
 };
 
 &cpu_l0 {
diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index affc3c309353..8d7b47f9dfbf 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -36,7 +36,7 @@
 
         wkup_uart0: serial@42300000 {
                 compatible = "ti,am654-uart";
-                reg = <0x00 0x42300000 0x00 0x100>;
+                reg = <0x42300000 0x100>;
                 reg-shift = <2>;
                 reg-io-width = <4>;
                 interrupts = <GIC_SPI 697 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index 5c1564fcc24e..bdb29e51b417 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -258,7 +258,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
         chips->chip.set = davinci_gpio_set;
 
         chips->chip.ngpio = ngpio;
-        chips->chip.base = -1;
+        chips->chip.base = pdata->no_auto_base ? pdata->base : -1;
 
 #ifdef CONFIG_OF_GPIO
         chips->chip.of_gpio_n_cells = 2;
diff --git a/include/linux/platform_data/gpio-davinci.h b/include/linux/platform_data/gpio-davinci.h
index f92a47e18034..a93841bfb9f7 100644
--- a/include/linux/platform_data/gpio-davinci.h
+++ b/include/linux/platform_data/gpio-davinci.h
@@ -17,6 +17,8 @@
 #define __DAVINCI_GPIO_PLATFORM_H
 
 struct davinci_gpio_platform_data {
+        bool    no_auto_base;
+        u32     base;
         u32     ngpio;
         u32     gpio_unbanked;
 };