]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
9 years agoMLK-10439: arm: imx: fix system hang after resume back under low busfreq imx_3.14.28_1.0.0_ga kc/imx_3.14.28_1.0.0_ga
Bai Ping [Thu, 19 Mar 2015 19:29:28 +0000 (03:29 +0800)]
MLK-10439: arm: imx: fix system hang after resume back under low busfreq

System will be no response after resume back under low busfreq mode. The
root cause of this issue is that when the system is under ultra_low_bus_freq
mode on i.MX6SL, resume process has a low bus mode deamon in background,
cause system enter low bus mode twice, busfreq driver will notify thermal
driver to turn off PLL3 twice, and cause PLL3 usecount incorrect and UART
no message out.

Signed-off-by: Bai Ping <b51503@freescale.com>
9 years agoMLK-10422 pci: designware: do not switch the mem view
Richard Zhu [Mon, 16 Mar 2015 02:21:39 +0000 (10:21 +0800)]
MLK-10422 pci: designware: do not switch the mem view

Do not switch the mem view when the imx pcie ep/rc
validation system is enabled.
Otherwise, the RC wouldn't access the mem of the ep
device in the imx pcie ep/rc validation system.

Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit aeab51838317e0843a021b2e8426f942b97b01a8)

9 years agoMLK-10423: Capture: System hang if capture test app been killed
Sandor Yu [Sun, 15 Mar 2015 07:23:15 +0000 (15:23 +0800)]
MLK-10423: Capture: System hang if capture test app been killed

System will hang if csi unit test mx6s_v4l2_capture.out process
been killed.

In csi capture driver function mx6s_csi_enable/disable is called
by vidioc_streamon/streamoff function.
But when csi unit test process is killed, vidioc_streamon/streamoff
will not been called, and csi function still working even the csi
clock is gated.

Move mx6s_csi_enable/disable function from
mx6s_vidioc_streamon/streamoff function to
mx6s_start_streaming/ mx6s_stop_streaming function to resolve the
issue.

Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit fe3700b2dc97952ef5a055a48e1d5ba89e11b7dd)

9 years agoMLK-10210 WIFI: ath6kl: Fixed the issue that warning messages were printed when unins...
Shenwei Wang [Mon, 16 Feb 2015 16:27:37 +0000 (10:27 -0600)]
MLK-10210 WIFI: ath6kl: Fixed the issue that warning messages were printed when uninstalling ath6kl_sdio after iperf test.

When handing the command "ifconfig wlan0 down", the driver handler did
not notify the disconnected event to the upper layer stack cfg80211,
which would cause the relating resources unable to be released. A
notification of disconnet event to cfg80211 was added when the driver
was changed to the disconnect state.

Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
(cherry picked from commit 0b7b203a563ac98f5f0c5695a5149ec80d2114b4)

9 years agoMLK-10211 can: flexcan: fix resume failed issue
Dong Aisheng [Wed, 11 Feb 2015 07:12:44 +0000 (15:12 +0800)]
MLK-10211 can: flexcan: fix resume failed issue

We can observe the following error during system resume.
dpm_run_callback(): platform_pm_resume+0x0/0x4c returns -110
PM: Device 2090000.can failed to resume: error -110

It is caused by the flexcan is in disable state and the clock is disabled
by default while the CAN is not up. During resume, the calling of
flexcan_chip_enable will obviously fail due to no clock.

The issue only happened when CAN device is not up. If CAN is up, clock is there
and no issue will happen.

Because the CAN is always in disabled state by default if it's not up.
We don't have to disable it again during suspend and enable it after resume.
This patch simply the suspend/resume to only enter/exit disabled mode if CAN
is up.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 1a8a68cb11ce2de085efb05aa0262a7eca07aba6)

9 years agoMLK-10346: Enable NetFilter to align with Yocto Project community
Nitin Garg [Thu, 26 Feb 2015 18:24:03 +0000 (12:24 -0600)]
MLK-10346: Enable NetFilter to align with Yocto Project community

Enable CONFIG_NETFILTER as requested by Yocto community.

Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
9 years agoMLK-10269: dts: Change sii902x hdmi bpp from 32 to 16
Sandor Yu [Thu, 5 Mar 2015 10:38:30 +0000 (18:38 +0800)]
MLK-10269: dts: Change sii902x hdmi bpp from 32 to 16

In imx6sl/sx dts, the lcdif display bpp is setting to 16,
and sii902x hdmi driver bpp is 32.
The sii902x driver will overwrite the display bpp when it loading,
but some module such as v4l2 output driver is misses bpp change event.
So align sii902x hdmi driver bpp with lcdif display bpp.

Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit 0fd274cc93a71c8636551c17d7d4157e97fe5cf2)

9 years agoMLK-10371: ov5640: Rename int-device ov5640 driver to ov564x
Sandor Yu [Thu, 5 Mar 2015 02:13:43 +0000 (10:13 +0800)]
MLK-10371: ov5640: Rename int-device ov5640 driver to ov564x

There are two ov5640 driver in kernel, one is subdev ov5640 driver,
the other is int-device ov5640 driver.
Rename int-device ov5640 driver to ov564x.

Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit a084ad80684a5b2800d3610e22b4352da88cb749)

9 years agoMLK-10271 cpufreq: imx6: improve busfreq operation when wehn setpoint lower than...
Bai Ping [Sat, 28 Feb 2015 11:19:56 +0000 (19:19 +0800)]
MLK-10271 cpufreq: imx6: improve busfreq operation when wehn setpoint lower than 396MHz

for i.MX6SX, according to the latest datasheet, added a 198MHz setpoint in cpufreq driver.
The 198MHz setpoint is NOT enough to support playing mp3,the system will stay at a higher
setpoint and high_bus_mode. So when having a setpoint lower than 396MHz, make sure when
the cpufreq is at 396MHz or lower, the busfreq is always in low_bus_mode to save more power.

Signed-off-by: Bai Ping <b51503@freescale.com>
9 years agoMLK-10199 ARM: clk-imx6q: set enet pll rate to 125Mhz
Fugang Duan [Wed, 10 Dec 2014 10:55:04 +0000 (18:55 +0800)]
MLK-10199 ARM: clk-imx6q: set enet pll rate to 125Mhz

Set enet pll rate to 125Mhz for RGMII tx refrence clock to
support i.MX6q sabreauto cpu2 board.

changed the enet_ref clock name for 3.14 kernel.

Signed-off-by: Fugang Duan <B38611@freescale.com>
(cherry picked from commit 6ee3d49271b1f13e359c1acde189dbb6dc4cb13e)

