24 files changed, 131 insertions, 82 deletions

diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
index 365dcf384d73..82dd7582e945 100644
--- a/Documentation/devicetree/bindings/arm/cpus.yaml
+++ b/Documentation/devicetree/bindings/arm/cpus.yaml
@@ -228,7 +228,7 @@ patternProperties:
                 - renesas,r9a06g032-smp
                 - rockchip,rk3036-smp
                 - rockchip,rk3066-smp
-                - socionext,milbeaut-m10v-smp
+                - socionext,milbeaut-m10v-smp
                 - ste,dbx500-smp
 
       cpu-release-addr:
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index dce5be5df97b..edcff79879e7 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -57,6 +57,24 @@
                 enable-active-high;
         };
 
+        /* TPS79501 */
+        v1_8d_reg: fixedregulator-v1_8d {
+                compatible = "regulator-fixed";
+                regulator-name = "v1_8d";
+                vin-supply = <&vbat>;
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+        };
+
+        /* TPS79501 */
+        v3_3d_reg: fixedregulator-v3_3d {
+                compatible = "regulator-fixed";
+                regulator-name = "v3_3d";
+                vin-supply = <&vbat>;
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
         matrix_keypad: matrix_keypad0 {
                 compatible = "gpio-matrix-keypad";
                 debounce-delay-ms = <5>;
@@ -499,10 +517,10 @@
                 status = "okay";
 
                 /* Regulators */
-                AVDD-supply = <&vaux2_reg>;
-                IOVDD-supply = <&vaux2_reg>;
-                DRVDD-supply = <&vaux2_reg>;
-                DVDD-supply = <&vbat>;
+                AVDD-supply = <&v3_3d_reg>;
+                IOVDD-supply = <&v3_3d_reg>;
+                DRVDD-supply = <&v3_3d_reg>;
+                DVDD-supply = <&v1_8d_reg>;
         };
 };
 
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index b128998097ce..2c2d8b5b8cf5 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -73,6 +73,24 @@
                 enable-active-high;
         };
 
+        /* TPS79518 */
+        v1_8d_reg: fixedregulator-v1_8d {
+                compatible = "regulator-fixed";
+                regulator-name = "v1_8d";
+                vin-supply = <&vbat>;
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+        };
+
+        /* TPS78633 */
+        v3_3d_reg: fixedregulator-v3_3d {
+                compatible = "regulator-fixed";
+                regulator-name = "v3_3d";
+                vin-supply = <&vbat>;
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
         leds {
                 pinctrl-names = "default";
                 pinctrl-0 = <&user_leds_s0>;
@@ -501,10 +519,10 @@
                 status = "okay";
 
                 /* Regulators */
-                AVDD-supply = <&vaux2_reg>;
-                IOVDD-supply = <&vaux2_reg>;
-                DRVDD-supply = <&vaux2_reg>;
-                DVDD-supply = <&vbat>;
+                AVDD-supply = <&v3_3d_reg>;
+                IOVDD-supply = <&v3_3d_reg>;
+                DRVDD-supply = <&v3_3d_reg>;
+                DVDD-supply = <&v1_8d_reg>;
         };
 };
 
diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index f459ec316a22..ca6d9f02a800 100644
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -1762,7 +1762,7 @@
                         reg = <0xcc000 0x4>;
                         reg-names = "rev";
                         /* Domains (P, C): per_pwrdm, l4ls_clkdm */
-                        clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>;
+                        clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>;
                         clock-names = "fck";
                         #address-cells = <1>;
                         #size-cells = <1>;
@@ -1785,7 +1785,7 @@
                         reg = <0xd0000 0x4>;
                         reg-names = "rev";
                         /* Domains (P, C): per_pwrdm, l4ls_clkdm */
