15 files changed, 54 insertions, 28 deletions

diff --git a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt
index fbbacd958240..6f28969af9dc 100644
--- a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt
+++ b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt
@@ -6,7 +6,7 @@ perform in-band IPMI communication with their host.
 
 Required properties:
 
-- compatible : should be "aspeed,ast2400-bt-bmc"
+- compatible : should be "aspeed,ast2400-ibt-bmc"
 - reg: physical address and size of the registers
 
 Optional properties:
@@ -17,7 +17,7 @@ Optional properties:
 Example:
 
         ibt@1e789140 {
-                compatible = "aspeed,ast2400-bt-bmc";
+                compatible = "aspeed,ast2400-ibt-bmc";
                 reg = <0x1e789140 0x18>;
                 interrupts = <8>;
         };
diff --git a/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
index fd40c852d7c7..462b04e8209f 100644
--- a/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
+++ b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
@@ -12,7 +12,7 @@ Required properties:
 
 Optional properties:
 - ti,dmic: phandle for the OMAP dmic node if the machine have it connected
-- ti,jack_detection: Need to be present if the board capable to detect jack
+- ti,jack-detection: Need to be present if the board capable to detect jack
   insertion, removal.
 
 Available audio endpoints for the audio-routing table:
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index dec4b073ceb1..379939699164 100644
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -64,8 +64,8 @@
                         };
 
                         ldo3_reg: ldo3 {
-                                regulator-min-microvolt = <600000>;
-                                regulator-max-microvolt = <1800000>;
+                                regulator-min-microvolt = <1725000>;
+                                regulator-max-microvolt = <3300000>;
                                 regulator-always-on;
                         };
 
@@ -76,8 +76,8 @@
                         };
 
                         ldo5_reg: ldo5 {
-                                regulator-min-microvolt = <1725000>;
-                                regulator-max-microvolt = <3300000>;
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3600000>;
                                 regulator-always-on;
                         };
 
@@ -100,14 +100,14 @@
                         };
 
                         ldo9_reg: ldo9 {
-                                regulator-min-microvolt = <1200000>;
+                                regulator-min-microvolt = <1250000>;
                                 regulator-max-microvolt = <3600000>;
                                 regulator-always-on;
                         };
 
                         ldo10_reg: ldo10 {
-                                regulator-min-microvolt = <1250000>;
-                                regulator-max-microvolt = <3650000>;
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3600000>;
                                 regulator-always-on;
                         };
                 };
diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi
index 0ff1c2de95bf..26cce4d18405 100644
--- a/arch/arm/boot/dts/logicpd-som-lv.dtsi
+++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
@@ -13,6 +13,11 @@
                 };
         };
 
+        memory@80000000 {
+                device_type = "memory";
+                reg = <0x80000000 0>;
+        };
+
         wl12xx_vmmc: wl12xx_vmmc {
                 compatible = "regulator-fixed";
                 regulator-name = "vwl1271";
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 731ec37aed5b..8f9a69ca818c 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -13,9 +13,9 @@
                 };
         };
 