9 years agoMLK-10228 dts: imx6qdl-sabreauto: remove SDb WP pin which is not connect by default
Dong Aisheng [Fri, 6 Feb 2015 09:33:04 +0000 (17:33 +0800)]
MLK-10228 dts: imx6qdl-sabreauto: remove SDb WP pin which is not connect by default

SDb WP pin is not connected by default on MX6Q CPU2 board, so we removed it
in DTS file. BTW, SDb slot is designed for WiFi slot, it is ok to disable WP
for old CPU board also.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 2efa09eb28d7404933725bc25b528641a9dc10f9)
(cherry picked from commit dd6e28f2932284494c89bb4897ad84c01db969d8)

9 years agoMLK-10349 ARM: dts: imx6dql: fix the clock for MIPI CSI2
Robby Cai [Sat, 28 Feb 2015 10:48:21 +0000 (18:48 +0800)]
MLK-10349 ARM: dts: imx6dql: fix the clock for MIPI CSI2

Fix the clock index for cfg clock and use MACRO instead of hard-codes.

This patch fixes the following issue.
-----------------------------------------------------------
root@imx6qdlsolo:~# /unit_tests/mxc_v4l2_capture.out -d /dev/video1 1.yuv
in_width = 176, in_height = 144
out_width = 176, out_height = 144
top = 0, left = 0
mipi csi2 can not receive sensor clk!
...

ERROR: v4l2 capture: mxc_v4l_dqueue timeout enc_counter 0
VIDIOC_DQBUF failed.ERROR: v4l2 capture: VIDIOC_QBUF: buffer already queued
-----------------------------------------------------------

Signed-off-by: Robby Cai <r63905@freescale.com>
(cherry picked from commit 6e4ee449de591d3cfb93575ca639ca32944832bc)

9 years agoMLK-10279-2 usb: chipidea: imx: only do charger detection if we enable it
Peter Chen [Sun, 15 Feb 2015 07:44:43 +0000 (15:44 +0800)]
MLK-10279-2 usb: chipidea: imx: only do charger detection if we enable it

We should only do charger detection if both we have enabled
usb charger at kernel configuration and set usb charger enable
at dts. Otherwise, we will do useless things, like toggle dp.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit 6b677c09dbda0274c6b2e1d61ea0d7f1cc73f621)

9 years agoMLK-10279-1 usb: common: otg-fsm: only signal connect after switching to peripheral
Peter Chen [Sun, 15 Feb 2015 06:42:21 +0000 (14:42 +0800)]
MLK-10279-1 usb: common: otg-fsm: only signal connect after switching to peripheral

We should signal connect (pull up dp) after we have already
at peripheral mode, otherwise, the dp may be toggled due to
we reset controller or do disconnect during the initialization
for peripheral, then, the host may be confused during the
enumeration, eg, it finds the reset can't succeed, but the
device is still there, see below error message.

hub 1-0:1.0: USB hub found
hub 1-0:1.0: 1 port detected
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: Cannot enable port 1.  Maybe the USB cable is bad?
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: Cannot enable port 1.  Maybe the USB cable is bad?
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: Cannot enable port 1.  Maybe the USB cable is bad?
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: cannot reset port 1 (err = -32)
hub 1-0:1.0: Cannot enable port 1.  Maybe the USB cable is bad?
hub 1-0:1.0: unable to enumerate USB device on port 1

Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit b4b5728425454c1713d152855f09af9c9c12d78d)

9 years agoMLK-10259: Remove ARCH_MULTI_V6 config from v7 defconfig
Nitin Garg [Wed, 25 Feb 2015 18:56:19 +0000 (12:56 -0600)]
MLK-10259: Remove ARCH_MULTI_V6 config from v7 defconfig

Sync imx_v7_defconfig with imx_3.10. ARCH_MULTI_V6 is
not required.

Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
(cherry picked from commit ea673b70908b301fc9901d804f141974491dcb3d)

9 years agoARM: imx: drop PL310 errata 588369 and 727915
Shawn Guo [Wed, 2 Jul 2014 07:24:30 +0000 (15:24 +0800)]
ARM: imx: drop PL310 errata 588369 and 727915

The PL310 integrated on i.MX6 series and VF610 are revision r3p1 and
later.  Per ARM PL310 errata document, 588369 is fixed in r2p0 and
727915 is fixed in r3p1.  Neither is needed for i.MX6 or VF610.  So
let's drop them.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
(cherry picked from commit 8629a0f43b832573b06c27a214100c9b6398f59a)
(cherry picked from commit 09d9f7dcfb59b6c65c9b1f4e37b72da480262133)

9 years agoMLK-10248 video: ipuv3-fb: fix hang up with cmdline option for CLAA WVGA
Robby Cai [Sun, 15 Feb 2015 06:00:14 +0000 (14:00 +0800)]
MLK-10248 video: ipuv3-fb: fix hang up with cmdline option for CLAA WVGA

The kernel boot stops at "Starting kernel ..." if assign cmdline
"video=mxcfb0:dev=lcd,if=RGB565".

The cause is that there's no 'mode_str' property for mxcfb0 in DTS file,
so of_property_read_string() does not touch it and 'mode_str' could be used
uninitialized in mxcfb_get_of_property(), where it's assigned to
plat_data->mode_str and then used uninitialized in fb_find_mode().
This may cause buffer overflow. This patch initializes 'mode_str' to NULL
to fix it.

Signed-off-by: Robby Cai <r63905@freescale.com>
(cherry picked from commit 115d11804b7b56d058ee6be8496b13f57869be93)

9 years agoMLK-10243 usb: chipidea: udc: enable and disable BSV irq only for ID change
Li Jun [Wed, 11 Feb 2015 10:32:33 +0000 (18:32 +0800)]
MLK-10243 usb: chipidea: udc: enable and disable BSV irq only for ID change

Since BSV irq is only used for B-device, this patch correct the setting of
BSVIE of otgsc only for case of ID change, that is:
- In otg fsm mode, ID change from 0 to 1 means otg state from A_IDLE to
  B_IDLE; ID change from 1 to 0 means otg state from B_IDLE to A_IDLE, so
  only disable BSVIE if the current state is B_IDLE(to be update to A_IDLE),
  only enable BSVIE if the current state is A_IDLE(to be update to B_IDLE).
- In non-otg-fsm mode, it's already correct.

This fix the bug of MLK-10243.

Signed-off-by: Li Jun <jun.li@freescale.com>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit c6151e8cc4a01128cbab4b26c09f859cfcd7ff39)

9 years agoMLK-10245: mtd: nand: may use minimum required ecc for 744 oobsize NAND
Han Xu [Wed, 11 Feb 2015 22:06:21 +0000 (16:06 -0600)]
MLK-10245: mtd: nand: may use minimum required ecc for 744 oobsize NAND

