linux.git/drivers/pinctrl, branch v3.8-rc5

Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-01-09T02:53:56+00:00

Pull ARM SoC fixes from Olof Johansson:
 "People are back from the holiday breaks, and it shows.  Here are a
  bunch of fixes for a number of platforms:
   - A couple of small fixes for Nomadik
   - A larger set of changes for kirkwood/mvebu
     - uart driver selection, dt clocks, gpio-poweroff fixups, a few
       __init annotation fixes and some error handling improvement in
       their xor dma driver.
   - i.MX had a couple of minor fixes (and a critical one for flexcan2
     clock setup)
   - MXS has a small board fix and a framebuffer bugfix
   - A set of fixes for Samsung Exynos, fixing default bootargs and some
     Exynos5440 clock issues
   - A set of OMAP changes including PM fixes and a few sparse warning
     fixups

  All in all a bit more positive code delta than we'd ideally want to
  see here, mostly from the OMAP PM changes, but nothing overly crazy."

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  pinctrl: mvebu: make pdma clock on dove mandatory
  ARM: Dove: Add pinctrl clock to DT
  dma: mv_xor: fix error handling for clocks
  dma: mv_xor: fix error handling of mv_xor_channel_add()
  arm: mvebu: Add missing ; for cpu node.
  arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
  arm: mvebu: Armada XP MV78230 has two cores, not one
  clk: mvebu: Remove inappropriate __init tagging
  ARM: Kirkwood: Use fixed-regulator instead of board gpio call
  ARM: Kirkwood: Fix missing sdio clock
  ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
  ...

pinctrl: mvebu: make pdma clock on dove mandatory

2013-01-07T16:19:02+00:00

With the ability to pass clocks through DT, now make the pdma
clock of dove pinctrl mandatory. Otherwise, pinctrl will hang
the system when accessing some registers.

Signed-off-by: Sebastian Hesselbarth 
Signed-off-by: Jason Cooper

Merge tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2013-01-04T00:17:50+00:00

Pull driver core __dev* removal patches - take 3 - from Greg Kroah-Hartman:
 "Here are the remaining __dev* removal patches against the 3.8-rc2
  tree.  All of these patches were previously sent to the subsystem
  maintainers, most of them were picked up and pushed to you, but there
  were a number that fell through the cracks, and new drivers were added
  during the merge window, so this series cleans up the rest of the
  instances of these markings.

  Third time's the charm...

  Signed-off-by: Greg Kroah-Hartman "

Fixed up trivial conflict with the pinctrl pull in pinctrl-sirf.c.

* tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (54 commits)
  misc: remove __dev* attributes.
  include: remove __dev* attributes.
  Documentation: remove __dev* attributes.
  Drivers: misc: remove __dev* attributes.
  Drivers: block: remove __dev* attributes.
  Drivers: bcma: remove __dev* attributes.
  Drivers: char: remove __dev* attributes.
  Drivers: clocksource: remove __dev* attributes.
  Drivers: ssb: remove __dev* attributes.
  Drivers: dma: remove __dev* attributes.
  Drivers: gpu: remove __dev* attributes.
  Drivers: infinband: remove __dev* attributes.
  Drivers: memory: remove __dev* attributes.
  Drivers: mmc: remove __dev* attributes.
  Drivers: iommu: remove __dev* attributes.
  Drivers: power: remove __dev* attributes.
  Drivers: message: remove __dev* attributes.
  Drivers: macintosh: remove __dev* attributes.
  Drivers: mfd: remove __dev* attributes.
  pstore: remove __dev* attributes.
  ...

Drivers: pinctrl: remove __dev* attributes.

2013-01-03T23:57:02+00:00

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton 
Cc: Linus Walleij 
Cc: Jean-Christophe Plagniol-Villard 
Cc: Stephen Warren 
Cc: Srinidhi Kasagar 
Cc: Barry Song 
Cc: Viresh Kumar 
Cc: Thomas Petazzoni 
Cc: Jason Cooper 
Cc: Sebastian Hesselbarth 
Cc: Andrew Lunn 
Signed-off-by: Greg Kroah-Hartman

pinctrl: nomadik: return if prcm_base is NULL

2012-12-26T00:59:54+00:00

This patch adds a check for npct->prcm_base to make sure that the
address is not NULL before using it, as the driver was made capable of
loading even without a proper memory resource in:

f1671bf pinctrl/nomadik: make independent of prcmu driver

Also, refuses to probe without prcm_base on anything else than nomadik.

This solves the following crash, introduced during the merge window when
booting on U8500 with device tree:

