1. 05 11月, 2011 12 次提交
    • 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
    • T
    • T
    • T
  2. 02 11月, 2011 24 次提交
    • L
      Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc · 994c0e99
      Linus Torvalds 提交于
      * 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits)
        MAINTAINERS: add ARM/FREESCALE IMX6 entry
        arm/imx: merge i.MX3 and i.MX6
        arm/imx6q: add suspend/resume support
        arm/imx6q: add device tree machine support
        arm/imx6q: add smp and cpu hotplug support
        arm/imx6q: add core drivers clock, gpc, mmdc and src
        arm/imx: add gic_handle_irq function
        arm/imx6q: add core definitions and low-level debug uart
        arm/imx6q: add device tree source
        ARM: highbank: add suspend support
        ARM: highbank: Add cpu hotplug support
        ARM: highbank: add SMP support
        MAINTAINERS: add Calxeda Highbank ARM platform
        ARM: add Highbank core platform support
        ARM: highbank: add devicetree source
        ARM: l2x0: add empty l2x0_of_init
        picoxcell: add a definition of VMALLOC_END
        picoxcell: remove custom ioremap implementation
        picoxcell: add the DTS for the PC7302 board
        picoxcell: add the DTS for pc3x2 and pc3x3 devices
        ...
      
      Fix up trivial conflicts in arch/arm/Kconfig, and some more header file
      conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge
      by Arnd).
      994c0e99
    • L
      Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc · 367069f1
      Linus Torvalds 提交于
      * 'next/dt' of git://git.linaro.org/people/arnd/arm-soc:
        ARM: gic: use module.h instead of export.h
        ARM: gic: fix irq_alloc_descs handling for sparse irq
        ARM: gic: add OF based initialization
        ARM: gic: add irq_domain support
        irq: support domains with non-zero hwirq base
        of/irq: introduce of_irq_init
        ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support
        ARM: at91: dt: at91sam9g45 family and board device tree files
        arm/mx5: add device tree support for imx51 babbage
        arm/mx5: add device tree support for imx53 boards
        ARM: msm: Add devicetree support for msm8660-surf
        msm_serial: Add devicetree support
        msm_serial: Use relative resources for iomem
      
      Fix up conflicts in arch/arm/mach-at91/{at91sam9260.c,at91sam9g45.c}
      367069f1
    • L
      Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc · 81a3c10c
      Linus Torvalds 提交于
      * 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc: (31 commits)
        ARM: OMAP: Warn if omap_ioremap is called before SoC detection
        ARM: OMAP: Move set_globals initialization to happen in init_early
        ARM: OMAP: Map SRAM later on with ioremap_exec()
        ARM: OMAP: Remove calls to SRAM allocations for framebuffer
        ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done
        ARM: OMAP1: Use generic map_io, init_early and init_irq
        arm/dts: OMAP3+: Add mpu, dsp and iva nodes
        arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
        ARM: OMAP2+: l3-noc: Add support for device-tree
        ARM: OMAP2+: board-generic: Add i2c static init
        ARM: OMAP2+: board-generic: Add DT support to generic board
        arm/dts: Add support for OMAP3 Beagle board
        arm/dts: Add initial device tree support for OMAP3 SoC
        arm/dts: Add support for OMAP4 SDP board
        arm/dts: Add support for OMAP4 PandaBoard
        arm/dts: Add initial device tree support for OMAP4 SoC
        ARM: OMAP: omap_device: Add a method to build an omap_device from a DT node
        ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration
        of: Add helpers to get one string in multiple strings property
        ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures
        ...
      
      Fix up trivial header file conflicts in arch/arm/mach-omap2/board-generic.c
      81a3c10c
    • L
      Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc · 6585dea1
      Linus Torvalds 提交于
      * 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc:
        arm/imx: use Kconfig choice for low-level debug UART selection
        ARM: realview: use Kconfig choice for debug UART selection
        ARM: plat-samsung: use Kconfig choice for debug UART selection
        ARM: versatile: convert logical CPU numbers to physical numbers
        ARM: ux500: convert logical CPU numbers to physical numbers
        ARM: shmobile: convert logical CPU numbers to physical numbers
        ARM: msm: convert logical CPU numbers to physical numbers
        ARM: exynos4: convert logical CPU numbers to physical numbers
      
      Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of
      ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug
      6585dea1
    • L
      Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc · 16ee792e
      Linus Torvalds 提交于
      * 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits)
        ARM: tegra: update defconfig
        arm/tegra: Harmony: Configure PMC for low-level interrupts
        arm/tegra: device tree support for ventana board
        arm/tegra: add support for ventana pinmuxing
        arm/tegra: prepare Seaboard pinmux code for derived boards
        arm/tegra: pinmux: ioremap registers
        gpio/tegra: Convert to a platform device
        arm/tegra: Convert pinmux driver to a platform device
        arm/dt: Tegra: Add pinmux node to tegra20.dtsi
        arm/tegra: Prep boards for gpio/pinmux conversion to pdevs
        ARM: mx5: fix clock usage for suspend
        ARM i.MX entry-macro.S: remove now unused code
        ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER
        ARM i.MX tzic: add handle_irq function
        ARM i.MX avic: add handle_irq function
        ARM: mx25: Add the missing IIM base definition
        ARM i.MX avic: convert to use generic irq chip
        mx31moboard: Add poweroff support
        ARM: mach-qong: Add watchdog support
        ARM: davinci: AM18x: Add wl1271/wlan support
        ...
      
      Fix up conflicts in:
      	arch/arm/mach-at91/at91sam9g45.c
      	arch/arm/mach-mx5/devices-imx53.h
      	arch/arm/plat-mxc/include/mach/memory.h
      16ee792e
    • L
      Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc · f906fb1d
      Linus Torvalds 提交于
      * 'next/board' of git://git.linaro.org/people/arnd/arm-soc: (34 commits)
        ep93xx: add support Vision EP9307 SoM
        ARM: mxs: Add initial support for DENX MX28
        ARM: EXYNOS4: Add support SMDK4412 Board
        ARM: EXYNOS4: Add MCT support for EXYNOS4412
        ARM: EXYNOS4: Add functions for gic interrupt handling
        ARM: EXYNOS4: Add support clock for EXYNOS4412
        ARM: EXYNOS4: Add support new EXYNOS4412 SoC
        ARM: EXYNOS4: Add support MCT PPI for EXYNOS4212
        ARM: EXYNOS4: Add support PPI in external GIC
        ARM: EXYNOS4: convert boot_params to atag_offset
        ixp4xx: support omicron ixp425 based boards
        ARM: EXYNOS4: Add support SMDK4212 Board
        ARM: EXYNOS4: Add support PM for EXYNOS4212
        ARM: EXYNOS4: Add support clock for EXYNOS4212
        ARM: EXYNOS4: Add support new EXYNOS4212 SoC
        at91: USB-A9G20 C01 & C11 board support
        at91: merge board USB-A9260 and USB-A9263 together
        at91: add support for RSIs EWS board
        ARM: SAMSUNG: Fix mask value for S5P64X0 CPU IDs
        ARM: SAMSUNG: Fix mask for S3C64xx CPU IDs
        ...
      f906fb1d
    • L
      Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc · 510597e2
      Linus Torvalds 提交于
      * 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc:
        ARM: mach-nuc93x: delete
      
      Fix up trivial delete/edit conflicts in
      	arch/arm/mach-nuc93x/{Makefile.boot,mach-nuc932evb.c,time.c}
      510597e2
    • L
      Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc · cd9a0b6b
      Linus Torvalds 提交于
      * 'next/pm' of git://git.linaro.org/people/arnd/arm-soc: (66 commits)
        ARM: CSR: PM: use outer_resume to resume L2 cache
        ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII
        ARM: OMAP: voltage: voltage layer present, even when CONFIG_PM=n
        ARM: CSR: PM: add sleep entry for SiRFprimaII
        ARM: CSR: PM: save/restore irq status in suspend cycle
        ARM: CSR: PM: save/restore timer status in suspend cycle
        OMAP4: PM: TWL6030: add cmd register
        OMAP4: PM: TWL6030: fix ON/RET/OFF voltages
        OMAP4: PM: TWL6030: address 0V conversions
        OMAP4: PM: TWL6030: fix uv to voltage for >0x39
        OMAP4: PM: TWL6030: fix voltage conversion formula
        omap: voltage: add a stub header file for external/regulator use
        OMAP2+: VC: more registers are per-channel starting with OMAP5
        OMAP3+: voltage: update nominal voltage in voltdm_scale() not VC post-scale
        OMAP3+: voltage: rename omap_voltage_get_nom_volt -> voltdm_get_voltage
        OMAP3+: voltdm: final removal of omap_vdd_info
        OMAP3+: voltage: move/rename curr_volt from vdd_info into struct voltagedomain
        OMAP3+: voltage: rename scale and reset functions using voltdm_ prefix
        OMAP3+: VP: combine setting init voltage into common function
        OMAP3+: VP: remove unused omap_vp_get_curr_volt()
        ...
      
      Fix up trivial conflict in arch/arm/mach-prima2/l2x0.c (code removal vs
      edit)
      cd9a0b6b
    • L
      Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc · ac5761a6
      Linus Torvalds 提交于
      * 'next/timer' of git://git.linaro.org/people/arnd/arm-soc:
        clocksource: fixup ux500 build problems
        ARM: omap: use __devexit_p in dmtimer driver
        ARM: ux500: Reprogram timers upon resume
        ARM: plat-nomadik: timer: Export reset functions
        ARM: plat-nomadik: timer: Add support for periodic timers
        ARM: ux500: Move timer code to separate file
        ARM: ux500: add support for clocksource DBX500 PRCMU
        clocksource: add DBX500 PRCMU Timer support
        ARM: plat-nomadik: MTU sched_clock as an option
        ARM: OMAP: dmtimer: add error handling to export APIs
        ARM: OMAP: dmtimer: low-power mode support
        ARM: OMAP: dmtimer: skip reserved timers
        ARM: OMAP: dmtimer: pm_runtime support
        ARM: OMAP: dmtimer: switch-over to platform device driver
        ARM: OMAP: dmtimer: platform driver
        ARM: OMAP2+: dmtimer: convert to platform devices
        ARM: OMAP1: dmtimer: conversion to platform devices
        ARM: OMAP2+: dmtimer: add device names to flck nodes
        ARM: OMAP: Add support for dmtimer v2 ip
      ac5761a6
    • L
      Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc · 25498e5b
      Linus Torvalds 提交于
      * 'next/driver' of git://git.linaro.org/people/arnd/arm-soc:
        hw_random: add driver for atmel true hardware random number generator
        ARM: at91: at91sam9g45: add trng clock and platform device
        MX53 Enable the AHCI SATA on MX53 SMD board
        MX53 Enable the AHCI SATA on MX53 LOCO board
        MX53 Enable the AHCI SATA on MX53 ARD board
        AHCI Add the AHCI SATA feature on the MX53 platforms
        Fix pata imx resource
        ARM: imx: Define functions for registering PATA
        ARM: imx: Add PATA clock support
        ARM: imx: Add PATA resources for other i.MX processors
        imx: efika: Enable pata.
        imx51: add pata clock
        imx51: add pata device
      
      Fix up trivial conflict (new selects next to each other from separate
      branches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig
      25498e5b
    • L
      Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc · 95241450
      Linus Torvalds 提交于
      * 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
        ARM: mach-mxs: fix machines' initializers order
        mmc: mxcmmc: explicitly includes mach/hardware.h
        arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
        arm/imx: remove mx27_setup_weimcs() from mx27.h
        arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
        arm/imx: remove mx31_setup_weimcs() from mx31.h
        ARM: tegra: devices.c should include devices.h
        ARM: tegra: cpu-tegra: unexport two functions
        ARM: tegra: cpu-tegra: sparse type fix
        ARM: tegra: dma: staticify some tables and functions
        ARM: tegra: tegra2_clocks: don't export some tables
        ARM: tegra: tegra_powergate_is_powered should be static
        ARM: tegra: tegra_rtc_read_ms should be static
        ARM: tegra: tegra_init_cache should be static
        ARM: tegra: pcie: 0 -> NULL changes
        ARM: tegra: pcie: include board.h
        ARM: tegra: pcie: don't cast __iomem pointers
        ARM: tegra: tegra2_clocks: 0 -> NULL changes
        ARM: tegra: tegra2_clocks: don't cast __iomem pointers
        ARM: tegra: timer: don't cast __iomem pointers
        ...
      
      Fix up trivial conflicts in
        arch/arm/mach-omap2/Makefile,
        arch/arm/mach-u300/{Makefile.boot,core.c}
        arch/arm/plat-{mxc,omap}/devices.c
      95241450
    • L
      Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc · 68e24ba7
      Linus Torvalds 提交于
      * 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc: (28 commits)
        ARM: pxa/cm-x300: properly set bt_reset pin
        ARM: mmp: rename SHEEVAD to GPLUGD
        ARM: imx: Fix typo 'MACH_MX31_3DS_MXC_NAND_USE_BBT'
        ARM: i.MX28: shift frac value in _CLK_SET_RATE
        plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired
        ARM: mx5: fix clock usage for suspend
        ARM: pxa: use correct __iomem annotations
        ARM: pxa: sharpsl pm needs SPI
        ARM: pxa: centro and treo680 need palm27x
        ARM: pxa: make pxafb_smart_*() empty when not enabled
        ARM: pxa: select POWER_SUPPLY on raumfeld
        ARM: pxa: pxa95x is incompatible with earlier pxa
        ARM: pxa: CPU_FREQ_TABLE is needed for CPU_FREQ
        ARM: pxa: pxa95x/saarb depends on pxa3xx code
        ARM: pxa: allow selecting just one of TREO680/CENTRO
        ARM: pxa: export symbols from pxa3xx-ulpi
        ARM: pxa: make zylonite_pxa*_init declaration match code
        ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available
        ARM: at91: add defconfig for at91sam9g45 family
        ARM: at91: remove dependency for Atmel PWM driver selector in Kconfig
        ...
      68e24ba7
    • A
      Merge branch 'imx/imx6q' into next/soc · abc3f126
      Arnd Bergmann 提交于
      Conflicts:
      	Documentation/devicetree/bindings/arm/fsl.txt
      	arch/arm/Kconfig
      	arch/arm/Kconfig.debug
      	arch/arm/plat-mxc/include/mach/common.h
      abc3f126
    • A
      Merge branch 'picoxcell/soc' into next/soc · b8df0ea2
      Arnd Bergmann 提交于
      b8df0ea2
    • A
      Merge branch 'highbank/soc' into next/soc · 884897e6
      Arnd Bergmann 提交于
      Conflicts:
      	arch/arm/mach-mxs/include/mach/gpio.h
      	arch/arm/mach-omap2/board-generic.c
      	arch/arm/plat-mxc/include/mach/gpio.h
      884897e6
    • L
      Merge branch 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux · b4beb4bf
      Linus Torvalds 提交于
      * 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux: (47 commits)
        i2c-s3c2410: Add device tree support
        i2c-s3c2410: Keep a copy of platform data and use it
        i2c-nomadik: cosmetic coding style corrections
        i2c-au1550: dev_pm_ops conversion
        i2c-au1550: increase timeout waiting for master done
        i2c-au1550: remove unused ack_timeout
        i2c-au1550: remove usage of volatile keyword
        i2c-tegra: __iomem annotation fix
        i2c-eg20t: Add initialize processing in case i2c-error occurs
        i2c-eg20t: Fix flag setting issue
        i2c-eg20t: add stop sequence in case wait-event timeout occurs
        i2c-eg20t: Separate error processing
        i2c-eg20t: Fix 10bit access issue
        i2c-eg20t: Modify returned value s32 to long
        i2c-eg20t: Fix bus-idle waiting issue
        i2c-designware: Fix PCI core warning on suspend/resume
        i2c-designware: Add runtime power management support
        i2c-designware: Add support for Designware core behind PCI devices.
        i2c-designware: Push all register reads/writes into the core code.
        i2c-designware: Support multiple cores using same ISR
        ...
      b4beb4bf
    • L
      Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regulator · f3c3f067
      Linus Torvalds 提交于
      * 'for-linus' of git://opensource.wolfsonmicro.com/regulator: (22 commits)
        regulator: Constify constraints name
        regulator: Fix possible nullpointer dereference in regulator_enable()
        regulator: gpio-regulator add dependency on GENERIC_GPIO
        regulator: Add module.h include to gpio-regulator
        regulator: Add driver for gpio-controlled regulators
        regulator: remove duplicate REG_CTRL2 defines in tps65023
        regulator: Clarify documentation for regulator-regulator supplies
        regulator: Fix some bitrot in the machine driver documentation
        regulator: tps65023: Added support for the similiar TPS65020 chip
        regulator: tps65023: Setting correct core regulator for tps65021
        regulator: tps65023: Set missing bit for update core-voltage
        regulator: tps65023: Fixes i2c configuration issues
        regulator: Add debugfs file showing the supply map table
        regulator: tps6586x: add SMx slew rate setting
        regulator: tps65023: Fixes i2c configuration issues
        regulator: tps6507x: Remove num_voltages array
        regulator: max8952: removed unused mutex.
        regulator: fix regulator/consumer.h kernel-doc warning
        regulator: Ensure enough enable time for max8649
        regulator: 88pm8607: Fix off-by-one value range checking in the case of no id is matched
        ...
      f3c3f067
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · c18ae42a
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: ohci: fix isochronous DMA synchronization
        firewire: ohci: work around selfID junk due to wrong gap count
        firewire: net: Use posted writes
        firewire: use clamp and min3 macros
        firewire: ohci: optimize TSB41BA3D detection
        firewire: ohci: TSB41BA3D support tweaks
        firewire: ohci: Add support for TSB41BA3D phy
        firewire: ohci: Move code from the bus reset tasklet into a workqueue
        firewire: sbp2: fold two functions into one
        firewire: sbp2: move some code to more sensible places
        firewire: sbp2: remove obsolete reference counting
      c18ae42a
    • L
      Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 1c398651
      Linus Torvalds 提交于
      * 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore: make pstore write function return normal success/fail value
        pstore: change mutex locking to spin_locks
        pstore: defer inserting OOPS entries into pstore
      1c398651
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · f470f8d4
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (62 commits)
        mlx4_core: Deprecate log_num_vlan module param
        IB/mlx4: Don't set VLAN in IBoE WQEs' control segment
        IB/mlx4: Enable 4K mtu for IBoE
        RDMA/cxgb4: Mark QP in error before disabling the queue in firmware
        RDMA/cxgb4: Serialize calls to CQ's comp_handler
        RDMA/cxgb3: Serialize calls to CQ's comp_handler
        IB/qib: Fix issue with link states and QSFP cables
        IB/mlx4: Configure extended active speeds
        mlx4_core: Add extended port capabilities support
        IB/qib: Hold links until tuning data is available
        IB/qib: Clean up checkpatch issue
        IB/qib: Remove s_lock around header validation
        IB/qib: Precompute timeout jiffies to optimize latency
        IB/qib: Use RCU for qpn lookup
        IB/qib: Eliminate divide/mod in converting idx to egr buf pointer
        IB/qib: Decode path MTU optimization
        IB/qib: Optimize RC/UC code by IB operation
        IPoIB: Use the right function to do DMA unmap pages
        RDMA/cxgb4: Use correct QID in insert_recv_cqe()
        RDMA/cxgb4: Make sure flush CQ entries are collected on connection close
        ...
      f470f8d4
    • R
      Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib',... · 504255f8
      Roland Dreier 提交于
      Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next
      504255f8
    • L
      Merge git://github.com/herbertx/crypto · dc47d381
      Linus Torvalds 提交于
      * git://github.com/herbertx/crypto: (48 commits)
        crypto: user - Depend on NET instead of selecting it
        crypto: user - Add dependency on NET
        crypto: talitos - handle descriptor not found in error path
        crypto: user - Initialise match in crypto_alg_match
        crypto: testmgr - add twofish tests
        crypto: testmgr - add blowfish test-vectors
        crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT
        crypto: twofish-x86_64-3way - fix ctr blocksize to 1
        crypto: blowfish-x86_64 - fix ctr blocksize to 1
        crypto: whirlpool - count rounds from 0
        crypto: Add userspace report for compress type algorithms
        crypto: Add userspace report for cipher type algorithms
        crypto: Add userspace report for rng type algorithms
        crypto: Add userspace report for pcompress type algorithms
        crypto: Add userspace report for nivaead type algorithms
        crypto: Add userspace report for aead type algorithms
        crypto: Add userspace report for givcipher type algorithms
        crypto: Add userspace report for ablkcipher type algorithms
        crypto: Add userspace report for blkcipher type algorithms
        crypto: Add userspace report for ahash type algorithms
        ...
      dc47d381
    • E
      sysfs: Make sysfs_rename safe with sysfs_dirents in rbtrees. · f6d90b4f
      Eric W. Biederman 提交于
      In sysfs_rename we need to remove the optimization of not calling
      sysfs_unlink_sibling and sysfs_link_sibling if the renamed parent
      directory is not changing.  This optimization is no longer valid now
      that sysfs dirents are stored in an rbtree sorted by name.
      
      Move the assignment of s_ns before the call of sysfs_link_sibling.  With
      no sysfs_dirent fields changing after the call of sysfs_link_sibling
      this allows sysfs_link_sibling to take any of the directory entries into
      account when it builds the rbtrees, and s_ns looks like a prime canidate
      to be used in the rbtree in the future.
      Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
      Cc: Jiri Slaby <jirislaby@gmail.com>
      Cc: Greg KH <gregkh@suse.de>
      Cc: David Miller <davem@davemloft.net>
      Cc: Mikulas Patocka <mpatocka@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f6d90b4f
    • A
      Merge branch 'imx/devel' into next/dt · c72dbae9
      Arnd Bergmann 提交于
      The board changes in the imx/devel branch conflict with other changes in
      the device imx/dt branch.
      
      Conflicts:
      	arch/arm/mach-mx5/board-mx53_loco.c
      	arch/arm/mach-mx5/board-mx53_smd.c
      	arch/arm/plat-mxc/include/mach/common.h
      	arch/arm/plat-mxc/include/mach/memory.h
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      c72dbae9
  3. 01 11月, 2011 4 次提交