1. 21 5月, 2013 4 次提交
  2. 20 5月, 2013 2 次提交
    • T
      arm: mvebu: fix the 'ranges' property to handle PCIe · 8eed481e
      Thomas Petazzoni 提交于
      Since 82a68267 ('ARM: dts: mvebu: Convert all the mvebu files to use
      the range property') all the device nodes of Armada 370/XP are under a
      common 'ranges' property that translates the device register addresses
      into their absolute address, thanks to the base address of the
      internal register space.
      
      However, beyond just the register areas, there are also PCIe I/O and
      memory regions, whose addresses should be properly translated. This
      patch fixes the Armada 370 and XP ranges property to take PCIe into
      account properly.
      Signed-off-by: NThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Signed-off-by: NJason Cooper <jason@lakedaemon.net>
      8eed481e
    • G
      ARM: mvebu: select ARCH_REQUIRE_GPIOLIB for mvebu platform · c689cbac
      Gregory CLEMENT 提交于
      Initially ARCH_REQUIRE_GPIOLIB was part of Thomas Petazzoni series
      when he introduced the gpiolib support for mvebu:
      93a59cf3 arm: mvebu: use GPIO support now that a driver is available
      
      This commit was written to be applied for the ARCH_MVEBU which was
      located in arch/arm/KConfig and was merged in 3.7.
      
      In the same time Rob Herring moved the ARCH_MVEBU block to
      arch/arm/mach-mvebu/Kconfig with this commit and also merged in 3.7:
      387798b3 ARM: initial multiplatform support
      
      Unfortunately the ARCH_REQUIRE_GPIOLIB have been lost during this
      migration. This was not noticed until the v3.10-rc1, because mvebu as
      part of ARCH_MULTIPLATFORM was always selected with ARCH_VEXPRESS, and
      this architect selected ARCH_REQUIRE_GPIOLIB.
      
      Since the following commit from Arnd: "883a106b ARM: default machine
      descriptor for multiplatform", ARCH_VEXPRESS was then no more selected
      by default with ARCH_MVEBU and it made appeared the lack of
      ARCH_REQUIRE_GPIOLIB for mvebu. This commit added back the selection
      of ARCH_REQUIRE_GPIOLIB for ARCH_MVEBU.
      Signed-off-by: NGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: NJason Cooper <jason@lakedaemon.net>
      c689cbac
  3. 18 5月, 2013 13 次提交
  4. 17 5月, 2013 5 次提交
    • D
      Revert "MIPS: Allow ASID size to be determined at boot time." · 48c4ac97
      David Daney 提交于
      This reverts commit d532f3d2.
      
      The original commit has several problems:
      
      1) Doesn't work with 64-bit kernels.
      
      2) Calls TLBMISS_HANDLER_SETUP() before the code is generated.
      
      3) Calls TLBMISS_HANDLER_SETUP() twice in per_cpu_trap_init() when
         only one call is needed.
      
      [ralf@linux-mips.org: Also revert the bits of the ASID patch which were
      hidden in the KVM merge.]
      Signed-off-by: NDavid Daney <david.daney@cavium.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: "Steven J. Hill" <Steven.Hill@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Patchwork: https://patchwork.linux-mips.org/patch/5242/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      48c4ac97
    • D
      Revert "MIPS: microMIPS: Support dynamic ASID sizing." · 8ea6cd7a
      David Daney 提交于
      This reverts commit f6b06d93.
      
      The next revert depends on this one, so this has to go too.
      Signed-off-by: NDavid Daney <david.daney@cavium.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: "Steven J. Hill" <Steven.Hill@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Patchwork: https://patchwork.linux-mips.org/patch/5241/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      8ea6cd7a
    • P
      ARM: OMAP2+: Add missing CONFIG_ARCH_MULTI_V6=y to omap2plus_defconfig · a545ec16
      Paul Walmsley 提交于
      omap2plus_defconfig is missing CONFIG_ARCH_MULTI_V6.  This results in
      undefined instruction traps in u-boot (and boot failures) on OMAP2xxx
      SoCs, which are ARM11-based.  Fix by setting CONFIG_ARCH_MULTI_V6.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      a545ec16
    • W
      ARM: OMAP: fix error return code in omap1_system_dma_init() · a8b09c52
      Wei Yongjun 提交于
      Fix to return -ENOMEM in the d->chan alloc error handling
      case instead of 0, as done elsewhere in this function.
      Signed-off-by: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      a8b09c52
    • J
      ARM: OMAP: fix __init section mismatch for _enable_preprogram · 0f497039
      jean-philippe francois 提交于
      _enable_preprogram is marked as __init, but is called from _enable
      which is not. Without this patch, the board oopses after init. Tested
      on custom hardware and on beagle board xM. Otherwise we can get:
      
      Unable to handle kernel paging request at virtual address 000b0012
      pgd = cf968000
      *pgd=8fb06831, *pte=00000000, *ppte=00000000
      PREEMPT ARM
      Modules linked in:
      CPU: 0    Not tainted  (3.9.0 #2)
      PC is at _enable_preprogram+0x1c/0x24
      LR is at omap_hwmod_enable+0x34/0x60
         psr: 80000093
      sp : cf95de08  ip : 00002de5  fp : bec33d4c
      r10: 00000000  r9 : 00000002  r8 : b6dd2c78
      r7 : 00000004  r6 : 00000000  r5 : a0000013  r4 : cf95c000
      r3 : 00000000  r2 : b6dd2c7c  r1 : 00000000  r0 : 000b0012
      Flags: Nzcv  IRQs off  FIQs on  Mode SVC_32  ISA ARM  Segment user
      Control: 10c5387d  Table: 8f968019  DAC: 00000015
      Process otpcmd (pid: 607, stack limit = 0xcf95c230)
      Stack: (0xcf95de08 to 0xcf95e000)
      de00:                   00000001 cf91f840 00000000 c001d6fc 00000002 cf91f840
      de20: cf8f7e10 c001de54 cf8f7e10 c001de78 c001de68 c01d5e80 00000000 cf8f7e10
      de40: cf8f7e10 c01d5f28 cf8f7e10 c0530d30 00000000 c01d6f28 00000000 c0088664
      de60: b6ea1000 cfb05284 cf95c000 00000001 cf95c000 60000013 00000001 cf95dee4
      de80: cf870050 c01d7308 cf870010 cf870050 00000001 c0278b14 c0526f28 00000000
      dea0: cf870050 ffff8e18 00000001 cf95dee4 00000000 c0274f7c cf870050 00000001
      dec0: cf95dee4 cf1d8484 000000e0 c0276464 00000008 cf9c0000 00000007 c0276980
      dee0: cf9c0000 00000064 00000008 cf1d8404 cf1d8400 c01cc05c 0000270a cf1d8504
      df00: 00000023 cf1d8484 00000007 c01cc670 00000bdd 00000001 00000000 cf449e60
      df20: cf1dde70 cf1d8400 bec33d18 cf1d8504 c0246f00 00000003 cf95c000 00000000
      df40: bec33d4c c01cd078 00000003 cf1d8504 00000081 c01cbcb8 bec33d18 00000003
      df60: bec33d18 c00a9034 00002000 c00a9c68 cf92fe00 00000003 c0246f00 cf92fe00
      df80: 00000000 c00a9cb0 00000003 00000000 00008e70 00000000 b6f17000 00000036
      dfa0: c000e484 c000e300 00008e70 00000000 00000003 c0246f00 bec33d18 bec33d18
      dfc0: 00008e70 00000000 b6f17000 00000036 00000000 00000000 b6f6d000 bec33d4c
      dfe0: b6ea1bd0 bec33d0c 00008c9c b6ea1bdc 60000010 00000003 00000000 00000000
      (_omap_device_enable_hwmods+0x20/0x34)
      (omap_device_enable+0x3c/0x50)
      (_od_runtime_resume+0x10/0x1c)
      (__rpm_callback+0x54/0x98)
      (rpm_callback+0x64/0x7c)
      (rpm_resume+0x434/0x554)
      (__pm_runtime_resume+0x48/0x74)
      (omap_i2c_xfer+0x28/0xe8)
      (__i2c_transfer+0x3c/0x78)
      (i2c_transfer+0x6c/0xc0)
      (i2c_master_send+0x38/0x48)
      (sha204p_send_command+0x60/0x9c)
      (sha204c_send_and_receive+0x5c/0x1e0)
      (sha204m_read+0x94/0xa0)
      (otp_do_read+0x50/0xa4)
      (vfs_ioctl+0x24/0x40)
      (do_vfs_ioctl+0x1b0/0x1c0)
      (sys_ioctl+0x38/0x54)
      (ret_fast_syscall+0x0/0x30)
      Code: e1a08002 ea000009 e598003c e592c05c (e7904003)
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NJean-Philippe Fran=C3=A7ois <jp.francois@cynove.com>
      Acked-by: NKevin Hilman <khilman@linaro.org>
      [tony@atomide.com: updated description with oops]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      0f497039
  5. 16 5月, 2013 1 次提交
    • T
      ARM: dts: Fix musb interrupt for device tree booting · 304e71e0
      Tony Lindgren 提交于
      Commit ad871c10 (ARM: dts: OMAP: Add usb_otg and glue data to
      OMAP3+ boards) added support for MUSB on omap3 for device tree,
      but added the interrupts the wrong way probably as they were
      copied from the omap4.dtsi file. On omap3 we have TI specific
      interrupt controller, not GIC.
      
      Fix this by specifying the interrupt following the TI INTC
      binding.
      
      Without this fix MUSB won't work as it is trying to use
      irq0 instead of irq92.
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      304e71e0
  6. 15 5月, 2013 2 次提交
  7. 14 5月, 2013 13 次提交