Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next

diff --combined arch/arm/mach-omap2/Makefile
index 512b15204450417c88a7040b0302eccb3f8fdfdc,512b15204450417c88a7040b0302eccb3f8fdfdc,186f482ed414e2036091ede95d2d34a191748b47,a45cd6409686f7eadfd6cc85e24e010c628c6d0d..f082f7d657609b630f87df8c2a7d685e1228573c
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
--- 3/arch/arm/mach-omap2/Makefile
--- 4/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@@@ -68,7 -68,7 -68,7 -68,7 +68,7 @@@@@ obj-$(CONFIG_OMAP_SMARTREFLEX
    obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)       += smartreflex-class3.o
    
    AFLAGS_sleep24xx.o                  :=-Wa,-march=armv6
  --AFLAGS_sleep34xx.o                  :=-Wa,-march=armv7-a
  ++AFLAGS_sleep34xx.o                  :=-Wa,-march=armv7-a$(plus_sec)
    
    ifeq ($(CONFIG_PM_VERBOSE),y)
    CFLAGS_pm_bus.o                             += -DDEBUG
@@@@@ -229,8 -229,8 -229,6 -229,8 +229,6 @@@@@ obj-$(CONFIG_MACH_CM_T35)                += board-cm-
    obj-$(CONFIG_MACH_CM_T3517)         += board-cm-t3517.o
    obj-$(CONFIG_MACH_IGEP0020)         += board-igep0020.o \
                                           hsmmc.o
-- -obj-$(CONFIG_MACH_IGEP0030)         += board-igep0030.o \
-- -                                       hsmmc.o
    obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)  += board-omap3touchbook.o \
                                           hsmmc.o
    obj-$(CONFIG_MACH_OMAP_4430SDP)             += board-4430sdp.o \
@@@@@ -270,3 -270,3 -268,5 -270,3 +268,5 @@@@@ obj-$(CONFIG_ARCH_OMAP4)         += hwspinlock
    
    disp-$(CONFIG_OMAP2_DSS)            := display.o
    obj-y                                       += $(disp-m) $(disp-y)
++ +
++ +obj-y                                       += common-board-devices.o

diff --combined arch/arm/mach-omap2/omap_l3_smx.c
index 4321e79389291c9695e4695d91132f64b48cc803,4321e79389291c9695e4695d91132f64b48cc803,6a7d87b6bcb4e1c9769f99f57d21236787848b2d,5f2da7565b68b917dd439c4574ab98402ed1790c..873c0e33b512e1da521e2277a8122b60aa84a779
--- 1/arch/arm/mach-omap2/omap_l3_smx.c
--- 2/arch/arm/mach-omap2/omap_l3_smx.c
--- 3/arch/arm/mach-omap2/omap_l3_smx.c
--- 4/arch/arm/mach-omap2/omap_l3_smx.c
+++ b/arch/arm/mach-omap2/omap_l3_smx.c
@@@@@ -155,7 -155,7 -155,7 -155,7 +155,7 @@@@@ static irqreturn_t omap3_l3_block_irq(s
        u8                      multi = error & L3_ERROR_LOG_MULTI;
        u32                     address = omap3_l3_decode_addr(error_addr);
    
-- -    WARN(true, "%s Error seen by %s %s at address %x\n",
++ +    WARN(true, "%s seen by %s %s at address %x\n",
                                 omap3_l3_code_string(code),
                          omap3_l3_initiator_string(initid),
                             multi ? "Multiple Errors" : "",
@@@@@ -167,21 -167,21 -167,15 -167,21 +167,15 @@@@@
    static irqreturn_t omap3_l3_app_irq(int irq, void *_l3)
    {
        struct omap3_l3         *l3 = _l3;
-- -
        u64                     status, clear;
        u64                     error;
        u64                     error_addr;
        u64                     err_source = 0;
        void                    __iomem *base;
        int                     int_type;
-- -
        irqreturn_t             ret = IRQ_NONE;
    
-- -    if (irq == l3->app_irq)
-- -            int_type = L3_APPLICATION_ERROR;
-- -    else
-- -            int_type = L3_DEBUG_ERROR;
-- -
++ +    int_type = irq == l3->app_irq ? L3_APPLICATION_ERROR : L3_DEBUG_ERROR;
        if (!int_type) {
                status = omap3_l3_readll(l3->rt, L3_SI_FLAG_STATUS_0);
                /*
@@@@@ -196,13 -196,13 -190,12 -196,13 +190,12 @@@@@
                /* No timeout error for debug sources */
        }
    
  --    base = ((l3->rt) + (*(omap3_l3_bases[int_type] + err_source)));
  --
        /* identify the error source */
        for (err_source = 0; !(status & (1 << err_source)); err_source++)
                                                                        ;
   -    error = omap3_l3_readll(base, L3_ERROR_LOG);
  + 
  ++    base = l3->rt + *(omap3_l3_bases[int_type] + err_source);
   +    error = omap3_l3_readll(base, L3_ERROR_LOG);
--  
        if (error) {
                error_addr = omap3_l3_readll(base, L3_ERROR_LOG_ADDR);
    
@@@@@ -210,9 -210,9 -203,8 -210,9 +203,8 @@@@@
        }
    
        /* Clear the status register */
-- -    clear = ((L3_AGENT_STATUS_CLEAR_IA << int_type) |
-- -             (L3_AGENT_STATUS_CLEAR_TA));
-- -
++ +    clear = (L3_AGENT_STATUS_CLEAR_IA << int_type) |
++ +            L3_AGENT_STATUS_CLEAR_TA;
        omap3_l3_writell(base, L3_AGENT_STATUS, clear);
    
        /* clear the error log register */
@@@@@ -228,10 -228,10 -220,8 -228,10 +220,8 @@@@@ static int __init omap3_l3_probe(struc
        int                     ret;
    
        l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
-- -    if (!l3) {
-- -            ret = -ENOMEM;
-- -            goto err0;
-- -    }
++ +    if (!l3)
++ +            return -ENOMEM;
    
        platform_set_drvdata(pdev, l3);
    
@@@@@ -239,13 -239,13 -229,13 -239,13 +229,13 @@@@@
        if (!res) {
                dev_err(&pdev->dev, "couldn't find resource\n");
                ret = -ENODEV;
-- -            goto err1;
++ +            goto err0;
        }
        l3->rt = ioremap(res->start, resource_size(res));
-- -    if (!(l3->rt)) {
++ +    if (!l3->rt) {
                dev_err(&pdev->dev, "ioremap failed\n");
                ret = -ENOMEM;
-- -            goto err2;
++ +            goto err0;
        }
    
        l3->debug_irq = platform_get_irq(pdev, 0);
@@@@@ -254,28 -254,28 -244,26 -254,28 +244,26 @@@@@
                "l3-debug-irq", l3);
        if (ret) {
                dev_err(&pdev->dev, "couldn't request debug irq\n");
-- -            goto err3;
++ +            goto err1;
        }
    
        l3->app_irq = platform_get_irq(pdev, 1);
        ret = request_irq(l3->app_irq, omap3_l3_app_irq,
                IRQF_DISABLED | IRQF_TRIGGER_RISING,
                "l3-app-irq", l3);
-- -
        if (ret) {
                dev_err(&pdev->dev, "couldn't request app irq\n");
-- -            goto err4;
++ +            goto err2;
        }
    
-- -    goto err0;
++ +    return 0;
    
-- -err4:
-- -err3:
-- -    iounmap(l3->rt);
    err2:
++ +    free_irq(l3->debug_irq, l3);
    err1:
-- -    kfree(l3);
++ +    iounmap(l3->rt);
    err0:
++ +    kfree(l3);
        return ret;
    }
    

diff --combined arch/arm/mach-omap2/voltage.c
index 0c1552d9d99508c3bc0d2a3aaf4ae5038becc089,0c1552d9d99508c3bc0d2a3aaf4ae5038becc089,b74bfb8ce93707c027320e1d3b7b968798701c71,6fb520999b6e770bb12e376042ef0fc15da5b7ed..9ef3789ded4b0f1c5e48d1782c7004067a03d8cd
--- 1/arch/arm/mach-omap2/voltage.c
--- 2/arch/arm/mach-omap2/voltage.c
--- 3/arch/arm/mach-omap2/voltage.c
--- 4/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@@@@ -114,6 -114,6 -114,7 -114,7 +114,6 @@@@@ static int __init _config_common_vdd_da
        sys_clk_speed /= 1000;
    
        /* Generic voltage parameters */
  --    vdd->curr_volt = 1200000;
        vdd->volt_scale = vp_forceupdate_scale_voltage;
        vdd->vp_enabled = false;
    
@@@@@ -148,7 -148,7 -149,6 -149,7 +148,6 @@@@@ static int vp_volt_debug_get(void *data
        }
    
        vsel = vdd->read_reg(prm_mod_offs, vdd->vp_data->voltage);
-- -    pr_notice("curr_vsel = %x\n", vsel);
    
        if (!vdd->pmic_info->vsel_to_uv) {
                pr_warning("PMIC function to convert vsel to voltage"