summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-07-07MLK-11001 ARM: dts: Disable the SD1 VSELECT for mx7d 19x19 lpddr3 arm2 boardrel_imx_3.14.38_6ul7d_betaYe.Li
The VSELECT for 1.8V does not work on PMIC board, so should not use it for SD1. Signed-off-by: Ye.Li <Ye.Li@freescale.com> (cherry picked from commit 7c8fbfea57590904df4f9ed8d5d3bbae4d27a597)
2015-07-07MLK-10507 video: mxsfb: clear vsync and frame_done irqs immediately in ISRFancy Fang
The vsync and frame_done irqs should be cleared in the ISR. Otherwise, the unrequired irq may be triggered in a wrong moment. Signed-off-by: Fancy Fang <chen.fang@freescale.com>
2015-07-03MLK-11206: input: misc: fxls8471: support ±2g/±4g/±8g dynamically selectionGao Pan
Support ±2g/±4g/±8g dynamically selection for motion sensor fxls8471. Set the sensor mode to standby mode before changing the scale range with the command "echo 0 > enable". The scale range can be changed with the command "echo 0/1/2 > range". Signed-off-by: Gao Pan <b54642@freescale.com>
2015-07-03MLK-11218: misc: fxos8700: support ±2g/±4g/±8g dynamicallyGao Pan
Support ±2g/±4g/±8g dynamically selection for motion sensor fxos8700. Set the sensor mode to standby mode before changing the scale range with the command "echo 0 > enable". The scale range can be changed with the command "echo 0/1/2 > range". Signed-off-by: Gao Pan <b54642@freescale.com>
2015-07-03MLK-11133: mtd:gpmi: support runtime pm for gpmi nandHan Xu
support runtime PM on gpmi nand to save the cost to enable/disable clock in each NAND IO. The driver also claim high-freq bus when resumed. Signed-off-by: Han Xu <b45815@freescale.com> (cherry-picked from commit 5b72b3388d1399420f3b49a0ca937ca5792e2d7d)
2015-07-02MLK-11212 iio: adc: correct the adc register read fail issueHaibo Chen
Read the register only when the adc register address is 4 byte aligned. Signed-off-by: Haibo Chen <haibo.chen@freescale.com> (cherry picked from commit 68af93647354087a55c86c58be48e8802c98aa3d)
2015-07-01MLK-11171 ARM: dts: Add option for CAAM to prevent megamix domain to power down.Dan Douglass
Add CAAM jr irqs to the gpc mf-mix-wakeup-irq mask to allow the Job Rings to register as wakeup devices. Fixed both 6UL and 7D configurations to cover all available Job Rings. Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
2015-07-01MLK-11204 ARM: imx: set int_mem_clk_lpm bit bit when entering wait mode on 6ulBai Ping
This bit is used to keep the ARM Platform memory clocks enabled if an interrupt is pending when entering low power mode. This bit should always bet set when the CCM_CLPCR_LPM bits are set to 01(WAIT Mode) or 10 (STOP mode) without power gating. Signed-off-by: Bai Ping <b51503@freescale.com>
2015-06-30MLK-11157 ARM: dts: Add CAAM snvs/secvio device tree nodes.Dan Douglass
Add CAAM snvs/secvio device tree nodes to enable the driver.. Signed-off-by: Ulises Cardenas <Ulises.Cardenas@freescale.com> Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
2015-06-30MLK-11202: dtb: Disable lcdif in csi dtbSandor Yu
iMX7D DDR3 ARM2 board LCDIF pin confilict with CSI, so disable LCDIF in csi dtb. Signed-off-by: Sandor Yu <R01008@freescale.com> (cherry picked from commit 7099bf4b77165b547512c34b27709cdaf4d07fde)
2015-06-30MLK-10507: ov5640 mipi: Keep sensor in power up state after probeSandor Yu
Sometimes ov5640 can not working on iMX7D ARM2 board, ov5640 signal is not accepted by imx7d mipi csi phy. Remove power down function and keep ov5640 power up after driver probe, the issue is fixed. Signed-off-by: Sandor Yu <R01008@freescale.com> (cherry picked from commit d5e090bbfe9939a8e3c278ef86eddab0c9873fa9)
2015-06-30MLK-11155-2 rpmsg: imx: set the max limit of the tty testsRichard Zhu
samples should not live forever, set the max limit of the tty tests. Signed-off-by: Richard Zhu <richard.zhu@freescale.com> (cherry picked from commit 28cc7d83b4480602a1457e95a81438d0d6e64d7f)
2015-06-30MLK-11155-1 arm: mu: keep mu rpmsg int enableRichard Zhu
Keep the mu rpmsg int always enable. - rpmsg transmissions are async, and drived by mu interactions between the amp cores. - the schedule delay is not real time mechanism, the mu interactions maybe blocked by the previous rpmsg int disable when there are very quick intercations between the amp cores. Solution: Keep mu rpmsg int always enable, since it is just to notify rpmsg master that there is buffer to read, and can be re-entry multi-times. Signed-off-by: Richard Zhu <richard.zhu@freescale.com> (cherry picked from commit 8487604b25aec5ef50ed865c2ccf2766eb658e78)
2015-06-30MLK-11179 ASoC: fsl: implement specify audio DMA buffer size from devicetreeZidan Wang
If the property "fsl,dma-buffer-size" is present, using the specified buffer size. Otherwise, using the default audio buffer size. Signed-off-by: Zidan Wang <zidan.wang@freescale.com> (cherry picked from commit bba153dd92a4f58b81c4c26fb3a95c45445c65e0)
2015-06-29MLK-11142 ARM: dts: Add third Job Ring to CAAM i.mx6ul device tree.Dan Douglass
Populate i.mx6ul device tree with third Job Ring configuration. Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
2015-06-30MLK-11178-02 thermal: imx: disbale hardware reset funtion on imx7Bai Ping
As per to the design team, use the software poweroff when critical trip temp reached. No need to set the panic alam register bits when using the software poweroff as the critical trip action. Signed-off-by: Bai Ping <b51503@freescale.com>
2015-06-30MLK-11178-01 thermal: add a check to avoid orderly_poweroff twiceBai Ping
When temperature >= the 'critical_trip' temperature, the common framework code will call 'orderly_poweroff' function to power off the system. During the power off procedure the thermal framework will go on polling the temp, this will lead to recall the 'orderly_poweroff' again. In the first poweroff flow, some system resource has been freezed, then if the secondary 'orderly_poweroff' frees the resource again, it will lead to kernel dump. Signed-off-by: Bai Ping <b51503@freescale.com>
2015-06-27MLK-11173 ARM: imx: disable arm arch timer when smp is NOT enabledAnson Huang
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 our timer driver, if SMP is NOT enabled, ARM_ARCH_TIMER will be disabled and using GPT timer always. Signed-off-by: Anson Huang <b20788@freescale.com>
2015-06-26MLK-11136 ARM: dts: imx6: update the tempmon node on imx6ulBai Ping
Update the TEMPMON node properties on i.MX6UL. Signed-off-by: Bai Ping <b51503@freescale.com>
2015-06-26MLK-11162 video: mipi_dsi_samsung: add runtime pm for mipi phyFancy Fang
Using runtime pm framework to control the mipi phy on/off dynamically. Signed-off-by: Fancy Fang <chen.fang@freescale.com> (cherry picked from commit 0dcb155067e95d8cdb0030584a2157034cae4701)
2015-06-25MLK-11169 ASoC: fsl_sai: using special pcm config for IMX seriesZidan Wang
Using special pcm config for IMX series. The dafault pcm config is using 512K DMA Buffer which will cause allocating from OCRAM failed. The special pcm config will using 64K DMA buffer. Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
2015-06-25MLK-11168-2 ARM: dtsi: imx7d: enable OCRAM node to support internal SRAMZidan Wang
By doing this, we can allocate memory from iram when using i.MX7D SoC. Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
2015-06-25MLK-11168-1 ARM: dtsi: imx6ul: add iram property to support internal SRAMZidan Wang
By doing this, we can allow SDMA driver to allocate its memory from iram when using i.MX6UL SoC. Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
2015-06-24MLK-11137 usb: chipidea: host: add own hc_driver for each hcdPeter Chen
There are several benefits for doing like this: - hc_driver can be customized for each hcd - Other hcd hc_driver's initialization will not affect current one. We run out NULL pointer dereference problem when one hcd is started by module_init, and the other is started by otg thread at SMP platform. The reason for this problem is ehci_init_driver will do memory copy for current uniform hc_driver, and this memory copy will do memset (as 0) first, so when the first hcd is running usb_add_hcd, and the second hcd may clear the uniform hc_driver's space (at ehci_init_driver), then the first hcd will meet NULL pointer at the same time. See below two logs: LOG_1: ci_hdrc ci_hdrc.0: EHCI Host Controller ci_hdrc ci_hdrc.0: new USB bus registered, assigned bus number 1 ci_hdrc ci_hdrc.1: doesn't support gadget Unable to handle kernel NULL pointer dereference at virtual address 00000014 pgd = 80004000 [00000014] *pgd=00000000 Internal error: Oops: 805 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 108 Comm: kworker/u8:2 Not tainted 3.14.38-222193-g24b2734-dirty #25 Workqueue: ci_otg ci_otg_work task: d839ec00 ti: d8400000 task.ti: d8400000 PC is at ehci_run+0x4c/0x284 LR is at _raw_spin_unlock_irqrestore+0x28/0x54 pc : [<8041f9a0>] lr : [<8070ea84>] psr: 60000113 sp : d8401e30 ip : 00000000 fp : d8004400 r10: 00000001 r9 : 00000001 r8 : 00000000 r7 : 00000000 r6 : d8419940 r5 : 80dd24c0 r4 : d8419800 r3 : 8001d060 r2 : 00000000 r1 : 00000001 r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c53c7d Table: 1000404a DAC: 00000015 Process kworker/u8:2 (pid: 108, stack limit = 0xd8400238) Stack: (0xd8401e30 to 0xd8402000) 1e20: d87523c0 d8401e48 66667562 d8419800 1e40: 00000000 00000000 d8419800 00000000 00000000 00000000 d84198b0 8040fcdc 1e60: 00000000 80dd320c d8477610 d8419c00 d803d010 d8419800 00000000 00000000 1e80: d8004400 00000000 d8400008 80431494 80431374 d803d100 d803d010 d803d1ac 1ea0: 00000000 80432428 804323d4 d803d100 00000001 80435eb8 80e0d0bc d803d100 1ec0: 00000006 80436458 00000000 d803d100 80e92ec8 80436f44 d803d010 d803d100 1ee0: d83fde00 8043292c d8752710 d803d1f4 d803d010 8042ddfc 8042ddb8 d83f3b00 1f00: d803d1f4 80042b60 00000000 00000003 00000001 00000001 80054598 d83f3b00 1f20: d8004400 d83f3b18 d8004414 d8400000 80e3957b 00000089 d8004400 80043814 1f40: d839ec00 00000000 d83fcd80 d83f3b00 800436e4 00000000 00000000 00000000 1f60: 00000000 80048f34 00000000 00000000 00000000 d83f3b00 00000000 00000000 1f80: d8401f80 d8401f80 00000000 00000000 d8401f90 d8401f90 d8401fac d83fcd80 1fa0: 80048e68 00000000 00000000 8000e538 00000000 00000000 00000000 00000000 1fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 1fe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000 [<8041f9a0>] (ehci_run) from [<8040fcdc>] (usb_add_hcd+0x248/0x6e8) [<8040fcdc>] (usb_add_hcd) from [<80431494>] (host_start+0x120/0x2e4) [<80431494>] (host_start) from [<80432428>] (ci_otg_start_host+0x54/0xbc) [<80432428>] (ci_otg_start_host) from [<80435eb8>] (otg_set_protocol+0xa4/0xd0) [<80435eb8>] (otg_set_protocol) from [<80436458>] (otg_set_state+0x574/0xc58) [<80436458>] (otg_set_state) from [<80436f44>] (otg_statemachine+0x408/0x46c) [<80436f44>] (otg_statemachine) from [<8043292c>] (ci_otg_fsm_work+0x3c/0x190) [<8043292c>] (ci_otg_fsm_work) from [<8042ddfc>] (ci_otg_work+0x44/0x1c4) [<8042ddfc>] (ci_otg_work) from [<80042b60>] (process_one_work+0xf4/0x35c) [<80042b60>] (process_one_work) from [<80043814>] (worker_thread+0x130/0x3bc) [<80043814>] (worker_thread) from [<80048f34>] (kthread+0xcc/0xe4) [<80048f34>] (kthread) from [<8000e538>] (ret_from_fork+0x14/0x3c) Code: e5953018 e3530000 0a000000 e12fff33 (e5878014) LOG_2: ci_hdrc ci_hdrc.0: EHCI Host Controller ci_hdrc ci_hdrc.0: new USB bus registered, assigned bus number 1 ci_hdrc ci_hdrc.1: doesn't support gadget Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = 80004000 [00000000] *pgd=00000000 In Online 00:00ternal e Offline rror: Oops: 80000005 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 108 Comm: kworker/u8:2 Not tainted 3.14.38-02007-g24b2734-dirty #127 Workque Online 00:00ue: ci_o Offline tg ci_otg_work Online 00:00task: d8 Offline 39ec00 ti: d83ea000 task.ti: d83ea000 PC is at 0x0 LR is at usb_add_hcd+0x248/0x6e8 pc : [<00000000>] lr : [<8040f644>] psr: 60000113 sp : d83ebe60 ip : 00000000 fp : d8004400 r10: 00000001 r9 : 00000001 r8 : d85fd4b0 r7 : 00000000 r6 : 00000000 r5 : 00000000 r4 : d85fd400 r3 : 00000000 r2 : d85fd4f4 r1 : 80410178 r0 : d85fd400 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c53c7d Table: 1000404a DAC: 00000015 Process kworker/u8:2 (pid: 108, stack limit = 0xd83ea238) Stack: (0xd83ebe60 to 0xd83ec000) be60: 00000000 80dd920c d8654e10 d85fd800 d803e010 d85fd400 00000000 00000000 be80: d8004400 00000000 d83ea008 80430e34 80430d14 d803e100 d803e010 d803e1ac bea0: 00000000 80431dc8 80431d74 d803e100 00000001 80435858 80e130bc d803e100 bec0: 00000006 80435df8 00000000 d803e100 80e98ec8 804368e4 d803e010 d803e100 bee0: d86e8100 804322cc d86cf050 d803e1f4 d803e010 8042d79c 8042d758 d83cf900 bf00: d803e1f4 80042b78 00000000 00000003 00000001 00000001 800545e8 d83cf900 bf20: d8004400 d83cf918 d8004414 d83ea000 80e3f57b 00000089 d8004400 8004382c bf40: d839ec00 00000000 d8393780 d83cf900 800436fc 00000000 00000000 00000000 bf60: 00000000 80048f50 80e019f4 00000000 0000264c d83cf900 00000000 00000000 bf80: d83ebf80 d83ebf80 00000000 00000000 d83ebf90 d83ebf90 d83ebfac d8393780 bfa0: 80048e84 00000000 00000000 8000e538 00000000 00000000 00000000 00000000 bfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 bfe0: 00000000 00000000 00000000 00000000 00000013 00000000 ee66e85d 133ebd03 [<804 Online 00:000f644>] Offline (usb_add_hcd) from [<80430e34>] (host_start+0x120/0x2e4) [<80430e34>] (host_start) from [<80431dc8>] (ci_otg_start_host+0x54/0xbc) [<80431dc8>] (ci_otg_start_host) from [<80435858>] (otg_set_protocol+0xa4/0xd0) [<80435858>] (otg_set_protocol) from [<80435df8>] (otg_set_state+0x574/0xc58) [<80435df8>] (otg_set_state) from [<804368e4>] (otg_statemachine+0x408/0x46c) [<804368e4>] (otg_statemachine) from [<804322cc>] (ci_otg_fsm_work+0x3c/0x190) [<804322cc>] (ci_otg_fsm_work) from [<8042d79c>] (ci_otg_work+0x44/0x1c4) [<8042d79c>] (ci_otg_work) from [<80042b78>] (process_one_work+0xf4/0x35c) [<80042b78>] (process_one_work) from [<8004382c>] (worker_thread+0x130/0x3bc) [<8004382c>] (worker_thread) from [<80048f50>] (kthread+0xcc/0xe4) [<80048f50>] (kthread) from [<8000e538>] (ret_from_fork+0x14/0x3c) Code: bad PC value Signed-off-by: Peter Chen <peter.chen@freescale.com> (cherry picked from commit 8d0ca70bdac986f5886ba8ccfff46a41e7a555ec)
2015-06-24MLK-11151 usb: chipidea: otg: drive vbus off if fsm.drv_vbus is truePeter Chen
The current condition may not true even we have driven vbus on already. The vbus drive operation may be async, eg through i2c gpio expendor, so the vbus may not be valid when we unload usb module. We meet this issue when we do fast load/unload usb module test. Signed-off-by: Peter Chen <peter.chen@freescale.com> (cherry picked from commit a4dec7730c98f2639fe250a1a67f782b6f73bdf5)
2015-06-24MLK-11163 dma: pxp-v2: refine the pxp scaling logicFancy Fang
The pxp scaling logic will cause issue when the s0 and out are both yuv formats. The issue has been reported in another MM CR. Signed-off-by: Fancy Fang <chen.fang@freescale.com> (cherry picked from commit a0bf35c7c4be567589156e9c61c6fbfdfa5de1ec)
2015-06-24MLK-11160 pci: imx: enlarge the delay time after resumeRichard Zhu
some pcie pe devices maybe still failed resime back, after pcie rc is resumed, when the pcie ep devices have a heavy loading task. Enlarge the delay time after imx6qp pcie rc resume back. Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com> (cherry picked from commit e0f3836149889b1db7cce76218c76efbf0347e0e)
2015-06-24MLK-11132 usb: chipidea: otg: delay suspend for a_wait_vfallLi Jun
While A device as peripheral ends session by a_bus_drop, it will go back to host role by transition to a_wait_vfall state, then ehci host driver may access portsc status after controller enters suspend , this will result in system hang since its clock is gated off. This patch use existing autosuspend to delay the controller suspend if it comes to a_wait_vfall state. Signed-off-by: Li Jun <jun.li@freescale.com> (cherry picked from commit b140fa6803ef6ececec17e435212a960a3169cc2)
2015-06-23MLK-11141 net: fec: init MAC prior to mii bus probeFugang Duan
Below case causes mii bus probe failed: ifconfig eth0 down -> suspend/resume with Mega/fax mix off -> ifconfig eth0 up Mega/fast mix off, ENET MAC power will be off, all initialized MAC registers reset to default, so in the case, it must init MAC prior to mii bus probe. Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-06-21MLK-11138 ARM: imx: correct AHB post div name for busfreqAnson Huang
Commit (913c520 MLK-11045: arm: imx: clk-imx7d: remove ahb_root_clk LPCG clock gate) changes AHB clk's post divider name from IMX7D_AHB_CHANNEL_ROOT_DIV to IMX7D_AHB_CHANNEL_ROOT_CLK, busfreq needs to update AHB clk name accordingly, otherwise, first time busfreq enters low bus mode, AHB clk rate is 12MHz which is incorrect, it should be 24MHz. Signed-off-by: Anson Huang <b20788@freescale.com>
2015-06-15Revert "MLK-11080-1 dts: imx7d-sdb: add OOB GPIO config for wlan node"Dong Aisheng
WL_HOST_WAKEUP feature causes system suspend/resume break, so revert. This reverts commit ce9e893341c6196a5c31b3265525218c537d3e3e.
2015-06-15Revert "MLK-11080-2 bcmdhd: add WL_HOST_WAKEUP support"Dong Aisheng
WL_HOST_WAKEUP feature causes system suspend/resume break, so revert. This reverts commit 2ce8a1ad56f76a072656c0d244c3b1f72603fac0.
2015-06-15Revert "MLK-11080-3 dts: imx_v7_defconfig: enable CONFIG_BCM4339 to optimize ↵Dong Aisheng
performance" WL_HOST_WAKEUP feature causes system suspend/resume break, so revert. This reverts commit d9edd6e61897e4253fcbf0c7d2680933583e13c8.
2015-06-15MLK-11115 arm: imx: double check m4 is enabledRichard Zhu
Make a double check that m4 is enabled and run on imx7d Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com> (cherry picked from commit 6b8ce07eeb11b4cc8ead6e400277f9468f6c5bd0)
2015-06-15MLK-11113 video: mipi_dsi_samsung: add fastmix support when suspendFancy Fang
In 7D platform, the fastmix will power down MIPI DSI when system doing suspend. So when system resume, the MIPI DSI will be in the 'reset' state and all the registers should be configured again. Signed-off-by: Fancy Fang <chen.fang@freescale.com> (cherry picked from commit 25ad2d6142962455ac0e515c1118b9c42bd13ffa)
2015-06-15MLK-11111 ARM: dts: reconfigure TXD/RXD pin to fix noise when ↵Zidan Wang
playback/record mono wav There are some noise in the right channel when playback/record mono wav with some sample rate. Reconfigure TXD/RXD pin can fix this issue. Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
2015-06-15MLK-11110: cpufreq: imx7-cpufreq: fix system resume failedRobin Gong
System resume failed easily after commit b993956109856d3, the commit is no problem, but it exposes the potential deadlock bug which not unlock mutex if cpufreq not change, remove these code since the cpufreq framwork has consider it. Signed-off-by: Robin Gong <b38343@freescale.com> (cherry picked from commit d791bf25e07023f7a936fcabe6f641ad391048b3)
2015-06-12MLK-11088: arm: imx: pinctrl-imx: fix GPIO1_IO00 group registerAdrian Alonso
* Fix GPIO1_IO00 pin group register, add ZERO_OFFSET_VALID to iomuxc-lpsr as GPIO1_IO00 mux_reg offset is Zero. --- 302c0000.iomuxc-lpsr: failed to get pin(12) name 302c0000.iomuxc-lpsr: maps: function hog group hoggrp-2 num 4 pinctrl core: add 4 pinmux maps pinconfig core: failed to register map default (3): no group/pin given --- * Fix debug info use pin_id to get the corresponding pad name. Signed-off-by: Adrian Alonso <aalonso@freescale.com> Signed-off-by: Robin Gong <b38343@freescale.com>
2015-06-12MLK-11107 epdc: update 7D panel nameEvan Kotara
Update the name of the panel used on the 7D DC4 ebook board from development name to ED060XH2C1. Signed-off-by: Evan Kotara <evan.kotara@freescale.com>
2015-06-12MLK-11102 ARM: dts: imx6ul-evk: Fix the pin conflict between CSI and SIM.Robby Cai
Fix the pin conflict between CSI camera and SIM. [ 8.877825] imx6ul-pinctrl 20e0000.iomuxc: pin MX6UL_PAD_CSI_DATA02 already requested by 21b4000.sim; cannot claim for 1-003c [ 8.966473] imx6ul-pinctrl 20e0000.iomuxc: pin-123 (1-003c) status -22 [ 9.013472] imx6ul-pinctrl 20e0000.iomuxc: could not request pin 123 (MX6UL_PAD_CSI_DATA02) from group csi1grp on device 20e0000.iomuxc [ 9.108263] ov5640 1-003c: Error applying setting, reverse things back [ 9.153798] imx6ul-pinctrl 20e0000.iomuxc: pin MX6UL_PAD_CSI_DATA02 already requested by 21b4000.sim; cannot claim for 1-003c [ 9.255857] imx6ul-pinctrl 20e0000.iomuxc: pin-123 (1-003c) status -22 [ 9.262427] imx6ul-pinctrl 20e0000.iomuxc: could not request pin 123 (MX6UL_PAD_CSI_DATA02) from group csi1grp on device 20e0000.iomuxc [ 9.389992] ov5640 1-003c: Error applying setting, reverse things back [ 9.429637] ov5640 1-003c: setup pinctrl failed [ 9.554600] ov5640: probe of 1-003c failed with error -22 [ 13.052973] kjournald starting. Commit interval 5 seconds Signed-off-by: Robby Cai <r63905@freescale.com> (cherry picked from commit fd102b852ec2b5f3d1915ec71203ced032786b75)
2015-06-12MLK-11100 ARM: dts: imx6ul-14x14-ddr3-arm2-emmc: disable qspi when use emmcHaibo Chen
eMMC has pin conflict with qspi, so disable qspi when enable emmc on imx6ul-14x14-ddr3-arm2 board. Signed-off-by: Haibo Chen <haibo.chen@freescale.com> (cherry picked from commit e9654ae969a23059ecbd9ac78981f6757285eab9)
2015-06-12MLK-11097-2: ARM: gpc: skip power domain touch for i.mx6ulRobin Gong
Skip power domain touch since there are no PU and display misc power domain on i.mx6ul. Signed-off-by: Robin Gong <b38343@freescale.com> (cherry picked from commit fe28d08ebb7922d429f5b24c13b4ea2eccf5b8f6)
2015-06-12MLK-11097-1: ARM: imx6ul: clean up gps dts setting for i.mx6ulRobin Gong
Clean up ldo-bypass setting in i.mx6ul-14x14-evk.dts to avoid any misunderstanding, although u-boot have already dsiable ldo-bypass setting check. Meanwhile, remove power-domain since there are no PU and display misc on i.mx6ul Signed-off-by: Robin Gong <b38343@freescale.com> (cherry picked from commit 7de477a1d07a2cb59773c4f2376a2d574aba1349)
2015-06-11MLK-11095: mtd:qspi: clear the DDR_EN bit on 6UL and 7DHan Xu
the obsolete bit DDR_EN on 6UL and 7D should be clear in case other program set the bit and cause qspi probe fail. Signed-off-by: Han Xu <b45815@freescale.com> (cherry picked from commit bde382480e9c3ba3ba1f0f4c73f77df894482699)
2015-06-11MLK-11087: mtd:qspi: support DDR Quad mode for Macronix mx25l51245gHan Xu
Enable DDR quad mode for Macronix qspi chip mx25l51245g by setting Quad bit in status register and enabling in dts file. The LUT for SPINOR_OP_READ_1_4_4_D was initially designed for Spansion qspi chip, so there is one cycle for "mode" after address and before dummy. While Macronix qspi chip doesn't have this feature, so we just take off one cycle in dts file to bypass this problem. Signed-off-by: Han Xu <b45815@freescale.com> (cherry picked from commit 2ee7cdc2b821605dbb47854238d7fc124800547a)
2015-06-11MLK-11093-2 dts: imx6ul-14x14-ddr3-arm2-emmc: enable HS200 supportDong Aisheng
Add ultra high speed mode pinctrl states to support eMMC HS200. HW rework needed that changing both NVCC_SD and NVCC_NAND to 1.8v. Signed-off-by: Dong Aisheng <b29396@freescale.com>
2015-06-11MLK-11093-1 dts: imx6ul-14x14-ddr-arm2: add SD1 eMMC supportDong Aisheng
The eMMC signals are reused from SD1 slot signals on MX6UL ARM2 board. Thus a new dts is introduced to avoid such pin confliction. Before using this dts, user has to do hw rework to connect eMMC IO signals and disconnect SD1 Slot signals. Signed-off-by: Dong Aisheng <b29396@freescale.com>
2015-06-11MLK-11071 cpufreq: imx7: add cpufreq pm_notifier on imx7dBai Ping
Add pm_notifier for cpufreq on i.MX7D to make sure when system do suspend/resume no cpu frequency change. cpu frequency change may use the I2C/SPI interface to control the external PMIC chip, if the I2C/SPI are not active in this procedure, frequency change will fail. Signed-off-by: Bai Ping <b51503@freescale.com>
2015-06-11MLK-11083: ov5640 mipi: Fix build errorSandor Yu
Build error when ov5640 mipi driver build as build-in: drivers/media/platform/mxc/subdev/built-in.o: In function `OV5640_get_HTS': :(.text+0x5d08): multiple definition of `OV5640_get_HTS' drivers/media/platform/mxc/capture/built-in.o::(.text+0x6228): first defined here drivers/media/platform/mxc/subdev/built-in.o: In function `OV5640_get_light_freq': :(.text+0x5e6c): multiple definition of `OV5640_get_light_freq' drivers/media/platform/mxc/capture/built-in.o::(.text+0x638c): first defined here drivers/media/platform/mxc/subdev/built-in.o: In function `binning_on': :(.text+0x6bb4): multiple definition of `binning_on' It is cause by ov5640 mipi global function name conflict, Add static property to these functions to fix the issue. Signed-off-by: Sandor Yu <R01008@freescale.com> (cherry picked from commit 3826c16be99c1d1a432f914ca09808f0d4591edb)
2015-06-10MLK-11046: arm: imx: clk-imx7d: add adc_root_clkAdrian Alonso
* Add ADC root clock IMX7D_ADC_ROOT_CLK * Update device tree adc node to use IMX7D_ADC_ROOT_CLK Signed-off-by: Adrian Alonso <aalonso@freescale.com>