-                        clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>;
+                        clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>;
                         clock-names = "fck";
                         #address-cells = <1>;
                         #size-cells = <1>;
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
index aa107ee41b8b..ef653c3209bc 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
@@ -254,6 +254,7 @@
                         };
 
                         vccio_sd: LDO_REG5 {
+                                regulator-boot-on;
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vccio_sd";
@@ -430,7 +431,7 @@
         bus-width = <4>;
         cap-mmc-highspeed;
         cap-sd-highspeed;
-        card-detect-delay = <200>;
+        broken-cd;
         disable-wp;                     /* wp not hooked up */
         pinctrl-names = "default";
         pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 0bc2409f6903..192dbc089ade 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -25,8 +25,6 @@
 
         gpio_keys: gpio-keys {
                 compatible = "gpio-keys";
-                #address-cells = <1>;
-                #size-cells = <0>;
 
                 pinctrl-names = "default";
                 pinctrl-0 = <&pwr_key_l>;
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index ca7d52daa8fb..a024d1e7e74c 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -70,7 +70,7 @@
                         compatible = "arm,cortex-a12";
                         reg = <0x501>;
                         resets = <&cru SRST_CORE1>;
-                        operating-points = <&cpu_opp_table>;
+                        operating-points-v2 = <&cpu_opp_table>;
                         #cooling-cells = <2>; /* min followed by max */
                         clock-latency = <40000>;
                         clocks = <&cru ARMCLK>;
@@ -80,7 +80,7 @@
                         compatible = "arm,cortex-a12";
                         reg = <0x502>;
                         resets = <&cru SRST_CORE2>;
-                        operating-points = <&cpu_opp_table>;
+                        operating-points-v2 = <&cpu_opp_table>;
                         #cooling-cells = <2>; /* min followed by max */
                         clock-latency = <40000>;
                         clocks = <&cru ARMCLK>;
@@ -90,7 +90,7 @@
                         compatible = "arm,cortex-a12";
                         reg = <0x503>;
                         resets = <&cru SRST_CORE3>;
-                        operating-points = <&cpu_opp_table>;
+                        operating-points-v2 = <&cpu_opp_table>;
                         #cooling-cells = <2>; /* min followed by max */
                         clock-latency = <40000>;
                         clocks = <&cru ARMCLK>;
@@ -1119,8 +1119,6 @@
                 clock-names = "ref", "pclk";
                 power-domains = <&power RK3288_PD_VIO>;
                 rockchip,grf = <&grf>;
-                #address-cells = <1>;
-                #size-cells = <0>;
                 status = "disabled";
 
                 ports {
@@ -1282,27 +1280,27 @@
         gpu_opp_table: gpu-opp-table {
                 compatible = "operating-points-v2";
 
-                opp@100000000 {
+                opp-100000000 {
                         opp-hz = /bits/ 64 <100000000>;
                         opp-microvolt = <950000>;
                 };
-                opp@200000000 {
+                opp-200000000 {
                         opp-hz = /bits/ 64 <200000000>;
                         opp-microvolt = <950000>;
                 };
-                opp@300000000 {
+                opp-300000000 {
                         opp-hz = /bits/ 64 <300000000>;
                         opp-microvolt = <1000000>;
                 };
-                opp@400000000 {
+                opp-400000000 {
                         opp-hz = /bits/ 64 <400000000>;
                         opp-microvolt = <1100000>;
                 };
-                opp@500000000 {
+                opp-500000000 {
                         opp-hz = /bits/ 64 <500000000>;
                         opp-microvolt = <1200000>;
                 };
-                opp@600000000 {
+                opp-600000000 {
                         opp-hz = /bits/ 64 <600000000>;
                         opp-microvolt = <1250000>;
                 };
diff --git a/arch/arm/boot/dts/sama5d2-pinfunc.h b/arch/arm/boot/dts/sama5d2-pinfunc.h
index 1c01a6f843d8..28a2e45752fe 100644
--- a/arch/arm/boot/dts/sama5d2-pinfunc.h
+++ b/arch/arm/boot/dts/sama5d2-pinfunc.h
@@ -518,7 +518,7 @@
 #define PIN_PC9__GPIO                   PINMUX_PIN(PIN_PC9, 0, 0)
 #define PIN_PC9__FIQ                    PINMUX_PIN(PIN_PC9, 1, 3)
 #define PIN_PC9__GTSUCOMP               PINMUX_PIN(PIN_PC9, 2, 1)
-#define PIN_PC9__ISC_D0                 PINMUX_PIN(PIN_PC9, 2, 1)
+#define PIN_PC9__ISC_D0                 PINMUX_PIN(PIN_PC9, 3, 1)
 #define PIN_PC9__TIOA4                  PINMUX_PIN(PIN_PC9, 4, 2)
 #define PIN_PC10                        74
 #define PIN_PC10__GPIO                  PINMUX_PIN(PIN_PC10, 0, 0)
diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
index f2f6558a00f1..04066f9cb8a3 100644
--- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts
+++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
@@ -213,13 +213,12 @@
                 gpio-sck = <&gpio0 5 GPIO_ACTIVE_HIGH>;
                 gpio-mosi = <&gpio0 4 GPIO_ACTIVE_HIGH>;
                 /*
-                 * This chipselect is active high. Just setting the flags
-                 * to GPIO_ACTIVE_HIGH is not enough for the SPI DT bindings,
-                 * it will be ignored, only the special "spi-cs-high" flag
-                 * really counts.
+                 * It's not actually active high, but the frameworks assume
+                 * the polarity of the passed-in GPIO is "normal" (active
+                 * high) then actively drives the line low to select the
+                 * chip.
                  */
                 cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
-                spi-cs-high;
                 num-chipselects = <1>;
 
                 /*
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 51e808adb00c..2a757dcaa1a5 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void)
 
         np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");
         if (!np)
-                goto securam_fail;
+                goto securam_fail_no_ref_dev;
 
         pdev = of_find_device_by_node(np);
         of_node_put(np);
         if (!pdev) {
                 pr_warn("%s: failed to find securam device!\n", __func__);
-                goto securam_fail;
+                goto securam_fail_no_ref_dev;
         }
 
         sram_pool = gen_pool_get(&pdev->dev, NULL);
@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)
         return 0;
 
 securam_fail:
+        put_device(&pdev->dev);
+securam_fail_no_ref_dev:
         iounmap(pm_data.sfrbu);
         pm_data.sfrbu = NULL;
         return ret;
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index 53c316f7301e..fe4932fda01d 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = {
         }
 };
 
-static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);
+static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(32);
 static struct iop_adma_platform_data iop13xx_adma_0_data = {
         .hw_id = 0,
         .pool_size = PAGE_SIZE,
@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = {
         .resource = iop13xx_adma_0_resources,
         .dev = {
                 .dma_mask = &iop13xx_adma_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
                 .platform_data = (void *) &iop13xx_adma_0_data,
         },
 };
@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = {
         .resource = iop13xx_adma_1_resources,
         .dev = {
                 .dma_mask = &iop13xx_adma_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
                 .platform_data = (void *) &iop13xx_adma_1_data,
         },
 };
@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = {
         .resource = iop13xx_adma_2_resources,
         .dev = {
                 .dma_mask = &iop13xx_adma_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
                 .platform_data = (void *) &iop13xx_adma_2_data,
         },
 };
diff --git a/arch/arm/mach-iop13xx/tpmi.c b/arch/arm/mach-iop13xx/tpmi.c
index db511ec2b1df..116feb6b261e 100644
--- a/arch/arm/mach-iop13xx/tpmi.c
+++ b/arch/arm/mach-iop13xx/tpmi.c
@@ -152,7 +152,7 @@ static struct resource iop13xx_tpmi_3_resources[] = {
         }
 };
 
-u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64);
+u64 iop13xx_tpmi_mask = DMA_BIT_MASK(32);
 static struct platform_device iop13xx_tpmi_0_device = {
         .name = "iop-tpmi",
         .id = 0,
@@ -160,7 +160,7 @@ static struct platform_device iop13xx_tpmi_0_device = {
         .resource = iop13xx_tpmi_0_resources,
         .dev = {
                 .dma_mask          = &iop13xx_tpmi_mask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
 };
 
@@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = {
         .resource = iop13xx_tpmi_1_resources,
         .dev = {
                 .dma_mask          = &iop13xx_tpmi_mask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
 };
 
@@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = {
         .resource = iop13xx_tpmi_2_resources,
         .dev = {
                 .dma_mask          = &iop13xx_tpmi_mask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
 };
 
@@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = {
         .resource = iop13xx_tpmi_3_resources,
         .dev = {
                 .dma_mask          = &iop13xx_tpmi_mask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
 };
 
diff --git a/arch/arm/mach-milbeaut/platsmp.c b/arch/arm/mach-milbeaut/platsmp.c
index 591543c81399..3ea880f5fcb7 100644
--- a/arch/arm/mach-milbeaut/platsmp.c
+++ b/arch/arm/mach-milbeaut/platsmp.c
@@ -65,6 +65,7 @@ static void m10v_smp_init(unsigned int max_cpus)
                 writel(KERNEL_UNBOOT_FLAG, m10v_smp_base + cpu * 4);
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void m10v_cpu_die(unsigned int l_cpu)
 {
         gic_cpu_if_down(0);
@@ -83,12 +84,15 @@ static int m10v_cpu_kill(unsigned int l_cpu)
 
         return 1;
 }
+#endif
 
 static struct smp_operations m10v_smp_ops __initdata = {
         .smp_prepare_cpus       = m10v_smp_init,
         .smp_boot_secondary     = m10v_boot_secondary,
+#ifdef CONFIG_HOTPLUG_CPU
         .cpu_die                = m10v_cpu_die,
         .cpu_kill               = m10v_cpu_kill,
+#endif
 };
 CPU_METHOD_OF_DECLARE(m10v_smp, "socionext,milbeaut-m10v-smp", &m10v_smp_ops);
 
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index be30c3c061b4..1b15d593837e 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -182,6 +182,7 @@ static struct resource latch1_resources[] = {
 
 static struct bgpio_pdata latch1_pdata = {
         .label  = LATCH1_LABEL,
+        .base   = -1,
         .ngpio  = LATCH1_NGPIO,
 };
 
@@ -219,6 +220,7 @@ static struct resource latch2_resources[] = {
 
 static struct bgpio_pdata latch2_pdata = {
         .label  = LATCH2_LABEL,
+        .base   = -1,
         .ngpio  = LATCH2_NGPIO,
 };
 
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 1444b4b4bd9f..439e143cad7b 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -250,8 +250,10 @@ static int __init omapdss_init_of(void)
         if (!node)
                 return 0;
 
-        if (!of_device_is_available(node))
+        if (!of_device_is_available(node)) {
+                of_node_put(node);
                 return 0;
+        }
 
         pdev = of_find_device_by_node(node);
 
diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c
index a4d1f8de3b5b..d9612221e484 100644
--- a/arch/arm/plat-iop/adma.c
+++ b/arch/arm/plat-iop/adma.c
@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = {
         .resource = iop3xx_dma_0_resources,
         .dev = {
                 .dma_mask = &iop3xx_adma_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
                 .platform_data = (void *) &iop3xx_dma_0_data,
         },
 };
@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = {
         .resource = iop3xx_dma_1_resources,
         .dev = {
                 .dma_mask = &iop3xx_adma_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
                 .platform_data = (void *) &iop3xx_dma_1_data,
         },
 };
@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = {
         .resource = iop3xx_aau_resources,
         .dev = {
                 .dma_mask = &iop3xx_adma_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(64),
+                .coherent_dma_mask = DMA_BIT_MASK(32),
                 .platform_data = (void *) &iop3xx_aau_data,
         },
 };
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index a6c81ce00f52..8647cb80a93b 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = {
         .resource       = orion_xor0_shared_resources,
         .dev            = {
                 .dma_mask               = &orion_xor_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
                 .platform_data          = &orion_xor0_pdata,
         },
 };
@@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = {
         .resource       = orion_xor1_shared_resources,
         .dev            = {
                 .dma_mask               = &orion_xor_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
                 .platform_data          = &orion_xor1_pdata,
         },
 };
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index 7c649f6b14cb..cd7c76e58b09 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -162,6 +162,7 @@
                         rx-fifo-depth = <16384>;
                         snps,multicast-filter-bins = <256>;
                         iommus = <&smmu 1>;
+                        altr,sysmgr-syscon = <&sysmgr 0x44 0>;
                         status = "disabled";
                 };
 
@@ -179,6 +180,7 @@
                         rx-fifo-depth = <16384>;
                         snps,multicast-filter-bins = <256>;
                         iommus = <&smmu 2>;
+                        altr,sysmgr-syscon = <&sysmgr 0x48 0>;
                         status = "disabled";
                 };
 
@@ -196,6 +198,7 @@
                         rx-fifo-depth = <16384>;
                         snps,multicast-filter-bins = <256>;
                         iommus = <&smmu 3>;
+                        altr,sysmgr-syscon = <&sysmgr 0x4c 0>;
                         status = "disabled";
                 };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
index 33c44e857247..0e34354b2092 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -108,8 +108,8 @@
         snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
         snps,reset-active-low;
         snps,reset-delays-us = <0 10000 50000>;
-        tx_delay = <0x25>;
-        rx_delay = <0x11>;
+        tx_delay = <0x24>;
+        rx_delay = <0x18>;
         status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index 2157a528276b..79b4d1d4b5d6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -46,8 +46,7 @@
 
         vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
                 compatible = "regulator-fixed";
-                enable-active-high;
-                gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
+                gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&usb20_host_drv>;
                 regulator-name = "vcc_host1_5v";
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 84f14b132e8f..dabef1a21649 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1445,11 +1445,11 @@
 
                 sdmmc0 {
                         sdmmc0_clk: sdmmc0-clk {
-                                rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none_4ma>;
+                                rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none_8ma>;
                         };
 
                         sdmmc0_cmd: sdmmc0-cmd {
-                                rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_4ma>;
+                                rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_8ma>;
                         };
 
                         sdmmc0_dectn: sdmmc0-dectn {
@@ -1461,14 +1461,14 @@
                         };
 
                         sdmmc0_bus1: sdmmc0-bus1 {
-                                rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_4ma>;
+                                rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>;
                         };
 
                         sdmmc0_bus4: sdmmc0-bus4 {
-                                rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_4ma>,
-                                                <1 RK_PA1 1 &pcfg_pull_up_4ma>,
-                                                <1 RK_PA2 1 &pcfg_pull_up_4ma>,
-                                                <1 RK_PA3 1 &pcfg_pull_up_4ma>;
+                                rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>,
+                                                <1 RK_PA1 1 &pcfg_pull_up_8ma>,
+                                                <1 RK_PA2 1 &pcfg_pull_up_8ma>,
+                                                <1 RK_PA3 1 &pcfg_pull_up_8ma>;
                         };
 
                         sdmmc0_gpio: sdmmc0-gpio {
@@ -1642,50 +1642,50 @@
                         rgmiim1_pins: rgmiim1-pins {
                                 rockchip,pins =
                                         /* mac_txclk */
-                                        <1 RK_PB4 2 &pcfg_pull_none_12ma>,
+                                        <1 RK_PB4 2 &pcfg_pull_none_8ma>,
                                         /* mac_rxclk */
-                                        <1 RK_PB5 2 &pcfg_pull_none_2ma>,
+                                        <1 RK_PB5 2 &pcfg_pull_none_4ma>,
                                         /* mac_mdio */
-                                        <1 RK_PC3 2 &pcfg_pull_none_2ma>,
+                                        <1 RK_PC3 2 &pcfg_pull_none_4ma>,
                                         /* mac_txen */
-                                        <1 RK_PD1 2 &pcfg_pull_none_12ma>,
+                                        <1 RK_PD1 2 &pcfg_pull_none_8ma>,
                                         /* mac_clk */
-                                        <1 RK_PC5 2 &pcfg_pull_none_2ma>,
+                                        <1 RK_PC5 2 &pcfg_pull_none_4ma>,
                                         /* mac_rxdv */
-                                        <1 RK_PC6 2 &pcfg_pull_none_2ma>,
+                                        <1 RK_PC6 2 &pcfg_pull_none_4ma>,
                                         /* mac_mdc */
-                                        <1 RK_PC7 2 &pcfg_pull_none_2ma>,
+                                        <1 RK_PC7 2 &pcfg_pull_none_4ma>,
                                         /* mac_rxd1 */
-                                        <1 RK_PB2 2 &pcfg_pull_none_2ma>,
+                                        <1 RK_PB2 2 &pcfg_pull_none_4ma>,
                                         /* mac_rxd0 */
-                                        <1 RK_PB3 2 &pcfg_pull_none_2ma>,
+                                        <1 RK_PB3 2 &pcfg_pull_none_4ma>,
                                         /* mac_txd1 */
-                                        <1 RK_PB0 2 &pcfg_pull_none_12ma>,
+                                        <1 RK_PB0 2 &pcfg_pull_none_8ma>,
                                         /* mac_txd0 */
-                                        <1 RK_PB1 2 &pcfg_pull_none_12ma>,
+                                        <1 RK_PB1 2 &pcfg_pull_none_8ma>,
                                         /* mac_rxd3 */
-                                        <1 RK_PB6 2 &pcfg_pull_none_2ma>,
+                                        <1 RK_PB6 2 &pcfg_pull_none_4ma>,
                                         /* mac_rxd2 */
-                                        <1 RK_PB7 2 &pcfg_pull_none_2ma>,
+                                        <1 RK_PB7 2 &pcfg_pull_none_4ma>,
                                         /* mac_txd3 */
-                                        <1 RK_PC0 2 &pcfg_pull_none_12ma>,
+                                        <1 RK_PC0 2 &pcfg_pull_none_8ma>,
                                         /* mac_txd2 */
-                                        <1 RK_PC1 2 &pcfg_pull_none_12ma>,
+                                        <1 RK_PC1 2 &pcfg_pull_none_8ma>,
 
                                         /* mac_txclk */
-                                        <0 RK_PB0 1 &pcfg_pull_none>,
+                                        <0 RK_PB0 1 &pcfg_pull_none_8ma>,
                                         /* mac_txen */
-                                        <0 RK_PB4 1 &pcfg_pull_none>,
+                                        <0 RK_PB4 1 &pcfg_pull_none_8ma>,
                                         /* mac_clk */
-                                        <0 RK_PD0 1 &pcfg_pull_none>,
+                                        <0 RK_PD0 1 &pcfg_pull_none_4ma>,
                                         /* mac_txd1 */
-                                        <0 RK_PC0 1 &pcfg_pull_none>,
+                                        <0 RK_PC0 1 &pcfg_pull_none_8ma>,
                                         /* mac_txd0 */
-                                        <0 RK_PC1 1 &pcfg_pull_none>,
+                                        <0 RK_PC1 1 &pcfg_pull_none_8ma>,
                                         /* mac_txd3 */
-                                        <0 RK_PC7 1 &pcfg_pull_none>,
+                                        <0 RK_PC7 1 &pcfg_pull_none_8ma>,
                                         /* mac_txd2 */
-                                        <0 RK_PC6 1 &pcfg_pull_none>;
+                                        <0 RK_PC6 1 &pcfg_pull_none_8ma>;
                         };
 
                         rmiim1_pins: rmiim1-pins {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
index 4a543f2117d4..844eac939a97 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
@@ -158,6 +158,7 @@
 };
 
 &hdmi {
+        ddc-i2c-bus = <&i2c3>;
         pinctrl-names = "default";
         pinctrl-0 = <&hdmi_cec>;
         status = "okay";
diff --git a/drivers/reset/reset-meson-audio-arb.c b/drivers/reset/reset-meson-audio-arb.c
index 91751617b37a..c53a2185a039 100644
--- a/drivers/reset/reset-meson-audio-arb.c
+++ b/drivers/reset/reset-meson-audio-arb.c
@@ -130,6 +130,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev)
         arb->rstc.nr_resets = ARRAY_SIZE(axg_audio_arb_reset_bits);
         arb->rstc.ops = &meson_audio_arb_rstc_ops;
         arb->rstc.of_node = dev->of_node;
+        arb->rstc.owner = THIS_MODULE;
 
         /*
          * Enable general :
diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
index 8063e8314eef..6d487c5eba2c 100644
--- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
+++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
@@ -51,7 +51,10 @@
 #define RESET_SD_EMMC_A                 44
 #define RESET_SD_EMMC_B                 45
 #define RESET_SD_EMMC_C                 46
-/*                                      47-60 */
+/*                                      47      */
+#define RESET_USB_PHY20                 48
+#define RESET_USB_PHY21                 49
+/*                                      50-60   */
 #define RESET_AUDIO_CODEC               61
 /*                                      62-63   */
 /*      RESET2                                  */