Xianzhong [Mon, 31 Oct 2016 07:52:44 +0000 (15:52 +0800)]
MGS-2302-3 [#imx-225] disable power management for gpu profiler
GPU power management is disabled by force for performance.
The porifler will enable GPU1 power management after affinity tests.
When run openvg conformance later, GPU0 has no power management, GPU1 is
with power management and will become OFF often.
Hence this lead to GPU1 hang after openvg conformance test.
Date: Oct 31, 2016
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Xianzhong [Mon, 17 Oct 2016 07:58:52 +0000 (15:58 +0800)]
MGS-2302-1 [#imx-225] fix the gpu1 hang with independent mode
when the app is killed, the kernel driver will free database from the gpu0.
if the app is running on gpu1, its database may be freed by gpu0 unexpectely.
need check kernel pointer in record to prevent the incorrect database free.
Date: Oct 17, 2016
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Xianzhong [Fri, 4 Nov 2016 04:47:03 +0000 (12:47 +0800)]
MGS-2388 [#ccc] integrate 6.2.0 post patch
apply the gpu hang patch for multiple instances
001-IMX101-15870-04-cl81286-Fixed-ES31-CTS.core.tessellation_shader.tessellation_shader_tc_barriers.barrier_guarded_write_calls-hang.patch
apply the debug patch for gpu module clock
0014-cl83047-added-debug-control-for-new-module-s-clock-gating.patch
Date: Nov 11, 2016
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Yong Gan [Fri, 14 Oct 2016 19:49:15 +0000 (03:49 +0800)]
MGS-1972 [#imx-142] Enable GPU MMU flat mapping to cover CMA range on DV
Limited baseAddress offset only for GPU without MC20 feature.
Date: Oct 14, 2016
Signed-off-by: Yong Gan <yong.gan@nxp.com>
Haibo Chen [Tue, 8 Nov 2016 07:06:58 +0000 (15:06 +0800)]
MLK-13442: mmc: sdhci-esdhc-imx: release bus frequency when usdhc remove
When usdhc driver remove, also need to release bus frequency.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Alejandro Sierra [Mon, 26 Sep 2016 21:37:19 +0000 (16:37 -0500)]
MLK-13287 ARM: dts: imx: support for epop 6sxscm evb board
Add support for the epop i.MX6SX SCM EVB board
The epop variant contains an eMMC(512MB) within the
POP package.
Support the next features for epop 6sxscm EVB:
- Regular epop board
- M4 support
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Alejandro Sierra [Mon, 26 Sep 2016 19:58:36 +0000 (14:58 -0500)]
MLK-13286 ARM: dts: imx: support emmc on 6sxscm platforms
Add the generic dtsi configuration to support EMMC on the
i.MX6SX SCM platforms
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Juan Gutierrez [Mon, 26 Sep 2016 19:31:19 +0000 (14:31 -0500)]
MLK-13284 ARM: dts: imx: generic support for 6sxscm 512mb evb
Add the generic dtsi configuration support for the i.MX6SX SCM
platforms with 512MB of DDR memory mapping.
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Alejandro Sierra [Mon, 26 Sep 2016 19:20:04 +0000 (14:20 -0500)]
MLK-13283 ARM: dts: imx: support for 1gb 6sxscm evb board
Add support for the 1gb i.MX6SX SCM EVB board
Support the next features for 1Gb 6sxscm EVB:
- Regular 1gb board
- M4 support
- MQS
- SAI sound card
- LCD and HDMI with sii902x support
- Bluetooth and Wifi Murata ZP SDIO dongle
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Juan Gutierrez [Mon, 26 Sep 2016 18:14:01 +0000 (13:14 -0500)]
MLK-13282 ARM: dts: imx: generic dts support for 6sxscm evb
Add the generic dts configuration support, including BT and
Wifi for the i.MX6SX SCM Evaluation Board (EVB)
- Generic DTS for 6SXSCM EVB
- Bluetooth and Wifi
- LDO enabled
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Robin Gong [Fri, 4 Nov 2016 08:41:39 +0000 (16:41 +0800)]
MLK-13421 ARM: dts: imx6sll: correct the wrong compatible name in imx6sll.dtsi
The initial version is wrong, fix it.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Alejandro Sierra [Mon, 26 Sep 2016 19:42:20 +0000 (14:42 -0500)]
MLK-13281 ARM: imx: add micrel phy init for 6sxscm evb board
Add Micrel phy initialization for imx6sxscm evb platform
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Juan Gutierrez [Mon, 26 Sep 2016 21:51:06 +0000 (16:51 -0500)]
MLK-13280 ARM: imx: missing mmdc read fifo reset on resume
When a device like (USB, CAMM, tty, etc) prevents the megamix
domain to power down during the suspend process (by enabling
a wakeup source) the resume process goes through a path where
the MMDC context should not be restored. However this resume
path does not reset the read fifo MMDCx_MPDGCTRL0[RST_RD_FIFO]
for the platforms with LPDDR2 causing a bad resuming and reset
of the device due to an exception.
This patch adds the reset_read_fifo on the No-restoring-MMDC
path to fix the bad resuming.
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Signed-off-by: Alejandro Sierra <b18039@freescale.com>
Juan Gutierrez [Mon, 26 Sep 2016 21:44:45 +0000 (16:44 -0500)]
MLK-13279 rpmsg: imx: make vring address configurable by dts
vring memory address was hardcoded at the top of the 1GB RAM.
For systems with a memory map with less or different than 1GB,
the hardcoded value might be not correct and cause issues.
This patch add the support to pass the vring address from device
tree configuration on the reg platform argument in the following
format:
reg = <vring_address vring_size>
For example, for a 512MB system, with the rpmgs vring placed at
top of the memory the configuration will look like below:
&rpmsg{
reg = <0x9FFF0000 0x8000>;
};
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Andy Duan [Mon, 31 Oct 2016 09:18:06 +0000 (17:18 +0800)]
MLK-13413 ARM: imx6sll-evk: add Murata Type ZP (BCM4339) module support
Add Murata Type ZP (BCM4339) module support on i.MX6SLL platforms:
- i.MX6SLL EVK (SD3 slot + BT connector) + Murata adapter V2.0
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Jason Liu [Wed, 2 Nov 2016 10:23:38 +0000 (18:23 +0800)]
Revert "ARM: imx: Added perf functionality to mmdc driver"
This reverts commit
3d7dd5ec903bc867c0274ac871b707839712f832.
This commit is wrongly pushed and also it breaks build, revert it.
Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
Alejandro Sierra [Tue, 6 Sep 2016 16:19:37 +0000 (11:19 -0500)]
MLK-13248 ARM: dts: imx: add support for 1gb evb board
Add support for SCM i.MX6DQ 1Gb Evaluation Board (EVB).
Support the next features for 1Gb EVB boards:
- Support for fix and interleave mode
- For fix mode additional dts are provided for:
- hdcp
- enetirq
- bluetooth and wifi for Murata ZP SDIO dongle
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Juan Gutierrez [Tue, 6 Sep 2016 21:59:11 +0000 (16:59 -0500)]
MLK-13247 ARM: dts: imx: add support for 1gb qwks board
Add support for SCM i.MX6DQ 1Gb Quick Start Board (QWKS).
Support the next features for 1Gb QWKS boards:
- Support for fix and interleave mode
- For fix mode additional dts are provided for
- hdcp
- Wifi with Murata ZP SDIO dongle
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Juan Gutierrez [Tue, 6 Sep 2016 21:57:07 +0000 (16:57 -0500)]
MLK-13246 ARM: dts: imx: generic support for 6dqscm 1gb board
Add the generic dtsi configuration support for the SCM i.MX6DQ
QWKS and EVB board with 1GB of DDR memory mapping
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Juan Gutierrez [Tue, 6 Sep 2016 18:03:15 +0000 (13:03 -0500)]
MLK-13245 ARM: dts: imx: generic dtsi support for qwks board
Add the generic dtsi configuration support, including
Wifi, for the SCM i.MX6DQ Quick Start Board (QWKS)
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Alejandro Lozano [Tue, 6 Sep 2016 21:41:13 +0000 (16:41 -0500)]
MLK-13244 input: touchscreen: add support for vtl touchscreen
Add the support for a CT36X based touchscreens using
the CT36X controller and i2c touchscreen interface.
Signed-off-by: Alejandro Lozano <alejandro.lozano@nxp.com>
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Signed-off-by: Alejandro Sierra <alejandro.sierra@nxp.com>
Zhengyu Shen [Mon, 19 Sep 2016 17:57:29 +0000 (12:57 -0500)]
ARM: imx: Added perf functionality to mmdc driver
MMDC is a multi-mode DDR controller that supports DDR3/DDR3L x16/x32/x64
and LPDDR2 two channel x16/x32 memory types. MMDC is configurable, high
performance, and optimized. MMDC is present on i.MX6 Quad and i.MX6
QuadPlus devices, but this driver only supports i.MX6 Quad at the moment.
MMDC provides registers for performance counters which read via this
driver to help debug memory throughput and similar issues.
$ perf stat -a -e mmdc/busy-cycles/,mmdc/read-accesses/,mmdc/read-bytes/,mmdc/total-cycles/,mmdc/write-accesses/,mmdc/write-bytes/ dd if=/dev/zero of=/dev/null bs=1M count=5000
Performance counter stats for 'dd if=/dev/zero of=/dev/null bs=1M count=5000':
898021787 mmdc/busy-cycles/
14819600 mmdc/read-accesses/
471.30 MB mmdc/read-bytes/
2815419216 mmdc/total-cycles/
13367354 mmdc/write-accesses/
427.76 MB mmdc/write-bytes/
5.
334757334 seconds time elapsed
Signed-off-by: Zhengyu Shen <zhengyu.shen@nxp.com>
Signed-off-by: Frank Li <frank.li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Bai Ping [Tue, 1 Nov 2016 03:10:19 +0000 (11:10 +0800)]
MLK-13409 ARM: config: add imx6sll support in imx_v7 mfg defconfig
Add i.MX6SLL support in imx_v7_mfg_defconfig.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Haibo Chen [Tue, 18 Oct 2016 06:34:12 +0000 (14:34 +0800)]
MLK-13358 mmc: sdhci-esdhc-imx: make sure usdhc clock enabled while doing suspend
When suspend usdhc, it will access usdhc register. So usdhc clock
should be enabled, otherwise the access usdhc register will return
error or cause system.
Take this into consideration, if system enable a usdhc and do not
connect any SD/SDIO/MMC card, after system boot up, this usdhc
will do runtime suspend, and close all usdhc clock. At this time,
if suspend the system, due to no card persent, usdhc runtime resume
will not be called. So usdhc clock still closed, then in suspend,
once access usdhc register, system hung or bus error return.
This patch make sure usdhc clock always enabled while doing usdhc
suspend.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Richard Zhu [Mon, 17 Oct 2016 07:13:56 +0000 (15:13 +0800)]
MLK-13387-4 ARM: imx: gpcv2: correct pcie phy reg notifier
1.8v of imx7d pcie phy, should be turned on after
the 1p0d(1.0v) of pcie phy is turned on.
And turned off before the 1p0d(1.0v) of pcie phy
is turned off
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Richard Zhu [Mon, 17 Oct 2016 07:17:43 +0000 (15:17 +0800)]
MLK-13387-3 regulator: consumer: add new event macro
Add one new regulator events macro 'REGULATOR_EVENT_AFT_DO_ENABLE'.
1.8v of imx7d pcie phy, should be turned on after
the 1p0d(1.0v) of pcie phy is turned on.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Richard Zhu [Mon, 17 Oct 2016 07:12:08 +0000 (15:12 +0800)]
MLK-13387-2 regulator: consumer: add new event macro
Add the AFT_ENABLE event macros, because that
1.8v of imx7d pcie phy, should be turned on after
the 1p0d(1.0v) of pcie phy is turned on.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Richard Zhu [Tue, 25 Oct 2016 08:04:49 +0000 (16:04 +0800)]
MLK-13387-1 ARM: dts: imx7d: use enable bit of 1p0d
Do not set the override bit of 1p0d regulator.
Because, the 1p0d and the vdd1.8v should be turned on
separately by the requirements of the imx7d pcie phy.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Richard Zhu [Tue, 18 Oct 2016 09:35:21 +0000 (17:35 +0800)]
MLK-13365 pci: imx: fix imx6dl ep rc validation failure
The ep rc validation is failed on imx6dl.
Root cause:
The ref clk of imx6dl pcie is 100M(bit20 of PLL_ENET).
But the driver doesn't enable it.
Solution:
enable pci_bus clock in ep rc validation system, since
the parent of the pci_bus is the 100M.
The connection between ep and rc only have the TX/RX
parirs, there is no impaction when enable the pcie_bus
in pcie ep rc validation system.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Robby Cai [Tue, 25 Oct 2016 09:51:03 +0000 (17:51 +0800)]
MLK-13390 ARM: dts: imx6sll: add V4L2 output support
Add PXP V4L2 output support
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Peter Chen [Tue, 25 Oct 2016 09:46:12 +0000 (17:46 +0800)]
MLK-13389 ARM: imx6sll-evk: enable USBOTG1
Enable USBOTG1
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Bai Ping [Mon, 24 Oct 2016 10:08:39 +0000 (18:08 +0800)]
MLK-13384 ARM: imx: remove ldo bypass check on imx6sll
As on i.MX6SLL, there is no ARM LDO, the code for ARM LDO
bypass check is unnecessary, remove these piece of code in
i.MX6SLL low power idle.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Haibo Chen [Tue, 25 Oct 2016 02:15:01 +0000 (10:15 +0800)]
MLK-13366 mmc: sdhci-esdhc-imx: no need busfreq for imx6qdl
This reverts commit
2c01452f4d7c0f65553b365adc27a1b7b6ba8644.
Besides, add other SoC request high bus freq. This is because
only imx6qdl do not implement low bus idle, so imx6qdl can work
well under low power mode without request high bus freq which
also can save power. For other SoC, need to request high bus
freq when usdhc is active.
Also can refer to commit
312979d1fcbd.
Juan Gutierrez [Wed, 19 Oct 2016 17:32:10 +0000 (12:32 -0500)]
MLK-13361-3 arm: imx6q: busfreq: restore mmdc timing settings for 100MHz
The timing settings for 100MHz are almost the same as the ones for
400MHz except for the MMDCx_MISC[RALAT] parameter which needs to be
set to 2 cycles.
For the 100MHz case the restoration of the mmdc setting should be performed
in 2 steps: restore the mmdc setting and then overwrite the RALAT setting
for 2 cycles.
A decision code within the "mmdc_clk_lower_equal_100MHz" macro is added
to go to the "equal to 100MHz" or to the "lower to 100MHz" case
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Signed-off-by: Alejandro Lozano <alejandro.lozano@nxp.com>
Juan Gutierrez [Wed, 19 Oct 2016 17:06:50 +0000 (12:06 -0500)]
MLK-13361-2 arm: imx6q: busfreq: wrap ralat settings on a macro
Setting the Read Additional Latency (RALAT) to 2 cycles,
MMDCx_MDMISC[RALAT] = 2, is needed for 24MHz operation point.
Currently this is set within the "set_timings_below_100MHz_operation"
macro, which is use for the 24MHz case.
In order to provide a generic way for setting RALAT=2 the code
is wrapped in this new macro: "set_mmdc_misc_ralat_2_cycles", so
other set points (besides the below 100MHz case) can reuse this code.
As an example, for 100Mhz operation the RALAT should be set to 2 cycles,
however, the rest of the MMDCFG parameter are not the same as in the
"below_100MHz" case. So, this macro can be reused for its RALAT part.
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Juan Gutierrez [Wed, 19 Oct 2016 16:58:43 +0000 (11:58 -0500)]
MLK-13361-1 arm: imx6q: busfreq: rename 100MHz-related macros
Two macros are renamed:
1) set_timings_above_100MHz_operation as restore_mmdc_settings_info
2) mmdc_clk_lower_100MHz as mmdc_clk_lower_equal_100MHz
For (1) the operation is generic to several cases and not just related
(at least on a semantic way) with the operations "above" 100MHz
Renamed as restore_mmdc_settings_info the macro can be reused for the
other cases like equal to 100MHz and possibly other intermediate
operation points.
For (2), the macro is renamed as mmdc_clk_lower_equal_100MHz to reflect
that this macro handles both the "lower than 100 MHz" case and the
"equal to 100MHz" case.
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Dong Aisheng [Fri, 14 Oct 2016 04:21:19 +0000 (12:21 +0800)]
MLK-13340 dts: mx6ul-lpddr2-arm2: fix sd gpio polarity
system can't detect SD card due to wrong gpio polarity.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Shengjiu Wang [Wed, 19 Oct 2016 09:24:26 +0000 (17:24 +0800)]
MLK-13369-2: ARM: dts: Add more parameters for gpr property of sound
The new parameter description is:
gpr = <gpr-node, register-offset, mask, value>;
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Shengjiu Wang [Wed, 19 Oct 2016 09:22:16 +0000 (17:22 +0800)]
MLK-13369-1: ASoC: fsl: fix the hard code gpr address in machine driver
There is hard code for gpr address in machine driver, imx-wm8960
and imx-wm8958, when the sai interface changed to sai1 or sai3,
there will be issue, so remove the hard code, use the property
from the device tree.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Bai Ping [Wed, 19 Oct 2016 00:48:34 +0000 (08:48 +0800)]
MLK-13362 ARM: imx: fix audio bus mode hang on imx6sx/ul/sll
When MMDC runs at a low frequency, it is not recommended to
perform "force measurement", the MMDC measure unit may return
a wrong measurement value when running below 100MHz.
Additionally, the double MU count operations should be only done
when changing the MMDC frequency from 400MHz to a low
frequency(100MHz or 24MHz). Otherwise, the MU count may overflow
and lead to system hang issue.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Fri, 14 Oct 2016 05:12:19 +0000 (13:12 +0800)]
MLK-13344-05 ARM: imx: Add cpuidle support on imx6sll
Add low power idle support on i.MX6SLL.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Fri, 14 Oct 2016 04:49:08 +0000 (12:49 +0800)]
MLK-13344-04 ARM: imx: Add busfreq support on imx6sll
Add bufreq driver support on i.MX6SLL. For i.MX6SLL,
it only support LPDDR2 and LPDDR3. the DDR clock change
flow is same on these two type of DDR.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Fri, 14 Oct 2016 04:48:08 +0000 (12:48 +0800)]
MLK-13344-03 ARM: dts: imx: add busfreq node on imx6sll
Add busfreq device node for i.MX6SLL.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Fri, 14 Oct 2016 05:11:29 +0000 (13:11 +0800)]
MLK-13344-02 ARM: dts: imx: update the setpoints on imx6sll
According to datasheet Rev.B,06/2016 of i.MX6SLL. It has below
setpoints support:
996MHz 1.2V
792MHz 1.15V
396MHz 1.05V
198MHz 0.95V
We add a 25mV margin to cover the IR drop and board tolerance.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Fri, 14 Oct 2016 04:47:18 +0000 (12:47 +0800)]
MLK-13344-01 ARM: imx: Change AXI and AHB clock rate on imx6sll
Increase the AXI and AHB clock rate on i.MX6SLL according to
the RM to improve the system bus performance.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Peter Chen [Tue, 18 Oct 2016 08:36:39 +0000 (16:36 +0800)]
MLK-13308-2 usb: phy: phy-mxs-usb: handle USB PHY event
For mxs PHY, if there is a vbus but the bus is not enumerated,
force the dp/dm as SE0 from the consider side. If not, there
is possible USB wakeup due to unstable dp/dm, since there is
possible no pull on dp/dm, eg, there is a USB charger on the
port. Note, the vbus event is only occurred at device mode,
and sent by udc driver.
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Peter Chen [Tue, 18 Oct 2016 08:32:04 +0000 (16:32 +0800)]
MLK-13308-1 usb: chipidea: udc: add USB PHY event
Add USB PHY event for below situation:
- vbus connect
- vbus disconnect
- gadget driver is enumerated
USB PHY driver can get the last event after above situation
occurs.
Signed-off-by: Peter Chen <peter.chen@nxp.com>
ye li [Fri, 14 Oct 2016 02:29:14 +0000 (10:29 +0800)]
MLK-13347 dts: mx6sll: enable DCP and hardware RNG for i.mx6sll
Add DCP and RNG node in imx6sll.dtsi to enable them.
Signed-off-by: ye li <ye.li@nxp.com>
Bai Ping [Tue, 18 Oct 2016 07:45:14 +0000 (15:45 +0800)]
MLK-13359 ARM: dts: imx: Add imx6sll evk board dts
Add i.MX6SLL EVK board dts file.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Thu, 13 Oct 2016 02:18:17 +0000 (10:18 +0800)]
MLK-13334 ARM: dts: imx: Add lpddr2 arm2 dts for imx6sll
For i.MX6SLL LPDDR2 and LPDDR3 ARM2 board, they share the same
board design but using different DDR chip. So we can reuse the
LPDDR3 ARM2 board dts on LPDDR2 ARM2 board.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Guoniu.Zhou [Fri, 14 Oct 2016 03:20:03 +0000 (11:20 +0800)]
MLK-13341 IPU: mxc_vout: fix the potential uninitalized variable usage
Fix coverity CID 17624 uninitialized scalar variable
The 'fb_fmt' variable may be used before uninitialized
So initialize it at the begining.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Robby Cai [Fri, 14 Oct 2016 10:20:02 +0000 (18:20 +0800)]
MLK-13350-2 ARM: dts: add ecspi dts file for imx6sll lpddr3 arm2 board
ECSPI1_SCLK pin is shared by LCD power enable and SPI1 SCLK.
To use ecspi, need to disable lcdif function.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Fri, 14 Oct 2016 09:44:03 +0000 (17:44 +0800)]
MLK-13350-1 ARM: dts: add lcdif support for imx6sll lpddr3 arm2 board
Add lcdif data/ctrl pin and power-enable pin setting
Add backlight/pwm setting
disable ecspi1 since ECSPI1_SCLK pin is also used as LCD power enable,
and add another dts file for ecspi1.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Signed-off-by: Fancy Fang <chen.fang@freescale.com>
Robby Cai [Fri, 14 Oct 2016 06:22:28 +0000 (14:22 +0800)]
MLK-13345-2 ARM: dts: csi: add parallel camera support on imx6sll lpddr3 arm board
since there's pin conflict between camera and epdc on this board,
we add a new dts file for csi/camera function.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Fri, 14 Oct 2016 06:36:52 +0000 (14:36 +0800)]
MLK-13345-1 ARM: dts: csi: correct the base address for csi on imx6sll
correct the base address for imx6sll CSI
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Shengjiu Wang [Fri, 14 Oct 2016 05:12:11 +0000 (13:12 +0800)]
MLK-13343-2: ARM: dts: imx6sll: enable audio functions
enabled the wm8962 and spdif out.
There is pin conflict between spdif and usdhc2. So add
dedicate spdif dts.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Shengjiu Wang [Fri, 14 Oct 2016 04:54:43 +0000 (12:54 +0800)]
MLK-13343-1: ARM: imx: clk: Add extern audio clock in imx6sll
add extern audio clock in imx6sll clock tree
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Shengjiu Wang [Fri, 14 Oct 2016 03:44:34 +0000 (11:44 +0800)]
MLK-13224: ASoC: imx-hdmi-dma: fix glitch noise issue in long time playback
The calculation "runtime->status->hw_ptr * (runtime->frame_bits / 8)" may
exceed the integer scope, then appl_bytes is no correct.
This patch is to fix this issue.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Robby Cai [Thu, 13 Oct 2016 10:31:26 +0000 (18:31 +0800)]
MLK-13339-2 ARM: dts: pxp: enable pxp on imx6sll lpddr3 arm2 board
correct the clock name for pxp and enable pxp
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Thu, 13 Oct 2016 07:58:42 +0000 (15:58 +0800)]
MLK-13339-1 ARM: dts: epdc: add epdc support on imx6sll lpddr3 arm2 board
Add e-ink display PMIC setting, and add pin setting for epdc and the pmic.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Peter Chen [Wed, 12 Oct 2016 08:50:03 +0000 (16:50 +0800)]
MLK-13312-3 ARM: imx_v7_defconfig: build in usbnet to support NFS for non-ethernet board
At some boards, it has no ethernet support. As an alternative, we can use
USB Ethernet card to support NFS (u-boot supports it too). It supports
AXIS cards which are used most frequently.
This commit is the similar with below mainline commit:
https://git.kernel.org/cgit/linux/kernel/git/peter.chen/usb.git/commit/
?h=peter-usb-dev&id=
277ad756ead72845796c4f5430dd345301dc460b
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Peter Chen [Wed, 12 Oct 2016 08:10:58 +0000 (16:10 +0800)]
MLK-13312-2 ARM: imx6sll-lpddr3-arm2: add USB support
USBOTG1 is for dual-role, USBOTG2 is host-only due to pin conflict with EPDC.
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Peter Chen [Wed, 12 Oct 2016 08:08:30 +0000 (16:08 +0800)]
MLK-13312-1 ARM: imx6sll: refine USB support
The imx6sll is much like imx6ul, so add imx6ul compatible string for it.
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Robin Gong [Wed, 13 Jul 2016 01:47:22 +0000 (09:47 +0800)]
MLK-12928-22: mfd: pf1550: correct VMINSYS_MASK define
correct VMINSYS_MASK and _CNFG_REGTEMP_MASK define for regmap
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Mon, 27 Jun 2016 08:42:13 +0000 (16:42 +0800)]
MLK-12928-21 power: pf1550: fix charger interrupt never caught
Charger interrupt can't be caught anymore after plug in DC 5V in/out dozens of
times, that caused by VBUS_I or CHG_I pending interrupt not cleared in time. The root
cause is VBUS_I and CHG_I will be triggered in very narrow window, and VBUS_I/CHG_I
act as the sub-interrupt of charger and share the same interrupt handler. Thus if CHG_I
interrupt status is coming while VBUS_I handler is running, CHG_I interrupt status will
never be cleared, since interrupt has been disabled in ISR. The unclear CHG_I interrupt
status make pf1550 never trigger next interrupt again. So clear all charger interrupt
status in ISR to workaround instead of ack for every sub-intterrupt.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Sun, 12 Jun 2016 08:20:44 +0000 (16:20 +0800)]
MLK-12928-20 ARM: dts: imx6ul-14x14-evk-pf1550: enable pf1550 charger driver
enable pf1550 charger driver.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Wed, 12 Oct 2016 07:00:52 +0000 (15:00 +0800)]
MLK-12928-19 power: pf1550: remove usless DPMI
remove useless DPMI interrupt in pf1550 charger.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Wed, 12 Oct 2016 07:14:33 +0000 (15:14 +0800)]
MLK-129281-18 mfd: pf1550: remove usless DPMI interrupt
remove usless DPMI interrupt.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Wed, 12 Oct 2016 06:55:33 +0000 (14:55 +0800)]
MLK-12928-17 mfd: pf1550: remove DPMI interrupt
That's pf1550's internal interrupt, usless for charger.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Wed, 12 Oct 2016 06:53:28 +0000 (14:53 +0800)]
MLK-12928-16 regulator: pf1550: check device node check
Do not probe if the device node is not correct in dts.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Mon, 27 Jun 2016 08:13:50 +0000 (16:13 +0800)]
MLK-12928-15 mfd/regulator: pf1550: check OTP_SW2_DVS_ENB bit for different voltages
check OTP_SW2_DVS_ENB bit for the different voltage list while SW2
regulator registered.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Tue, 3 May 2016 07:58:46 +0000 (15:58 +0800)]
MLK-12928-14 mfd: pf1550: add otp read interface
add otp read interface to let pf1550 regulator driver or other sub driver
to read out otp register.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Fri, 29 Apr 2016 07:46:30 +0000 (15:46 +0800)]
MLK-12928-13 ARM: dts: imx6ul-14x14-evk-pf1550: add onkey device node
Add onkey device node in dts.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Wed, 12 Oct 2016 06:50:26 +0000 (14:50 +0800)]
MLK-12928-12 input: keyboard: pf1550: enable ONKEY wakeup interrupt before suspend
Enable ONKEY wakeup interrupt before suspend, and remove usless marocs.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Fri, 29 Apr 2016 01:55:33 +0000 (09:55 +0800)]
MLK-12928-11 mfd: pf1550: add irq ack for pf1550
add ".use_ack" ..etc for pf1550 irq, since we have to clear irq status in
pf1550, else no any more interrupt trigged.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Thu, 28 Apr 2016 13:15:38 +0000 (21:15 +0800)]
MLK-12928-10 mfd: pf1550: correct virtual irqs for every sub-driver of pf1550
Correct virtual irqs macro from zero for every sub-driver of pf1550,
otherwise,below warning will be triggered:
------------[ cut here ]------------
WARNING: CPU: 0 PID: 1 at kernel/irq/irqdomain.c:280 irq_domain_associate+0x148/0x1d4()
error: hwirq 0xb is too large for (null)
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted
4.1.15-01689-gb67ecb6-dirty #195
Hardware name: Freescale i.MX6 Ultralite (Device Tree)
[<
80015e04>] (unwind_backtrace) from [<
80012754>] (show_stack+0x10/0x14)
[<
80012754>] (show_stack) from [<
807909c0>] (dump_stack+0x84/0xc4)
[<
807909c0>] (dump_stack) from [<
80034914>] (warn_slowpath_common+0x84/0xb4)
[<
80034914>] (warn_slowpath_common) from [<
80034974>] (warn_slowpath_fmt+0x30/0x40)
[<
80034974>] (warn_slowpath_fmt) from [<
800717fc>] (irq_domain_associate+0x148/0x1d4)
[<
800717fc>] (irq_domain_associate) from [<
80071da4>] (irq_create_mapping+0x60/0xc4)
[<
80071da4>] (irq_create_mapping) from [<
804910a4>] (pf1550_onkey_probe+0xe8/0x230)
[<
804910a4>] (pf1550_onkey_probe) from [<
803823e8>] (platform_drv_probe+0x44/0xa4)
[<
803823e8>] (platform_drv_probe) from [<
80380ca0>] (driver_probe_device+0x174/0x2b4)
[<
80380ca0>] (driver_probe_device) from [<
80380eb0>] (__driver_attach+0x8c/0x90)
[<
80380eb0>] (__driver_attach) from [<
8037f1e8>] (bus_for_each_dev+0x6c/0xa0)
[<
8037f1e8>] (bus_for_each_dev) from [<
8038043c>] (bus_add_driver+0x148/0x1f0)
[<
8038043c>] (bus_add_driver) from [<
803814b4>] (driver_register+0x78/0xf8)
[<
803814b4>] (driver_register) from [<
80009730>] (do_one_initcall+0x8c/0x1d4)
[<
80009730>] (do_one_initcall) from [<
80a8bdac>] (kernel_init_freeable+0x144/0x1e4)
[<
80a8bdac>] (kernel_init_freeable) from [<
8078ca20>] (kernel_init+0x8/0xe8)
[<
8078ca20>] (kernel_init) from [<
8000f568>] (ret_from_fork+0x14/0x2c)
---[ end trace
dc402f301115a3b2 ]---
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Thu, 28 Apr 2016 04:20:32 +0000 (12:20 +0800)]
MLK-12928-9 ARM: configs: imx_v7_defconfig: add pf1550 driver
add new pf1550 pmic driver which based on MFD framework including regulator
,charger and ONKEY driver.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Thu, 28 Apr 2016 04:19:18 +0000 (12:19 +0800)]
MLK-12928-8 ARM: dts: imx6ul-14x14-evk: add new imx6ul-14x14-evk-pf1550 boad
Add new pf1550 board support.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Mon, 27 Jun 2016 07:32:50 +0000 (15:32 +0800)]
MLK-12928-7 regulator: pf1550: correct ldo ops setting
The voltage of LDO1 and LDO3 are not linear, use voltage_table instead,so
add new ops for them. Meanwhile, correct 12500uV for one step of SW1/SW2
rather than 125000uV.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Mon, 27 Jun 2016 07:14:09 +0000 (15:14 +0800)]
MLK-12928-6 mfd: pf1550: correct num_regs of regmap_irq_chip
Correct num_regs of regmap_irq_chip structure, otherwise request irq
failed.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Tue, 8 Dec 2015 10:12:09 +0000 (18:12 +0800)]
MLK-12928-5 input: keyboard: pf1550_onkey: add onkey driver for pf1550
Add pf1550_onkey driver, so that POWERON key can link to pf1550 instead of
i.mx6ul.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Tue, 8 Dec 2015 10:11:23 +0000 (18:11 +0800)]
MLK-12928-4 power: pf1550_charger: add pf1550 charger driver
Add basic pf1550 charger driver.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Tue, 8 Dec 2015 10:10:31 +0000 (18:10 +0800)]
MLK-12928-3: mfd: pf1550: add headfile for pf1550 mfd
Add head file for pf1550 mfd.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Tue, 8 Dec 2015 10:09:51 +0000 (18:09 +0800)]
MLK-12928-2 regulator: pf1550: add pf1550 regulator driver
Add basic pf1550 regulator driver.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Tue, 8 Dec 2015 10:08:35 +0000 (18:08 +0800)]
MLK-12928-1 mfd: pf1550: add pf1550 mfd driver
Add basic pf1550 mfd driver.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Anson Huang [Thu, 13 Oct 2016 10:26:30 +0000 (18:26 +0800)]
MLK-13333-3 ARM: imx: enable bus clock auto gating for i.mx6sll
i.MX6SLL has new hardware function of bus auto clock gating,
whenerve bus is idle, its clock will be auto gated to save
power, enable this function.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Thu, 13 Oct 2016 10:23:09 +0000 (18:23 +0800)]
MLK-13333-2 ARM: dts: imx6sll: add compatible string for iomuxc gpr
Add "fsl,imx6q-iomuxc-gpr" compatible string for i.MX6SLL.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Wed, 12 Oct 2016 20:59:34 +0000 (04:59 +0800)]
MLK-13333-1 ARM: imx: correct i.mx6sll dram io low power mode
i.MX6SLL has different DRAM IO offset, and it has no
CAS/RAS/ODT/RESET pin now, correct the DRAM IO offset.
To better support all different i.MX6 SoCs and different
DRAM types, introduce a new column to store the low power
settings for DRAM IO, then suspend asm code no need to check
SoC or DRAM type, just get the DRAM IO's low power
settings from OCRAM pm_info and set to each DRAM IO.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Guoniu.Zhou [Wed, 12 Oct 2016 03:29:31 +0000 (11:29 +0800)]
MLK-13329 IPU: add return value check after calling ipu_init_channel()
Fix coverity CID 17574 uncheck return value.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Haibo Chen [Wed, 12 Oct 2016 09:49:01 +0000 (17:49 +0800)]
MLK-13332-2 arm: dts: imx6sll-lpddr3-arm2: add SD3 slot support
Add SD3 support, now can support SD3.0 card. Due to the WP pin
DNP, so SD3 slot do not support write protect feature.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Haibo Chen [Wed, 12 Oct 2016 09:41:52 +0000 (17:41 +0800)]
MLK-13332-1 arm: dts: imx6sll-lpddr3-arm2: add SD3.0 support for SD1 slot
Add SD1 slot support for SD3.0 card.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Bai Ping [Tue, 11 Oct 2016 09:09:35 +0000 (17:09 +0800)]
MLK-13310-02 ARM: dts: imx: Correct the clock node property on imx6sll
Add more properties to the clock node.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Tue, 11 Oct 2016 09:00:28 +0000 (17:00 +0800)]
MLK-13310-01 ARM: dts: imx: remove unnecessary node on imx6sll
On i.MX6SLL, there're no LDO_ARM, LDO_SOC and LOD_PU regulator,
so remove these device node.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Tue, 11 Oct 2016 07:48:50 +0000 (15:48 +0800)]
MLK-13309-02 ARM: dts: imx: fix a typo of l2 cache node
fix a typo of L2 cache device node.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Tue, 11 Oct 2016 07:43:21 +0000 (15:43 +0800)]
MLK-13309-01 ARM: imx: clear the L2_PGE bit on imx6sll
On i.MX6SLL, the 'L2_PGE' bit in GPC CNTR register is set
by default,this bit must be clear, otherwise, system will
failed to resume from DSM mode if L2 cache is enabled.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Bai Ping [Mon, 10 Oct 2016 08:25:54 +0000 (16:25 +0800)]
MLK-13305 ARM: dts: Correct the setpoints table on imx6ull arm2 board
Correct the setpoints when LDO enabled on i.MX6ULL DDR3 arm2 board.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Anson Huang [Mon, 10 Oct 2016 16:44:19 +0000 (00:44 +0800)]
MLK-13306-2 ARM: imx: update MMDC restore settings for i.mx6sll
i.MX6SLL LPDDR3 script v1.2 is released, update MMDC
restore settings accordingly.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Mon, 10 Oct 2016 16:20:59 +0000 (00:20 +0800)]
MLK-13306-1 ARM: imx: correct ddr type for i.mx6sll
For MMDC, LPDDR3 type's value is 2b'11, which is
different from DDRC, so correct it.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Sun, 9 Oct 2016 10:52:52 +0000 (18:52 +0800)]
MLK-13303-11 ARM: imx: add cpufreq support for i.mx6sll
Add cpufreq support for i.MX6SLL, uses i.MX6SL's
opp table for now.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Sun, 9 Oct 2016 10:32:32 +0000 (18:32 +0800)]
MLK-13303-10 ARM: imx: add DSM mode support for i.mx6sll
Add DSM mode support for i.MX6SLL, Mega/Fast mix
can be off now.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>