15 files changed, 109 insertions, 41 deletions

diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index a3c9b346721d..f04bc3e15332 100644
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -94,6 +94,28 @@
                 regulator-boot-on;
         };
 
+        baseboard_3v3: fixedregulator-3v3 {
+                /* TPS73701DCQ */
+                compatible = "regulator-fixed";
+                regulator-name = "baseboard_3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                vin-supply = <&vbat>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
+        baseboard_1v8: fixedregulator-1v8 {
+                /* TPS73701DCQ */
+                compatible = "regulator-fixed";
+                regulator-name = "baseboard_1v8";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                vin-supply = <&vbat>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
         backlight_lcd: backlight-regulator {
                 compatible = "regulator-fixed";
                 regulator-name = "lcd_backlight_pwr";
@@ -105,7 +127,7 @@
 
         sound {
                 compatible = "simple-audio-card";
-                simple-audio-card,name = "DA850/OMAP-L138 EVM";
+                simple-audio-card,name = "DA850-OMAPL138 EVM";
                 simple-audio-card,widgets =
                         "Line", "Line In",
                         "Line", "Line Out";
@@ -210,10 +232,9 @@
 
                 /* Regulators */
                 IOVDD-supply = <&vdcdc2_reg>;
-                /* Derived from VBAT: Baseboard 3.3V / 1.8V */
-                AVDD-supply = <&vbat>;
-                DRVDD-supply = <&vbat>;
-                DVDD-supply = <&vbat>;
+                AVDD-supply = <&baseboard_3v3>;
+                DRVDD-supply = <&baseboard_3v3>;
+                DVDD-supply = <&baseboard_1v8>;
         };
         tca6416: gpio@20 {
                 compatible = "ti,tca6416";
diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts
index 0177e3ed20fe..3a2fa6e035a3 100644
--- a/arch/arm/boot/dts/da850-lcdk.dts
+++ b/arch/arm/boot/dts/da850-lcdk.dts
@@ -39,9 +39,39 @@
                 };
         };
 
+        vcc_5vd: fixedregulator-vcc_5vd {
+                compatible = "regulator-fixed";
+                regulator-name = "vcc_5vd";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-boot-on;
+        };
+
+        vcc_3v3d: fixedregulator-vcc_3v3d {
+                /* TPS650250 - VDCDC1 */
+                compatible = "regulator-fixed";
+                regulator-name = "vcc_3v3d";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                vin-supply = <&vcc_5vd>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
+        vcc_1v8d: fixedregulator-vcc_1v8d {
+                /* TPS650250 - VDCDC2 */
+                compatible = "regulator-fixed";
+                regulator-name = "vcc_1v8d";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                vin-supply = <&vcc_5vd>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
         sound {
                 compatible = "simple-audio-card";
-                simple-audio-card,name = "DA850/OMAP-L138 LCDK";
+                simple-audio-card,name = "DA850-OMAPL138 LCDK";
                 simple-audio-card,widgets =
                         "Line", "Line In",
                         "Line", "Line Out";
@@ -221,6 +251,12 @@
                 compatible = "ti,tlv320aic3106";
                 reg = <0x18>;
                 status = "okay";
+
+                /* Regulators */
+                IOVDD-supply = <&vcc_3v3d>;
+                AVDD-supply = <&vcc_3v3d>;
+                DRVDD-supply = <&vcc_3v3d>;
+                DVDD-supply = <&vcc_1v8d>;
         };
 };
 
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index cbaf06f2f78e..eb917462b219 100644
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -36,8 +36,8 @@
                 compatible = "gpio-fan";
                 pinctrl-0 = <&pmx_fan_high_speed &pmx_fan_low_speed>;
                 pinctrl-names = "default";
-                gpios = <&gpio1 14 GPIO_ACTIVE_LOW
-                         &gpio1 13 GPIO_ACTIVE_LOW>;
+                gpios = <&gpio1 14 GPIO_ACTIVE_HIGH
+                         &gpio1 13 GPIO_ACTIVE_HIGH>;
                 gpio-fan,speed-map = <0    0
                                       3000 1
                                       6000 2>;
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index e52ec1619b70..c4da635ee4ce 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -208,9 +208,9 @@ static struct gpiod_lookup_table mmc_gpios_table = {
         .dev_id = "da830-mmc.0",
         .table = {
                 /* gpio chip 1 contains gpio range 32-63 */
-                GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_CD_PIN, "cd",
+                GPIO_LOOKUP("davinci_gpio", DA830_MMCSD_CD_PIN, "cd",
                             GPIO_ACTIVE_LOW),
-                GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_WP_PIN, "wp",
+                GPIO_LOOKUP("davinci_gpio", DA830_MMCSD_WP_PIN, "wp",
                             GPIO_ACTIVE_LOW),
         },
 };
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 6a29baf0a289..44bca048dfd0 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -805,9 +805,9 @@ static struct gpiod_lookup_table mmc_gpios_table = {
         .dev_id = "da830-mmc.0",
         .table = {
                 /* gpio chip 2 contains gpio range 64-95 */
-                GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",
+                GPIO_LOOKUP("davinci_gpio", DA850_MMCSD_CD_PIN, "cd",
                             GPIO_ACTIVE_LOW),
-                GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",
+                GPIO_LOOKUP("davinci_gpio", DA850_MMCSD_WP_PIN, "wp",
                             GPIO_ACTIVE_HIGH),
         },
 };
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index f53a461a606f..f7fa960c23e3 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -117,9 +117,9 @@ static struct platform_device davinci_nand_device = {
 static struct gpiod_lookup_table i2c_recovery_gpiod_table = {
         .dev_id = "i2c_davinci.1",
         .table = {
-                GPIO_LOOKUP("davinci_gpio.0", DM355_I2C_SDA_PIN, "sda",
+                GPIO_LOOKUP("davinci_gpio", DM355_I2C_SDA_PIN, "sda",
                             GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-                GPIO_LOOKUP("davinci_gpio.0", DM355_I2C_SCL_PIN, "scl",
+                GPIO_LOOKUP("davinci_gpio", DM355_I2C_SCL_PIN, "scl",
                             GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
         },
 };
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index e1428115067f..b80c4ee76217 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -660,9 +660,9 @@ static struct i2c_board_info __initdata i2c_info[] =  {
 static struct gpiod_lookup_table i2c_recovery_gpiod_table = {
         .dev_id = "i2c_davinci.1",
         .table = {
-                GPIO_LOOKUP("davinci_gpio.0", DM644X_I2C_SDA_PIN, "sda",
+                GPIO_LOOKUP("davinci_gpio", DM644X_I2C_SDA_PIN, "sda",
                             GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-                GPIO_LOOKUP("davinci_gpio.0", DM644X_I2C_SCL_PIN, "scl",
+                GPIO_LOOKUP("davinci_gpio", DM644X_I2C_SCL_PIN, "scl",
                             GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
         },
 };
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index 8e8d51f4a276..94c4f126ef86 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -134,9 +134,9 @@ static const short hawk_mmcsd0_pins[] = {
 static struct gpiod_lookup_table mmc_gpios_table = {
         .dev_id = "da830-mmc.0",
         .table = {
-                GPIO_LOOKUP("davinci_gpio.0", DA850_HAWK_MMCSD_CD_PIN, "cd",
+                GPIO_LOOKUP("davinci_gpio", DA850_HAWK_MMCSD_CD_PIN, "cd",
                             GPIO_ACTIVE_LOW),
-                GPIO_LOOKUP("davinci_gpio.0", DA850_HAWK_MMCSD_WP_PIN, "wp",
+                GPIO_LOOKUP("davinci_gpio", DA850_HAWK_MMCSD_WP_PIN, "wp",
                             GPIO_ACTIVE_LOW),
         },
 };
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index a109f6482413..8dfad012dfae 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -390,10 +390,14 @@ static int __ref impd1_probe(struct lm_device *dev)
                         char *mmciname;
 
                         lookup = devm_kzalloc(&dev->dev,
-                                              sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup),
+                                              struct_size(lookup, table, 3),
                                               GFP_KERNEL);
                         chipname = devm_kstrdup(&dev->dev, devname, GFP_KERNEL);
-                        mmciname = kasprintf(GFP_KERNEL, "lm%x:00700", dev->id);
+                        mmciname = devm_kasprintf(&dev->dev, GFP_KERNEL,
+                                                  "lm%x:00700", dev->id);
+                        if (!lookup || !chipname || !mmciname)
+                                return -ENOMEM;
+
                         lookup->dev_id = mmciname;
                         /*
                          * Offsets on GPIO block 1:
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
index 29ea7e81ec4c..329f8ceeebea 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
@@ -183,7 +183,7 @@
         pinctrl-0 = <&cp0_pcie_pins>;
         num-lanes = <4>;
         num-viewport = <8>;
-        reset-gpio = <&cp0_gpio1 20 GPIO_ACTIVE_LOW>;
+        reset-gpios = <&cp0_gpio2 20 GPIO_ACTIVE_LOW>;
         status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 7d94c1fa592a..7f799cb5668e 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -28,6 +28,23 @@
                 method = "smc";
         };
 
+        reserved-memory {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                /*
+                 * This area matches the mapping done with a
+                 * mainline U-Boot, and should be updated by the
+                 * bootloader.
+                 */
+
+                psci-area@4000000 {
+                        reg = <0x0 0x4000000 0x0 0x200000>;
+                        no-map;
+                };
+        };
+
         ap806 {
                 #address-cells = <2>;
                 #size-cells = <2>;
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 3ef443cfbab6..c8432e24207e 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -506,11 +506,15 @@ CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_RK3399_GRU_SOUND=m
+CONFIG_SND_MESON_AXG_SOUND_CARD=m
 CONFIG_SND_SOC_SAMSUNG=y
 CONFIG_SND_SOC_RCAR=m
 CONFIG_SND_SOC_AK4613=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_TAS571X=m
 CONFIG_I2C_HID=m
 CONFIG_USB=y
 CONFIG_USB_OTG=y
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index 4d8012e1205c..68bfca6f20dd 100644
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -44,7 +44,7 @@ config ARCH_RZN1
         bool
         select ARM_AMBA
 
-if ARM
+if ARM && ARCH_RENESAS
 
 #comment "Renesas ARM SoCs System Type"
 
diff --git a/drivers/soc/renesas/r8a774c0-sysc.c b/drivers/soc/renesas/r8a774c0-sysc.c
index e1ac4c0f6640..11050e17ea81 100644
--- a/drivers/soc/renesas/r8a774c0-sysc.c
+++ b/drivers/soc/renesas/r8a774c0-sysc.c
@@ -28,19 +28,6 @@ static struct rcar_sysc_area r8a774c0_areas[] __initdata = {
         { "3dg-b",      0x100, 1, R8A774C0_PD_3DG_B,    R8A774C0_PD_3DG_A },
 };
 
-static void __init rcar_sysc_fix_parent(struct rcar_sysc_area *areas,
-                                        unsigned int num_areas, u8 id,
-                                        int new_parent)
-{
-        unsigned int i;
-
-        for (i = 0; i < num_areas; i++)
-                if (areas[i].isr_bit == id) {
-                        areas[i].parent = new_parent;
-                        return;
-                }
-}
-
 /* Fixups for RZ/G2E ES1.0 revision */
 static const struct soc_device_attribute r8a774c0[] __initconst = {
         { .soc_id = "r8a774c0", .revision = "ES1.0" },
@@ -50,12 +37,10 @@ static const struct soc_device_attribute r8a774c0[] __initconst = {
 static int __init r8a774c0_sysc_init(void)
 {
         if (soc_device_match(r8a774c0)) {
-                rcar_sysc_fix_parent(r8a774c0_areas,
-                                     ARRAY_SIZE(r8a774c0_areas),
-                                     R8A774C0_PD_3DG_A, R8A774C0_PD_3DG_B);
-                rcar_sysc_fix_parent(r8a774c0_areas,
-                                     ARRAY_SIZE(r8a774c0_areas),
-                                     R8A774C0_PD_3DG_B, R8A774C0_PD_ALWAYS_ON);
+                /* Fix incorrect 3DG hierarchy */
+                swap(r8a774c0_areas[6], r8a774c0_areas[7]);
+                r8a774c0_areas[6].parent = R8A774C0_PD_ALWAYS_ON;
+                r8a774c0_areas[7].parent = R8A774C0_PD_3DG_B;
         }
 
         return 0;
diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
index 1637385bcc17..d0aecc04c54b 100644
--- a/include/linux/qcom_scm.h
+++ b/include/linux/qcom_scm.h
@@ -13,6 +13,7 @@
 #ifndef __QCOM_SCM_H
 #define __QCOM_SCM_H
 
+#include <linux/err.h>
 #include <linux/types.h>
 #include <linux/cpumask.h>