By default, NAND driver will choose the highest ecc strength that oob
could contain, in this case, for some 8K+744 NAND flash, the ecc
strength will be up to 52bit, which is beyond the i.MX6QDL BCH
capability (40bit).

This code change allows the NAND driver try to use minimum required ecc
strength if it failed to use the highest ecc, even without explicitly
claiming "fsl,use-minimum-ecc" in dts.

Signed-off-by: Han Xu <b45815@freescale.com>
(cherry picked from commit aba987c75fcf264d60f4f819dda53fcb828f7c73)

9 years agoMLK-10249: vadc: improve vadc video mode detected
Sandor Yu [Wed, 11 Feb 2015 08:06:03 +0000 (16:06 +0800)]
MLK-10249: vadc: improve vadc video mode detected

After enable dispmix function, vadc driver 50%
failed to detect video mode.
Add video signal state check before read the result
of video mode detect, vadc driver detected correct video mode
increase to 95%.

Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit b95957f4bc258c86683501d60f70371366ce3bd3)

9 years agoMLK-10232-3: dts: Add vadc to generic pm domain
Sandor Yu [Wed, 11 Feb 2015 08:23:58 +0000 (16:23 +0800)]
MLK-10232-3: dts: Add vadc to generic pm domain

-Add vadc to generic pm domain
-Add vadc clk to dispmix management

Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit 9c3199fa95d0b219234b511c364f6a9d4aec75cd)

9 years agoMLK-10232-2 gpc: change the number of disply clks
Sandor Yu [Wed, 11 Feb 2015 08:17:59 +0000 (16:17 +0800)]
MLK-10232-2 gpc: change the number of disply clks

Add vadc clock to dispmix power management.

Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit 42bede68c37c23d807bf7ea44d7d2f8f7b31073d)

9 years agoMLK-10232-1: vadc: Add vadc to generic pm domain
Sandor Yu [Wed, 11 Feb 2015 08:12:36 +0000 (16:12 +0800)]
MLK-10232-1: vadc: Add vadc to generic pm domain

Vadc in the dispmix power domian, the register will been reset
when dispmix power off, add vadc to generic pm domain,
dispmix will not power off when vadc driver loading.

Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit e06f7339c01d6f77a94cfc8fc22276d03841fecf)

9 years agoMLK-10203-4 PCI: imx: add the disp_mix for imx6sx pcie
Richard Zhu [Fri, 6 Feb 2015 05:59:39 +0000 (13:59 +0800)]
MLK-10203-4 PCI: imx: add the disp_mix for imx6sx pcie

disp_mix power domain is mandatory requried by imx6sx
pcie. Add the related operations for imx6sx pcie

Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit 84b448770a67bae34d7db41839390426a70600d2)

9 years agoMLK-10203-3 arm: pcie: add the disp mix pwr domain
Richard Zhu [Thu, 5 Feb 2015 04:26:56 +0000 (12:26 +0800)]
MLK-10203-3 arm: pcie: add the disp mix pwr domain

since the pcie is power-ed by disp_mix domain,
add disp_mix domain into pcie device node.

Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit 9ba62b896a873bf35df95b7d1c899021f3d7e9d6)

9 years agoMLK-10203-2 arm: pcie: enable imx6qdl pcie support
Richard Zhu [Thu, 5 Feb 2015 08:17:00 +0000 (16:17 +0800)]
MLK-10203-2 arm: pcie: enable imx6qdl pcie support

enable imx6qdl pcie support on imx_3.14 kernel

Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit 87326992bc29c36abdd3c8a23f8766cfa136ab37)

9 years agoMLK-10203-1 pci: imx: enable imx6qdl pcie support
Richard Zhu [Thu, 5 Feb 2015 08:13:07 +0000 (16:13 +0800)]
MLK-10203-1 pci: imx: enable imx6qdl pcie support

enable imx6qdl pcie on imx_3.14 kernel
and add the pcie pm workaround for imx6qdl.
------
L2 can exit by 'reset' or Inband beacon (from remote EP)
toggling phy_powerdown has same effect as 'inband beacon'
So, toggle bit18 of GPR1, used as a workaround of errata
"PCIe PCIe does not support L2 Power Down"
WARNING: This is not official workaround for ERR005723.
Fortunately, we don't encounter issue with this workaround.
User should take own risk to use it.

Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit 4cdd4fb7fb3b3e746b66838f4cdd24fccd67c78d)

9 years agoMLK-10179-2 usb: chipidea: host: turn on vbus before add hcd if early vbus on is...
Li Jun [Tue, 3 Feb 2015 05:59:10 +0000 (13:59 +0800)]
MLK-10179-2 usb: chipidea: host: turn on vbus before add hcd if early vbus on is required

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 <jun.li@freescale.com>
(cherry picked from commit a745133191bfe0c2ca408d9f8bcfc2a5204b0dbd)

9 years agoMLK-10179-1 usb: chipidea: add a flag for turn on vbus early for host
Li Jun [Tue, 3 Feb 2015 05:40:47 +0000 (13:40 +0800)]
MLK-10179-1 usb: chipidea: add a flag for turn on vbus early for host

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 <jun.li@freescale.com>
(cherry picked from commit 1d4c054323817b49897fd7a59bc57b4d36f09491)

9 years agoMLK-10238-4: power: domain: add suspend_noirq/resume_noirq in power domain
Robin Gong [Tue, 10 Feb 2015 01:43:25 +0000 (09:43 +0800)]
MLK-10238-4: power: domain: add suspend_noirq/resume_noirq in power domain

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 <b38343@freescale.com>
(cherry picked from commit 1ab47908d426ce8252c27db962f54588f5d6b156)

9 years agoMLK-10238-3: ARM: imx: gpc: correct the function and structure
Robin Gong [Tue, 10 Feb 2015 00:27:42 +0000 (08:27 +0800)]
MLK-10238-3: ARM: imx: gpc: correct the function and structure

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 <b38343@freescale.com>
(cherry picked from commit bddfa2a6ffa844d9a21a63dab974b993e4eccc41)

9 years agodrivercore / platform: Convert to dev_pm_domain_attach|detach()
Ulf Hansson [Fri, 19 Sep 2014 18:27:38 +0000 (20:27 +0200)]
drivercore / platform: Convert to dev_pm_domain_attach|detach()

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 <ulf.hansson@linaro.org>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit cb51841397e8e5714cf82a7f91053f6e1fb80d1f)
(cherry picked from commit cd4edd4cb84f9dadb9e8f12b1e1f10bf2ef28749)

9 years agoPM / Domains: Add APIs to attach/detach a PM domain for a device
Ulf Hansson [Fri, 19 Sep 2014 18:27:37 +0000 (20:27 +0200)]
PM / Domains: Add APIs to attach/detach a PM domain for a device

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 <ulf.hansson@linaro.org>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 46420dd73b800f87a19af13af5883855cf38cb08)
(cherry picked from commit 451a5b00e51410adc16f8349ed753f7eced46bc5)