pinctrl-nomadik pinctrl-db8500: No PRCM base, assume no ALT-Cx control is available
Unable to handle kernel NULL pointer dereference at virtual address 00000138
pgd = c0004000
[00000138] *pgd=00000000
Internal error: Oops: 5 [#1] PREEMPT SMP ARM
Modules linked in:
CPU: 0    Not tainted  (3.7.0-02892-g1ebaf4f #631)
PC is at nmk_pmx_enable+0x1bc/0x4d0
LR is at clk_disable+0x40/0x44
[snip]
[] (nmk_pmx_enable+0x1bc/0x4d0) from [] (pinmux_enable_setting+0x12c/0x1ec)
[] (pinmux_enable_setting+0x12c/0x1ec) from [] (pinctrl_select_state_locked+0xfc/0x134)
[] (pinctrl_select_state_locked+0xfc/0x134) from [] (pinctrl_register+0x26c/0x43c)
[] (pinctrl_register+0x26c/0x43c) from [] (nmk_pinctrl_probe+0x114/0x238)
[] (nmk_pinctrl_probe+0x114/0x238) from [] (platform_drv_probe+0x28/0x2c)
[] (platform_drv_probe+0x28/0x2c) from [] (driver_probe_device+0x84/0x21c)
[] (driver_probe_device+0x84/0x21c) from [] (__device_attach+0x50/0x54)
[] (__device_attach+0x50/0x54) from [] (bus_for_each_drv+0x54/0x9c)
[] (bus_for_each_drv+0x54/0x9c) from [] (device_attach+0x84/0x9c)
[] (device_attach+0x84/0x9c) from [] (bus_probe_device+0x94/0xb8)
[] (bus_probe_device+0x94/0xb8) from [] (device_add+0x4f0/0x5bc)
[] (device_add+0x4f0/0x5bc) from [] (of_device_add+0x40/0x48)
[] (of_device_add+0x40/0x48) from [] (of_platform_device_create_pdata+0x68/0x98)
[] (of_platform_device_create_pdata+0x68/0x98) from [] (of_platform_bus_create+0xe4/0x260)
[] (of_platform_bus_create+0xe4/0x260) from [] (of_platform_bus_create+0x130/0x260)
[] (of_platform_bus_create+0x130/0x260) from [] (of_platform_populate+0x6c/0xac)
[] (of_platform_populate+0x6c/0xac) from [] (u8500_init_machine+0x78/0x140)
[] (u8500_init_machine+0x78/0x140) from [] (customize_machine+0x24/0x30)
[] (customize_machine+0x24/0x30) from [] (do_one_initcall+0x130/0x1b0)
[] (do_one_initcall+0x130/0x1b0) from [] (kernel_init+0x138/0x2e8)
[] (kernel_init+0x138/0x2e8) from [] (ret_from_fork+0x14/0x20)
Code: 0a00001b e19400b2 e59a200c e0822000 (e592c000)
---[ end trace 1b75b31a2719ed1c ]---
note: swapper/0[1] exited with preempt_count 1
Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b

Signed-off-by: Fabio Baltieri 
Signed-off-by: Linus Walleij

pinctrl: sirf: enable GPIO pullup/down configuration from dts

2012-12-26T00:59:53+00:00

commit 7bec207427c2efb794 remove sirfsoc_gpio_set_pull function,
this patches takes the feature back by adding sirf,pullups and
sirf,pulldowns prop in dts, and the driver will set the GPIO
pull according to the dts.

Cc: Arnd Bergmann 
Signed-off-by: Barry Song 
Signed-off-by: Linus Walleij

pinctrl: fix comment mistake

2012-12-26T00:59:52+00:00

This variable pertains to pinctrl handles not muxes
specifically.

Signed-off-by: Linus Walleij

drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

2012-12-26T00:59:51+00:00

The function at91_dt_node_to_map is ultimately called by the function
pinctrl_get, which is an exported function.  Since it is possible that this
function is not called from within a probe function, for safety, the kfree
is converted to a devm_kfree, to both free the data and remove it from the
device in a failure situation.

Acked-by: Jean-Christophe PLAGNIOL-VILLARD 
Signed-off-by: Julia Lawall 
Signed-off-by: Linus Walleij

pinctrl: imx5: fix GPIO_8 pad CAN1_RXCAN configuration

2012-12-26T00:59:50+00:00

3 is an invalid value for the CAN1_IPP_IND_CANRX_SELECT_INPUT
register. Set it to 2, which correctly selects the GPIO_8 pad.

Signed-off-by: Philipp Zabel 
Signed-off-by: Linus Walleij

pinctrl: exynos5440/samsung: Staticize pcfgs

2012-12-19T03:00:25+00:00

I got below build error with random config if CONFIG_PINCTRL_SAMSUNG=y &&
CONFIG_PINCTRL_EXYNOS5440=y.

Fix the build error by making pcfgs static.

  LD      drivers/pinctrl/built-in.o
drivers/pinctrl/pinctrl-exynos5440.o: In function `.LANCHOR0':
pinctrl-exynos5440.c:(.data+0x54): multiple definition of `pcfgs'
drivers/pinctrl/pinctrl-samsung.o:pinctrl-samsung.c:(.data+0x54): first defined here
make[2]: *** [drivers/pinctrl/built-in.o] Error 1
make[1]: *** [drivers/pinctrl] Error 2
make: *** [drivers] Error 2

Signed-off-by: Axel Lin 
Acked-by: Linus Walleij 
Acked-by: Thomas Abraham 
Signed-off-by: Kukjin Kim