9 files changed, 37 insertions, 44 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 857b1f097fd8..f49cd51e162a 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -37,8 +37,6 @@ config ARCH_OMAP2PLUS_TYPICAL
         select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
         select PM_RUNTIME
         select REGULATOR
-        select SERIAL_OMAP
-        select SERIAL_OMAP_CONSOLE
         select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
         select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
         select VFP
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 62bb352c2d37..55a9d6777683 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -32,12 +32,12 @@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)	+= sdrc.o
 
 # SMP support ONLY available for OMAP4
 
-obj-$(CONFIG_SMP)                       += omap-smp.o omap-headsmp.o
-obj-$(CONFIG_HOTPLUG_CPU)               += omap-hotplug.o
+smp-$(CONFIG_SMP)                       += omap-smp.o omap-headsmp.o
+smp-$(CONFIG_HOTPLUG_CPU)               += omap-hotplug.o
 omap-4-5-common                         =  omap4-common.o omap-wakeupgen.o \
                                            sleep44xx.o
-obj-$(CONFIG_ARCH_OMAP4)                += $(omap-4-5-common)
-obj-$(CONFIG_SOC_OMAP5)                 += $(omap-4-5-common)
+obj-$(CONFIG_ARCH_OMAP4)                += $(omap-4-5-common) $(smp-y)
+obj-$(CONFIG_SOC_OMAP5)                 += $(omap-4-5-common) $(smp-y)
 
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_omap-headsmp.o                   :=-Wa,-march=armv7-a$(plus_sec)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 6de78605c0af..04c116555412 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -112,13 +112,13 @@ static u8 omap3_beagle_version;
  */
 static struct {
         int mmc1_gpio_wp;
-        int usb_pwr_level;
+        bool usb_pwr_level;     /* 0 - Active Low, 1 - Active High */
         int dvi_pd_gpio;
         int usr_button_gpio;
         int mmc_caps;
 } beagle_config = {
         .mmc1_gpio_wp = -EINVAL,
-        .usb_pwr_level = GPIOF_OUT_INIT_LOW,
+        .usb_pwr_level = 0,
         .dvi_pd_gpio = -EINVAL,
         .usr_button_gpio = 4,
         .mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
@@ -178,7 +178,7 @@ static void __init omap3_beagle_init_rev(void)
         case 0:
                 printk(KERN_INFO "OMAP3 Beagle Rev: xM Ax/Bx\n");
                 omap3_beagle_version = OMAP3BEAGLE_BOARD_XM;
-                beagle_config.usb_pwr_level = GPIOF_OUT_INIT_HIGH;
+                beagle_config.usb_pwr_level = 1;
                 beagle_config.mmc_caps &= ~MMC_CAP_8_BIT_DATA;
                 break;
         case 2:
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 1a884670a6c4..18ca61e300b3 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -73,11 +73,11 @@
 #define LIS302_IRQ1_GPIO 181
 #define LIS302_IRQ2_GPIO 180  /* Not yet in use */
 
-/* list all spi devices here */
+/* List all SPI devices here. Note that the list/probe order seems to matter! */
 enum {
         RX51_SPI_WL1251,
-        RX51_SPI_MIPID,         /* LCD panel */
         RX51_SPI_TSC2005,       /* Touch Controller */
+        RX51_SPI_MIPID,         /* LCD panel */
 };
 
 static struct wl12xx_platform_data wl1251_pdata;
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index ed946df5ad8a..6c4da1254f53 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -1520,36 +1520,22 @@ static int gpmc_probe_dt(struct platform_device *pdev)
                 return ret;
         }
 