9 years agoACPI / PM: Assign the ->detach() callback when attaching the PM domain
Ulf Hansson [Fri, 19 Sep 2014 18:27:35 +0000 (20:27 +0200)]
ACPI / PM: Assign the ->detach() callback when attaching the PM domain

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 <ulf.hansson@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 86f1e15f5646b4855bd77025c950239650c4843e)
(cherry picked from commit 5856005b1a1f4aecef050de96a02e1c757049fa0)

9 years agoPM / Domains: Add a detach callback to the struct dev_pm_domain
Ulf Hansson [Fri, 19 Sep 2014 18:27:34 +0000 (20:27 +0200)]
PM / Domains: Add a detach callback to the struct dev_pm_domain

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 <ulf.hansson@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit c3099a5294f2c7266234e8ea35cbffc20a41aa9a)
(cherry picked from commit 96257e7b72821bbaa5681b1d2042050c6aab0ea1)

9 years agoMLK-10238-2: Revert "drivercore: Bind/unbind power domain on probe/remove"
Robin Gong [Mon, 9 Feb 2015 08:54:52 +0000 (16:54 +0800)]
MLK-10238-2: Revert "drivercore: Bind/unbind power domain on probe/remove"

This reverts commit ef2c90dea437f8955b7dc089ff1579c2aa06a6b7.
Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit e2c50506fee918f95425babbccc7ecf28d3d2f87)

9 years agoPM / Domains: Add generic OF-based PM domain look-up
Tomasz Figa [Fri, 19 Sep 2014 18:27:36 +0000 (20:27 +0200)]
PM / Domains: Add generic OF-based PM domain look-up

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 <ulf.hansson@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit aa42240ab2544a8bcb2efb400193826f57f3175e)
(cherry picked from commit 4a2d7a846761e3b86e08b903e5a1a088686e2181)

9 years agoPM / domains: Spelling s/domian/domain/
Geert Uytterhoeven [Tue, 16 Sep 2014 19:59:39 +0000 (21:59 +0200)]
PM / domains: Spelling s/domian/domain/

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 12e10bb60be2a4259373c05dfbf8f71b87a17421)
(cherry picked from commit f1c3e733b6823274d4de2c599e2f0bb96baa5d83)

9 years agoPM / domains: Add late_initcall to disable unused PM domains
Ulf Hansson [Wed, 3 Sep 2014 10:52:26 +0000 (12:52 +0200)]
PM / domains: Add late_initcall to disable unused PM domains

As default behavior let genpd at late init try to disable the unused
PM domains.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 2fe71dcdfd10d3f71bb559609a8ceda9f76b1e2c)
(cherry picked from commit 5993cf209e1dcc68de523fcd5998f2464cc32990)

9 years agoPM / domains: Remove genpd_queue_power_off_work() API
Ulf Hansson [Wed, 3 Sep 2014 10:52:25 +0000 (12:52 +0200)]
PM / domains: Remove genpd_queue_power_off_work() API

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 <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit d971f0b0eaaf3f2086bf21bbd64f7ea7e2f28459)
(cherry picked from commit 835729a13d0061f55d6bd714811a16ebaecb9b0e)

9 years agoPM / domains: Remove pm_genpd_syscore_switch() API
Ulf Hansson [Wed, 3 Sep 2014 10:52:24 +0000 (12:52 +0200)]
PM / domains: Remove pm_genpd_syscore_switch() API

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 <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit d47e6464ae6c96735d4706f5cb0537fe717b6b00)
(cherry picked from commit 9b68cd944341e5a613e9858e65e3432bd5691f92)

9 years agoPM / domains: Remove redundant check for CONFIG_PM
Ulf Hansson [Wed, 3 Sep 2014 10:52:23 +0000 (12:52 +0200)]
PM / domains: Remove redundant check for CONFIG_PM

CONFIG_PM_GENERIC_DOMAINS depends on CONFIG_PM, thus there are no need
to check explicity for it.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 784b0d3d8bc5b8ac60fc620c3420dc430bba61a7)
(cherry picked from commit d5b35c3260e14bff3f201c6f6ea59b1c91f1cff1)

9 years agoPM / domains: Remove dev_irq_safe from genpd config
Ulf Hansson [Wed, 3 Sep 2014 10:52:22 +0000 (12:52 +0200)]
PM / domains: Remove dev_irq_safe from genpd config

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 <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit c5d79ec2a5715489cff16a0d1cf4fa9108a5509e)
(cherry picked from commit 4cffcdb2c92cabbba3e55a0f2d9c7d86d8a756ed)

9 years agoPM / domains: Remove system PM callbacks from gpd_dev_ops
Ulf Hansson [Wed, 3 Sep 2014 10:52:19 +0000 (12:52 +0200)]
PM / domains: Remove system PM callbacks from gpd_dev_ops

There no users of these callbacks, let's simplify the generic power
domain by removing them.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 1e0407ca54d28db8e5f02e437ff21cc6416c0be8)
(cherry picked from commit 0f19454e606c6fbc7ce980ca128a703ebc8990fb)

9 years agoPM / domains: Ignore callbacks for subsys generic_pm_domain_data
Ulf Hansson [Wed, 3 Sep 2014 10:52:18 +0000 (12:52 +0200)]
PM / domains: Ignore callbacks for subsys generic_pm_domain_data

In a step of simplifying the generic power domain let's move away from
using these callbacks.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 67da6d4bf43c4208433ef8f3ee487401b4dc9c74)
(cherry picked from commit b16a428836529af31f23b807065cc6e643c409da)

9 years agoPM / domains: Remove the pm_genpd_add|remove_callbacks APIs
Ulf Hansson [Wed, 3 Sep 2014 10:52:17 +0000 (12:52 +0200)]
PM / domains: Remove the pm_genpd_add|remove_callbacks APIs

There are no users of these APIs. To simplify the generic power domain
let's remove them.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 55e15c949fd05d247a889df0ed0177a676fec665)
(cherry picked from commit da452fc0f1a1a75993a6c989a600dd2de309026c)

9 years agoPM / domains: Add pd_ignore_unused to keep power domains enabled
Tushar Behera [Fri, 28 Mar 2014 05:20:21 +0000 (10:50 +0530)]
PM / domains: Add pd_ignore_unused to keep power domains enabled

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 <tushar.behera@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 39ac5ba51b69a77a30d2e783aed02ec73c9f6d70)
(cherry picked from commit 8507e882be1aa8363d229e6dbc8367c963e37bd3)

