Skip to content

L
linux
Switch branch/tag
  1. 06 Jul, 2012 5 commits
    • Magnus Damm's avatar
      ARM: shmobile: fix platsmp.c build when ARCH_SH73A0=n · 873e9f7a
      Magnus Damm authored 
      Fix build error in the case of SMP=y but ARCH_SH73A0=n
introduced by:

9601e873 ARM: shmobile: fix smp build

The use of of_machine_is_compatible() will link in the
the SoC-specific symbols:
"sh73a0_get_core_count", "sh73a0_smp_prepare_cpus",
"sh73a0_secondary_init" and "sh73a0_boot_secondary".

This patch adds an ugly #ifdef wrapper as a stop-gap
solution.
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Tested-by: default avatarTested-by: Simon Horman <horms@verge.net.au>
Acked-by: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      873e9f7a
    • Arnd Bergmann's avatar
      Merge branch 'ux500/fixes-3.5' into fixes · 78ee225f
      Arnd Bergmann authored 
      From Lee Jones <lee.jones@linaro.org>:

* ux500/fixes-3.5:
  ARM: ux500: Over-ride the DT device naming scheme for pinctrl
  ARM: ux500: Fix build errors/warnings when MACH_UX500_DT is not set
  of: address: Don't fail a lookup just because a node has no reg property

I ended up rebasing Lee's branch on 3.5-rc5 because we have more patches
lined for 3.6 that depend on them, and I want to keep all branches in
arm-soc be based on -rc releases rather than random commits in the
upstream history.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      78ee225f
    • Lee Jones's avatar
      ARM: ux500: Over-ride the DT device naming scheme for pinctrl · 2b667a2d
      Lee Jones authored 
      When pin control mapping tables are written the registered device
name is supplied for use in name-based searches within the pinctrl
driver. In the case of the DB8500 the string "pinctrl-db8500" is
used. However, when we register the driver with Device Tree, its
naming convention uses something that looks more like "pinctrl.2".

To work around the device naming inconsistencies between devices
registered via platform code and the ones registered by Device
Tree, we use AUXDATA to over-ride the Device Tree naming scheme.
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      2b667a2d
    • Lee Jones's avatar
      ARM: ux500: Fix build errors/warnings when MACH_UX500_DT is not set · c57920e6
      Lee Jones authored 
      When MACH_UX500_DT and all related Device Tree configurations are forced
off the warning and error below prevent the kernel from compiling. This
simple patch fixes both issues and allows for full build and boot of
ST-Ericsson's low-cost development board, Snowball.

Warnings fixed:
  arch/arm/mach-ux500/board-mop500.c:680:32: warning: ‘snowball_of_platform_devs’ defined but not used

Errors fixed:
  arch/arm/mach-ux500/timer.c: In function ‘ux500_timer_init’:
  arch/arm/mach-ux500/timer.c:66:3: error: implicit declaration of function ‘of_find_matching_node’
  arch/arm/mach-ux500/timer.c:66:6: warning: assignment makes pointer from integer without a cast

Cc: stable@vger.kernel.org
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      c57920e6
    • Lee Jones's avatar
      of: address: Don't fail a lookup just because a node has no reg property · 84774e61
      Lee Jones authored 
      Sometimes it doesn't make any sense for a node to have an address.
In this case device lookup will always be unsuccessful because we
currently assume every node will have a reg property. This patch
changes the semantics so that the resource address and the lookup
address will only be compared if one exists.

Things like AUXDATA() rely on of_dev_lookup to return the lookup
entry of a particular device in order to do things like apply
platform_data to a device. However, this is currently broken for
nodes which do not have a reg property, meaning that platform_data
can not be passed in those cases.
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      84774e61
  3. 05 Jul, 2012 4 commits
  5. 04 Jul, 2012 7 commits
  7. 02 Jul, 2012 4 commits
  9. 01 Jul, 2012 1 commit
    • Paul Parsons's avatar
      ARM: pxa: hx4700: Fix basic suspend/resume · 6416c040
      Paul Parsons authored 
      Basic suspend/resume is fixed by ensuring that the PGSR registers are
set correctly before sleep mode is entered. In particular four of the
active low resets need to be driven high while in sleep mode, otherwise
the unit resets itself instead of suspending. Another problem was that
the PCFR_GPROD bit is set by the HTC bootloader; this caused GPIO reset
(i.e. the reset button) to fail immediately after returning from sleep
mode.
Signed-off-by: default avatarPaul Parsons <lost.distance@yahoo.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
      6416c040
  11. 30 Jun, 2012 13 commits
  13. 29 Jun, 2012 6 commits
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7