linux-stable.git/drivers/pinctrl/sirf, branch linux-3.12.y

Merge tag 'v3.11-rc7' into devel

2013-08-29T07:46:30+00:00

Merged in this to avoid conflicts with the big locking fixes
from upstream.

Signed-off-by: Linus Walleij 

Conflicts:
	drivers/pinctrl/pinctrl-sunxi.c

pinctrl: sirf: add lost atlas6 uart0-no-stream-control pingroup

2013-08-23T06:56:27+00:00

the old codes defined uart0_nostreamctrl_pins, but missed pingroup
and padmux definition for it. this patch fixes it.

Signed-off-by: Qipan Li 
Signed-off-by: Barry Song 
Signed-off-by: Linus Walleij

pinctrl: sirf: add missing __iomem annotation

2013-08-07T20:30:40+00:00

Added missing __iomem annotation in order to fix the following
sparse warnings:

drivers/pinctrl/sirf/pinctrl-sirf.c:846:14: warning: incorrect type in assignment (different address spaces)
drivers/pinctrl/sirf/pinctrl-sirf.c:846:14:    expected void *regs
drivers/pinctrl/sirf/pinctrl-sirf.c:846:14:    got void [noderef] *
drivers/pinctrl/sirf/pinctrl-sirf.c:869:33: warning: incorrect type in assignment (different address spaces)
drivers/pinctrl/sirf/pinctrl-sirf.c:869:33:    expected void [noderef] *regs
drivers/pinctrl/sirf/pinctrl-sirf.c:869:33:    got void *regs
drivers/pinctrl/sirf/pinctrl-sirf.c:909:17: warning: incorrect type in argument 1 (different address spaces)
drivers/pinctrl/sirf/pinctrl-sirf.c:909:17:    expected void volatile [noderef] *addr
drivers/pinctrl/sirf/pinctrl-sirf.c:909:17:    got void *regs

Signed-off-by: Jingoo Han 
Signed-off-by: Linus Walleij

pinctrl: sirf: add freeze and restore entries for hibernation support

2013-07-22T23:23:25+00:00

this patch adds hibernation entries so that the sirf platform can
support suspend-to-disk.

Signed-off-by: Barry Song 
Signed-off-by: Linus Walleij

pinctrl: sirf: fix the checkpatch issue about indentation

2013-07-22T23:23:24+00:00

Signed-off-by: Rongjun Ying 
Signed-off-by: Barry Song 
Signed-off-by: Linus Walleij

pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl

2013-07-21T22:52:19+00:00

this patch adds the lost pin group which supports to let USP0 to simulate
a UART without hardware flow control.

Signed-off-by: Qipan Li 
Signed-off-by: Barry Song 
Signed-off-by: Linus Walleij

pinctrl: sirf: fix the pin number and mux bit for usp0

2013-07-21T22:49:36+00:00

we missed a pin and related mux bit for usp pin group, this
patch fixes it.

Signed-off-by: Qipan Li 
Signed-off-by: Barry Song 
Signed-off-by: Linus Walleij

pinctrl: sirf: save the status in suspend and restore after resuming

2013-06-16T09:56:50+00:00

this patch saves the status of pinctrl registers and restore them while
resuming. this makes all drivers have coherent status for pinmux after
suspending and resuming.

Signed-off-by: Barry Song 
Signed-off-by: Linus Walleij

pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC

2013-06-16T09:56:49+00:00

atlas6 is a SoC very similar with primaII, the register layput of
pinctrl is same, but the pads, groups and functions of atlas6 have
different layout with prima2, this patch
1. pull the definition of pads, groups and functions out of the
pinctrl-sirf driver,and put them into soc-specific files
2. add pads, groups and functions tables for atlas6
3. let pads, groups and functions tables become the config data of
   the related dt compatible node, so the pinctrl-sirf can support
   all SiRF SoCs with the config data as private data.

In this patch,we create a sirf dir, and let
the old drivers/pinctrl/pinctrl-sirf.c =
        drivers/pinctrl/sirf/pinctrl-prima2.c +
        drivers/pinctrl/sirf/pinctrl-sirf.c

drivers/pinctrl/sirf/pinctrl-atlas6.c is a newly created file for the
pin layout of atlas6.

Signed-off-by: Barry Song 
Signed-off-by: Linus Walleij