9 years agodrivers/base: delete non-required instances of include <linux/init.h>
Paul Gortmaker [Tue, 21 Jan 2014 21:23:10 +0000 (16:23 -0500)]
drivers/base: delete non-required instances of include <linux/init.h>

None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>.  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 <len.brown@intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 4272b9611c30f99f51590085998129480f2fe45e)
(cherry picked from commit 9680398849d6b7f74cf8874522c16064a3df535d)

9 years agoMLK-10238-1: Revert "base: power: Add generic OF-based power domain look-up"
Robin Gong [Mon, 9 Feb 2015 08:16:44 +0000 (16:16 +0800)]
MLK-10238-1: Revert "base: power: Add generic OF-based power domain look-up"

This reverts commit 4aa055cb0634bc8d0389070104fe6aa7cfa99b8c.
Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit e599f64de890a60a3b9884dd5838c43472f145e2)

9 years agoMLK-9961-5 cpufreq:imx6x: Change PLL1 clock management.
Ranjani Vaidyanathan [Fri, 30 Jan 2015 19:41:28 +0000 (13:41 -0600)]
MLK-9961-5 cpufreq:imx6x: Change PLL1 clock management.

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 <Ranjani.Vaidyanathan@freescale.com>
9 years agoMLK-9961-4 arm:imx6x: Change PLL1 clock management.
Ranjani Vaidyanathan [Fri, 30 Jan 2015 19:40:30 +0000 (13:40 -0600)]
MLK-9961-4 arm:imx6x: Change PLL1 clock management.

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 <Ranjani.Vaidyanathan@freescale.com>
9 years agoMLK-9961-3 arm:dts:imx6x: Change PLL1 clock management.
Ranjani Vaidyanathan [Fri, 30 Jan 2015 18:48:50 +0000 (12:48 -0600)]
MLK-9961-3 arm:dts:imx6x: Change PLL1 clock management.

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 <Ranjani.Vaidyanathan@freescale.com>
9 years agoMLK-9961-2 Revert "MLK-10007-02 arm: imx: enable pll1 when changing arm_podf value"
Ranjani Vaidyanathan [Fri, 30 Jan 2015 19:51:17 +0000 (13:51 -0600)]
MLK-9961-2 Revert "MLK-10007-02 arm: imx: enable pll1 when changing arm_podf value"

This reverts commit 09bcfcabc08a57bce3000677052d5a2fcc2b1b68.

Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>
9 years agoMLK-9961-1 Revert "MLK-10091 arm: imx: check pll1 enable when changing arm_podf"
Ranjani Vaidyanathan [Fri, 30 Jan 2015 19:47:35 +0000 (13:47 -0600)]
MLK-9961-1 Revert "MLK-10091 arm: imx: check pll1 enable when changing arm_podf"

This reverts commit 8cc908a0168afb677b5de6405579b681b6f595db.

Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>
9 years agoMLK-10214-2: regmap: rbtree: Fix the shift issue.
Shengjiu Wang [Mon, 9 Feb 2015 10:19:38 +0000 (18:19 +0800)]
MLK-10214-2: regmap: rbtree: Fix the shift issue.

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 <shengjiu.wang@freescale.com>
9 years agoMLK-10214-1: ASoC: fsl_asrc: sound is wrong after suspend/resume
Shengjiu Wang [Mon, 9 Feb 2015 10:22:04 +0000 (18:22 +0800)]
MLK-10214-1: ASoC: fsl_asrc: sound is wrong after suspend/resume

The register ASRCFG is volatile, but some bits need to be recovered
after suspend/resume.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
9 years agoMLK-10213-2: ASoC: dmaengine: Merge trigger RESUME to START and SUSPEND to STOP
Shengjiu Wang [Mon, 9 Feb 2015 10:21:27 +0000 (18:21 +0800)]
MLK-10213-2: ASoC: dmaengine: Merge trigger RESUME to START and SUSPEND to STOP

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 <shengjiu.wang@freescale.com>
9 years agoMLK-10213-1: ASoC: fsl_ssi: sound is wrong after suspend/resume
Shengjiu Wang [Mon, 9 Feb 2015 10:13:54 +0000 (18:13 +0800)]
MLK-10213-1: ASoC: fsl_ssi: sound is wrong after suspend/resume

The register SFCSR is volatile, but some bits in it need to be
recovered after suspend/resume.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
9 years agoMLK-10227 video: mxsfb: Correct interrupt handling
Liu Ying [Thu, 5 Feb 2015 07:08:24 +0000 (15:08 +0800)]
MLK-10227 video: mxsfb: Correct interrupt handling

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 <Ying.Liu@freescale.com>
(cherry picked from commit 24e1e55076b624f9dc93c1f23e14dd024bdff1c7)

9 years agoENGR00292341 imx6sl hwrng
Dan Douglass [Thu, 20 Feb 2014 17:25:56 +0000 (11:25 -0600)]
ENGR00292341 imx6sl hwrng

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)
[<vicki.milhoan@freescale.com>: Edited to apply to 3.14]

Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com>
(cherry picked from commit 586166b87eee2e5ec40331032aed8c8eaec884f3)

9 years agoMGS-504 imx: i.MX6DL gpu3d_core_clk should be 528M instead of 396M
Xianzhong [Fri, 6 Feb 2015 06:58:38 +0000 (14:58 +0800)]
MGS-504 imx: i.MX6DL gpu3d_core_clk should be 528M instead of 396M

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 <b02279@freescale.com>
Signed-off-by: Xianzhong <b07117@freescale.com>
Acked-by: Jason Liu
(cherry picked from commit e63222bdba7c2de063c6367017ccd6a1d1d3cc22)

9 years agoENGR00299939-3 USB: imx6x: Add dummy LDO2p5 regulator for VBUS wakeup
Ranjani Vaidyanathan [Tue, 4 Mar 2014 21:38:18 +0000 (15:38 -0600)]
ENGR00299939-3 USB: imx6x: Add dummy LDO2p5 regulator for VBUS wakeup

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 <Ranjani.Vaidyanathan@freescale.com>
(cherry picked from commit 7d849e4d9ebca3c3c045deca0a12559f84ad6fa1)

9 years agoMLK-10188 arm: imx: Add dummy LDO2p5 regulator for VBUS wakeup
Bai Ping [Fri, 30 Jan 2015 10:56:40 +0000 (18:56 +0800)]
MLK-10188 arm: imx:  Add dummy LDO2p5 regulator for VBUS wakeup

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 resolve

