1. 06 4月, 2012 1 次提交
    • R
      ARM: fix __io macro for PCMCIA · 1ac02d79
      Rob Herring 提交于
      With commit c334bc15 (ARM: make mach/io.h include optional), PCMCIA was
      broken. PCMCIA depends on __io() returning a valid i/o address, and most
      ARM platforms require IO_SPACE_LIMIT be set to 0xffffffff for PCMCIA. This
      needs a better fix with a fixed i/o address mapping, but for now we just
      restore things to the previous behavior.
      
      This fixes at91, omap1, pxa and sa11xx. pxa needs io.h if PCI is enabled,
      but PCMCIA is not. sa11xx already has IO_SPACE_LIMIT set to 0xffffffff,
      so it doesn't need an io.h.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Cc: Joachim Eastwood <joachim.eastwood@jotron.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Andrew Victor <linux@maxim.org.za>
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
      Tested-by: Paul Parsons <lost.distance@yahoo.com> (pxa270)
      Acked-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      1ac02d79
  2. 31 3月, 2012 1 次提交
    • O
      ARM: fix builds due to missing <asm/system_misc.h> includes · 86dfe446
      Olof Johansson 提交于
      This does a sweeping change fixing up all the missing system_misc.h and
      system_info.h includes from the system.h split-up change. These were the
      ones I came across when building all defconfigs in arch/arm/configs, there
      might be more but they lack adequate build coverage to be easily caught.
      
      I'm expecting to get a lot of these piecemeal by each maintainer, so we
      might just as well do one sweeping change to get them all at once.
      
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Sascha Hauer <kernel@pengutronix.de>
      Cc: Imre Kaloz <kaloz@openwrt.org>
      Cc: Krzysztof Halasa <khc@pm.waw.pl>
      Cc: Eric Miao <eric.y.miao@gmail.com>
      Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
      Cc: Wan ZongShun <mcuos.com@gmail.com>
      Acked-by: NKukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      86dfe446
  3. 30 3月, 2012 3 次提交
  4. 29 3月, 2012 1 次提交
  5. 28 3月, 2012 1 次提交
    • P
      ARM: pxa: fix regulator related build fail in magician_defconfig · 3a569132
      Paul Gortmaker 提交于
      commit 737f360d (linux-next)
      
        "regulator: Remove support for supplies specified by struct device"
      
      deletes the field from the struct, but this platform was still trying
      to set those fields.  Delete the assignments.
      
      arch/arm/mach-pxa/magician.c:581: error: unknown field 'dev' specified in initializer
      arch/arm/mach-pxa/magician.c:581: warning: initialization from incompatible pointer type
      arch/arm/mach-pxa/magician.c:585: error: unknown field 'dev' specified in initializer
      arch/arm/mach-pxa/magician.c:585: warning: initialization from incompatible pointer type
      
      arch/arm/mach-pxa/hx4700.c:683: error: unknown field 'dev' specified in initializer
      arch/arm/mach-pxa/hx4700.c:683: warning: initialization from incompatible pointer type
      arch/arm/mach-pxa/hx4700.c:687: error: unknown field 'dev' specified in initializer
      arch/arm/mach-pxa/hx4700.c:687: warning: initialization from incompatible pointer type
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NHaojian Zhuang <haojian.zhuang@gmail.com>
      3a569132
  6. 26 3月, 2012 2 次提交
  7. 24 3月, 2012 1 次提交
  8. 14 3月, 2012 3 次提交
  9. 07 3月, 2012 1 次提交
  10. 06 3月, 2012 4 次提交
  11. 28 2月, 2012 5 次提交
    • H
      ARM: pxa: add dummy clock for pxa25x and pxa27x · 43de6a7d
      Haojian Zhuang 提交于
      gpio-pxa driver is shared among arch-pxa and arch-mmp. Clock is the
      essential component on pxa3xx/pxa95x and arch-mmp. So we need to
      define dummy clock in pxa25x/pxa27x instead.
      Signed-off-by: NHaojian Zhuang <haojian.zhuang@marvell.com>
      43de6a7d
    • P
      pxa/hx4700: Add ASIC3 LED support · 91cb8ee3
      Paul Parsons 提交于
      Add LED support for the HTC ASIC3. Underlying support is provided by the mfd/asic3 and leds/leds-asic3 drivers. An example configuration is provided by the pxa/hx4700 platform.
      Signed-off-by: NPaul Parsons <lost.distance@yahoo.com>
      Acked-by: NPhilipp Zabel <philipp.zabel@gmail.com>
      Signed-off-by: NHaojian Zhuang <haojian.zhuang@gmail.com>
      91cb8ee3
    • P
      pxa/hx4700: Correct StrataFlash block size discovery · 11407e57
      Paul Parsons 提交于
      The HP iPAQ hx4700 has 128Mb of flash provided by two Intel StrataFlash devices.
      The hx4700 platform configuration defines a single 128Mb flash resource,
      resulting in the MTD physmap-flash driver probing the first device only and
      presuming the second device is identical:
      
      physmap platform flash device: 08000000 at 00000000
      physmap-flash: Found 2 x16 devices at 0x0 in 32-bit bank. Manufacturer ID 0x000089 Chip ID 0x008816
      physmap-flash: Found 2 x16 devices at 0x4000000 in 32-bit bank
      <snip>
      erase region 0: offset=0x0,size=0x10000,blocks=4
      erase region 1: offset=0x40000,size=0x40000,blocks=255
      erase region 2: offset=0x4000000,size=0x10000,blocks=4
      erase region 3: offset=0x4040000,size=0x40000,blocks=255
      physmap-flash: 2 set(s) of 2 interleaved chips --> 32 partitions of 4096 KiB
      
      Unfortunately the two devices are not identical. The first has a device ID of
      0x8816, identifying a bottom parameter device. The second has a device ID of
      0x8813, identifying a top parameter device. By not probing the second device,
      physmap-flash does not discover the correct block sizes.
      
      This patch splits the configuration into two 64Mb flash resources, forcing
      physmap-flash to probe both devices and thus discover the correct block sizes:
      
      physmap platform flash device: 04000000 at 00000000
      physmap-flash: Found 2 x16 devices at 0x0 in 32-bit bank. Manufacturer ID 0x000089 Chip ID 0x008816
      <snip>
      erase region 0: offset=0x0,size=0x10000,blocks=4
      erase region 1: offset=0x40000,size=0x40000,blocks=255
      physmap-flash: 1 set(s) of 2 interleaved chips --> 16 partitions of 4096 KiB
      physmap platform flash device: 04000000 at 04000000
      physmap-flash: Found 2 x16 devices at 0x0 in 32-bit bank. Manufacturer ID 0x000089 Chip ID 0x008813
      <snip>
      erase region 0: offset=0x0,size=0x40000,blocks=255
      erase region 1: offset=0x3fc0000,size=0x10000,blocks=4
      physmap-flash: 1 set(s) of 2 interleaved chips --> 16 partitions of 4096 KiB
      Concatenating MTD devices:
      (0): "physmap-flash"
      (1): "physmap-flash"
      into device "physmap-flash"
      Signed-off-by: NPaul Parsons <lost.distance@yahoo.com>
      Signed-off-by: NHaojian Zhuang <haojian.zhuang@gmail.com>
      11407e57
    • H
      ARM: pxa: add rtc dummy clock · 3e12ec77
      Haojian Zhuang 提交于
      sa1100-rtc driver could be shared among sa1100/pxa/mmp series silicon.
      Since clk is used in mmp series silicon, add dummy clock support in
      pxa also.
      Signed-off-by: NHaojian Zhuang <haojian.zhuang@marvell.com>
      3e12ec77
    • H
      rtc: sa1100: declare irq in resource · 3888c090
      Haojian Zhuang 提交于
      Avoid to hard coded irq in rtc-sa1100 driver since we could share
      it among arch-sa1100/arch-pxa/arch-mmp.
      
      We still keep hard coded register address since the requirement is
      enabling both rtc-sa1100 and rtc-pxa driver. The register addresses
      are conflict since they're only two wrappers on the same rtc device.
      Signed-off-by: NHaojian Zhuang <haojian.zhuang@marvell.com>
      Reviewed-by: NArnd Bergmann <arnd@arndb.de>
      3888c090
  12. 27 2月, 2012 1 次提交
  13. 24 2月, 2012 1 次提交
  14. 22 2月, 2012 1 次提交
  15. 17 2月, 2012 1 次提交
  16. 16 2月, 2012 4 次提交
  17. 13 2月, 2012 2 次提交
  18. 04 2月, 2012 1 次提交
  19. 26 1月, 2012 1 次提交
  20. 21 1月, 2012 1 次提交
  21. 20 1月, 2012 1 次提交
    • R
      Revert "RTC: sa1100: support sa1100, pxa and mmp soc families" · a0164a57
      Russell King 提交于
      This reverts commit 7cea0065.
      
      The sa1100 cleanups fatally broke the SA1100 RTC driver - the first
      hint that something is wrong are these compiler warnings:
      
      drivers/rtc/rtc-sa1100.c:42:1: warning: "RCNR" redefined
      In file included from arch/arm/mach-sa1100/include/mach/hardware.h:73,
                       from drivers/rtc/rtc-sa1100.c:35:
      arch/arm/mach-sa1100/include/mach/SA-1100.h:877:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:43:1: warning: "RTAR" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:876:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:44:1: warning: "RTSR" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:879:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:45:1: warning: "RTTR" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:878:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:47:1: warning: "RTSR_HZE" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:891:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:48:1: warning: "RTSR_ALE" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:890:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:49:1: warning: "RTSR_HZ" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:889:1: warning: this is the location of the previous definition
      drivers/rtc/rtc-sa1100.c:50:1: warning: "RTSR_AL" redefined
      arch/arm/mach-sa1100/include/mach/SA-1100.h:888:1: warning: this is the location of the previous definition
      
      and the second problem, which is far more severe, are the different
      register layouts, resulting in the wrong registers being read on
      SA11x0 platforms.  This patch adds:
      
      	#define RCNR           0x00    /* RTC Count Register */
      	#define RTAR           0x04    /* RTC Alarm Register */
      	#define RTSR           0x08    /* RTC Status Register */
      	#define RTTR           0x0c    /* RTC Timer Trim Register */
      
      but the SA11x0 registers are:
      
      	#define RTAR            __REG(0x90010000)  /* RTC Alarm Reg. */
      	#define RCNR            __REG(0x90010004)  /* RTC CouNt Reg. */
      	#define RTTR            __REG(0x90010008)  /* RTC Trim Reg. */
      	#define RTSR            __REG(0x90010010)  /* RTC Status Reg. */
      a0164a57
  22. 19 1月, 2012 1 次提交
  23. 05 1月, 2012 2 次提交