-        memory@0 {
+        memory@80000000 {
                 device_type = "memory";
-                reg = <0 0>;
+                reg = <0x80000000 0>;
         };
 
         leds {
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index 6365635fea5c..4caadb253249 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -124,6 +124,7 @@
                 compatible = "ti,abe-twl6040";
                 ti,model = "omap5-uevm";
 
+                ti,jack-detection;
                 ti,mclk-freq = <19200000>;
 
                 ti,mcpdm = <&mcpdm>;
@@ -415,7 +416,7 @@
                         ti,backup-battery-charge-high-current;
                 };
 
-                gpadc {
+                gpadc: gpadc {
                         compatible = "ti,palmas-gpadc";
                         interrupts = <18 0
                                       16 0
@@ -475,8 +476,8 @@
                                 smps6_reg: smps6 {
                                         /* VDD_DDR3 - over VDD_SMPS6 */
                                         regulator-name = "smps6";
-                                        regulator-min-microvolt = <1200000>;
-                                        regulator-max-microvolt = <1200000>;
+                                        regulator-min-microvolt = <1350000>;
+                                        regulator-max-microvolt = <1350000>;
                                         regulator-always-on;
                                         regulator-boot-on;
                                 };
diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
index ef2ff2f518f6..7fb507fcba7e 100644
--- a/arch/arm/boot/dts/stih410-b2260.dts
+++ b/arch/arm/boot/dts/stih410-b2260.dts
@@ -74,7 +74,7 @@
                 /* Low speed expansion connector */
                 spi0: spi@9844000 {
                         label = "LS-SPI0";
-                        cs-gpio = <&pio30 3 0>;
+                        cs-gpios = <&pio30 3 0>;
                         status = "okay";
                 };
 
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 48fc24f36fcb..300a1bd5a6ec 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -282,11 +282,15 @@
                         uart1_pins_a: uart1@0 {
                                 allwinner,pins = "PG6", "PG7";
                                 allwinner,function = "uart1";
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
 
                         uart1_pins_cts_rts_a: uart1-cts-rts@0 {
                                 allwinner,pins = "PG8", "PG9";
                                 allwinner,function = "uart1";
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
 
                         mmc0_pins_a: mmc0@0 {
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index a9afeebd59f2..0465338183c7 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -71,6 +71,7 @@ config SOC_AM43XX
         select HAVE_ARM_TWD
         select ARM_ERRATA_754322
         select ARM_ERRATA_775420
+        select OMAP_INTERCONNECT
 
 config SOC_DRA7XX
         bool "TI DRA7XX"
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 2abd53ae3e7a..cc6d9fa60924 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -205,11 +205,15 @@ void __init omap2xxx_check_revision(void)
 
 #define OMAP3_SHOW_FEATURE(feat)                \
         if (omap3_has_ ##feat())                \
-                printk(#feat" ");
+                n += scnprintf(buf + n, sizeof(buf) - n, #feat " ");
 
 static void __init omap3_cpuinfo(void)
 {
         const char *cpu_name;
+        char buf[64];
+        int n = 0;
+
+        memset(buf, 0, sizeof(buf));
 
         /*
          * OMAP3430 and OMAP3530 are assumed to be same.
@@ -241,10 +245,10 @@ static void __init omap3_cpuinfo(void)
                 cpu_name = "OMAP3503";
         }
 
-        sprintf(soc_name, "%s", cpu_name);
+        scnprintf(soc_name, sizeof(soc_name), "%s", cpu_name);
 
         /* Print verbose information */
-        pr_info("%s %s (", soc_name, soc_rev);
+        n += scnprintf(buf, sizeof(buf) - n, "%s %s (", soc_name, soc_rev);
 
         OMAP3_SHOW_FEATURE(l2cache);
         OMAP3_SHOW_FEATURE(iva);
@@ -252,8 +256,10 @@ static void __init omap3_cpuinfo(void)
         OMAP3_SHOW_FEATURE(neon);
         OMAP3_SHOW_FEATURE(isp);
         OMAP3_SHOW_FEATURE(192mhz_clk);
-
-        printk(")\n");
+        if (*(buf + n - 1) == ' ')
+                n--;
+        n += scnprintf(buf + n, sizeof(buf) - n, ")\n");
+        pr_info("%s", buf);
 }
 
 #define OMAP3_CHECK_FEATURE(status,feat)                                \
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 62680aad2126..718981bb80cd 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -319,6 +319,9 @@ void __init omap3_prm_init_pm(bool has_uart4, bool has_iva)
         if (has_uart4) {
                 en_uart4_mask = OMAP3630_EN_UART4_MASK;
                 grpsel_uart4_mask = OMAP3630_GRPSEL_UART4_MASK;
+        } else {
+                en_uart4_mask = 0;
+                grpsel_uart4_mask = 0;
         }
 
         /* Enable wakeups in PER */
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index cba8cada8c81..cd15dbd62671 100644
--- a/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@ -87,6 +87,12 @@ int voltdm_scale(struct voltagedomain *voltdm,
                 return -ENODATA;
         }
 
+        if (!voltdm->volt_data) {
+                pr_err("%s: No voltage data defined for vdd_%s\n",
+                        __func__, voltdm->name);
+                return -ENODATA;
+        }
+
         /* Adjust voltage to the exact voltage from the OPP table */
         for (i = 0; voltdm->volt_data[i].volt_nominal != 0; i++) {
                 if (voltdm->volt_data[i].volt_nominal >= target_volt) {
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index c4762538ec01..e9bd58793464 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -105,7 +105,7 @@
                                 status = "disabled";
                         };
 
-                        nb_perih_clk: nb-periph-clk@13000{
+                        nb_periph_clk: nb-periph-clk@13000 {
                                 compatible = "marvell,armada-3700-periph-clock-nb";
                                 reg = <0x13000 0x100>;
                                 clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
@@ -113,7 +113,7 @@
                                 #clock-cells = <1>;
                         };
 
-                        sb_perih_clk: sb-periph-clk@18000{
+                        sb_periph_clk: sb-periph-clk@18000 {
                                 compatible = "marvell,armada-3700-periph-clock-sb";
                                 reg = <0x18000 0x100>;
                                 clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 842fb333285c..6bf9e241179b 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -130,8 +130,8 @@
                                 reg = <0x700600 0x50>;
                                 #address-cells = <0x1>;
                                 #size-cells = <0x0>;
-                                cell-index = <1>;
-                                clocks = <&cps_syscon0 0 3>;
+                                cell-index = <3>;
+                                clocks = <&cps_syscon0 1 21>;
                                 status = "disabled";
                         };
 
@@ -140,7 +140,7 @@
                                 reg = <0x700680 0x50>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
-                                cell-index = <2>;
+                                cell-index = <4>;
                                 clocks = <&cps_syscon0 1 21>;
                                 status = "disabled";
                         };
diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c
index b49e61320952..fc9e8891eae3 100644
--- a/drivers/char/ipmi/bt-bmc.c
+++ b/drivers/char/ipmi/bt-bmc.c
@@ -484,7 +484,7 @@ static int bt_bmc_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id bt_bmc_match[] = {
-        { .compatible = "aspeed,ast2400-bt-bmc" },
+        { .compatible = "aspeed,ast2400-ibt-bmc" },
         { },
 };
 
@@ -502,4 +502,4 @@ module_platform_driver(bt_bmc_driver);
 MODULE_DEVICE_TABLE(of, bt_bmc_match);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Alistair Popple <alistair@popple.id.au>");
-MODULE_DESCRIPTION("Linux device interface to the BT interface");
+MODULE_DESCRIPTION("Linux device interface to the IPMI BT interface");