-        for_each_node_by_name(child, "nand") {
-                ret = gpmc_probe_nand_child(pdev, child);
-                if (ret < 0) {
-                        of_node_put(child);
-                        return ret;
-                }
-        }
+        for_each_child_of_node(pdev->dev.of_node, child) {
 
-        for_each_node_by_name(child, "onenand") {
-                ret = gpmc_probe_onenand_child(pdev, child);
-                if (ret < 0) {
-                        of_node_put(child);
-                        return ret;
-                }
-        }
+                if (!child->name)
+                        continue;
 
-        for_each_node_by_name(child, "nor") {
-                ret = gpmc_probe_generic_child(pdev, child);
-                if (ret < 0) {
-                        of_node_put(child);
-                        return ret;
-                }
-        }
+                if (of_node_cmp(child->name, "nand") == 0)
+                        ret = gpmc_probe_nand_child(pdev, child);
+                else if (of_node_cmp(child->name, "onenand") == 0)
+                        ret = gpmc_probe_onenand_child(pdev, child);
+                else if (of_node_cmp(child->name, "ethernet") == 0 ||
+                         of_node_cmp(child->name, "nor") == 0)
+                        ret = gpmc_probe_generic_child(pdev, child);
 
-        for_each_node_by_name(child, "ethernet") {
-                ret = gpmc_probe_generic_child(pdev, child);
-                if (ret < 0) {
+                if (WARN(ret < 0, "%s: probing gpmc child %s failed\n",
+                         __func__, child->full_name))
                         of_node_put(child);
-                        return ret;
-                }
         }
 
         return 0;
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 0f4c18e6e60c..1272c41d4749 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -419,11 +419,15 @@ void __init omap3xxx_check_revision(void)
                         cpu_rev = "1.0";
                         break;
                 case 1:
-                /* FALLTHROUGH */
-                default:
                         omap_revision = AM335X_REV_ES2_0;
                         cpu_rev = "2.0";
                         break;
+                case 2:
+                /* FALLTHROUGH */
+                default:
+                        omap_revision = AM335X_REV_ES2_1;
+                        cpu_rev = "2.1";
+                        break;
                 }
                 break;
         case 0xb8f2:
@@ -644,13 +648,12 @@ void __init omap_soc_device_init(void)
         soc_dev_attr->revision = soc_rev;
 
         soc_dev = soc_device_register(soc_dev_attr);
-        if (IS_ERR_OR_NULL(soc_dev)) {
+        if (IS_ERR(soc_dev)) {
                 kfree(soc_dev_attr);
                 return;
         }
 
         parent = soc_device_to_device(soc_dev);
-        if (!IS_ERR_OR_NULL(parent))
-                device_create_file(parent, &omap_soc_attr);
+        device_create_file(parent, &omap_soc_attr);
 }
 #endif /* CONFIG_SOC_BUS */
diff --git a/arch/arm/mach-omap2/mux34xx.h b/arch/arm/mach-omap2/mux34xx.h
index 6543ebf8ecfc..3f26d297c082 100644
--- a/arch/arm/mach-omap2/mux34xx.h
+++ b/arch/arm/mach-omap2/mux34xx.h
@@ -393,6 +393,10 @@
 #define OMAP3_CONTROL_PADCONF_SAD2D_SWAKEUP_OFFSET              0xa1c
 #define OMAP3_CONTROL_PADCONF_JTAG_RTCK_OFFSET                  0xa1e
 #define OMAP3_CONTROL_PADCONF_JTAG_TDO_OFFSET                   0xa20
+#define OMAP3_CONTROL_PADCONF_GPIO_127                          0xa24
+#define OMAP3_CONTROL_PADCONF_GPIO_126                          0xa26
+#define OMAP3_CONTROL_PADCONF_GPIO_128                          0xa28
+#define OMAP3_CONTROL_PADCONF_GPIO_129                          0xa2a
 
 #define OMAP3_CONTROL_PADCONF_MUX_SIZE                          \
-                (OMAP3_CONTROL_PADCONF_JTAG_TDO_OFFSET + 0x2)
+                (OMAP3_CONTROL_PADCONF_GPIO_129 + 0x2)
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index eeea4fa28fbc..e6d230700b2b 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -876,4 +876,4 @@ static int __init omap_device_late_init(void)
         bus_for_each_dev(&platform_bus_type, NULL, NULL, omap_device_late_idle);
         return 0;
 }
-omap_late_initcall(omap_device_late_init);
+omap_late_initcall_sync(omap_device_late_init);
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 18fdeeb3a44a..197cc16870d9 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -396,6 +396,7 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define AM335X_CLASS            0x33500033
 #define AM335X_REV_ES1_0        AM335X_CLASS
 #define AM335X_REV_ES2_0        (AM335X_CLASS | (0x1 << 8))
+#define AM335X_REV_ES2_1        (AM335X_CLASS | (0x2 << 8))
 
 #define OMAP443X_CLASS          0x44300044
 #define OMAP4430_REV_ES1_0      (OMAP443X_CLASS | (0x10 << 8))
@@ -496,6 +497,7 @@ level(__##fn);
 #define omap_subsys_initcall(fn)        omap_initcall(subsys_initcall, fn)
 #define omap_device_initcall(fn)        omap_initcall(device_initcall, fn)
 #define omap_late_initcall(fn)          omap_initcall(late_initcall, fn)
+#define omap_late_initcall_sync(fn)     omap_initcall(late_initcall_sync, fn)
 
 #endif  /* __ASSEMBLY__ */