11 Feb, 2015
27 commits
-
If CI_HDRC_IMX_VBUS_EARLY_ON is set, turn on vbus before add hcd, and do not
set reg_vbus of ehci_ci_priv, so vbus will not be handled by ehci core.Signed-off-by: Li Jun
(cherry picked from commit a745133191bfe0c2ca408d9f8bcfc2a5204b0dbd) -
Some PHY of imx usb need power supply from vbus to make it work, if there
is no vbus, USB PHY will not in correct state when the controller starts to
work, for host, this requires vbus should be turned on before setting port
power(PP) of ehci, to work with this kind of USB PHY design, this patch adds
a flag CI_HDRC_IMX_VBUS_EARLY_ON, can be checked by host driver to turn on
vbus while start host.Signed-off-by: Li Jun
(cherry picked from commit 1d4c054323817b49897fd7a59bc57b4d36f09491) -
Since some driver which use power domain may use suspend_noirq/resume_noirq
we need implement it in power domain framework.Signed-off-by: Robin Gong
(cherry picked from commit 1ab47908d426ce8252c27db962f54588f5d6b156) -
Correct the function and structure since update the below patch
(24d70aa Revert "base: power: Add generic OF-based power domain look-up")
(dc092bc PM / Domains: Add generic OF-based PM domain look-up)
Signed-off-by: Robin Gong(cherry picked from commit bddfa2a6ffa844d9a21a63dab974b993e4eccc41)
-
Previously only the ACPI PM domain was supported by the platform bus.
Let's convert to the common attach/detach functions for PM domains,
which currently means we are extending the support to include the
generic PM domain as well.Signed-off-by: Ulf Hansson
Tested-by: Philipp Zabel
Reviewed-by: Kevin Hilman
Reviewed-by: Dmitry Torokhov
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit cb51841397e8e5714cf82a7f91053f6e1fb80d1f)
(cherry picked from commit cd4edd4cb84f9dadb9e8f12b1e1f10bf2ef28749) -
To maintain scalability let's add common methods to attach and detach
a PM domain for a device, dev_pm_domain_attach|detach().Typically dev_pm_domain_attach() shall be invoked from subsystem level
code at the probe phase to try to attach a device to its PM domain.
The reversed actions may be done a the remove phase and then by
invoking dev_pm_domain_detach().When attachment succeeds, the attach function should assign its
corresponding detach function to a new ->detach() callback added in the
struct dev_pm_domain.Signed-off-by: Ulf Hansson
Tested-by: Philipp Zabel
Reviewed-by: Kevin Hilman
Reviewed-by: Dmitry Torokhov
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit 46420dd73b800f87a19af13af5883855cf38cb08)
(cherry picked from commit 451a5b00e51410adc16f8349ed753f7eced46bc5) -
As as preparation to simplify the detachment of devices from their PM
domains, we assign the ->detach() callback to genpd_dev_pm_detach().Signed-off-by: Ulf Hansson
Reviewed-by: Dmitry Torokhov
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit 86f1e15f5646b4855bd77025c950239650c4843e)
(cherry picked from commit 5856005b1a1f4aecef050de96a02e1c757049fa0) -
The intent of this callback is to simplify detachment of devices from
their PM domains. Further patches will show the benefit.Signed-off-by: Ulf Hansson
Reviewed-by: Dmitry Torokhov
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit c3099a5294f2c7266234e8ea35cbffc20a41aa9a)
(cherry picked from commit 96257e7b72821bbaa5681b1d2042050c6aab0ea1) -
This reverts commit ef2c90dea437f8955b7dc089ff1579c2aa06a6b7.
Signed-off-by: Robin Gong(cherry picked from commit e2c50506fee918f95425babbccc7ecf28d3d2f87)
-
This patch introduces generic code to perform PM domain look-up using
device tree and automatically bind devices to their PM domains.Generic device tree bindings are introduced to specify PM domains of
devices in their device tree nodes.Backwards compatibility with legacy Samsung-specific PM domain bindings
is provided, but for now the new code is not compiled when
CONFIG_ARCH_EXYNOS is selected to avoid collision with legacy code.
This will change as soon as the Exynos PM domain code gets converted to
use the generic framework in further patch.This patch was originally submitted by Tomasz Figa when he was employed
by Samsung.Link: http://marc.info/?l=linux-pm&m=139955349702152&w=2
Signed-off-by: Ulf Hansson
Acked-by: Rob Herring
Tested-by: Philipp Zabel
Reviewed-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit aa42240ab2544a8bcb2efb400193826f57f3175e)
(cherry picked from commit 4a2d7a846761e3b86e08b903e5a1a088686e2181) -
Signed-off-by: Geert Uytterhoeven
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit 12e10bb60be2a4259373c05dfbf8f71b87a17421)
(cherry picked from commit f1c3e733b6823274d4de2c599e2f0bb96baa5d83) -
As default behavior let genpd at late init try to disable the unused
PM domains.Signed-off-by: Ulf Hansson
Reviewed-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit 2fe71dcdfd10d3f71bb559609a8ceda9f76b1e2c)
(cherry picked from commit 5993cf209e1dcc68de523fcd5998f2464cc32990) -
There are no active users of this API. Let's remove it and if future
needs shows up we could consider to have a get/put API instead.Signed-off-by: Ulf Hansson
Reviewed-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit d971f0b0eaaf3f2086bf21bbd64f7ea7e2f28459)
(cherry picked from commit 835729a13d0061f55d6bd714811a16ebaecb9b0e) -
The pm_genpd_syscore_poweroff() API and pm_genpd_syscore_poweron() API
makes the pm_genpd_syscore_switch() API redundant.Moreover, since there are no active users, let's just remove it.
Signed-off-by: Ulf Hansson
Reviewed-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit d47e6464ae6c96735d4706f5cb0537fe717b6b00)
(cherry picked from commit 9b68cd944341e5a613e9858e65e3432bd5691f92) -
CONFIG_PM_GENERIC_DOMAINS depends on CONFIG_PM, thus there are no need
to check explicity for it.Signed-off-by: Ulf Hansson
Reviewed-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit 784b0d3d8bc5b8ac60fc620c3420dc430bba61a7)
(cherry picked from commit d5b35c3260e14bff3f201c6f6ea59b1c91f1cff1) -
The genpd dev_irq_safe configuration somewhat overlaps with the runtime
PM pm_runtime_irq_safe() option. Also, currently genpd don't have a
good way to deal with these device. So, until we figured out if and how
to support this in genpd, let's remove the option to configure it.Signed-off-by: Ulf Hansson
Reviewed-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit c5d79ec2a5715489cff16a0d1cf4fa9108a5509e)
(cherry picked from commit 4cffcdb2c92cabbba3e55a0f2d9c7d86d8a756ed) -
There no users of these callbacks, let's simplify the generic power
domain by removing them.Signed-off-by: Ulf Hansson
Reviewed-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit 1e0407ca54d28db8e5f02e437ff21cc6416c0be8)
(cherry picked from commit 0f19454e606c6fbc7ce980ca128a703ebc8990fb) -
In a step of simplifying the generic power domain let's move away from
using these callbacks.Signed-off-by: Ulf Hansson
Reviewed-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit 67da6d4bf43c4208433ef8f3ee487401b4dc9c74)
(cherry picked from commit b16a428836529af31f23b807065cc6e643c409da) -
There are no users of these APIs. To simplify the generic power domain
let's remove them.Signed-off-by: Ulf Hansson
Reviewed-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit 55e15c949fd05d247a889df0ed0177a676fec665)
(cherry picked from commit da452fc0f1a1a75993a6c989a600dd2de309026c) -
Keep all power-domains already enabled by bootloader on, even if no
driver has claimed them. This is useful for debug and development, but
should not be needed on a platform with proper driver support.Signed-off-by: Tushar Behera
Signed-off-by: Rafael J. Wysocki
(cherry picked from commit 39ac5ba51b69a77a30d2e783aed02ec73c9f6d70)
(cherry picked from commit 8507e882be1aa8363d229e6dbc8367c963e37bd3) -
None of these files are actually using any __init type directives
and hence don't need to include . Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.Cc: Len Brown
Signed-off-by: Paul Gortmaker
Acked-by: Pavel Machek
Acked-by: Rafael J. Wysocki
Acked-by: Mark Brown
Signed-off-by: Greg Kroah-Hartman
(cherry picked from commit 4272b9611c30f99f51590085998129480f2fe45e)
(cherry picked from commit 9680398849d6b7f74cf8874522c16064a3df535d) -
This reverts commit 4aa055cb0634bc8d0389070104fe6aa7cfa99b8c.
Signed-off-by: Robin Gong(cherry picked from commit e599f64de890a60a3b9884dd5838c43472f145e2)
-
Add support to leave PLL1 enabled since its required whenever ARM-PODF is
changed. With this patch PLL1 is set to bypassed mode (and enabled) whenever
ARM is sourced from step_clk.Signed-off-by: Ranjani Vaidyanathan
-
Add support to leave PLL1 enabled since its required whenever ARM-PODF is
changed. With this patch PLL1 is set to bypassed mode (and enabled) whenever
ARM is sourced from step_clk.Signed-off-by: Ranjani Vaidyanathan
-
Add support to leave PLL1 enabled since its required whenever ARM-PODF is
changed. With this patch PLL1 is set to bypassed mode (and enabled) whenever
ARM is sourced from step_clk.
Also change imx6dl.dtsi to use #defines instead of hard-coded numbers for
busfreq clocks.Signed-off-by: Ranjani Vaidyanathan
-
This reverts commit 09bcfcabc08a57bce3000677052d5a2fcc2b1b68.
Signed-off-by: Ranjani Vaidyanathan
-
This reverts commit 8cc908a0168afb677b5de6405579b681b6f595db.
Signed-off-by: Ranjani Vaidyanathan
10 Feb, 2015
4 commits
-
The right shift should be changed to left shift. Lower register
address correspond to LSB of the cache_present, if right shift
old cache_present, the valid bits is moved out, then the new
cache_present is not correct.Signed-off-by: Shengjiu Wang
-
The register ASRCFG is volatile, but some bits need to be recovered
after suspend/resume.Signed-off-by: Shengjiu Wang
-
Merged from 2a17c1bbcd83a9d9f6d07bc0545742a59a043ae4
The SDMA driver doesn't support DMA_PAUSE and DMA_RESUME commands.
So this patch use TRIGGER_START for TRIGGER_RESUME and TRIGGER_SUSPEND
for TRIGGER_STOP as a work around so that Audio can normally stop
and restart its corresponding DMA channels.Signed-off-by: Shengjiu Wang
-
The register SFCSR is volatile, but some bits in it need to be
recovered after suspend/resume.Signed-off-by: Shengjiu Wang
09 Feb, 2015
3 commits
-
We've got a race condition bewteen the interrupt handler mxsfb_irq_handler()
and the function mxsfb_wait_for_vsync() on the flag host->wait4vsync.
If a CUR_FRAME_DONE interrupt comes and we just finish setting host->wait4vsync
to be 1 in mxsfb_wait_for_vsync() before we go to the interrupt handler, we are
likely to see the VSYNC_EDGE interrupt status bit asserted in the interrupt
handler for the CUR_FRAME_DONE interrupt, disable the not yet enabled VSYNC_EDGE
interrupt and finally clear host->wait4vsync.
Then, we go back to mxsfb_wait_for_vsync() and enable the VSYNC_EDGE interrupt
with host->wait4vsync=0. This may leave the VSYNC_EDGE interrupt enabled all
the time and never get a chance to be disabled in the interrupt handler.
So, we are deemed to hang up because the uncleared VSYNC_EDGE interrupt status
bit will cause the CPU to be trapped forever, according to SoC designer's words.
This patch corrects the interrupt handling to handle only the interrupts which
are acknowledged by checking both the interrupt enablement bits and the status
bits but not the status bits only. This may avoid any bogus interrupt from
being handled.Signed-off-by: Liu Ying
(cherry picked from commit 24e1e55076b624f9dc93c1f23e14dd024bdff1c7) -
Add hwrng support for i.MX6SL.
1. Add RNG driver. This driver originated as fsl-rngc.c. It
has been modified to support device tree. The name has been
changed since it supports both b and c variants of RNG.
2. Added clock and compatible info to the device tree data.
3. Added the entry in the options in the Kconfig for hwrng.(cherry picked from commit 1f3f2c0647b7319c4e23293a61512e4191593513)
[: Edited to apply to 3.14]Signed-off-by: Dan Douglass
Signed-off-by: Victoria Milhoan
(cherry picked from commit 586166b87eee2e5ec40331032aed8c8eaec884f3) -
This patch is refined from the previous commit 20d89c9c909:
-Update the parent of gpu2d_core for mx6dl.
-Update the parent of gpu3d_shader and gpu3d_core for mx6dl.
-Update the clock of gpu3d_shader and gpu3d_core for mx6dl.
The code change is cherry-picked from patch 00e75bcba16d.Signed-off-by: Loren Huang
Signed-off-by: Xianzhong
Acked-by: Jason Liu
(cherry picked from commit e63222bdba7c2de063c6367017ccd6a1d1d3cc22)
03 Feb, 2015
2 commits
-
LDO2p5 cannot be disabled in low power idle mode when the USB driver
enables VBUS wakeup. To identify when LDO2p5 can be disabled add a dummy
regulator that the USB driver will enable when VBUS wakeup is required.Signed-off-by: Ranjani Vaidyanathan
(cherry picked from commit 7d849e4d9ebca3c3c045deca0a12559f84ad6fa1) -
LDO2p5 cannot be disabled in low power idle mode when the USB driver
enables VBUS wakeup. To identify when LDO2p5 can be disabled add a dummy
regulator that the USB driver will enable when VBUS wakeup is required.This patch is copied from commit 7d849e4d9ebca3c as code the structure has
changed too many. directly cherry-pick has too many conflicts to resolveSigned-off-by: Bai Ping
02 Feb, 2015
4 commits
-
The patch "MA-6031 tty: serial: imx: reduce the transmit and receive latency"
cannot pass stress test, so revert it now.Signed-off-by: Fugang Duan
-
Add checking GPU module logic in qos init. This prevents kernel
booting issue in the iMX6sx SOC where there is no GPU module.Signed-off-by: Shawn Xiao
-
(cherry-pick from f9759787e60ad3422d2119f9f25ac320ca58f5df)
confilict: arch/arm/boot/dts/imx6sx.dtsi
The dts file arch has changed in 3.14. Add QoS description in
imx6sx dts manually and solve the conflict.Date Feb 2, 2015
Signed-off-by: Shawn Xiao
-
(cherry-pick from f3f7f04e644d20c6483232eeb8da91ad8905d23b)
conflict: arch/arm/match-imx/match-imx6sx.c
Some patches have not been moved from 3.10 to 3.14. Rewrite the logic
as what the pre-commit has done and resolve the conflict.Date Feb 2, 2015
Signed-off-by: Shawn Xiao
