1. 05 11月, 2011 9 次提交
    • T
      ARM: OMAP: change get_context_loss_count ret value to int · fc013873
      Tomi Valkeinen 提交于
      get_context_loss_count functions return context loss count as u32, and
      zero means an error. However, zero is also returned when context has
      never been lost and could also be returned when the context loss count
      has wrapped and goes to zero.
      
      Change the functions to return an int, with negative value meaning an
      error.
      
      OMAP HSMMC code uses omap_pm_get_dev_context_loss_count(), but as the
      hsmmc code handles the returned value as an int, with negative value
      meaning an error, this patch actually fixes hsmmc code also.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Acked-by: NKevin Hilman <khilman@ti.com>
      Acked-by: NPaul Walmsley <paul@pwsan.com>
      [tony@atomide.com: updated to fix a warning with recent dmtimer changes]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      fc013873
    • B
      ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly · c862dd70
      Balaji T K 提交于
      Fix the typo, instead it should be SDMMC1
      USBC1 is not related to MMC1 I/Os
      Signed-off-by: NBalaji T K <balajitk@ti.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      c862dd70
    • B
      ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF · ff2beb1d
      Balaji T K 提交于
      MMC1 data line IO's are powered down in before set regulator function.
      IO's should not be powered ON when regulator is OFF.
      Keep the IO's in power pown mode after regulator OFF otherwise VMODE_ERROR
      interrupt is generated due to mismatch in input (regulator)
      voltage and MMC IO drive voltage.
      Delete incorrect comments which are not applicable for OMAP4.
      Signed-off-by: NBalaji T K <balajitk@ti.com>
      Signed-off-by: NKishore Kadiyala <kishore.kadiyala@ti.com>
      Reported-by: NViswanath Puttagunta <vishp@ti.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      ff2beb1d
    • P
      ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list · ace90216
      Paul Walmsley 提交于
      Commit d6504acd ("OMAP2+: hwmod:
      remove OMAP_CHIP*") tests the inverse condition of what it should be
      testing for the return value from omap_hwmod_register().  This causes
      several IP blocks to not be registered on several OMAP3 family devices.
      
      Fixing that bug also unmasked another bug, originally reported by
      Chase Maupin <chase.maupin@ti.com> and then subsequently by Abhilash K
      V <abhilash.kv@ti.com>, which caused SmartReflex IP blocks to be
      registered on SoCs that don't support them.
      
      Thanks to Russell King - ARM Linux <linux@arm.linux.org.uk> for comments
      on a previous version of the patch.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Chase Maupin <chase.maupin@ti.com>
      Cc: Abhilash K V <abhilash.kv@ti.com>
      Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      ace90216
    • L
      ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success · af504e5d
      Laurent Pinchart 提交于
      Commit 4d17aeb1 ("OMAP: I2C: split
      device registration and convert OMAP2+ to omap_device") makes
      omap2_i2c_add_bus() return a pointer to an omap_device instead on
      success instead of 0.
      
      This breaks the omap_register_i2c_bus() ABI and results in the igep0020
      board code detecting an I2C bus registration error when there is none.
      
      Fix the problem by using PTR_RET() instead of PTR_ERR() in
      omap2_i2c_add_bus().
      Reported-by: NAlexander Kinzer <a.kinzer@plusoptix.de>
      Signed-off-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      [tony@atomide.com: updated to return pdev instead of od]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      af504e5d
    • A
      ARM: OMAP: dmtimer: Include linux/module.h · 869dec15
      Axel Lin 提交于
      Include linux/module.h to fix below build error:
      
        CC      arch/arm/plat-omap/dmtimer.o
      arch/arm/plat-omap/dmtimer.c:184: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:184: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:184: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:215: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:215: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:215: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:228: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:228: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:228: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:234: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:234: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:234: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:240: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:240: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:240: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:248: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:248: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:248: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:294: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:294: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:294: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:302: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:302: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:302: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:316: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:316: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:316: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:344: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:344: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:344: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:361: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:361: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:361: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:380: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:380: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:380: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:406: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:406: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:406: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:443: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:443: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:443: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:468: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:468: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:468: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:494: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:494: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:494: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:517: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:517: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:517: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:534: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:534: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:534: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:549: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:549: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:549: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:561: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:561: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:561: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:572: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:572: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:572: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:587: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:587: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:587: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:604: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:604: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
      arch/arm/plat-omap/dmtimer.c:604: warning: parameter names (without types) in function declaration
      arch/arm/plat-omap/dmtimer.c:746: error: expected declaration specifiers or '...' before string constant
      arch/arm/plat-omap/dmtimer.c:746: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:746: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
      arch/arm/plat-omap/dmtimer.c:746: warning: function declaration isn't a prototype
      arch/arm/plat-omap/dmtimer.c:747: error: expected declaration specifiers or '...' before string constant
      arch/arm/plat-omap/dmtimer.c:747: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:747: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
      arch/arm/plat-omap/dmtimer.c:747: warning: function declaration isn't a prototype
      arch/arm/plat-omap/dmtimer.c:748: error: expected declaration specifiers or '...' before string constant
      arch/arm/plat-omap/dmtimer.c:748: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:748: warning: type defaults to 'int' in declaration of 'MODULE_ALIAS'
      arch/arm/plat-omap/dmtimer.c:748: warning: function declaration isn't a prototype
      arch/arm/plat-omap/dmtimer.c:749: error: expected declaration specifiers or '...' before string constant
      arch/arm/plat-omap/dmtimer.c:749: warning: data definition has no type or storage class
      arch/arm/plat-omap/dmtimer.c:749: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
      arch/arm/plat-omap/dmtimer.c:749: warning: function declaration isn't a prototype
      make[1]: *** [arch/arm/plat-omap/dmtimer.o] Error 1
      make: *** [arch/arm/plat-omap] Error 2
      Signed-off-by: NAxel Lin <axel.lin@gmail.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      869dec15
    • A
      ARM: OMAP2+: l3-noc: Include linux/module.h · d4fc7eb5
      Axel Lin 提交于
      Include linux/module.h to fix below build error:
      
        CC      arch/arm/mach-omap2/omap_l3_noc.o
      arch/arm/mach-omap2/omap_l3_noc.c:240: error: expected ',' or ';' before 'MODULE_DEVICE_TABLE'
      arch/arm/mach-omap2/omap_l3_noc.c:250: error: 'THIS_MODULE' undeclared here (not in a function)
      make[1]: *** [arch/arm/mach-omap2/omap_l3_noc.o] Error 1
      make: *** [arch/arm/mach-omap2] Error 2
      Signed-off-by: NAxel Lin <axel.lin@gmail.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      d4fc7eb5
    • P
      ARM: OMAP2+: devices: Fixes for McPDM · 927dbbb2
      Peter Ujfalusi 提交于
      Commit f718e2c0 (ARM: OMAP2+: devices:
      Remove all omap_device_pm_latency structures) removed these structures.
      Commit 3528c58e (OMAP: omap_device:
      when building return platform_device instead of omap_device) now
      returns platform_device instead of omap_device.
      
      Fix up the omap-mcpdm init function since this part comes via sound
      tree, and there has been changes regarding to hwmod/omap_device_build.
      Signed-off-by: NPeter Ujfalusi <peter.ujfalusi@ti.com>
      CC: Benoit Cousson <b-cousson@ti.com>
      CC: Kevin Hilman <khilman@ti.com>
      [tony@atomide.com: updated comments]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      927dbbb2
    • S
      ARM: OMAP: Fix errors and warnings when building for one board · c4e2d245
      Sanjeev Premi 提交于
      When customizing omap2plus_defconfig to build for only
      one board (omap3evm), I came across these warnings and
      errors (filenames truncated):
      
      arch/arm/mach-omap2/board-generic.c:76:20: warning: 'omap4_init' defined but not used
      arch/arm/mach-omap2/built-in.o: In function `omap2420_init_early':
      arch/arm/mach-omap2/io.c:364: undefined reference to `omap2_set_globals_242x'
      arch/arm/mach-omap2/io.c:366: undefined reference to `omap2xxx_voltagedomains_init'
      arch/arm/mach-omap2/io.c:367: undefined reference to `omap242x_powerdomains_init'
      arch/arm/mach-omap2/io.c:368: undefined reference to `omap242x_clockdomains_init'
      arch/arm/mach-omap2/io.c:369: undefined reference to `omap2420_hwmod_init'
      arch/arm/mach-omap2/built-in.o: In function `omap2430_init_early':
      arch/arm/mach-omap2/io.c:376: undefined reference to `omap2_set_globals_243x'
      arch/arm/mach-omap2/io.c:378: undefined reference to `omap2xxx_voltagedomains_init'
      arch/arm/mach-omap2/io.c:379: undefined reference to `omap243x_powerdomains_init'
      arch/arm/mach-omap2/io.c:380: undefined reference to `omap243x_clockdomains_init'
      arch/arm/mach-omap2/io.c:381: undefined reference to `omap2430_hwmod_init'
      arch/arm/mach-omap2/built-in.o: In function `omap4430_init_early':
      arch/arm/mach-omap2/io.c:436: undefined reference to `omap2_set_globals_443x'
      arch/arm/mach-omap2/io.c:438: undefined reference to `omap44xx_voltagedomains_init'
      arch/arm/mach-omap2/io.c:439: undefined reference to `omap44xx_powerdomains_init'
      arch/arm/mach-omap2/io.c:440: undefined reference to `omap44xx_clockdomains_init'
      arch/arm/mach-omap2/io.c:441: undefined reference to `omap44xx_hwmod_init'
      
      This patch fixes them.
      Signed-off-by: NSanjeev Premi <premi@ti.com>
      Acked-by: NThomas Weber <weber@corscience.de>
      [tony@atomide.com: updated to fix warnings for board-generic.c]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      c4e2d245
  2. 01 11月, 2011 31 次提交