Signed-off-by: Bai Ping <b51503@freescale.com>
9 years agoMLK-10194 Revert "MA-6031 tty: serial: imx: reduce the transmit and receive latency"
Fugang Duan [Mon, 2 Feb 2015 07:35:03 +0000 (15:35 +0800)]
MLK-10194 Revert "MA-6031 tty: serial: imx: reduce the transmit and receive latency"

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 <B38611@freescale.com>
9 years agoMLK-10169 GPU: fix kernel booting issue on iMX6sx SOC without GPU
Shawn Xiao [Wed, 28 Jan 2015 08:39:16 +0000 (16:39 +0800)]
MLK-10169 GPU: fix kernel booting issue on iMX6sx SOC without GPU

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 <b49994@freescale.com>
9 years agoENGR00306443-2 dts:Add QoS description in imx6sx dts
Shawn Xiao [Mon, 2 Feb 2015 07:39:51 +0000 (15:39 +0800)]
ENGR00306443-2 dts:Add QoS description in imx6sx dts

(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 <b49994@freescale.com>
9 years agoENGR00306443-1 mx6sx:Update the gc400t QoS
Shawn Xiao [Mon, 2 Feb 2015 07:31:17 +0000 (15:31 +0800)]
ENGR00306443-1 mx6sx:Update the gc400t QoS

(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 <b49994@freescale.com>
9 years agoMLK-10138: Revert "MLK-10047: hdmi: Add hotplug detect for DVI monitors"
Sandor Yu [Mon, 2 Feb 2015 02:00:16 +0000 (10:00 +0800)]
MLK-10138: Revert "MLK-10047: hdmi: Add hotplug detect for DVI monitors"

This reverts commit e88c775a272b4f7af1a2fec8736fea9a55e58472.
Some HDMI TV not support rxsense as hotplug interrupter source.

Signed-off-by: Sandor Yu <R01008@freescale.com>
9 years agoMLK-10193: dts: Remove obsolete dts item csi1_v4l2_cap
Sandor Yu [Mon, 2 Feb 2015 06:21:31 +0000 (14:21 +0800)]
MLK-10193: dts: Remove obsolete dts item csi1_v4l2_cap

Remove csi1_v4l2_cap item from imx6sx-sdb-lcdif.dts file.
The item is not used in dts now.

Signed-off-by: Sandor Yu <R01008@freescale.com>
9 years agoMLK-10192: dts: Move sii902x hdmi function to imx6sx sdb lcdif1 dts
Sandor Yu [Mon, 2 Feb 2015 05:54:23 +0000 (13:54 +0800)]
MLK-10192: dts: Move sii902x hdmi function to imx6sx sdb lcdif1 dts

-Sii902x hdmi daughter connect to lcdif1 interface,
move this function to lcdif1 dts.
-Sii902x hdmi driver share the reset pin with ov5640 driver,
one driver will been reset by the other driver,
so move sii902x reset pin configure to licdif1 dts.

Signed-off-by: Sandor Yu <R01008@freescale.com>
9 years agoMLK-10190 ARM: dts: disable disp mix on imx6sl by default
Robby Cai [Sun, 1 Feb 2015 10:11:16 +0000 (18:11 +0800)]
MLK-10190 ARM: dts: disable disp mix on imx6sl by default

The cause is EPDC works not stable if DISP mix is enabled.

Signed-off-by: Robby Cai <r63905@freescale.com>
9 years agoENGR00279980 ubi: attach: do not return -EINVAL if the mtd->numeraseregions is 1
Huang Shijie [Wed, 18 Sep 2013 02:17:39 +0000 (10:17 +0800)]
ENGR00279980 ubi: attach: do not return -EINVAL if the mtd->numeraseregions is 1

If the master mtd does not have any slave mtd partitions,
and its numeraseregions is one(only has one erease block), and
we attach the master mtd with : ubiattach -m 0 -d 0

We will meet the error:
-------------------------------------------------------
root@freescale ~$ ubiattach /dev/ubi_ctrl -m 0 -d 0
UBI: attaching mtd0 to ubi0
UBI error: io_init: multiple regions, not implemented
ubiattach: error!: cannot attach mtd0
           error 22 (Invalid argument)
-------------------------------------------------------

In fact, if there is only one "erase block", we should not
prevent the attach.

This patch fixes it.

Signed-off-by: Huang Shijie <b32955@freescale.com>
(cherry picked from commit 361cdc47fc4c4db31c5485560cdabd94f409bd81)

9 years agoMLK-10189: ARM:dts: disable gpmi nand module in imx6qdl sabreauto dts
Allen Xu [Thu, 29 Jan 2015 17:57:44 +0000 (01:57 +0800)]
MLK-10189: ARM:dts: disable gpmi nand module in imx6qdl sabreauto dts

disable gpmi nand module in imx6qdl default dts since it conflicts with
uart3

Signed-off-by: Allen Xu <b45815@freescale.com>
9 years agoMLK-10182: cam :Module can't load/unload twice without camera connected
Sandor Yu [Fri, 30 Jan 2015 09:25:40 +0000 (17:25 +0800)]
MLK-10182: cam :Module can't load/unload twice without camera connected

If no camera connected, ov5640 driver loading failed,
but the driver have register subdev by v4l2_async_register_subdev.
v4l2_async_unregister_subdev function in remove function
and not been called when module unloading.
Same subdev can not register twice, v4l2 async driver will print
error message in the second module loading.
Move v4l2_async_register_subdev function after ov5640 is succeed
found to fix the issue.

Signed-off-by: Sandor Yu <R01008@freescale.com>
9 years agoMLK-10136 imx_v7_defconfig: disable rfkill feature
Dong Aisheng [Fri, 30 Jan 2015 10:19:11 +0000 (18:19 +0800)]
MLK-10136 imx_v7_defconfig: disable rfkill feature

Currently wpa_supplicant in yocto rootfs does not work properly due to RFKILL
feature and Yocto upgrade.
It causes the WiFi in new Yocto rootfs unable to get ip address via DHCP.
The root cause is still unkown.
This patch temporarily disable RFKILL feature to make WiFi work first.

Current there's no user of RFKILL in Yocto rootfs.
We will enable it again if needed after the issue is fixed.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
9 years agoMLK-10184 ARM: dts: imx6sx: clean up enet property and enable enet2 multi-queue
Fugang Duan [Fri, 30 Jan 2015 05:43:03 +0000 (13:43 +0800)]
MLK-10184 ARM: dts: imx6sx: clean up enet property and enable enet2 multi-queue

Clean up enet property and enebale enet2 multi-queue.

Signed-off-by: Fugang Duan <B38611@freescale.com>
9 years agoENGR00286971-1 imx6q: add sanity check for getting gpio for flexcan
Dong Aisheng [Fri, 8 Nov 2013 07:48:23 +0000 (15:48 +0800)]
ENGR00286971-1 imx6q: add sanity check for getting gpio for flexcan

This is used to avoid a warning:
WARNING: at /home/b29397/work/projects/linux-2.6-imx/drivers/gpio/gpiolib.c:126
gpio_to_desc+0x30/0x44()
invalid GPIO -517
Modules linked in:
....
gpiod_request: invalid GPIO

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit e644b009e6e127f028f3a2708585fa867a9db35c)

9 years agoMLK-10135 dts:enable sii902x driver in imx6sl/sx board
Sandor Yu [Wed, 28 Jan 2015 09:57:47 +0000 (17:57 +0800)]
MLK-10135 dts:enable sii902x driver in imx6sl/sx board

Enable sii902x driver in imx6sl/sx board

Signed-off-by: Sandor Yu <R01008@freescale.com>
9 years agoMLK-10137:csi: Return physical address in querybuffer call
Sandor Yu [Fri, 23 Jan 2015 06:18:01 +0000 (14:18 +0800)]
MLK-10137:csi: Return physical address in querybuffer call

GST application want to use physical address even video buffer
allocated with type of V4L2_MEMORY_MMAP.
So add a trick in querybuffer function, if video buffer flags
is setting to V4L2_BUF_FLAG_MAPPED, overwirte m.offset with
physical address.

Signed-off-by: Sandor Yu <R01008@freescale.com>
9 years agoMLK-10177 arm: imx: add cpuidle driver support for i.MX6DL
Bai Ping [Thu, 29 Jan 2015 13:24:36 +0000 (21:24 +0800)]
MLK-10177 arm: imx: add cpuidle driver support for i.MX6DL

Add cpudile driver support for i.MX6DL.

Signed-off-by: Bai Ping <b51503@freescale.com>
9 years agoMLK-10175 arm: imx6: Skip gating QSPI2 clk when M4 is enabled
Bai Ping [Thu, 29 Jan 2015 11:09:39 +0000 (19:09 +0800)]
MLK-10175 arm: imx6: Skip gating QSPI2 clk when M4 is enabled

When the M4 core is enabled on i.MX6, the QSPI2 clk can't be gated,
otherwise, the M4 will hang. This patch add a check to make sure when
M4 is enabled, just skip the QSPI2 clk gating operations.

Signed-off-by: Bai Ping <b51503@freescale.com>
9 years agoMLK-10174-2 usb: chipidea: host: keep controller power if host has dev connected
Li Jun [Thu, 29 Jan 2015 02:32:32 +0000 (10:32 +0800)]
MLK-10174-2 usb: chipidea: host: keep controller power if host has dev connected

This patch is to keep usb controller power on while system suspend if there
is usb device connected by telling GPC to keep mega fast domain power.

Signed-off-by: Li Jun <jun.li@freescale.com>
9 years agoMLK-10174-1 arm: imx: gpc: export an interface to keep mega fast power
Li Jun [Thu, 29 Jan 2015 02:26:52 +0000 (10:26 +0800)]
MLK-10174-1 arm: imx: gpc: export an interface to keep mega fast power

Add an interface for GPC used by drivers to keep mega fast mix domain
power.

Signed-off-by: Li Jun <jun.li@freescale.com>
9 years agoENGR00325832 usb: chipidea: usb vbus glitch check logic change
Li Jun [Wed, 10 Sep 2014 09:49:33 +0000 (17:49 +0800)]
ENGR00325832 usb: chipidea: usb vbus glitch check logic change

This patch changes the vbus glitch check to cover usb otg certification
case, so the possible cases of vbus rise:
- USB vbus can reach AVV(4.4v), valid vbus.
- USB vbus keeps above BSV(0.8v) but lower than AVV(4.4v) for
  more than 300ms, we think it's valid vbus event, this can meet
  usb otg certificataion case(B device can do connection in 1s when
  vbus is 4.0v).
- USB vbus cannot be kept above BSV(0.8v) for more than 300ms,
  it's a vbus glitch.
In case of vbus drop: if the vbus on flag is not set, it's a vbus glitch,
otherwise it's a valid vbus drop event.

Acked-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Li Jun <b47624@freescale.com>
(cherry picked from commit de5ab444839b6d1492d697256ea2b8a1dcaffc62)

9 years agoENGR00320099 usb: chipidea: add vbus glitch handling
Li Jun [Fri, 20 Jun 2014 07:52:14 +0000 (15:52 +0800)]
ENGR00320099 usb: chipidea: add vbus glitch handling

We add vbus glitch handling for both BSV rise and drop interruptes.
If it is a vbus glitch (higher than BSV but cannot reach AVV), ignore it.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Li Jun <b47624@freescale.com>
(cherry picked from commit 827f2fe71e6222882930db7e89460087cb3bce5b)

9 years agoMLK-10161-3: ARM: imx6sx: Add SPDIF_GCLK clock in clock tree
Shengjiu Wang [Tue, 27 Jan 2015 08:44:34 +0000 (16:44 +0800)]
MLK-10161-3: ARM: imx6sx: Add SPDIF_GCLK clock in clock tree

As spdif driver will register SPDIF clock to regmap, regmap will do
clk_prepare in init function, so SPDIF clock is prepared in probe, then its
root clock (pll clock) is prepared also, which cause the arm can't enter
low power mode.
Add SPDIF_GCLK in clock tree which share same gate bits with SPDIF clock.
Its root clock is ipg clock, and register it to regmap, then the issue can be
fixed.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
9 years agoMLK-10161-2: ARM: imx6sl: Add SPDIF_GCLK clock in clock tree
Shengjiu Wang [Tue, 27 Jan 2015 08:43:17 +0000 (16:43 +0800)]
MLK-10161-2: ARM: imx6sl: Add SPDIF_GCLK clock in clock tree

As spdif driver will register SPDIF clock to regmap, regmap will do
clk_prepare in init function, so SPDIF clock is prepared in probe, then its
root clock (pll clock) is prepared also, which cause the arm can't enter
low power mode.
Add SPDIF_GCLK in clock tree which share same gate bits with SPDIF clock.
Its root clock is ipg clock, and register it to regmap, then the issue can be
fixed.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
9 years agoMLK-10161-1: ARM: imx6q: Add SPDIF_GCLK clock in clock tree
Shengjiu Wang [Tue, 27 Jan 2015 08:24:53 +0000 (16:24 +0800)]
MLK-10161-1: ARM: imx6q: Add SPDIF_GCLK clock in clock tree

As spdif driver will register SPDIF clock to regmap, regmap will do
clk_prepare in init function, so SPDIF clock is prepared in probe, then its
root clock (pll clock) is prepared also, which cause the arm can't enter
low power mode.
Add SPDIF_GCLK in clock tree which share same gate bits with SPDIF clock.
Its root clock is ipg clock, and register it to regmap, then the issue can be
fixed.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
9 years agoMLK-10165 Enable crypto algorithms for i.mx6 devices
Victoria Milhoan [Wed, 28 Jan 2015 05:38:00 +0000 (22:38 -0700)]
MLK-10165 Enable crypto algorithms for i.mx6 devices

Enable various crypto algorithms in the default kernel configuration
for i.MX6 devices.

Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com>
9 years agoMLK-10101-5 usb: chipidea: otg: init otg_fsm of usb_bus while start host
Li Jun [Tue, 27 Jan 2015 09:26:48 +0000 (17:26 +0800)]
MLK-10101-5 usb: chipidea: otg: init otg_fsm of usb_bus while start host

Set otg_fsm of usb_bus to be ci->fsm while start host.

Signed-off-by: Li Jun <jun.li@freescale.com>
9 years agoMLK-10101-4 usb: add otg_fsm pointer in usb_bus
Li Jun [Tue, 27 Jan 2015 09:11:14 +0000 (17:11 +0800)]
MLK-10101-4 usb: add otg_fsm pointer in usb_bus

Add otg_fsm pointer in struct of usb_bus for access otg_fsm via bus.
Original way was to put it in usb_otg, then usb host can access otg_fsm via
hcd->usb_phy->otg->fsm, since usb_phy will not be the future direction, instead
phy is prefered, so this way may not work. It's more direct and simple to put
it in usb_bus.

Signed-off-by: Li Jun <jun.li@freescale.com>
9 years agoMLK-9618-1 doc: usb: chipidea: select gadget drivers for otg compliance test
Li Jun [Sun, 28 Sep 2014 05:55:01 +0000 (13:55 +0800)]
MLK-9618-1 doc: usb: chipidea: select gadget drivers for otg compliance test

This patch adds guide for selecting available gadget drivers for otg and EH
compliance tests.

Acked-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Li Jun <b47624@freescale.com>
(cherry picked from commit 520cac9e4fe938887dd45b5b4df6c8e35e125a59)

9 years agoMLK-9617-2 usb: gadget: set bcdOTG of OTG descriptor for gadget drivers
Li Jun [Mon, 1 Sep 2014 07:44:15 +0000 (15:44 +0800)]
MLK-9617-2 usb: gadget: set bcdOTG of OTG descriptor for gadget drivers

This patch sets bcdOTG field of OTG descriptor for below 3 gadget drivers:
- ether
- mass storage
- serial
OTG and EH supplement release number in binary-coded decimal(i.e. 2.0 is 0200H).

Acked-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Li Jun <b47624@freescale.com>
(cherry picked from commit a426ace68acd9b770ce3a609f92029782b8ca1d1)

9 years agoMLK-9617-1 usb: otg: update otg descriptor definition for OTG and EH 2.0
Li Jun [Thu, 9 Jan 2014 02:25:55 +0000 (10:25 +0800)]
MLK-9617-1 usb: otg: update otg descriptor definition for OTG and EH 2.0

Add one field bcdOTG for OTG and EH supplement release number in OTG
descriptor according to On-The-Go and Embedded Host Supplement to the
USB Revision 2.0 Specification Revision 2.0 version 1.1a.

Acked-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Li Jun <b47624@freescale.com>
(cherry picked from commit 1bf5e829100a2922826818bd8cbb18ee81452cfc)

9 years agoENGR00333297-1 usb: whitelist: update otg & eh's TPL for fsl i.mx
Peter Chen [Fri, 8 Aug 2014 01:12:52 +0000 (09:12 +0800)]
ENGR00333297-1 usb: whitelist: update otg & eh's TPL for fsl i.mx

The default TPL is for USB OTG & EH compliance test, the supported
class is: mass storage, hub, and hid.

Besides, we add one match criterion that matching targeted device
through class at interface descriptor.

Tested-by: Li Jun <b47624@freescale.com>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit 483c071d989ceb36cacf76e1e3e779c67e5b8280)

