12 Jan, 2012
3 commits
-
SH/R-Mobile updates for 3.3 merge window.
* tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh: (32 commits)
arm: mach-shmobile: add a resource name for shdma
ARM: mach-shmobile: r8a7779 SMP support V3
ARM: mach-shmobile: Add kota2 defconfig.
ARM: mach-shmobile: Add marzen defconfig.
ARM: mach-shmobile: r8a7779 power domain support V2
ARM: mach-shmobile: Fix up marzen build for recent GIC changes.
ARM: mach-shmobile: r8a7779 PFC function support
ARM: mach-shmobile: Flush caches in platform_cpu_die()
ARM: mach-shmobile: Allow SoC specific CPU kill code
ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT
ARM: mach-shmobile: clock-r8a7779: clkz/clkzs support
ARM: mach-shmobile: clock-r8a7779: add DIV4 clock support
ARM: mach-shmobile: Marzen LAN89218 support
ARM: mach-shmobile: Marzen SCIF2/SCIF4 support
ARM: mach-shmobile: r8a7779 PFC GPIO-only support V2
ARM: mach-shmobile: r8a7779 and Marzen base support V2
sh: pfc: Unlock register support
sh: pfc: Variable bitfield width config register support
sh: pfc: Add config_reg_helper() function
sh: pfc: Convert index to field and value pair
... -
Conflicts:
arch/sh/kernel/cpu/sh4a/clock-sh7723.cSigned-off-by: Paul Mundt
-
When CONFIG_PM_RUNTIME is off, drivers/sh/pm_runtime.o still has to be
built on sh platforms, because then it provides means to statically
switch on device PM clocks.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Paul Mundt
10 Jan, 2012
2 commits
-
sh_clk_init_parent() are using clk->mapped_reg
which is mapped in clk_register()Signed-off-by: Kuninori Morimoto
Signed-off-by: Paul Mundt
09 Jan, 2012
8 commits
-
Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.cSigned-off-by: Paul Mundt
-
Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.cSigned-off-by: Paul Mundt
-
Add PFC support for a 32-bit unlock register. Needed to
drive the r8a7779 PFC that comes with a funky PMMR register.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Add support for variable config reg hardware by adding
the macro PINMUX_CFG_REG_VAR(). The width of each bitfield
needs to be passed to the macro, and the correct space must
be consumed by each bitfield in the enum table following the
macro. Data registers still need to have fixed bitfields.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Add a helper function for shared config reg access
calculations. This allows us to reduce the amount
of duplicated code, and at the same time prepare
for a common place for future variable bitwidth
config reg support.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Update the way the PFC code is passing bitfield
selection between configure register functions.Convert the code from using index only to bitfield
number and selected value. First step towards future
variable bitfield width support.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Introduce gpio_read_bit() for data register read access
and modify sh_gpio_get_value() to make use of the new
function instead of gpio_read_reg(). The purpose of
this change is to update the code to only use the
gpio_read_reg() function for config register access.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)
PM / Hibernate: Implement compat_ioctl for /dev/snapshot
PM / Freezer: fix return value of freezable_schedule_timeout_killable()
PM / shmobile: Allow the A4R domain to be turned off at run time
PM / input / touchscreen: Make st1232 use device PM QoS constraints
PM / QoS: Introduce dev_pm_qos_add_ancestor_request()
PM / shmobile: Remove the stay_on flag from SH7372's PM domains
PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume
PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode
PM: Drop generic_subsys_pm_ops
PM / Sleep: Remove forward-only callbacks from AMBA bus type
PM / Sleep: Remove forward-only callbacks from platform bus type
PM: Run the driver callback directly if the subsystem one is not there
PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers
PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.
PM / Sleep: Merge internal functions in generic_ops.c
PM / Sleep: Simplify generic system suspend callbacks
PM / Hibernate: Remove deprecated hibernation snapshot ioctls
PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()
ARM: S3C64XX: Implement basic power domain support
PM / shmobile: Use common always on power domain governor
...Fix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused
XBT_FORCE_SLEEP bit
07 Jan, 2012
1 commit
-
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.The microcode_core.c patch was provided by Stephen Rothwell
who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.Signed-off-by: Greg Kroah-Hartman
26 Dec, 2011
1 commit
-
Since the SH7372's INTCS in included into syscore suspend/resume,
which causes the chip to be accessed when PM domains have been
turned off during system suspend, the A4R domain containing the
INTCS has to stay on during system sleep, which is suboptimal
from the power consumption point of view.For this reason, add a new INTC flag, skip_syscore_suspend, to mark
the INTCS for intc_suspend() and intc_resume(), so that they don't
touch it. This allows the A4R domain to be turned off during
system suspend and the INTCS state is resrored during system
resume by the A4R's "power on" code.Suggested-by: Magnus Damm
Signed-off-by: Rafael J. Wysocki
Acked-by: Magnus Damm
22 Dec, 2011
1 commit
-
After all sysdev classes are ported to regular driver core entities, the
sysdev implementation will be entirely removed from the kernel.Cc: Paul Mundt
Cc: Magnus Damm
Cc: Paul Gortmaker
Signed-off-by: Kay Sievers
Signed-off-by: Greg Kroah-Hartman
09 Dec, 2011
6 commits
-
Add support for non-entity mapped PFC registers through
the use of struct resource and ioremap()/iounmap().The PFC main data structure gets updated with a pointer
to a struct resources array that point out all register
windows used by the PFC instance. The register definitions
are kept as physical addresses but the PFC code will do
transparent conversion into virtual addresses whenever
register windows are specified using with struct resource.To introduce as little performance penalty as possible the
virtual address of each data register is cached in memory.
The virtual address of each configuration register is however
calculated during run time. This because the configuration
is considered slow path so focus is instead put on keeping
memory foot print as small as possible.The PFC register access code is in this patch updated from
__raw_readN() / __raw_writeN() into ioreadN() / iowriteN().This patch is needed to support the PFC block in r8a7779.
Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Convert the CPG DIV6 helper code to use the new mapped_reg
together with ioread32() and iowrite32().Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Convert the CPG DIV4 helper code to use the new mapped_reg
together with ioread32() and iowrite32().Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Convert the CPG MSTP32 helper code to use the new mapped_reg
together with ioread32() and iowrite32().Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Add a "mapped_reg" member to struct clk and use that
to keep the ioremapped register based on enable_reg.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt
24 Nov, 2011
1 commit
-
Some clocks can select its parent clock by CPG register.
But it might have been modified by boot-loader or something.
This patch removed fixed initial parent clock,
and setup it from their current register settings.
It works on div6 reparent clocks for now.Signed-off-by: Kuninori Morimoto
Signed-off-by: Paul Mundt
18 Nov, 2011
4 commits
-
This kills of the now unused runtime PM stub in favour of the generic
one.Signed-off-by: Paul Mundt
-
Switch sh7723 to a runtime PM implementation, common with ARM-based
sh-mobile platforms.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Paul Mundt -
Switch sh7722 to a runtime PM implementation, common with ARM-based
sh-mobile platforms.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Paul Mundt -
Switch sh7724 to a runtime PM implementation, common with ARM-based
sh-mobile platforms.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Paul Mundt
11 Nov, 2011
4 commits
-
Now that all of the named string association with clocks has been
migrated to clkdev lookups there's no meaningful named topology that can
be constructed for a debugfs tree view. Get rid of the left over bits,
and shrink struct clk a bit in the process.Signed-off-by: Paul Mundt
-
Signed-off-by: Paul Mundt
-
The runtime PM platform support stub in use by ARM-based SH/R-Mobile
platforms contains nothing that's specifically ARM-related and instead of
wholly generic to anything using the clock framework.The recent runtime PM changes interact rather badly with the lazy
disabling of clocks late in the boot process through the clock framework,
leading to situations where the runtime suspend/resume paths are entered
without a clock being actively driven due to having been lazily gated
off.In order to correct this we can trivially tie in the aforementioned stub
as a general fallback for all SH platforms that don't presently have
their own runtime PM implementations (the corner case being SH-based
SH-Mobile platforms, which have their own stub through the hwblk API --
which in turn has bitrotted and will be subsequently adapted to use the
same stub as everyone else), regardless of whether the platforms choose
to define power domains of their own or not.This fixes up regressions for clock framework users who also build in
runtime PM support without any specific power domains of their own, which
was previously causing the serial console to be lost when warring with
lazy clock disabling.Signed-off-by: Paul Mundt
07 Nov, 2011
1 commit
-
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include
net: sch_generic remove redundant use of
net: inet_timewait_sock doesnt need
...Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
04 Nov, 2011
2 commits
-
Enable IRQ_TYPE_EDGE_BOTH on all R/SH-Mobile ARM SoCs.
This hardware feature is supported by sh7367, sh7377,
sh7372 and sh73a0.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
This provides a clk_rate_mult_range_round() helper for use by some of the
CPG PLL ranged multipliers, following the same approach as used by the
div ranges.Signed-off-by: Kuninori Morimoto
Signed-off-by: Paul Mundt
01 Nov, 2011
4 commits
-
This is exporting symbols and will fail to build once we remove
the implicit presence of module.hSigned-off-by: Paul Gortmaker
-
Signed-off-by: Paul Gortmaker
-
Signed-off-by: Paul Gortmaker
-
To fix:
arch/sh/drivers/dma/dma-sysfs.c:45:8: error: 'S_IRUGO' undeclared here (not in a function)
arch/sh/drivers/dma/dma-sysfs.c:75:8: error: 'S_IWUSR' undeclared here (not in a function)
make[4]: *** [arch/sh/drivers/dma/dma-sysfs.o] Error 1drivers/sh/intc/core.c:449: error: 'S_IRUGO' undeclared here (not in a function)
make[5]: *** [drivers/sh/intc/core.o] Error 1Signed-off-by: Paul Gortmaker
28 Oct, 2011
2 commits
-
This fix the problem that S_IRUSR and S_IWUSR are not solved in userimask.c.
-----
CC drivers/usb/host/r8a66597-hcd.o
drivers/sh/intc/userimask.c:57: error: ‘S_IRUSR’ undeclared here (not in a function)
drivers/sh/intc/userimask.c:57: error: ‘S_IWUSR’ undeclared here (not in a function)
CC drivers/watchdog/shwdt.o
-----Signed-off-by: Nobuhiro Iwamatsu
Signed-off-by: Paul Mundt -
Add GPIO IRQ support to the shared PFC code in drivers/sh/pfc.c
The enums pointed out by a certain GPIO will be matched against
a table for IRQ to enum mappings.Only the shared PFC code is updated by this patch. SoC specific
changes are also needed to allow platforms to make use of this
feature.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt
