Victoria Milhoan (b42089) [Fri, 17 Oct 2014 23:30:56 +0000 (16:30 -0700)]
MLK-9769-8 Add a test for the Freescale CAAM Random Number Generator
Freescale's CAAM includes a Random Number Generator. This change adds
a kernel configuration option to test the RNG's capabilities via the
hw_random framework.
Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com>
Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
Victoria Milhoan [Wed, 29 Oct 2014 18:23:05 +0000 (11:23 -0700)]
MLK-9769-1 caam: remove incorrect comment from job ring module
The caam_jr_register() function is no longer part of the CAAM
driver. This patch removes a comment referencing the function.
Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com>
Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
Cristian Stoica [Mon, 7 Jul 2014 08:52:41 +0000 (11:52 +0300)]
crypto: caam - fix memleak in caam_jr module
commit
0378c9a855bfa395f595fbfb049707093e270f69 upstream.
This patch fixes a memory leak that appears when caam_jr module is unloaded.
Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Conflicts:
drivers/crypto/caam/jr.c
Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
Horia Geanta [Fri, 18 Apr 2014 10:01:42 +0000 (13:01 +0300)]
crypto: caam - add allocation failure handling in SPRINTFCAT macro
commit
27c5fb7a84242b66bf1e0b2fe6bf40d19bcc5c04 upstream.
GFP_ATOMIC memory allocation could fail.
In this case, avoid NULL pointer dereference and notify user.
Cc: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Conflicts:
drivers/crypto/caam/error.c
Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
Anson Huang [Tue, 15 Dec 2015 09:59:11 +0000 (17:59 +0800)]
MLK-12014 ARM: imx: enable necessary clock for RDC recovery from DSM
1. Per design requirement, EXSC for PCIe will need clock to recover RDC
setting on resume when M/F mix is off, so we need to enable PCIe
LPCG before entering DSM.
2. As M4 clock is disabled in low power mode, after exit from DSM, A7
needs to restore TCM for M4, but without M4 clock, this operation
never success, so we enable A7 wakeup sources for M4 as well during
DSM, after exit DSM, M4's original wakeup sources will be restored.
Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
(cherry picked from commit
847db79957d25545c762670eb1bc003f34cb2592)
Signed-off-by: Teo Hall <teo.hall@nxp.com>
Anson Huang [Wed, 16 Dec 2015 13:54:50 +0000 (21:54 +0800)]
MLK-12025 ARM: imx: M4 should be in RUN mode when resume from DSM
On i.MX7D, only when M4 enters STOP mode, system is able to enter DSM
mode where M4 power will be gated off. This is done by checking
a variable which records M4's power mode. However, when system
resume from DSM, M4 is re-enabled to RUN mode by A7, but the variable
is NOT updated accordingly, so next time system suspend, even
M4 is NOT in STOP mode, system can enter DSM mode, which is
unexpected and would cause bus-freq use count mismatch.
Fix this issue by reset M4 power mode to RUN mode when resume
from DSM.
Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
(cherry picked from commit
d22127a8f395edaf719a5bf4874cf22c5bdc8661)
Signed-off-by: Teo Hall <teo.hall@nxp.com>
Anson Huang [Mon, 11 Jan 2016 16:14:53 +0000 (00:14 +0800)]
MLK-12182 ARM: imx: add M4 ddr image DSM support on i.MX7D
For DSM mode, M4 TCM context is lost and A7 will restore them
after resume and write TCM entry to M4 and re-kick it. It
assumes M4 is running on TCM, but M4 also has case of running
image on DDR, OCRAMS first 2 words stores the stack and pc
address for M4, to support M4 running on both TCM and DDR
case, we can just leave the OCRAMS first 3 words unchanged
during DSM, the third words is also reserved for M4, as OCRAMS
can keep its context during DSM.
This patch leaves OCRAMS first 3 words unchanged and remove
the re-program of TCM entry after exit from DSM, thus it can
support DSM mode for M4 running on TCM/DDR/OCRAM.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit
b8c47389d16dacf3a78c0f92e6737d09811c45a9)
Signed-off-by: Teo Hall <teo.hall@nxp.com>
Teo Hall [Fri, 30 Oct 2015 15:09:36 +0000 (10:09 -0500)]
MLK-11262-5: ARM: imx: add M4 rekick after DSM
Save M4 tcm in ddr. Copy memory after exit from DSM.
Also hold M4 in reset when entering DSM.
Signed-off-by: Teo Hall <teo.hall@freescale.com>
(cherry picked from commit
011ed0ab784eb566b68ebacea57ae3a6857b48ff)
Teo Hall [Thu, 7 Jan 2016 21:54:47 +0000 (15:54 -0600)]
MLK-11262-4: ARM: imx: add m4_tcm to dtsi
add tcm to dtsi for saving FreeRTOS image
Signed-off-by: Teo Hall <teo.hall@freescale.com>
Teo Hall [Fri, 30 Oct 2015 14:53:52 +0000 (09:53 -0500)]
MLK-11262-3: ARM: imx: Change GPC settings for Multicore LPM
change the slots to persistent to be congruent with
M4 image. Also change so that slots do read/modify/write
so that M4 settings are not overwritten.
Signed-off-by: Teo Hall <teo.hall@freescale.com>
(cherry picked from commit
eae33480b615c1586248a761ef3c6bcd9e0c59af)
Conflicts:
arch/arm/mach-imx/gpcv2.c
Teo Hall [Fri, 30 Oct 2015 14:00:36 +0000 (09:00 -0500)]
MLK-11262-2: ARM: imx: Add MU messages for LPM messages
add LPM messages for:
-M4 reporting state
-M4 Request/Release High Bus Freq
-A7 tell M4 it is ready
Signed-off-by: Teo Hall <teo.hall@freescale.com>
(cherry picked from commit
52234ae38e6e4f2b3452d807dd1c1e199be6350c)
Conflicts:
arch/arm/mach-imx/common.h
arch/arm/mach-imx/mu.c
Teo Hall [Fri, 30 Oct 2015 13:57:09 +0000 (08:57 -0500)]
MLK-11262-1: ARM: imx: add busfreq offset for M4
offset high_bus_count+1 when m4 is enabled
Signed-off-by: Teo Hall <teo.hall@freescale.com>
(cherry picked from commit
58983b6522c324affdbbeaa5b7b192a673c615a7)
Dong Aisheng [Wed, 20 Jan 2016 12:21:36 +0000 (20:21 +0800)]
MLK-12254 bcmdhd: fix warning when connect adhoc network
When connect adhoc network, we got below warning, it's caused
by network stack changes during kernel upgrade.
root@imx6qdlsolo:/mnt/nfs/vte_mx63# iw wlan0 ibss join TestAdhoc1 2412
------------[ cut here ]------------
WARNING: CPU: 1 PID: 1251 at /home/bamboo/build/4.1.X-1.0.0_ga/fsl-imx-fb/temp_build_dir/build_fsl-imx-fb/tmp/work-shared/imx6qdlsolo/kernel-source/net/wireless/ibss.c:67 wl_notify_connect_status+0x7b0/0x10f0 [bcmdhd]()
root@imx6qdlsolo:/mnt/nfs/vte_mx6Modules linked in:3# bcmdhd ov5642_camera ov5640_camera_mipi_int ov5640_camera_int mxc_dcic galcore(O) mxc_v4l2_capture ipu_bg_overlay_sdc ipu_still v4l2_int_device ipu_prp_enc ipu_csi_enc ipu_fg_overlay_sdc evbug
CPU: 1 PID: 1251 Comm: wl_event_handle Tainted: G O 4.1.8-1.0.0+g87e6c2f #1
Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree)
[<
80015d84>] (unwind_backtrace) from [<
80012728>] (show_stack+0x10/0x14)
[<
80012728>] (show_stack) from [<
80750a54>] (dump_stack+0x84/0xc4)
[<
80750a54>] (dump_stack) from [<
80032f3c>] (warn_slowpath_common+0x80/0xb0)
[<
80032f3c>] (warn_slowpath_common) from [<
80033008>] (warn_slowpath_null+0x1c/0x24)
[<
80033008>] (warn_slowpath_null) from [<
7f100060>] (wl_notify_connect_status+0x7b0/0x10f0 [bcmdhd])
[<
7f100060>] (wl_notify_connect_status [bcmdhd]) from [<
7f0f05bc>] (wl_event_handler+0x198/0x26c [bcmdhd])
[<
7f0f05bc>] (wl_event_handler [bcmdhd]) from [<
8004b588>] (kthread+0xdc/0xf4)
[<
8004b588>] (kthread) from [<
8000f528>] (ret_from_fork+0x14/0x2c)
---[ end trace
40b45ccda84900ce ]---
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Richard Zhu [Wed, 20 Jan 2016 07:10:09 +0000 (15:10 +0800)]
MLK-12280 firmware loader: iwl wifi card can't find its fw
Without FW_LOADER_USER_HELPER enable, iwl wifi cards can't
load their firmware in imx_4.1.y, enable it.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Zidan Wang [Wed, 20 Jan 2016 01:50:40 +0000 (09:50 +0800)]
MLK-12244 ASoC: fsl: Set the sound card owner field
When load sound card, the pulseaudio will using the sound card to
playback and record. It may be cause a kernel crash when the sound
card is unloaded while the playback/record is active
After setting the sound card owner field, when pulseaudio is running,
the sound card module ref-count will not be 0 and the sound card will
not be unloaded. So you should stop the pulseaudio when you want to
unload the sound card.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Xianzhong [Tue, 19 Jan 2016 08:18:21 +0000 (16:18 +0800)]
MGS-1560 [#2172] fix gpu kernel crash with invalid pointer
it is necessary to check the node object pointer before use,
otherwise the board will reboot with kernel crash.
Date: Jan 19, 2016
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Fugang Duan [Fri, 15 Jan 2016 09:35:23 +0000 (17:35 +0800)]
MLK-12271 Input: atkbd: add return value check after calling .dmi_check_system()
Add return value check after calling .dmi_check_system().
Reported by Coverity: CID18431
Signed-off-by: Fugang Duan <B38611@freescale.com>
Gao Pan [Tue, 19 Jan 2016 07:53:39 +0000 (15:53 +0800)]
MLK-12282 ARM: dts: imx6sx-sabreauto: add mlb support
Add mlb support for imx6sx-sabreauto platform.
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Dong Aisheng [Tue, 19 Jan 2016 03:30:03 +0000 (11:30 +0800)]
MLK-12170-3 dts: imx7d: move uSDHC fsl,tuning-step property into SoC.dtsi
Moving fsl,tuning-step property into SoC.dtsi due to it's mainly SoC
dependant. User could also overwrite it in board.dts for special board
requirment.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Dong Aisheng [Mon, 18 Jan 2016 13:52:14 +0000 (21:52 +0800)]
MLK-12170-2 dts: imx7d: add tuning-start-tap for usdhc
MX7D uSDHC has a bit long delay line in SoC internally, pre-set a safe
tuning start point to skip first 20 meaningless cells tuning.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Dong Aisheng [Thu, 28 Aug 2014 09:01:34 +0000 (17:01 +0800)]
MLK-12284-2 doc: syscon: add clocks as optional property
User can specify clocks in devicetree which is used for accessing the registers
in this regmap.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit
4a89ef5b579e6fb5640df099ee13939ca6d3a325)
Dong Aisheng [Wed, 27 Aug 2014 07:55:59 +0000 (15:55 +0800)]
MLK-12284-1 regmap: regmap-mmio: make clk_id optionally when getting clock
According to clock framework, the clk_id could be NULL when getting clock.
But current code relies on a non null clk_id to get clock.
Changing the code to allow a null clk_id to get clock to make it more
reasonable to use.
And the regmap_mmio_gen_context will try to get clock by default but ignore
error if not finding the clock in case some regmap access not reply on
a specific clock.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit
a60a38a5285ab27814f261ed39653c55a0a6e24b)
Dong Aisheng [Tue, 18 Nov 2014 08:03:55 +0000 (16:03 +0800)]
MLK-9501 dts: imx6sx-sdb: optimize usdhc3 pad settings
Detailed reproduce steps:
1. boot-up to Linux command prompt .
2. Plug SD3.0 UHS-I SD Card into SD3 Connector (make sure SD Card running
at SD3.0 DDR50/1.8V).
2. write data to SD3 using "dd" command (SD3_CLK running at 1.8V/50MHz).
3. capture the SD3_CLK, SD3_DATA, SD3_CMD waveforms during data write using
FET probe (>=1GHz)
4. CLK waveforms like triangular wave are observed.
HW team found that the pad setting of the SD3_CLK, SD3_DATA, SD3_CMD signal pins are
not optimized. In existing BSP, when running at SD3.0/DDR50/1.8V, SPEED/DSE/SRE
= 01/011/1 is used. They propose change it to -
SD3_CLK: SPEED/DSE/SRE = 01/110/1.
SD3_DATA/SD3_CMD: SPEED/DSE/SRE = 01/101/1.
SDHC high speed cards also had such issue(refer to MLK-9500).
We only changed the default state (<50Mhz) pad setting, for ultra high speed
state like 100Mhz and 200Mhz, it does not have such issue since they already
set to the maximum Drive Strength value.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit
69d4195c741050e0bc78d3005f8ff4f51990d1ae)
Conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
Dong Aisheng [Tue, 11 Nov 2014 13:18:12 +0000 (21:18 +0800)]
MLK-9833-2 dts: imx6sx: do not touch CAN gpios pads if M4 is enabled
CAN devices are allocated to run on M4.
So do not touch CAN pads setting if M4 is enabled.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit
9d2605e51b9ba83382c5da3a838656c9910d75a1)
Dong Aisheng [Tue, 11 Nov 2014 13:04:07 +0000 (21:04 +0800)]
MLK-9833-1 ARM: imx6sx: only set can clock parent when M4 disabled
Since CAN device is allocated to run on M4 and handled by M4 if M4 is enabled,
so we do not set CAN parent clock when M4 is enabled.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit
171a16fa6d62162e9c8cab38b9459e772c980d22)
Li Jun [Fri, 15 Jan 2016 09:17:56 +0000 (17:17 +0800)]
MLK-12173 regulator: pfuze100: add .is_enable() for pfuze100_swb_regulator_ops
If is_enabled() is not defined in its ops, regulator core will assume
this regulator is already enabled, then we never can really enable it
after disabled.
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Thu, 14 Jan 2016 06:20:57 +0000 (14:20 +0800)]
MLK-12268 usb: gadget: fsl_utp: change FSL_UTP Kconfig location
Move FSL_UTP to be under USB_MASS_STORAGE since it depends on it.
Signed-off-by: Li Jun <jun.li@nxp.com>
Shengjiu Wang [Mon, 18 Jan 2016 09:54:57 +0000 (17:54 +0800)]
MLK-12165: ASoC: fsl: imx-cs42888: remove 32k and 64k support
Revert "MLK-11623 ASoC: imx-cs42888: add 32k and 64k sample rate support"
This reverts commit
314a01f40599134086480ef3c5e89a54aeedbf1f.
In Async mode, record and playback use different samplerate, one is 32k,
another is 48kHz, there will be issue "unsupported sysclk ratio".
example case is
arecord -Dhw:0,1 -f S16_LE -r 32000 -c 2 | aplay -f S16_LE -r 32000 -c 2
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Shengjiu Wang [Mon, 18 Jan 2016 05:44:56 +0000 (13:44 +0800)]
MLK-12202: ASoC: fsl_asrc_m2m: fix dma timeout after suspend/resume
In suspend function, the complete will be set to done in callback.
After resuming, the convert will not spend time to wait the complete.
which is a wrong complete.
So in suspend function, the complete need to be reinited for next convert.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Richard Zhu [Fri, 15 Jan 2016 05:46:52 +0000 (13:46 +0800)]
MLK-12265 rpmsg: imx: set the imx rpmsg tests be module
Set the imx rpmsg tests to be module in defaut.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
(cherry picked from commit
20adce35ef6abfd6b0a52207febe069c7f09a1be)
Anson Huang [Wed, 2 Sep 2015 17:05:48 +0000 (01:05 +0800)]
MLK-11492 ARM: imx: keep weak 2p5 on for USB vbus wakeup
Since i.MX6SX, if USB vbus wake up is enabled, weak 2P5
needs to be on even if the DRAM is LPDDR2, previously, we need
to set stop_mode_config to keep 2P5 on, so enter DSM,
if USB vbus wakeup is enabled, we need to keep weak 2P5 on.
Signed-off-by: Anson Huang <b20788@freescale.com>
(cherry picked from commit
1ca4dffee79055ea95c59e27bab50bc5080310f5)
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Bai Ping [Fri, 15 Jan 2016 12:56:38 +0000 (20:56 +0800)]
MLK-12270 ARM: imx: upate the gpc setting using read-modify-update flow
The GPC setting should be modified using the read-modify-update flow.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Peter Chen [Sat, 13 Sep 2014 07:10:04 +0000 (15:10 +0800)]
MLK-12247 usb: chipidea: udc: disconnect host if system enters suspend
It is better we disconnect (pulldown dp) host when the system enters
suspend if the host did not suspend bus beforehand, it can avoid
unnecessary udc suspend irq during usb enters suspend. This unexpected
suspend irq occurs due to the udc still pulls up dp, but the host
suspends bus due to it finds the device has disconnected. The device
turns off high speed terminal will be considered a disconnection event
from the host.
It also fixes the bug ENGR00325724 describes.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit
9d9ddd142cdbfb4bcbaae161a452596668441b1a)
Li Jun [Wed, 13 Jan 2016 03:57:10 +0000 (11:57 +0800)]
MLK-12248-3 ARM: imx6ul-14x14-evk: add tx-d-cal property for usbphy
Set tx-d-cal to be 0x5 to improve usb signal quality.
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 13 Jan 2016 03:56:15 +0000 (11:56 +0800)]
MLK-12248-2 ARM: imx6sl-evk: add tx-d-cal property for usbphy
Set tx-d-cal to be 0x5 to improve usb signal quality.
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 13 Jan 2016 03:53:31 +0000 (11:53 +0800)]
MLK-12248-1 ARM: imx6qdl-sabresd: add tx-d-cal property for usbphy
Set tx-d-cal to be 0x5 to improve usb signal quality for all imx6qdl
sabresd boards.
Signed-off-by: Li Jun <jun.li@nxp.com>
Peter Chen [Mon, 2 Feb 2015 08:29:00 +0000 (16:29 +0800)]
MLK-10196-1 ARM: imx6: change anatop 3p0 property
- Delete regulator-always-on for 3p0 since it needs to enable/disable
on the fly.
- Add "anatop-enable-bit" property as the offset of enable bit for
3p0, 1p1, and 2p5.
- USB PHY refers "reg_3p0" phandle at its node.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit
c2c2cbc46fda3e8ea798d270a3410f351af9d1ca)
Anson Huang [Fri, 15 Jan 2016 01:33:18 +0000 (09:33 +0800)]
MLK-12263 ARM: imx: disable arm_arch_timer for i.MX7D nosmp
When SMP is deselected, ARM_ARCH_TIMER is still enabled while
broadcast time is disabled, so when system enters WAIT mode,
ARM platform's clock will be disabled, then system tick timer
will stop and cause system stay at WAIT mode and timer event
will NOT come as expected.
To fix this issue, we do runtime check in kernel boot up,
if SMP is NOT enabled, ARM_ARCH_TIMER will be disabled and
using GPT timer always.
we have to put this check in early stage before common
arm_arch_timer driver probed.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Tue, 22 Sep 2015 17:10:25 +0000 (01:10 +0800)]
MLK-11630 ARM: imx: register imx_clk_gate3 as fixed_factor when M4 is enabled
As clock root does NOT have domain control on i.MX7D,
and the clock root gate does NOT consume much power,
so it is acceptable to leave clock root always enabled
when M4 is enabled, this is suggested by design team,
otherwise, need to use shared memory to control clk
root between A7 and M4, which is NOT friendly.
Signed-off-by: Anson Huang <b20788@freescale.com>
(cherry picked from commit
bc4295b3aed83e426c49aa48f39224d2102048dd)
Anson Huang [Thu, 14 Jan 2016 11:13:34 +0000 (19:13 +0800)]
MLK-12136-3 ARM: imx: adjust ddr frequency scale flow on i.MX7D TO1.1
i.MX7D TO1.1 updates the DDR script, ddr frequency scale flow
should be updated accordingly.
Add runtime revision check to support both TO1.0 and TO1.1.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Wed, 13 Jan 2016 14:36:26 +0000 (22:36 +0800)]
MLK-12136-2 ARM: imx: add ddr phy registers restore for i.MX7D
i.MX7D TO1.1 adds some DDR PHY register settings to fix the CKE
timing issue, when fast MIX off in DSM, need to restore them
to make sure the DDR PHY setting is correct.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Wed, 13 Jan 2016 10:59:56 +0000 (18:59 +0800)]
MLK-12136-1 ARM: imx: adjust slot control to meet design requirement on i.MX7D
Design team recommend to put SCU/C0/C1 in same power up slot
to avoid reset timing issue of debug mode, adjust the power
up slot and timing per their requirement.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Fancy Fang [Thu, 14 Jan 2016 01:59:52 +0000 (09:59 +0800)]
MLK-12251 video: mipi_dsi: fix an unsigned compared against zero issue
Compared 'mux' against zero is meaningless. So correct this.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Tue, 12 Jan 2016 10:08:09 +0000 (18:08 +0800)]
MLK-12218 video: mxsfb: fix a potential unitialized pointer dereference
The 'rgb' pointer may be dereferenced before being initialized.
So correct this.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Tue, 12 Jan 2016 10:03:39 +0000 (18:03 +0800)]
MLK-12217 video: mxsfb: fix an uninitialized variable usage
The 'vmode' variable is used before it is initialized.
So initialize it before that.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Tue, 12 Jan 2016 09:34:57 +0000 (17:34 +0800)]
MLK-12216 video: mipi_dsi: fix the potential uninitalized variable usage
The 'val' variable may be used before uninitialized.
So initialize it at the begining.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Tue, 12 Jan 2016 09:29:19 +0000 (17:29 +0800)]
MLK-12215 video: mxsfb: free the 'timings' after using it to avoid resource leak
The 'timings' is allocated by 'of_get_display_timings()'
dynamically. So it should be freed when it is not used
anymore.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Wed, 13 Jan 2016 07:11:23 +0000 (15:11 +0800)]
MLK-12213 dma: pxp-v2: fix the potential resource leak issue reported by Coverity
There may be potential memory leak when the 'desc' allocation failed.
The previous allocated descriptors should be freed when the allocation
failed.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fugang Duan [Wed, 13 Jan 2016 10:11:41 +0000 (18:11 +0800)]
MLK-12257 ARM: dts: imx6qdl/imx6sx: add enet magic packet support
Add imx6q/dl/qp sabresd, imx6sx sabreauto magic packet support.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Dong Aisheng [Wed, 13 Jan 2016 08:04:06 +0000 (16:04 +0800)]
MLK-12252 dts: imx7d: move lpsr pin definition into a separated head file
Originally we put all the definition of both imx7d normal pins and
lpsr pins in imx7d-pinfunc.h which may lead to a easy failure of
user by wrongly put the normal pins of &iomuxc under &iomuxc_lpsr
node due to user has no idea about the difference, then pinctrl
driver will take the wrong value to set which may potentially break
other devices to work.
We have met this issue several times and it's hard to debug when it
happens.
This patch separates the lpsr pins into a dedicated head file
to give user a reminder to put lpsr pins group under the correct
pinctrl device node.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
(cherry picked from commit
c524454c24fd9e5e329351dd154cbd24d47d0e0e)
Peng Fan [Wed, 13 Jan 2016 06:50:29 +0000 (14:50 +0800)]
MLK-12189 imx: mx7d correct iomux error for SAI3 and ENET2_EN
pinmux settings using GPIO1_IO0[0-7] should use iomuxc_lpsr,
but not iomuxc. If use iomuxc, you will set wrong register
and may impact other functions.
Without this patch, SAI3_MCLK use GPIO1_IO03 pinmux and impacts
QSPI function.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Gao Pan [Tue, 12 Jan 2016 10:21:20 +0000 (18:21 +0800)]
MLK-12205 ARM: dts: 6sx-ard: add sensor node
Add sensor node in 6sx-ard dts. The sensors are mma8451,
mag3110 and isl29023.
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Anson Huang [Sat, 9 Jan 2016 16:38:37 +0000 (00:38 +0800)]
MLK-12203-2 ARM: imx: adjust loop number to delay ~20us for i.MX7D low power idle
ARM does NOT execute one instruction every cycle, the bus bandwidth,
cache status etc. would impacts the instruction execution time, so we
can NOT just calculate the delay time by ARM frequency, this patch
adjusts loop number to get a ~20us delay, measured via GPIO pin.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Sat, 9 Jan 2016 16:02:00 +0000 (00:02 +0800)]
MLK-12203-1 ARM: imx: adjust i.MX7D DDR retention mode for LPSR
Per design team's recommendation, for i.MX7D TO1.1
LPSR mode, as IOMUXC will lost power, so it needs to
use TO1.0's flow to avoid CKE toggle during retention,
but it has a limitation of POR reset fail during LPSR.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Robin Gong [Thu, 26 Nov 2015 09:05:07 +0000 (17:05 +0800)]
MLK-11909-2 regulator: anatop-regulator: Dereference null return value (NULL_RETURNS)
Dereference null return value (NULL_RETURNS).
Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit
e5d41f4bbded2f2b948a13d4dc04596cd896b072)
Robby Cai [Tue, 12 Jan 2016 08:35:12 +0000 (16:35 +0800)]
MLK-12179 epdc: use outer_flush_range instead of outer_flush_all
l2c210_flush_all, the underlying implementation of outer_flush_all() has the
constraint on 4.1 kernel that, it can not be called under interrupt context.
However the EPDC driver can not guarantee this condition at calling point, thus
it could cause kernel dump. This has been observed on i.MX6SL, and theorically
on other platforms like i.MX6DL (using PL310 L2 cache). So use outer_flush_range
to fix it.
Although we don't have such issue on i.MX7D (not PL310 L2), we still prefer to
use outer_flush_range() for legacy software dithering support and for easy
maintenance. Then we do the change in both EPDC driver.
------------[ cut here ]------------
Kernel BUG at
800204d8 [verbose debug info unavailable]
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ARM
Modules linked in: galcore(O) evbug
CPU: 0 PID: 842 Comm: kworker/u3:1 Tainted: G O 4.1.8-1.0.0+ge352a0b #1
Hardware name: Freescale i.MX6 SoloLite (Device Tree)
Workqueue: EPDC Submit epdc_submit_work_func
task:
a8a8f900 ti:
a92a4000 task.ti:
a92a4000
PC is at l2c210_flush_all+0x5c/0x60
LR is at epdc_submit_work_func+0x684/0xbf8
pc : [<
800204d8>] lr : [<
8030702c>] psr:
600b0013
sp :
a92a5e90 ip :
a9150c8c fp :
a8480518
r10:
a84a28c0 r9 :
00000008 r8 :
a9150644
r7 :
a91512e0 r6 :
0000012c r5 :
a91512e0 r4 :
a91512dc
r3 :
a00b0013 r2 :
80b184a0 r1 :
701fe019 r0 :
f4a02000
Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel
Control:
10c53c7d Table:
a943404a DAC:
00000015
Process kworker/u3:1 (pid: 842, stack limit = 0xa92a4210)
Stack: (0xa92a5e90 to 0xa92a6000)
5e80:
a92a5ed0 8005d058 0000bbc2 a851d4c0
5ea0:
00000000 a9150000 a8480000 a8480440 00000190 00000193 55555556 a84a28c0
5ec0:
a8480518 a8500000 80b18088 a94f3900 00000000 00000000 00000190 0000012c
5ee0:
a94f3900 a8480518 a87e8d80 a8479000 a845a200 00000020 00000000 a8479000
5f00:
a8479000 80046458 a92a4000 a8479000 a8479014 a8479000 a87e8d98 a8479014
...
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Sandor Yu [Tue, 12 Jan 2016 09:30:48 +0000 (17:30 +0800)]
MLK-12240: mxc cec: Fix potential memory leak issue
Fix mxc cec driver potential memory leak issue.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Bai Ping [Tue, 12 Jan 2016 08:27:46 +0000 (16:27 +0800)]
MLK-12219 thermal: imx: unregister busfreq_notifier in thermal_remove
unregister the busfreq_notifier when the thermal driver is removed.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Robin Gong [Tue, 12 Jan 2016 07:16:45 +0000 (15:16 +0800)]
MLK-12211-2: ARM: configs: imx_v7_defconfig: enable CONFIG_POWER_RESET_SYSCON_POWEROFF
On v4.1, use syscon-poweroff driver instead of poweroff interface in
rtc-snvs driver.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Tue, 12 Jan 2016 07:12:03 +0000 (15:12 +0800)]
MLK-12211-1: ARM: dts: imx6/imx7: enable snvs-poweroff
enable snvs-poweroff driver on imx6sx(except sabreauto board),imx6ul and
imx7d all boards.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robby Cai [Fri, 8 Jan 2016 10:51:07 +0000 (18:51 +0800)]
MLK-12190 ARM: dts: imx7d-sdb-revb: change pad setting to remove stripe
Change GPIO pad setting to control EPDC/ENET signals on REV B board from 0x59
to default one 0x14 in order to remove stripe when do EPDC unit test.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Gao Pan [Mon, 11 Jan 2016 08:30:05 +0000 (16:30 +0800)]
MLK-12185 mlb: imx: fix the operation for mlb status in mlb_isr
As a result that the wrong operation is used for the mlb status
in mlb_isr(), some results are independent of their operations.
for example:
rx_cis = (cdt_val[2] & ~MASK) >> SHIFT, where, MASK = 0xf0000000
and SHIFT = 28. So, the result is always 0 regardless of the values
of its operands.
This patch fixes the operation for mlb status in mlb_isr().
(reported by coverity check)
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Fugang Duan [Mon, 11 Jan 2016 09:42:44 +0000 (17:42 +0800)]
MLK-12188 dmaengine: fsl-edma: add fsl_chan->edesc NULL check
Add fsl_chan->edesc NULL when calling .fsl_edma_desc_residue() to avoid
NULL pointer access.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Fugang Duan [Mon, 11 Jan 2016 08:54:30 +0000 (16:54 +0800)]
MLK-12184 drm/imx: imx-ldb: add mux id check
Add mux id check and transfer a valid mux to .imx_ldb_set_clock().
Signed-off-by: Fugang Duan <B38611@freescale.com>
Fugang Duan [Mon, 11 Jan 2016 08:10:10 +0000 (16:10 +0800)]
MLK-12181 misc: at25: Cleaning up missing null-terminate in conjunction with strncpy
Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Fugang Duan [Mon, 11 Jan 2016 07:44:28 +0000 (15:44 +0800)]
MLK-12180 net: fec: add return value check after calling .of_property_read_u32()
Add return value check after calling .of_property_read_u32() to avoid
the warning reported by coverity.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Fugang Duan [Mon, 11 Jan 2016 06:40:32 +0000 (14:40 +0800)]
MLK-12176 Input: ads7846: add return value check after calling .of_property_read_u32()
Add return value check after calling .of_property_read_u32().
The issue was reported by coverity.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Robin Gong [Mon, 11 Jan 2016 09:25:33 +0000 (17:25 +0800)]
MLK-12186: ARM: imx: clk-imx6q: correct gpu2d_core_clock on i.mx6dl
On i.mx6dl, gpu2d_core_clock share with gpu3d_shader_clock, thus, no need
change gpu2d_core_clock anymore, since gpu3d_shader has already change.
This patch also fix the below boot warning, since there is no pll2_pfd1_594m
in gpu2d_core_sel:
[ 0.000000] failed to set parent of clk gpu2d_core_sel to pll2_pfd1_594m: -22
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Xianzhong [Mon, 11 Jan 2016 10:49:56 +0000 (18:49 +0800)]
MGS-1535 gpu: update 5.0.11.p8 driver copyright
Updated 5.0.11.p8 driver copyright from 2015 to 2016
Date: Jan 11, 2016
Signed-off-by: Xianzhong <b07117@freescale.com>
Robin Gong [Mon, 11 Jan 2016 02:23:55 +0000 (10:23 +0800)]
MLK-12172: ARM: dts: imx7d-sdb-m4: disable reg_can2_3v3
Disable can2 is not enough, since the reg_can2_3v3 will be turned off by
the regulator framwork and that will impact can2 in m4 side even if can2
driver disabled in A7 side.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
(cherry picked from commit
f1bd999df30c6e88c1a967856304086aa72f2db0)
Robin Gong [Mon, 11 Jan 2016 05:41:23 +0000 (13:41 +0800)]
MLK-12175: dma: imx-sdma: fix issues repoted by Coverity
Fix two code issues, but not function break or potential bug:
--Unsigned compared against 0 (NO_EFFECT)
--Wrong size argument (SIZEOF_MISMATCH)
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Thu, 16 Oct 2014 02:30:46 +0000 (10:30 +0800)]
MLK-9699: ARM: dts: imx6: enable spi dma support
This patch cherry-pick from the below commit, but make little change:
align i.mx6dl with i.mx6q, since TKT238285 should be exit on other chips
although it can't reproduced by SPI-NOR, now there is official workaround
for this bug(
a619a00e11a67b00805b9148f004a3c94d54f863). So this patch just
enable dma support on i.mx6sl and i.mx6sx.
*****************
There is one BUG(TKT238285) in ecspi module in DMA mode,but
it only found on i.mx6dl now, so enable dma support on all
i.mx6 chips except i.mx6dl
Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit
fa9ef1796819aadbb1ea184613d4fdd3de1b46c6)
(cherry picked from commit
cfedad0e853fbcd5e57591b559734d54cdb782c8)
Liu Ying [Mon, 11 Jan 2016 02:51:21 +0000 (10:51 +0800)]
MLK-12142 video: fbdev: mxc_ipuv3_fb: Set non-zero blank to FB_BLANK_POWERDOWN
We have implemented only two states for blank which are FB_BLANK_UNBLANK and
FB_BLANK_POWERDOWN. Let's map all the other blank states(FB_BLANK_NORMAL,
FB_BLANK_VSYNC_SUSPEND and FB_BLANK_HSYNC_SUSPEND) to FB_BLANK_POWERDOWN,
since all of them make the screen be blanked. This may avoid blanking a blanked
screen by setting the state to different non-zero values.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
Haibo Chen [Fri, 8 Jan 2016 12:15:05 +0000 (20:15 +0800)]
MLK-12140 ARM: dts: imx7d-sdb-epdc: add EPDC touch support for imx7d-sdb
EPDC board has touch screen, this patch add touch support on imx7d-sdb TO1.1
board, due to the touch pin conflict with UART5 and GPMI, so disable UART5 in
imx7d-sdb-epdc.dtsi. For GPMI, it default disabled in imx7d-sdb.dts, so do not
impact touch.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Anson Huang [Fri, 8 Jan 2016 16:20:25 +0000 (00:20 +0800)]
MLK-12162 ARM: imx: correct SCU PGC setting on i.MX7D
SCU PGC register is different from others, it contains
other timing settings, so we can NOT just program 0/1
to disable/enable SCU power gating, but need to only
program bit 0, correct it for all modules' PGC settings.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Fugang Duan [Fri, 8 Jan 2016 05:36:05 +0000 (13:36 +0800)]
MLK-12161 tty: serial: imx: only enable RTSD interrupt for hw flow control
Only enable RTSD interrupt for hw flow control, otherwise RTS_B signal
has some external signal disturbance without config RTS_B select input.
Signed-off-by: Fugang Duan <B38611@freescale.com>
(cherry picked from commit:
471e8c43aca3)
Conflicts:
drivers/tty/serial/imx.c
Fugang Duan [Fri, 8 Jan 2016 05:24:41 +0000 (13:24 +0800)]
MLK-12160 net: fec: disable all irqs during normal suspend
During normal suspend process, disable all irqs to avoid the late
TXF interrupt comming after clocks disabled that accessing registers
cause system hang.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Fugang Duan [Fri, 8 Jan 2016 07:25:49 +0000 (15:25 +0800)]
MLK-12145 ARM: dts: imx6ul-pinfunc: update imx6ul iomux headers
- Update i.MX6ul iomux haeders to
b151130 version.
- Merge the origin two pinfunc:
MX6UL_PAD_BOOT_MODE0__GPIO5_IO10
MX6UL_PAD_BOOT_MODE1__GPIO5_IO11
Signed-off-by: Fugang Duan <B38611@freescale.com>
(cherry picked and merged from commit:
f9bab6534f9f)
Han Xu [Thu, 7 Jan 2016 19:21:02 +0000 (13:21 -0600)]
MLK-12153: mtd: fsl-quadspi: fix the QSPI dereference null return value found by coverity
check the return value to avoid the dereference null return value when
parsing device tree.
Signed-off-by: Han Xu <han.xu@nxp.com>
Robby Cai [Thu, 7 Jan 2016 10:19:34 +0000 (18:19 +0800)]
MLK-12144 epdc: fix gpio active level to enable epdc signal
There's a GPIO pin to enable epdc signals on some platform like i.MX7D SDB.
However, it's changed from active-low to active-high on i.MX7D SDB RevB board.
Enhance the driver to handle the active level automatically,
then only need to adjust gpio as well as active level in dts file if necessary.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Frank Li [Wed, 6 Jan 2016 22:23:22 +0000 (16:23 -0600)]
MLK-12051: enable KCONFIG and KCONFIG_PROC
Fixed no /proc/config.gz is found in /proc.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Han Xu [Fri, 9 Oct 2015 15:16:24 +0000 (10:16 -0500)]
MLK-11719-1: imx: config: enable debugfs in mfg_defconfig
enable debugfs in mfg_defconfig for mfgtool to read bch layout setting
from debugfs.
Signed-off-by: Han Xu <b45815@freescale.com>
(cherry picked from commit
a4a31e73897b51b73b1be994d36759584407914f)
Robin Gong [Wed, 6 Jan 2016 03:06:45 +0000 (11:06 +0800)]
MLK-12126 ARM: dts: imx6/imx7d: correct wdog pinctrl setting
We move WDOG_B pinctrl setting from pinctrl_hog to wdog driver, so need to
remove the original setting in pinctl_hog device node, otherwise the below
warning message will be caught:
[ 1.284161] imx6ul-pinctrl
20e0000.iomuxc: pin MX6UL_PAD_LCD_RESET already requested by
20e0000.iomuxc; cannot claim for
20bc000.wdog
[ 1.294990] imx6ul-pinctrl
20e0000.iomuxc: pin-69 (
20bc000.wdog) status -22
[ 1.300689] imx6ul-pinctrl
20e0000.iomuxc: could not request pin 69 (MX6UL_PAD_LCD_RESET) from group wdoggrp on device
20e0000.iomuxc
[ 1.311550] imx2-wdt
20bc000.wdog: Error applying setting, reverse things back
Signed-off-by: Robin Gong <b38343@freescale.com>
Anson Huang [Wed, 6 Jan 2016 10:40:31 +0000 (18:40 +0800)]
MLK-12093-2 ARM: imx: correct coding error
Correct coding error and use macro define instead
of register value.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Thu, 24 Dec 2015 08:59:17 +0000 (16:59 +0800)]
MLK-12093-1 ARM: imx: adjust latency value of low power idle on imx7d
Per design team's suggestion, when enter/exit DDR PADs low power
mode, ~10us delay is necessary to make sure signal stable enough
for DDR operation, so add ~20us delay(10us margin) and adjust
latency value of low power idle.
Optimize enter/exit self-refresh flow of DDRC according to
design team's suggestion.
Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
Dong Aisheng [Mon, 4 Jan 2016 12:55:55 +0000 (20:55 +0800)]
MLK-12064 can: flexcan: fix timeout when set small bitrate
Current we can meet timeout issue when setting a small bitrate
like 10000 as follows:
root@imx6qdlsolo:~# ip link set can0 up type can bitrate 10000
A link change request failed with some changes committed already.
Interface can0 may have been left with an inconsistent configuration,
please check.
RTNETLINK answers: Connection timed out
It is caused by calling of flexcan_chip_unfreeze() timeout.
Originally the code is using usleep_range(10, 20) for unfreeze operation,
but the patch (
8badd65 can: flexcan: avoid calling usleep_range from
interrupt context) changed it into udelay(10) which is only a half delay
of before, there're also some other delay changes.
After only changed unfreeze delay back to udelay(20), the issue is gone.
So other timeout values are kept the same as
8badd65 changed.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Haoran Wang [Wed, 25 Nov 2015 08:48:11 +0000 (16:48 +0800)]
MA-7253 bcmdhd: avoid null interface before update tx status
Avoid to access the null interface before update tx status.
This patch workaround to fix the panic when the p2p connection
disconnect in the p2p stress test. The interface will be
released during the disconnect process.
Fixed coding style issue by Aisheng.
Acked-by: Dong Aisheng <aisheng.dong@freescale.com>
Signed-off-by: Haoran Wang <b50027@freescale.com>
(cherry picked from commit
4e093820e74a83d86f3bb0dadc1054e3ddb8248c)
Dong Aisheng [Sat, 31 Oct 2015 08:32:09 +0000 (16:32 +0800)]
MLK-11794 bcmdhd: prevent driver to use scatter list DMA if host not support
Current driver will meet the following warning on MX6SL platform which does
not support ADMA.
It is caused by the driver is using fixed scatter gather DMA not matter whether
the host supports or not. Then the host without ADMA capability will warning
if found the DMA sg_count is non-1.
Change the driver a bit to avoid multi DMA scatter list if found the
host->max_segs is only 1 to fix the issue.
root@imx6slevk:~# udhcpc -i wlan0
udhcpc (v1.23.1) started
Sending discover...
Sending select for 192.168.1.11...
Lease of 192.168.1.11 obtained, lease time 86400
/etc/udhcpc.d/50default: Adding DNS 192.168.1.1
root@imx6slevk:~# ------------[ cut here ]------------
WARNING: CPU: 0 PID: 954 at /home/jenkins/jobs/Standalone-X11_with_mfgtools/workspace/temp_build_dir/build_fsl-imx-internal-x11/tmp/work-shared/imx6slevk/kernel-source/drivers/mmc/host/sdhci.c:839 sdhci_send_command+0xc64/0xd10()
Modules linked in: bcmdhd evbug [last unloaded: bcmdhd]
CPU: 0 PID: 954 Comm: dhd_dpc Tainted: G W 3.14.52-1.1.0_ga+g76946e8 #1
[<
80014a68>] (unwind_backtrace) from [<
80011758>] (show_stack+0x10/0x14)
[<
80011758>] (show_stack) from [<
80720180>] (dump_stack+0x7c/0xbc)
[<
80720180>] (dump_stack) from [<
80031df8>] (warn_slowpath_common+0x70/0x8c)
[<
80031df8>] (warn_slowpath_common) from [<
80031eb0>] (warn_slowpath_null+0x1c/0x24)
[<
80031eb0>] (warn_slowpath_null) from [<
804d5d2c>] (sdhci_send_command+0xc64/0xd10)
[<
804d5d2c>] (sdhci_send_command) from [<
804d74e8>] (sdhci_request+0xc0/0x1f0)
[<
804d74e8>] (sdhci_request) from [<
804c218c>] (__mmc_start_req+0x60/0x84)
[<
804c218c>] (__mmc_start_req) from [<
804c25a4>] (mmc_wait_for_req+0x10/0x20)
[<
804c25a4>] (mmc_wait_for_req) from [<
7f27ff6c>] (sdioh_request_packet_chain+0x368/0x400 [bcmdhd])
[<
7f27ff6c>] (sdioh_request_packet_chain [bcmdhd]) from [<
7f280da4>] (sdioh_request_buffer+0x124/0x294 [bcmdhd])
[<
7f280da4>] (sdioh_request_buffer [bcmdhd]) from [<
7f27f6dc>] (bcmsdh_send_buf+0x94/0x108 [bcmdhd])
[<
7f27f6dc>] (bcmsdh_send_buf [bcmdhd]) from [<
7f28e98c>] (dhd_bcmsdh_send_buf.constprop.25+0x80/0x220 [bcmdhd])
[<
7f28e98c>] (dhd_bcmsdh_send_buf.constprop.25 [bcmdhd]) from [<
7f28f454>] (dhdsdio_txpkt.constprop.24+0x928/0xa2c [bcmdhd])
[<
7f28f454>] (dhdsdio_txpkt.constprop.24 [bcmdhd]) from [<
7f28f6b0>] (dhdsdio_sendfromq+0x158/0x3c4 [bcmdhd])
[<
7f28f6b0>] (dhdsdio_sendfromq [bcmdhd]) from [<
7f2913d4>] (dhdsdio_dpc+0x2e8/0x1034 [bcmdhd])
[<
7f2913d4>] (dhdsdio_dpc [bcmdhd]) from [<
7f24a270>] (dhd_dpc_thread+0xe8/0x124 [bcmdhd])
[<
7f24a270>] (dhd_dpc_thread [bcmdhd]) from [<
8004ca6c>] (kthread+0xcc/0xe4)
[<
8004ca6c>] (kthread) from [<
8000e500>] (ret_from_fork+0x14/0x34)
Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
(cherry picked from commit
77ff69e3d3a82c4fcf2d6c6d2a904d4fc1793542)
Dong Aisheng [Thu, 5 Nov 2015 07:52:09 +0000 (15:52 +0800)]
MLK-11833 bcmdhd: pull back sdpcm_hdrlen length from old skb for new skb
Pull back sdpcm_hdrlen length from old skb as new skb here
is passed to postprocessing.
This is a generic fix. We must have it regardless of host is
non scatter-gather or scatter gather capable.
Suggested by: Vinayak Kamath <vinayak.kamath@broadcom.com>
Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
(cherry picked from commit
45c96b8881eaa2b073b9dfa2a44229accd7409b7)
(cherry picked from commit
b72fea1818e92d18affe88a90f6f2460eab74360)
Dong Aisheng [Thu, 29 Oct 2015 09:37:51 +0000 (17:37 +0800)]
MLK-11790 dts: imx6: fix wlreg_on regulator always on issue
wlreg_on regulator always on will make WiFi module unable to do reset
during rmmod, then the re-insmod will fail.
In stead of make wlreg_on always on, we make vmmc regulator always on
for BT to work properly.
Then WiFi can still function well on wlreg_on regulator enable/disable.
Fixes: commit
f17b5e5be (dts: mx6ul evk: set regulator wlreg_on always on)
Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
(cherry picked from commit
e92b727494b10c7a13e9491f55fc07a7ed7622a3)
Robby Cai [Mon, 4 Jan 2016 11:26:31 +0000 (19:26 +0800)]
MLK-12054-2 defconfig: enable MIPI DSI for i.MX6QDL
Enable MIPI DSI option
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Mon, 4 Jan 2016 11:19:59 +0000 (19:19 +0800)]
MLK-12054-1 media: video: fix multiple definition error in MIPI DSI driver
When enable CONFIG_FB_MXC_MIPI_DSI, meet following compiling error.
drivers/video/fbdev/mxc/mipi_dsi_samsung.o: In function `mipi_dsi_pkt_write':
mipi_dsi_samsung.c:(.text+0x818): multiple definition of `mipi_dsi_pkt_write'
drivers/video/fbdev/mxc/mipi_dsi.o:mipi_dsi.c:(.text+0xa74): first defined here
drivers/video/fbdev/mxc/mipi_dsi_samsung.o: In function `mipi_dsi_pkt_read':
mipi_dsi_samsung.c:(.text+0x9d8): multiple definition of `mipi_dsi_pkt_read'
drivers/video/fbdev/mxc/mipi_dsi.o:mipi_dsi.c:(.text+0xc5c): first defined here
drivers/video/fbdev/mxc/mipi_dsi_samsung.o: In function `mipi_dsi_dcs_cmd':
mipi_dsi_samsung.c:(.text+0xa88): multiple definition of `mipi_dsi_dcs_cmd'
drivers/video/fbdev/mxc/mipi_dsi.o:mipi_dsi.c:(.text+0xdb0): first defined here
make[4]: *** [drivers/video/fbdev/mxc/built-in.o] Error 1
make[3]: *** [drivers/video/fbdev/mxc] Error 2
make[2]: *** [drivers/video/fbdev] Error 2
make[1]: *** [drivers/video] Error 2
move three dsi packet related functions to mipi_dsi_info
structure. This will avoid the multiple definition compiling
issue. This is what the commit
f54c7527895575a2e474b17a4752724977b898ea does
in 3.14.y
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Mon, 4 Jan 2016 09:20:02 +0000 (17:20 +0800)]
MLK-12103 media: capture: ov5640_mipi: add more delay for camera to stay stable
For power saving, the camera is set ON/OFF by 'PWDN' pin.
However, the DQBUF timeout problems have been observed occasionally when
do the resolution switch for the camera. The reason could be that the power
for the camera is set to off then on when do the switch, but the delay time
is not enough for camera to go stable. The patch sets it to an empirical
value and it has passed over 3-day stress test.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Liu Ying [Mon, 4 Jan 2016 02:49:17 +0000 (10:49 +0800)]
MLK-11759 mxc IPUv3: common: Config IPU_CONF correctly in ipu_enable_channel()
The register IPU_CONF contains several dedicated enable bits for IPU internal
modules. When we enable an IPU logic channel, e.g., MEM_BG_SYNC, by calling
the function ipu_enable_channel(), we should enable the necessary IPU internal
modules for that logic channel instead of touching other irrelevant modules.
This may most definitely keep the steps for enabling a logic channel steady
if no IPU internal module is shared by different logic channels.
An known issue is caused by breaking this rule: we are likely to switch the
display pixel clock source from IPU internal HSP clock to external clock when
enabling a display which is driven by MEM_BG_SYNC. This operation is safe if
the relevant DI enable bit in IPU_CONF is zero. In case another task, e.g.,
MEM_PP_MEM, is being enabled in parallel, it may accidently set the DI enable
bit to one before the pixel clock source is switched, which may cause the
display engine malfunction. To fix this issue, this patch configures the
register IPU_CONF correctly in the function ipu_enable_channel() according to
specific IPU logic channels.
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
Richard Zhu [Mon, 28 Dec 2015 06:11:26 +0000 (14:11 +0800)]
MLK-12081 ARM: dts: imx6qp-sabresd: remove the power on gpio
In regulator implementation, the gpio power on is used
as the fixed regulator, it is already manipulated by
the regulator driver, and always enabled.
Remove the power on gpio in pcie dts
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Xianzhong [Thu, 31 Dec 2015 09:32:44 +0000 (17:32 +0800)]
MGS-1274-2 gpu: Integrate 5.0.11.p8 kernel driver
Integrate the kernel part for 5.0.11.p8 gpu driver release
Signed-off-by: Xianzhong <b07117@freescale.com>
Richard Zhu [Fri, 13 Mar 2015 07:38:56 +0000 (15:38 +0800)]
MLK-10456-2 ata: imx: add the reset for 6qp sata
- add the sata phy power down and phy reset for 6qp
sata
Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit
b1270554354d46cf7676e354e63ec4f11766e6f6)
Richard Zhu [Fri, 9 Oct 2015 06:43:24 +0000 (14:43 +0800)]
MLK-11681-2 ata: imx: enable sata on imx6qp
Since the version of the imx6qp's ahci controller
is same to the version of imx6q ahci controller.
So, this work-around should be applied to imx6qp
ahci too.
Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit
31a7eab5be9843263535306dbaa08592b66714e5)
Richard Zhu [Fri, 9 Oct 2015 06:41:10 +0000 (14:41 +0800)]
MLK-11681-1 ARM: imx: enable sata on imx6qp sdb board
enable sata support on imx6qp sdb board.
Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit
8b08d0e657a121136eebe5bb6a998b7c9a6bff25)
Peter Chen [Mon, 28 Dec 2015 06:24:11 +0000 (14:24 +0800)]
MLK-12087 ARM: dts: imx6ul-9x9-evk.dts: add dual-role support for otg port
Add dual-role support for imx6ul-9x9 evk board, the full otg function
is not supported at this board due to the vbus can't be controlled
by software.
Signed-off-by: Peter Chen <peter.chen@freescale.com>