9 years agoENGR00331016-5 usb: chipidea: otg: clear b_bus_req when vbus is off
Li Jun [Mon, 22 Sep 2014 08:19:59 +0000 (16:19 +0800)]
ENGR00331016-5 usb: chipidea: otg: clear b_bus_req when vbus is off

In case of b_peripheral --> b_wait_acon --> b_idle due to vbus off
in b_wait_acon state, b_bus_req cannot be cleared in b_idle state,
which result in b device will do data pulse because b_bus_req is set.
This patch fix this issue by clear the input variable b_bus_req when
vbus is off.

Acked-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Li Jun <b47624@freescale.com>
(cherry picked from commit bc600546bf9193f1a39186ad4c07a5fd497c7bfd)

9 years agoENGR00331016-4 usb: chipidea: otg: remove unnecessary b_sess_vld tracking
Li Jun [Wed, 17 Sep 2014 07:05:24 +0000 (15:05 +0800)]
ENGR00331016-4 usb: chipidea: otg: remove unnecessary b_sess_vld tracking

Since BSV irq is enabled for B-device all the time, so B_SESS_VLD timer
is not required, and also no need to check BSV status when B_ASE0_BRST
timer timeout.

Acked-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Li Jun <b47624@freescale.com>
(cherry picked from commit a7d0b864b613c555add9ea864eb8c163e1d3362e)

9 years agoMLK-10101-3 usb: chipidea: otg: enable BSV irq when OTG B-device in host mode
Li Jun [Tue, 27 Jan 2015 07:01:57 +0000 (15:01 +0800)]
MLK-10101-3 usb: chipidea: otg: enable BSV irq when OTG B-device in host mode

When B-device in host mode, if Vbus is off by A-device or A-device is removed,
B-device should update charger status correctly. This patch enables BSV irq
for B-device in all states, so the charger connection and removal can be early
handled by BSV change irq.

Signed-off-by: Li Jun <jun.li@freescale.com>
9 years agoMLK-10101-2 usb: chipidea: otg: delay to enter low power mode for a_host
Li Jun [Tue, 27 Jan 2015 03:30:35 +0000 (11:30 +0800)]
MLK-10101-2 usb: chipidea: otg: delay to enter low power mode for a_host

There is 2s delay for controller resume from usb wakeup case already,
in OTG fsm mode, A-dev can start a new session via sys input file(means
not via usb wakeup), in this case, A-dev still need the 2s delay for
host root hub access registers, otherwise system will hang due to access
register at low power mode.

Signed-off-by: Li Jun <jun.li@freescale.com>
9 years agoMLK-10132-4 usb: chipidea: imx: disable usb wakeup in probe
Li Jun [Tue, 27 Jan 2015 02:25:25 +0000 (10:25 +0800)]
MLK-10132-4 usb: chipidea: imx: disable usb wakeup in probe

Disable usb wakeup as initial setting in probe.

Signed-off-by: Li Jun <jun.li@freescale.com>