linux.git
7 years agoMGS-2721: gpu: integrate 6.2.2 early release driver
Xianzhong [Fri, 10 Mar 2017 09:20:43 +0000 (17:20 +0800)]
MGS-2721: gpu: integrate 6.2.2 early release driver

integrated critical gpu bug-fixing for i.MX6/i.MX7ULP/i.MX8,
solved gpu hang and khronos conformance issues for below features:
 - OpenGL ES11/ES20/ES30/ES31/ES32,
 - OpenCL 1.1/1.2FP,
 - OpenVX 1.0.1
 - Vulkan 1.0
 - OpenVG 1.1

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
7 years agoMLK-14273: ARM: imx: mach-imx6q: fix csi mux setting for imx6qp
Laurentiu Palcu [Thu, 9 Mar 2017 09:54:17 +0000 (11:54 +0200)]
MLK-14273: ARM: imx: mach-imx6q: fix csi mux setting for imx6qp

Currently, for imx6qp, the first camera interface is set as MIPI CSI.
However, for sabresd and sabreauto, this should be set as parallel.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
7 years agoMLK-14400-2 defconfig: formalize imx_v7_mfg_defconfig
Haibo Chen [Fri, 10 Mar 2017 06:33:18 +0000 (14:33 +0800)]
MLK-14400-2 defconfig: formalize imx_v7_mfg_defconfig

This patch use command 'make savedefconfig' to produce the defconfig
and replace the imx_v7_mfg_defconfig

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
7 years agoMLK-14400-1 defconfig: fix warning in imx_v7_defconfig
Haibo Chen [Thu, 9 Mar 2017 11:49:25 +0000 (19:49 +0800)]
MLK-14400-1 defconfig: fix warning in imx_v7_defconfig

when use imx_v7_defconfig, there are following warning:

arch/arm/configs/imx_v7_defconfig:172:warning: override: reassigning to symbol TOUCHSCREEN_IMX6UL_TSC
arch/arm/configs/imx_v7_defconfig:392:warning: override: reassigning to symbol ION
arch/arm/configs/imx_v7_defconfig:393:warning: override: reassigning to symbol ION_MXC

This patch use command 'make savedefconfig' to produce the defconfig
and replace the imx_v7_defconfig.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
7 years agoMLK-14316 ASoC: fsl_ssi: Fix playback and capture with mono stream
Shengjiu Wang [Wed, 8 Mar 2017 17:44:47 +0000 (19:44 +0200)]
MLK-14316 ASoC: fsl_ssi: Fix playback and capture with mono stream

After starting playback with a single channel SSI runs in Normal mode
(SCR.net = 0b, SCR.i2s_mode = 00b). But, if starting also capture
in parallel with playback the SSI mode changes which breaks the playback.

This happens because, we can change SSI mode from two distinct places:
* _fsl_ssi_set_dai_fmt
* fsl_ssi_hw_params

When running playback and capture in parallel for a mono channel, changing
hw params for the second stream will have no effect.

This patch allows changing the mode only from fsl_ssi_hw_parms so that
we have an atomic view of SSI mode.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
7 years agoMLK-14388 mtd: gpmi: remove direct mtd->priv accesses
Octavian Purdila [Wed, 8 Mar 2017 17:02:29 +0000 (19:02 +0200)]
MLK-14388 mtd: gpmi: remove direct mtd->priv accesses

mtd->priv is no longer pointing to the struct nand_chip it is attached
to.  Replace those accesses by mtd_to_nand() calls.

Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
7 years agoMLK-14266 ARM: imx: mach-imx7d: remove mxc_restart
Octavian Purdila [Tue, 7 Mar 2017 15:03:26 +0000 (17:03 +0200)]
MLK-14266 ARM: imx: mach-imx7d: remove mxc_restart

mxc_restart was incorrectly added back in commit c81df74845c74d14
("MLK-13869 ARM: imx7d: run pm init during intialization").

Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
7 years agoMGS-2719 [#imx-421] fix gckOS_MapMemory failure
Xianzhong [Wed, 8 Mar 2017 08:56:20 +0000 (16:56 +0800)]
MGS-2719 [#imx-421] fix gckOS_MapMemory failure

gckOS_MapMemory failure with 4.9 kernel on ARM64 build,

_DmaMapUser will return gcvSTATUS_OUT_OF_MEMORY since
dma_mmap_writecombine does not set the valid device handle.

fslcma allocator has the same function as the DMA allocator,
then disable the DMA allocator to avoid more problems.

Date: Mar 08, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
7 years agoMGS-2715 [#imx-418] fix 6.2.0.p2 Coverity high impact issues
Xianzhong [Mon, 6 Mar 2017 08:47:55 +0000 (16:47 +0800)]
MGS-2715 [#imx-418] fix 6.2.0.p2 Coverity high impact issues

fix coverity high impact issues in 6.2.0.p2 gpu kernel driver

59982:  Resource leak (mappedQueue)
57724: Pointer to local outside scope (_nextCMDBUF)
57722: Uninitialized scalar variable (linkBytes)
57721: Uninitialized scalar variable (nopBytes)

Date: Mar 06, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
7 years agoMLK-14359-3 soc: imx8: correct pm domains compatible string
Anson Huang [Tue, 7 Mar 2017 16:50:00 +0000 (00:50 +0800)]
MLK-14359-3 soc: imx8: correct pm domains compatible string

Correct power domains compatible string name to match
with dtb.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
7 years agoMLK-14359-2 soc: imx8: skip power-domain initialization for non-SCFW system
Anson Huang [Tue, 7 Mar 2017 16:48:42 +0000 (00:48 +0800)]
MLK-14359-2 soc: imx8: skip power-domain initialization for non-SCFW system

For non-SCFW system, the power domain initialization is NOT
necessary, so add check to skip it if necessary.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
7 years agoMLK-14359-1 soc: imx8: improve coding style
Anson Huang [Tue, 7 Mar 2017 16:36:00 +0000 (00:36 +0800)]
MLK-14359-1 soc: imx8: improve coding style

Follow linux coding style.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
7 years agoMLK-14303: ARM: dts: imx7d: Fix duplicate tsc2046 definition
Leonard Crestez [Mon, 6 Mar 2017 16:07:07 +0000 (18:07 +0200)]
MLK-14303: ARM: dts: imx7d: Fix duplicate tsc2046 definition

Reconcile MLK-12075 ARM: dts: remove imx7d-sdb-touch.dts
with the upstream tsc2046@0 definition. When this patch was ported to
imx_4.9.y a new touchscreen definition was added instead.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
7 years agoMLK-14280: gpc: gpc driver not probed
Robert Chiras [Thu, 2 Mar 2017 12:01:46 +0000 (14:01 +0200)]
MLK-14280: gpc: gpc driver not probed

The GPC controller driver is handling two sections: interrupts and PGC
(Power Gate Controller). The interrupts are handled in imx_gpcv2_init
function, and the PGC is handled in imx_gpcv2_probe function.
In kernel 4.9, the driver is probed by it's compatible entry in:
OF_DECLARE_2(irqchip, imx_gpcv2, "fsl,imx7d-gpc", imx_gpcv2_init);

Because the driver is already probed, imx_gpcv2_probe function is not
called, since it is registered with the same compatible name.
In order to separate the interrupts from PGC, this patch moves the
regulator entrys in DTS to a new node: pgc. And, assign the probe
function to this new node.
Also, added DeviceTree documentation about the new added node. Since GPC
(the block containing the PGC) didn't have any documentation, documented
GPC too.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
7 years agoMLK-14283: dts: fix DE polarity for lcdif
Robert Chiras [Thu, 2 Mar 2017 14:01:38 +0000 (16:01 +0200)]
MLK-14283: dts: fix DE polarity for lcdif

For imx7d, the DTS definition (imx7d-sdb.dts) is used by default, and this
is the one used when plugging a HDMI device. Since HDMI works with DE
polarity as active high, but the MIPI DSI works with active low, this
patch sets the DE polarity to active high in imx7-sdb.dts and moves the
active low polarity to imx7d-sdb-mipi-dsi.dts.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
7 years agoMLK-14325-3 PCI: designware: Remove the redundant codes
Richard Zhu [Tue, 7 Mar 2017 01:12:09 +0000 (09:12 +0800)]
MLK-14325-3 PCI: designware: Remove the redundant codes

Remove the redundant codes in pcie-designware driver.
Because that the class configration had been
contained in 4.9 kernel.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
7 years agoMLK-14325-2 PCI: imx: enable pcie on 4.9 kernel
Richard Zhu [Tue, 7 Mar 2017 01:11:12 +0000 (09:11 +0800)]
MLK-14325-2 PCI: imx: enable pcie on 4.9 kernel

- Do not return error when the GEN2 link negatiation
is failed. Because that the limitation maybe caused
by the remote GEN1 EP device.
- Move the power saving codes to the proper place
after the link is down.
Otherwise, system would hang when link is down.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
7 years agoMLK-14325-1 ARM: dts: enable imx pcie gen2 link
Richard Zhu [Tue, 28 Feb 2017 01:22:23 +0000 (09:22 +0800)]
MLK-14325-1 ARM: dts: enable imx pcie gen2 link

Set the max link capability of the imx pcie to gen2

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
7 years agoARM: imx: hide unused variable in #ifdef
Arnd Bergmann [Tue, 10 Jan 2017 12:19:05 +0000 (13:19 +0100)]
ARM: imx: hide unused variable in #ifdef

A bugfix added a new local variable that is only used inside of an #ifdef
section, and unused if CONFIG_PERF_EVENTS is disabled:

arch/arm/mach-imx/mmdc.c:63:25: warning: 'cpuhp_mmdc_state' defined but not used [-Wunused-variable]

This moves the variable down inside that same ifdef.

Fixes: a051f220d6b9 ("ARM/imx/mmcd: Fix broken cpu hotplug handling")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
7 years agoARM/imx/mmcd: Fix broken cpu hotplug handling
Thomas Gleixner [Wed, 21 Dec 2016 19:19:48 +0000 (20:19 +0100)]
ARM/imx/mmcd: Fix broken cpu hotplug handling

The cpu hotplug support of this perf driver is broken in several ways:

1) It adds a instance before setting up the state.

2) The state for the instance is different from the state of the
   callback. It's just a randomly chosen state.

3) The instance registration is not error checked so nobody noticed that
   the call can never succeed.

4) The state for the multi install callbacks is chosen randomly and
   overwrites existing state. This is now prevented by the core code so the
   call is guaranteed to fail.

5) The error exit path in the init function leaves the instance registered
   and then frees the memory which contains the enqueued hlist node.

6) The remove function is removing the state and not the instance.

Fix it by:

- Setting up the state before adding instances. Use a dynamically allocated
  state for it.

- Installing instances after the state has been set up

- Removing the instance in the error path before freeing memory

- Removing the instance not the state in the driver remove callback

While at is use raw_cpu_processor_id(), because cpu_processor_id() cannot
be used in preemptible context, and set the driver data after successful
registration of the pmu.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Cc: Frank Li <frank.li@nxp.com>
Cc: Zhengyu Shen <zhengyu.shen@nxp.com>
Link: http://lkml.kernel.org/r/20161221192111.596204211@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
7 years agoARM: imx: mmdc perf function support i.MX6QP
Frank Li [Mon, 7 Nov 2016 17:30:48 +0000 (11:30 -0600)]
ARM: imx: mmdc perf function support i.MX6QP

i.MX6QP added new register bit PROFILE_SEL in MADPCR0.
need set it at perf start.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
7 years agoRevert "Revert "ARM: imx: Added perf functionality to mmdc driver""
Tiberiu Breana [Mon, 6 Mar 2017 16:56:13 +0000 (18:56 +0200)]
Revert "Revert "ARM: imx: Added perf functionality to mmdc driver""

This reverts commit 0fcec3b21f92184b230c98b85887fa7fbbdf6f64.

7 years agoMLK-14301: Revert "MLK-11343-01 cpufreq: imx: replace clk_get & regulator_get will...
Leonard Crestez [Fri, 3 Mar 2017 17:09:04 +0000 (19:09 +0200)]
MLK-14301: Revert "MLK-11343-01 cpufreq: imx: replace clk_get & regulator_get will devm ones"

Upstream rejected this patch because it is wrong: Attaching clk and
regulator resources to the cpu device results in them never actually
getting freed.

This is relevant now that we rely on supporting EPROBE_DEFER because we
must handle correctly returning from a partial probe.

In particular this patch fixes imx6qp-sabresd not setting the PU
regulator to bypass mode because the cpufreq driver fetched the
regulator before gpc and leaked it.

This is not a straight revert because other clks and regulators were
added, we add code to free them too.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
7 years agoMLK-14301: imx dts: Fix cpu regulator references
Leonard Crestez [Fri, 3 Mar 2017 16:50:41 +0000 (18:50 +0200)]
MLK-14301: imx dts: Fix cpu regulator references

On imx_4.9.y we no longer override the cpu arm/soc/pu-supply properties
to link to pmic directly but rather rely on the regulator core
propagating a set_voltage on a bypassed regulator upwards.

This change was already performance for imx6qdl, now do it for all the
boards using ldo-bypass.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
7 years agoMLK-14291 ARM: config: imx: Allow changing trip temperatures from userspace
Irina Tirdea [Tue, 28 Feb 2017 16:01:28 +0000 (18:01 +0200)]
MLK-14291 ARM: config: imx: Allow changing trip temperatures from userspace

The temperature trip points should be writable from userspace to
allow testing the thermal driver. This is a new configuration
option added in 4.9 and needed to allow the functionality
introduced by commit fc4fcd689419
("MLK-11705 thermal: imx: make the critical trip temp changable for test").

Signed-off-by: Irina Tirdea <irina.tirdea@nxp.com>
7 years agoMLK-14291 thermal: imx: fix setting passive trip temp
Irina Tirdea [Tue, 28 Feb 2017 15:51:05 +0000 (17:51 +0200)]
MLK-14291 thermal: imx: fix setting passive trip temp

When setting passive temperature trip point, it is not
allowed to set a higher value than the default.

Currently the driver compares the new temperature to set
with a constant (0). This comparison wil always be true
(temp to set higher than 0) and the driver will return
-EINVAL. This is a leftover from rebasing the commit fc4fcd689419
("MLK-11705 thermal: imx: make the critical trip temp changable for test").

Fix the comparison by using the actual default passive
temperature value instead of the wrong constant.

Signed-off-by: Irina Tirdea <irina.tirdea@nxp.com>
7 years agoMLK-14304 ARM: dts: imx7d: enable ocotp node
Octavian Purdila [Fri, 3 Mar 2017 11:04:22 +0000 (13:04 +0200)]
MLK-14304 ARM: dts: imx7d: enable ocotp node

The octop node was defined in imx7s.dtsi but disabled. It is needed by
the fsl_otp driver.

Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
7 years agoMLK-14292: 4.9 rebase: LCDIF: 6SX SDB does not boot with lcdif dts
Cristina Ciocan [Tue, 28 Feb 2017 17:10:54 +0000 (19:10 +0200)]
MLK-14292: 4.9 rebase: LCDIF: 6SX SDB does not boot with lcdif dts

On imx6SX SDB eLCDIF driver cannot coexist with CAAM driver. The cause
seems to be an ipg clk that failes to be identified by the CAAM driver.

This patch disables the CAAM driver by setting its status to "disabled"
in the dts used for obtaining LCDIF functionality.

Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
7 years agoMLK-13982: 4.9 rebase: EPDC does not work
Cristina Ciocan [Mon, 27 Feb 2017 10:04:17 +0000 (12:04 +0200)]
MLK-13982: 4.9 rebase: EPDC does not work

The Linux kernel regulator core implementation does not accept negative
voltage values; all negative values are treated as errors.

The problem with the EPDC is that the panel uses a negative voltage
regulator which fails to be enabled by the regulator core. This issue has
slipped up until the 4.9 rebase because the voltage range [min, max] was
checked against only when min = max. This has been fixed in 4.9, resulting
in errors in the VCOM regulator driver.

The fix is to use the negative values when communicating with the hardware,
but send only positive values to the regulator core.

This patch sends the absolute value to the regulator core and transforms
the received value (from the regulator core) to negative one before sending
it to hardware.

Fix device tree to deal with negative voltage regulator values by setting
min_value = -real_max_value and vice versa. Boards affected:
- imx6dl-sabresd
- imx6ull-14x14-ddr3-arm2
- imx7d-12x12-lpddr3-arm2
- imx7d-sdb
- imx6sll-evk
- imx6sl-evk
- imx6sll-lpddr3-arm2

Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
7 years agoMLK-13996: lcdif: Use DE polarity specified in DTS
Robert Chiras [Fri, 17 Feb 2017 12:16:52 +0000 (14:16 +0200)]
MLK-13996: lcdif: Use DE polarity specified in DTS

Currently, the LCDIF driver (mxsfb.c) is overriding the DE polarity
specified in DTS with the one specified in fb_videomode (sync member) by
the panel driver.
Initially, the panel driver found in
drivers/video/fbdev/mxc/mxcfb_hx8363_wvga.c specified the sync in
fb_videomode as FB_SYNC_OE_LOW_ACT.

But this patch, changed it to 0x0:

commit 4deb430fd05a ("MLK-13607-8 video: mipi-panel: hx8363: change DE
polarity to active high")
Author: Fancy Fang <chen.fang@nxp.com>
Date:   Wed Dec 14 16:21:51 2016 +0800

    The NorthWest Logic MIPI DSI only support active low data enable
    signal on imx7ulp-evk board.

The problem is that, the hx8363 panel was working with active low on
imx7d-sdb, but with active high on imx7ulp-evk. The above patch broke
hx8363 panel on imx7d-sdb board.

So, instead of using a hard-coded polarity in panel driver, better use
the one defined in device-tree.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
7 years agoMLK-14283: mxsfb: fix clock definitions for lcdif
Robert Chiras [Mon, 27 Feb 2017 13:19:50 +0000 (15:19 +0200)]
MLK-14283: mxsfb: fix clock definitions for lcdif

The mxsfb framebuffer driver uses three clock definitions, but only two
are defined in DTS for imx7s (also used by imx7d); because of this,
driver fails in probe. Since iMX7D uses only one clock, add the third clock
and make two of them dummy.
Also, add additional error messages for better identification of a
failing probe.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
7 years agoMLK-14276-2 mmc: sdhci: remove IS_ERR_VALUE abuses
Haibo Chen [Tue, 28 Feb 2017 11:12:14 +0000 (19:12 +0800)]
MLK-14276-2 mmc: sdhci: remove IS_ERR_VALUE abuses

It is wrong to pass 'int' to IS_ERR_VALUE(), Linus's commit
aa00edc1 point out this abuse.

This patch use operator instead.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
7 years agoMLK-14276-1 mmc: sdio: remove compile warning
Haibo Chen [Mon, 27 Feb 2017 09:07:28 +0000 (17:07 +0800)]
MLK-14276-1 mmc: sdio: remove compile warning

Remove the TI wifi from defconfig and include the head file host.h
which contain the definition of struct mmc_host to avoid the following
compile warning:

In file included from drivers/net/wireless/ti/wlcore/sdio.c:28:0:
./include/linux/mmc/sdio.h:193:35: warning: 'struct mmc_host' declared inside parameter list
 void mmc_sdio_force_remove(struct mmc_host *host);
                                    ^
./include/linux/mmc/sdio.h:193:35: warning: its scope is only this definition or declaration, which is probably not what you want

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
7 years agoMLK-14271 ARM64: configs: defconfig: remove unused configs to fix build warnings
Anson Huang [Mon, 27 Feb 2017 10:06:11 +0000 (18:06 +0800)]
MLK-14271 ARM64: configs: defconfig: remove unused configs to fix build warnings

Remove unused configs to fix below build warnings:

  CC      drivers/pci/host/pci-layerscape.o
drivers/pci/host/pci-layerscape.c:182:2: warning: initialization from incompatible pointer type
  .host_init = ls1021_pcie_host_init,
  ^
drivers/pci/host/pci-layerscape.c:182:2: warning: (near initialization for ‘ls1021_pcie_host_ops.host_init’)
drivers/pci/host/pci-layerscape.c:188:2: warning: initialization from incompatible pointer type
  .host_init = ls_pcie_host_init,
  ^
drivers/pci/host/pci-layerscape.c:188:2: warning: (near initialization for ‘ls_pcie_host_ops.host_init’)
  CC      drivers/pci/host/pcie-qcom.o
drivers/pci/host/pcie-qcom.c:482:2: warning: initialization from incompatible pointer type
  .host_init = qcom_pcie_host_init,
  ^
drivers/pci/host/pcie-qcom.c:482:2: warning: (near initialization for ‘qcom_pcie_dw_ops.host_init’)
  CC      drivers/pci/host/pcie-armada8k.o
drivers/pci/host/pcie-armada8k.c:164:2: warning: initialization from incompatible pointer type
  .host_init = armada8k_pcie_host_init,
  ^
drivers/pci/host/pcie-armada8k.c:164:2: warning: (near initialization for ‘armada8k_pcie_host_ops.host_init’)
  LD      drivers/pci/host/built-in.o
  LD      drivers/pci/built-in.o

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
7 years agoMLK-14241-5: ARM: imx: pm-rpmsg: add heartbeat_off support in bootargs
Robin Gong [Thu, 23 Feb 2017 10:07:56 +0000 (18:07 +0800)]
MLK-14241-5: ARM: imx: pm-rpmsg: add heartbeat_off support in bootargs

If bootargs with 'heartbeat_off' setting, will remove heartbeat feature
in kernel and M4 will not reset A7 even A7 hang. It's useful for debug
in A7 if you want to connect debugger, otherwise M4 will reset A7 core
if A7 core halt more than 30s.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-14241-4 ARM: imx: pm-rpmsg: fix 'rpmsg_send timeout' during bootup
Robin Gong [Wed, 22 Feb 2017 09:34:42 +0000 (17:34 +0800)]
MLK-14241-4 ARM: imx: pm-rpmsg: fix 'rpmsg_send timeout' during bootup

The rpmsg driver probe function such as pm_rpmsg_probe is called by rpmsg
rx callback, so we can't wait in pm_rpmsg_probe for any completion which
issued by callback itself, otherwise, timeout triggered definitily, because
your last callback no chance to reurn to handle the next callback unless
timeout happened. This patch move the rpmsg send code from pm_rpmsg_probe
to delay work.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-14241-3 ARM: imx: pm-rpmsg: cancel heartbeat workqueue before suspend
Robin Gong [Wed, 22 Feb 2017 08:52:51 +0000 (16:52 +0800)]
MLK-14241-3 ARM: imx: pm-rpmsg: cancel heartbeat workqueue before suspend

cancel heartbeat workqueue to make sure no any heartbeat message will
be sent to M4 after M4 thought A7 core enter VLLS mode.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-14241-2 ARM: imx: pm-rpmsg: add mutex protect for pm_send_message
Robin Gong [Mon, 20 Feb 2017 00:58:30 +0000 (08:58 +0800)]
MLK-14241-2 ARM: imx: pm-rpmsg: add mutex protect for pm_send_message

Heatbeat workqueue and suspend/resume may call pm_send_message at the same
time as pf1550-regulator-rpmsg driver, so add mutex to avoid the potential
pm_qpos_* reentry issue.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-14241-1 regulator: pf1550-regulator-rpmsg: add mutex for pm_qos_add_request reentry
Robin Gong [Sun, 19 Feb 2017 07:50:56 +0000 (15:50 +0800)]
MLK-14241-1 regulator: pf1550-regulator-rpmsg: add mutex for pm_qos_add_request reentry

Multi drivers(mmc, cpufreq..) may access pf1550 regulator rpmsg driver at
the same time, so we have to add mutex for this multi-entry case. Otherwise
the below kernel warning maybe triggered:

------------[ cut here ]------------
WARNING: CPU: 0 PID: 19 at kernel/power/qos.c:453 pf1550_send_message+0x4c/0xf8()
pm_qos_add_request() called for already added request
Modules linked in:
CPU: 0 PID: 19 Comm: kworker/0:1 Not tainted 4.1.33-02293-g80b8c19 #636
Hardware name: Freescale i.MX7ULP (Device Tree)
Workqueue: events od_dbs_timer
[<80015d78>] (unwind_backtrace) from [<8001271c>] (show_stack+0x10/0x14)
[<8001271c>] (show_stack) from [<8082ba50>] (dump_stack+0x88/0x9c)
[<8082ba50>] (dump_stack) from [<800387c8>] (warn_slowpath_common+0x80/0xb0)
[<800387c8>] (warn_slowpath_common) from [<80038828>] (warn_slowpath_fmt+0x30/0x40)
[<80038828>] (warn_slowpath_fmt) from [<80341180>] (pf1550_send_message+0x4c/0xf8)
[<80341180>] (pf1550_send_message) from [<80341504>] (pf1550_get_voltage+0x48/0x5c)
[<80341504>] (pf1550_get_voltage) from [<803370a0>] (_regulator_get_voltage+0x68/0xb4)
[<803370a0>] (_regulator_get_voltage) from [<8033936c>] (_regulator_do_set_voltage+0x5c/0x3e4)
[<8033936c>] (_regulator_do_set_voltage) from [<803397a4>] (regulator_set_voltage+0xb0/0x14c)
[<803397a4>] (regulator_set_voltage) from [<8058dae8>] (imx7ulp_set_target+0x178/0x238)
[<8058dae8>] (imx7ulp_set_target) from [<80584d14>] (__cpufreq_driver_target+0x164/0x294)
[<80584d14>] (__cpufreq_driver_target) from [<8058bb08>] (dbs_check_cpu+0x1a0/0x1e0)
[<8058bb08>] (dbs_check_cpu) from [<805888e8>] (od_dbs_timer+0x80/0x138)
[<805888e8>] (od_dbs_timer) from [<8004bbbc>] (process_one_work+0x118/0x3e4)
[<8004bbbc>] (process_one_work) from [<8004bed4>] (worker_thread+0x4c/0x4f4)
[<8004bed4>] (worker_thread) from [<80050e4c>] (kthread+0xdc/0xf4)
[<80050e4c>] (kthread) from [<8000f528>] (ret_from_fork+0x14/0x2c)
---[ end trace f8281ecde7a0b4ce ]---
------------[ cut here ]------------

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-14252-2 video: mipi_dsi_northwest: reset dsi domains when dsi disabled.
Fancy Fang [Thu, 23 Feb 2017 08:31:37 +0000 (16:31 +0800)]
MLK-14252-2 video: mipi_dsi_northwest: reset dsi domains when dsi disabled.

Put the three dsi domains into reset state when dsi is disabled
to avoid dsi being an unstable state before next time enabled.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
7 years agoMLK-14252-1 video: mipi_dsi_northwest: reset dsi domains when shutdown.
Fancy Fang [Thu, 23 Feb 2017 06:17:45 +0000 (14:17 +0800)]
MLK-14252-1 video: mipi_dsi_northwest: reset dsi domains when shutdown.

Put the three dsi domains into reset state before dsi is
shutdown to avoid dsi being a unstable state.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
7 years agoMLK-14237 video: mxsfb: fb1 maybe access when fb0 in blank state
Fancy Fang [Thu, 23 Feb 2017 01:36:26 +0000 (09:36 +0800)]
MLK-14237 video: mxsfb: fb1 maybe access when fb0 in blank state

The overlay framebuffer fb1 access maybe accessed when fb0
is in the blank state in which all the lcd clocks have been
disabled.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
7 years agoMLK-13362-2 ARM: imx: fix audio bus mode hang for imx6dq lpddr2
Juan Gutierrez [Tue, 21 Feb 2017 01:24:25 +0000 (19:24 -0600)]
MLK-13362-2 ARM: imx: fix audio bus mode hang for imx6dq lpddr2

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/panic issue.

This is basically a porting of 4d09bf110b878a6f720ee9d19c8b64ceace95fbe
to imx6dq lppdr2.

Also a member "freq" has been added to the mmdc_settings_info structure
to store the current ddr frequency on iram settings to be able to execute
the double MU count, only on 400MHz mode and bypass the operation
otherwise within the update freq routine.

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
7 years agoMLK-14240 video: mipi_dsi_northwest: fix access dsi register when clock disabled.
Fancy Fang [Wed, 22 Feb 2017 07:16:23 +0000 (15:16 +0800)]
MLK-14240 video: mipi_dsi_northwest: fix access dsi register when clock disabled.

In the mipi_dsi_shutdown() function, it accesses some dsi registers.
But in some cases, the esc_clk may be disabled at this moment. So
first enable this clock then do other shutdown works. Otherwise,
it may cause kernel panic dump as belows when rebooting system:

Unhandled fault: imprecise external abort (0x1c06) at 0x0033802c
pgd = b0a24000
[0033802c] *pgd=908f1831, *pte=6320775f, *ppte=63207c7f
Internal error: : 1c06 [#1] PREEMPT SMP ARM
Modules linked in:
CPU: 0 PID: 1059 Comm: reboot Not tainted 4.1.33-02248-g22f8d64-dirty #513
Hardware name: Freescale i.MX7ULP (Device Tree)
task: b0f56600 ti: b08e8000 task.ti: b08e8000
PC is at mipi_dsi_pkt_write+0x38/0x1b0
LR is at mipi_dsi_wr_tx_header.constprop.2+0x6c/0x94
pc : [<802fda08>]    lr : [<802fd8b8>]    psr: 60070013
sp : b08e9c00  ip : 00000001  fp : 00000000
r10: 00000000  r9 : b024a810  r8 : b00c5044
r7 : 80cac4d8  r6 : 80bd2504  r5 : b024a810  r4 : b024a810
r3 : c0920000  r2 : 00000000  r1 : 60070013  r0 : 00000023
Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment user
Control: 10c53c7d  Table: 90a2406a  DAC: 00000015
Process reboot (pid: 1059, stack limit = 0xb08e8210)
Stack: (0xb08e9c00 to 0xb08ea000)
9c00: 00000000 80066e30 00000000 b00c5000 20070113 b024a810 b024a810 b00c5010
9c20: 80cac4d8 b00c5044 80c54020 00000000 00000000 802fdba4 00000028 00000000
9c40: bf672edc 00000001 80bdff40 8007ad7c 8004993c 8082eb30 00000000 80be0140
9c60: 80bcddc0 80832cd8 80c517f1 80bcddc0 b08e9c70 80bdfb40 b0004c60 00000000
9c80: 00000009 00000000 00000009 00000000 80c576c0 00000000 80bd20a8 8003b9d8
9ca0: 00000000 b08e9d68 b08e9ca0 80c576c0 0000000a ffffb7c1 80bd2100 80bcbbe8
9cc0: 00000000 80bcd800 b0f56600 bf672800 b0f56648 b00fab08 b00fab10 8005fc30
9ce0: 00000017 00000000 00000000 8006ff84 c080200c 00000026 80bd2838 b08e9d28
9d00: 80361f04 80c586d6 80c586d6 8035b2a8 80361f04 b02b3610 80bd2504 001c0700
9d20: 003c0700 8036212c 80bff3b0 80c58198 80bdf8a0 20070093 00000199 8082e868
9d40: 00000000 80bdf8a0 80c58198 00000000 00000199 8082eadc 80c58198 8006e8b0
9d60: 00000400 80c5f48c 00000029 80c98ac8 80c58198 80c98098 60070013 00000000
9d80: 80bdf880 00000001 00000000 80c58198 00000000 00000029 00000001 80c58198
9da0: 00000029 00000001 00000000 8006e654 00000000 8006ee2c 00000000 00000000
9dc0: 00000000 00000000 80c98ae6 00000029 00000000 00000000 00000000 60070013
9de0: 00000000 00000000 00000000 8006f214 b024a810 b00c5010 80cac4d8 b00c5044
9e00: 80c54020 00000000 00000000 8006f238 80a580f0 b08e9e34 00000000 80824414
9e20: 80a58148 b08e9e34 b024a810 802fdc6c 80a580f0 80872338 00000000 802fdc80
9e40: 60070013 b024a810 b00c1a10 802fdd10 802fdcf0 b00c5010 b00c1a10 8038e8a8
9e60: b00c501c 8038b3cc 01234567 00000000 80bdee38 00000000 fee1dead 8000f644
9e80: b08e8000 800529cc 00000000 80052c24 bf699000 00000001 00000000 800b3498
9ea0: 00000000 bfca9160 bf699000 80bd04b8 bfca9160 00000000 80c50880 800b5460
9ec0: b08e9ed4 00000000 b08e9ec8 00000000 b074ad10 00000000 00359000 b074a7e8
9ee0: b08e9f20 b074ad10 b0a56e00 00351000 b074ad10 800d3cb8 b0a56e00 00000000
9f00: b074ad10 00351000 00000001 00000001 b08e9f24 b0001680 00000001 00000001
9f20: b08e9f34 bf672e00 b086a240 bf672e00 ae13f550 ae13f5a0 00080040 00000001
9f40: b086a240 ae1533f0 00000000 b07e1d90 ae13f550 40000010 b086a240 800ed1b0
9f60: 00000020 00000000 b0f569f8 00000000 b0f569f8 00000000 80c57c28 b0f56600
9f80: 00000000 8004f358 b086a240 b08e8000 8000f644 7eec5e14 00000003 00000000
9fa0: 00000058 8000f4c0 7eec5e14 00000003 fee1dead 28121969 01234567 00000000
9fc0: 7eec5e14 00000003 00000000 00000058 00000000 00000000 00000000 00000000
9fe0: 76f3ec10 7eec5c7c 00010fc8 76f3ec30 60070010 fee1dead 00000000 00000000
[<802fda08>] (mipi_dsi_pkt_write) from [<802fdba4>] (mipi_dsi_dcs_cmd.part.0+0x24/0x2c)
[<802fdba4>] (mipi_dsi_dcs_cmd.part.0) from [<802fdc80>] (mipi_display_enter_sleep+0x30/0xa0)
[<802fdc80>] (mipi_display_enter_sleep) from [<802fdd10>] (mipi_dsi_shutdown+0x20/0x9c)
[<802fdd10>] (mipi_dsi_shutdown) from [<8038e8a8>] (platform_drv_shutdown+0x18/0x28)
[<8038e8a8>] (platform_drv_shutdown) from [<8038b3cc>] (device_shutdown+0xdc/0x1e4)
[<8038b3cc>] (device_shutdown) from [<800529cc>] (kernel_restart+0xc/0x50)
[<800529cc>] (kernel_restart) from [<80052c24>] (SyS_reboot+0xc8/0x1b8)
[<80052c24>] (SyS_reboot) from [<8000f4c0>] (ret_fast_syscall+0x0/0x3c)
Code: e34860bd e58da000 e1a0200c ebffff90 (f57ff04e)
---[ end trace 9f61c48a242457f2 ]---

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
7 years agoMGS-2664-7 [#imx-403] request "gpu2d" and "gpuvg" resets as shared
Prabhu Sundararaj [Fri, 17 Feb 2017 20:22:43 +0000 (14:22 -0600)]
MGS-2664-7 [#imx-403] request "gpu2d" and "gpuvg" resets as shared

These resets are shared at least on im6q, so request them as shared to
avoid devm_reset_control_get() failures since Linux 4.9 upstream has modified it
to assume exclusive usage.

Date: Feb 17, 2016
Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
7 years agoMLK-13281-2 ARM: imx: missing brackets on phy checking for 6sx
Juan Gutierrez [Thu, 16 Feb 2017 21:01:48 +0000 (15:01 -0600)]
MLK-13281-2 ARM: imx: missing brackets on phy checking for 6sx

Adding the corresponding brackets were missing when introducing
a new phy fixup function. This patch fix it.

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
7 years agoMLK-14007: ASoC: fsl_rpmsg_i2s: remove mono for M4 don't support it
Shengjiu Wang [Mon, 20 Feb 2017 07:44:40 +0000 (15:44 +0800)]
MLK-14007: ASoC: fsl_rpmsg_i2s: remove mono for M4 don't support it

Currently the M4 audio driver don't support mono channel, so remove it.
After mono channel is supported in M4 os, this commit should be reverted.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
7 years agoMLK-13997: ARM: dts: disable rpmsg-audio in wm8960 dts for conflict
Shengjiu Wang [Mon, 20 Feb 2017 03:43:26 +0000 (11:43 +0800)]
MLK-13997: ARM: dts: disable rpmsg-audio in wm8960 dts for conflict

The rpmsg-audio and wm8960-audio use same device in two way, there is
conflict when enabled together.
imx7ulp-evk-wm8960.dts is for demo usage, there is a hardware issue
(TKT320235) that EDMA interrupt can't wake up the A7 core, so there
is glitch noise occassionally.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
7 years agoMGS-2664-5 [#imx-403] update GPU platform config with i.MX8QM
Xianzhong [Thu, 16 Feb 2017 08:16:07 +0000 (16:16 +0800)]
MGS-2664-5 [#imx-403] update GPU platform config with i.MX8QM

Update GPU platform config with i.MX8QM.

Date: Feb 16, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
7 years agoMGS-2664-4 [#imx-403] fix __dma_flush_range wht 4.9 kernel
Xianzhong [Thu, 16 Feb 2017 08:08:58 +0000 (16:08 +0800)]
MGS-2664-4 [#imx-403] fix __dma_flush_range wht 4.9 kernel

__dma_flush_range interface is removed in 4.9 kernel version,
should use the replaceable function with __dma_flush_area instead.

Date: Feb 16, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
7 years agoMGS-2664-2 [#imx-403] fix gpu build failure with get_user_pages
Xianzhong [Thu, 16 Feb 2017 08:03:48 +0000 (16:03 +0800)]
MGS-2664-2 [#imx-403] fix gpu build failure with get_user_pages

get_user_pages function has interface change in 4.9 kernel,
update the gpu driver to fix the build problem.

Date: Feb 16, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
7 years agoMLK-13994-1: ARM: imx7ulp: add acknowledgement for vlls message notification
Robin Gong [Fri, 17 Feb 2017 07:48:56 +0000 (15:48 +0800)]
MLK-13994-1: ARM: imx7ulp: add acknowledgement for vlls message notification

Now, M4 rpmsg add free buffer feature that free the reciever buffer and update
some rpmsg structure data in share memory(DDR) once M4 receive the message from
A7 side, that means M4 will access DDR after it receive the vlls message(A7 enter
VLLS mode quickly), thus M4 hang because DDR in slef-refresh...
This patch move the vlls message notification ahead to driver suspend and add
acknowledgement to make sure no any DDR access comes from M4 side after A7 enter
suspend.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13994-2 ARM: dts: imx7ulp: add heartbeat device node
Robin Gong [Fri, 17 Feb 2017 07:59:25 +0000 (15:59 +0800)]
MLK-13994-2 ARM: dts: imx7ulp: add heartbeat device node

add heartbeat device node to add suspend/resume in
arch/arm/mach-imx/pm-rpmsg.c

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13992: ASoC: fsl_rpmsg_i2s: add flush workqueue
Shengjiu Wang [Fri, 17 Feb 2017 02:09:31 +0000 (10:09 +0800)]
MLK-13992: ASoC: fsl_rpmsg_i2s: add flush workqueue

some cmd is sent by workqueue, others are sent by call send message
function directly, for workqueue may have delay, so there is occasion
that cmd is not sent in order.
Add flush_workqueue before the CLOSE and SUSPEND to make sure previous
cmd is finished in that time.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
7 years agoMLK-13991: ASoC: fsl_rpmsg_i2s: remove unsupported rate
Shengjiu Wang [Fri, 17 Feb 2017 02:11:35 +0000 (10:11 +0800)]
MLK-13991: ASoC: fsl_rpmsg_i2s: remove unsupported rate

The M4 audio driver only support 8k/16k/32k/44k/48kHz sample rate.
so remove other rate in supported list.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
7 years agoMLK-13993: video: Distinguish fb0 and fb1 in userspace.
Guoniu.Zhou [Fri, 17 Feb 2017 04:54:11 +0000 (12:54 +0800)]
MLK-13993: video: Distinguish fb0 and fb1 in userspace.

In userspace, user can not distinguish fb0 and fb1, so add fb1/name property to
distinguish them.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
7 years agoMLK-13914-06 ARM: config: imx: Enbale cpufreq support for i.mx7ulp
Bai Ping [Mon, 13 Feb 2017 08:54:25 +0000 (16:54 +0800)]
MLK-13914-06 ARM: config: imx: Enbale cpufreq support for i.mx7ulp

Enbale cpufreq support for i.MX7ULP in defconfig.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
7 years agoMLK-13914-05 ARM: imx: Add cpufreq device on i.mx7ulp
Bai Ping [Mon, 13 Feb 2017 08:53:31 +0000 (16:53 +0800)]
MLK-13914-05 ARM: imx: Add cpufreq device on i.mx7ulp

Add cpufreq device on i.MX7ULP.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
7 years agoMLK-13914-04 cpufreq: imx7ulp: Add cpufreq driver on i.mx7ulp
Bai Ping [Mon, 13 Feb 2017 08:30:08 +0000 (16:30 +0800)]
MLK-13914-04 cpufreq: imx7ulp: Add cpufreq driver on i.mx7ulp

According to the i.MX7ULP RM & datasheet, when A7 is in RUN mode,
the max CPU frequency it can run at is 500MHz, if we want to increase
the A7 CPU frequency to 800MHz, we need to change the A7 from RUN mode
to HSRUN mode. And only when A7 is in RUN mode, we can enter STOP mode
and VLLS mode.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
7 years agoMLK-13914-03 ARM: dts: Add cpu setpoints and clocks properties on i.mx7ulp
Bai Ping [Mon, 13 Feb 2017 08:24:36 +0000 (16:24 +0800)]
MLK-13914-03 ARM: dts: Add cpu setpoints and clocks properties on i.mx7ulp

Add CPU setpoints property on i.MX7ULP A0 part, the setpoints table is a preliminary
one, will update it according to the datasheet when the final one is available.

The setpoints we can currently used is as below:
416072 KHz/0.925V,
531648 KHz/1.025V;

Signed-off-by: Bai Ping <ping.bai@nxp.com>
7 years agoMLK-13914-02 ARM: imx: clk: Add hsrun clock on i.mx7ulp
Bai Ping [Mon, 13 Feb 2017 08:21:43 +0000 (16:21 +0800)]
MLK-13914-02 ARM: imx: clk: Add hsrun clock on i.mx7ulp

Add HSRUN mode clocks on i.MX7ULP. we also add a fake clock mux ARM
to make the clock tree more easy to handle in cpufreq.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
7 years agoMLK-13914-01 ARM: imx: enable hsrun mode on i.mx7ulp
Bai Ping [Mon, 13 Feb 2017 08:19:59 +0000 (16:19 +0800)]
MLK-13914-01 ARM: imx: enable hsrun mode on i.mx7ulp

Enable HSRUN mode on i.MX7ULP.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
7 years agoMLK-13801-02 ARM: dts: Correct the gpt timer clock source on imx6ul/ull/sll
Bai Ping [Fri, 20 Jan 2017 09:41:25 +0000 (17:41 +0800)]
MLK-13801-02 ARM: dts: Correct the gpt timer clock source on imx6ul/ull/sll

The GPT timer counter clock should be sourced from GPT_3M clock to avoid
counter clock frequency changed due to system bus clock changes.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
7 years agoMLK-13801-01 ARM: imx: add gpt_3m clock on imx6sll
Bai Ping [Fri, 20 Jan 2017 09:40:02 +0000 (17:40 +0800)]
MLK-13801-01 ARM: imx: add gpt_3m clock on imx6sll

Add gpt_3m clock source on i.MX6SLL.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
7 years agoMLK-13980: ASoC: fsl_rpmsg_i2s: fix wrong cmd sent to M4 in suspend
Shengjiu Wang [Thu, 16 Feb 2017 03:51:06 +0000 (11:51 +0800)]
MLK-13980: ASoC: fsl_rpmsg_i2s: fix wrong cmd sent to M4 in suspend

This typo issue will cause that wrong cmd send to M4 side.

Fixes: 3e13a631aee0 ("MLK-13904-1: ASoC: fsl: add audio cpu dai driver base on rpmsg")

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
7 years agoMLK-13981-2 rpmsg: imx: enable rpmsg virt tty
Richard Zhu [Wed, 15 Feb 2017 08:46:29 +0000 (16:46 +0800)]
MLK-13981-2 rpmsg: imx: enable rpmsg virt tty

Message can be transferred between remote
device and iMX7ULP M4.
Then the message can be transferred between A7
and M4 by rpmsg channel.
demo howto:
- insmode the imx_rpmsg_tty.ko module after
login A7/Linux.
- Receive messages. Used the following command
to dump out the msg from the virtual tty.
./unit_tests/mxc_mcc_tty_test.out /dev/ttyRPMSG 115200 R 100 1000 &
- Send: use the following command to send the
message to M4.
echo <your string message> /dev/ttyRPMSG

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
7 years agoMLK-13981-1 ARM: imx: add the virtual tty rpmsg channel
Richard Zhu [Wed, 15 Feb 2017 08:45:07 +0000 (16:45 +0800)]
MLK-13981-1 ARM: imx: add the virtual tty rpmsg channel

add the virtual tty rpmsg channel, thus the message can
be transferred between A core and M core by rpmsg

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
7 years agoMGS-2485 [#imx-309] fix gpu base address for new mmu version
Xianzhong [Thu, 16 Feb 2017 03:16:43 +0000 (11:16 +0800)]
MGS-2485 [#imx-309] fix gpu base address for new mmu version

The new gpu mmu has no base address feature and need set zero,
But hardware mmu version is not initialized before set baseaddress,

Hence kernel will get the wrong base address and pass to user driver,
This fix will add mmu version initialization before version check.

Date: Feb 15, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
7 years agoMLK-13904-5: ARM: defconfig: enable rpmsg audio driver in defconfig
Shengjiu Wang [Wed, 15 Feb 2017 03:24:16 +0000 (11:24 +0800)]
MLK-13904-5: ARM: defconfig: enable rpmsg audio driver in  defconfig

built in rpmsg audio driver

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Acked-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13904-4: ARM: dts: add rpmsg audio sound card device note
Shengjiu Wang [Wed, 15 Feb 2017 03:24:05 +0000 (11:24 +0800)]
MLK-13904-4: ARM: dts: add rpmsg audio sound card device note

audio will use the fourth slot in rpmsg address space.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Acked-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13904-3: ASoC: fsl: add audio machine driver base on rpmsg
Shengjiu Wang [Wed, 15 Feb 2017 03:23:45 +0000 (11:23 +0800)]
MLK-13904-3: ASoC: fsl: add audio machine driver base on rpmsg

Add machine driver, which is using the dummy codec.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Acked-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13904-2: ASoC: fsl: add audio platform driver base on rpmsg
Shengjiu Wang [Wed, 15 Feb 2017 03:28:26 +0000 (11:28 +0800)]
MLK-13904-2: ASoC: fsl: add audio platform driver base on rpmsg

Add platform driver, each step like set hw param, trigger start
trigger stop, and so on, will call the rpmsg api.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Acked-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13904-1: ASoC: fsl: add audio cpu dai driver base on rpmsg
Shengjiu Wang [Wed, 15 Feb 2017 03:28:36 +0000 (11:28 +0800)]
MLK-13904-1: ASoC: fsl: add audio cpu dai driver base on rpmsg

Add the cpu dai driver, as the rpmsg_send api can't be used in
atomic context, so using the workqueue instead of calling
rpmsg_send() directly.
The detail communication stack is defined in header file.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Acked-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13912-2 gpio: gpio-vf610: mask interrupt on suspend for imx7ulp
Peter Chen [Mon, 13 Feb 2017 07:14:17 +0000 (15:14 +0800)]
MLK-13912-2 gpio: gpio-vf610: mask interrupt on suspend for imx7ulp

At imx7ulp, any interrupts can wake system up from suspend at "standby"
mode, so we mask interrupt for gpio by default. The user can still
enable wakeup through /sys entry.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
7 years agoMLK-13912-1 extcon: ext-usb-gpio: do not enable wakeup by default
Peter Chen [Mon, 13 Feb 2017 06:56:37 +0000 (14:56 +0800)]
MLK-13912-1 extcon: ext-usb-gpio: do not enable wakeup by default

The wakeup on USB port should be determined by user, but not enabled
by default.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
7 years agoMLK-13917 pxp: fix build error for pxp library in user space
Robby Cai [Mon, 13 Feb 2017 10:01:25 +0000 (18:01 +0800)]
MLK-13917 pxp: fix build error for pxp library in user space

Fix following build error by changing type to '__u64'.

include/uapi/linux/pxp_dma.h:230:2: error: unknown type name 'u64'
   u64 lut_sels;
   ^~~

Signed-off-by: Robby Cai <robby.cai@nxp.com>
7 years agoMLK-13765 ARM: dts: imx7ulp-evk-sd1: remove property out for sd1 slot
Haibo Chen [Mon, 13 Feb 2017 09:35:30 +0000 (17:35 +0800)]
MLK-13765 ARM: dts: imx7ulp-evk-sd1: remove property out for sd1 slot

The two properties pm-ignore-notify and keep-power-in-suspend need
to remove for the sd slot on base board(sd1 slot).

If not, after system suspend, once remove the card from sd1 slot,
then system can't resume successfully, resume process hung due to
dead lock.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
7 years agoMLK-13913: ARM: imx: rpmsg: add reboot handler to support reboot
Robin Gong [Mon, 13 Feb 2017 06:58:55 +0000 (14:58 +0800)]
MLK-13913: ARM: imx: rpmsg: add reboot handler to support reboot

Add reboot handler to send reboot message by rpmsg to M4 side, then
M4 will reboot A7 core. Meanwhile, remove shutdown interface at rpmsg
level, since M4 prefer to clear reboot and shutdown interface instead
of shutdown interface at rpmsg level.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13905: ARM: imx: pm-rpmsg: fix kernel warning while resume back
Robin Gong [Fri, 10 Feb 2017 09:23:38 +0000 (17:23 +0800)]
MLK-13905: ARM: imx: pm-rpmsg: fix kernel warning while resume back

On i.mx7ulp, kernel need notify m4 side power mode message before enter VLLS
and resume back, but pm_qos_remove_request will enable local irq that cause
the below kernel warning since kernel assum local irq disalbed in syscore_resume.
In this case, just ignore touch pm_qos_* since cpu0 never enter idle at that
suspend time.

WARNING: CPU: 0 PID: 629 at drivers/base/syscore.c:99 syscore_resume+0xcc/0xec()
Interrupts enabled before system core resume.
Modules linked in:
CPU: 0 PID: 629 Comm: sh Not tainted 4.1.33-02249-g69520ab-dirty #259
Hardware name: Freescale i.MX7ULP (Device Tree)
[<80015ddc>] (unwind_backtrace) from [<8001274c>] (show_stack+0x10/0x14)
[<8001274c>] (show_stack) from [<807c97f0>] (dump_stack+0x88/0x9c)
[<807c97f0>] (dump_stack) from [<800386e4>] (warn_slowpath_common+0x84/0xb4)
[<800386e4>] (warn_slowpath_common) from [<80038744>] (warn_slowpath_fmt+0x30/0x40)
[<80038744>] (warn_slowpath_fmt) from [<8038d3d0>] (syscore_resume+0xcc/0xec)
[<8038d3d0>] (syscore_resume) from [<8006c1c4>] (suspend_devices_and_enter+0x3c4/0x500)
[<8006c1c4>] (suspend_devices_and_enter) from [<8006c580>] (pm_suspend+0x280/0x2fc

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13910: ARM: imx7d: clk: correct enet clock CCGR register offset
Andy Duan [Fri, 10 Feb 2017 08:25:14 +0000 (16:25 +0800)]
MLK-13910: ARM: imx7d: clk: correct enet clock CCGR register offset

Correct enet clock CCGR register offset.

CCGR6: IMX7D_ENET_AXI_ROOT_CLK (enet1 enet2 bus clocks)
CCGR112: IMX7D_ENET1_TIME_ROOT_CLK, IMX7D_ENET1_IPG_ROOT_CLK
CCGR113: IMX7D_ENET2_TIME_ROOT_CLK, IMX7D_ENET2_IPG_ROOT_CLK

IMX7D_ENET_PHY_REF_ROOT_DIV supply clock for PHY, no gate after the clock, its parent
clcok root has gate.
IMX7D_ENET1_REF_ROOT_DIV/IMX7D_ENET2_REF_ROOT_DIV supply clocks for enet IPG_CLK_RMII,
no gate after the clock, its parent clock root has gate.

IMX7D_PLL_ENET_MAIN_125M_CLK (anatop pll) supply clock for enet RGMII tx_clk.

Update copyright information.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com>
7 years agoMLK-13840 fbdev: mxsfb: Fix explicit null dereference
Cristina Ciocan [Mon, 30 Jan 2017 09:31:21 +0000 (11:31 +0200)]
MLK-13840 fbdev: mxsfb: Fix explicit null dereference

In mxsfb driver, function overlayfb_check_var, a null pointer dereference
occurs if fourcc pixel format is one not considered explicitly.

This case should not occur, since the pixel format is verified against
supported values before getting to this null dereference code, but this may
change if overlay_fmt_support() or overlayfb_check_var() changes and they
are not kept in sync.

Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
7 years agoMLK-13839 fbdev: mxsfb: Fix null pointer dereference
Cristina Ciocan [Fri, 3 Feb 2017 17:32:44 +0000 (19:32 +0200)]
MLK-13839 fbdev: mxsfb: Fix null pointer dereference

In function mxsfb_check_var an explicit null pointer dereference occurs
when input frame is 32 bpp (var->bits_per_pixel) and the output frame is
different from 8/16/18/24 (host->ld_intf_width).

Even though a 32bpp output is possible under certain conditions, this is
currently not implemented, so any other output bpp value is not valid.

Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
7 years agoMLK-13906: ARM: dts: new dtb for mfgtool to burn both BSP and M4 to eMMC
Han Xu [Fri, 10 Feb 2017 17:03:30 +0000 (11:03 -0600)]
MLK-13906: ARM: dts: new dtb for mfgtool to burn both BSP and M4 to eMMC

Add one more dtb file for mfgtool purpose only, it enabled both eMMC and
QSPI to burn both BSP and M4 images in one process.

Kernel still uses the original eMMC dtb so the QSPI, which belongs to
M4 domain won't be exposed in A7 domain.

Signed-off-by: Han Xu <han.xu@nxp.com>
7 years agoMLK-13862-2 epdc/pxp: imx6ull/imx6sll: enhance the LUT cleanup flow to avoid stalling...
Robby Cai [Wed, 25 Jan 2017 09:14:34 +0000 (17:14 +0800)]
MLK-13862-2 epdc/pxp: imx6ull/imx6sll: enhance the LUT cleanup flow to avoid stalling display

- change setting for wfe_b to support new flow
  (note there's no wfe_a on i.mx6ull/i.mx6sll, while on i.mx7d wfe_a is used
  for this purpose)
- the underlying design policy change as follows (similar to i.mx7d).
  in previous flow, when all LUTs are used, the LUT cleanup operation
  need to wait for all the LUT to finish, it will not happen util last LUT
  is done. while in new flow, the cleanup operation does not need to wait
  for all LUTs to finish, instead it can start when there's LUT's done.
  The saved time is multiple LUT operation time.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
7 years agoMLK-13862-1 epdc/pxp: imx7d: enhance the LUT cleanup flow to avoid stalling display
Robby Cai [Thu, 1 Dec 2016 01:47:31 +0000 (09:47 +0800)]
MLK-13862-1 epdc/pxp: imx7d: enhance the LUT cleanup flow to avoid stalling display

- change from wfe_b to wfe_a, and modifiy register settings to support new flow
- the underlying design policy change as follows.
  in previous flow, when all LUTs are used, the LUT cleanup operation
  need to wait for all the LUT to finish, it will not happen util last LUT
  is done. while in new flow, the cleanup operation does not need to wait
  for all LUTs to finish, instead it can start when there's LUT's done.
  The saved time is multiple LUT operation time.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
7 years agoMLK-13893 net: fec: do defer probe when mii bus not registered
Andy Duan [Tue, 7 Feb 2017 06:10:54 +0000 (14:10 +0800)]
MLK-13893 net: fec: do defer probe when mii bus not registered

When two MACs share one mii bus, MAC driver should do defer probe
when the mii bus not registered.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
7 years agoMGS-2092 [#imx-101] apply errata workaround to fix mmu exception
Xianzhong [Fri, 10 Feb 2017 06:11:09 +0000 (14:11 +0800)]
MGS-2092 [#imx-101] apply errata workaround to fix mmu exception

fixed gc7000xsvx mmu exception with hardware problems:
  - Texture border clamps to wrong max value (HBN1839)
  - MMU exception created when Image Load reads pixel data at end of
    buffer(HBN1847)

only apply errata workaround for the texture with GL_CLAMP_TO_BORDER.

Date: Jan 16, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
7 years agoMGS-2133-4 [#imx-199] fix gpu hang with power management
Xianzhong [Mon, 6 Feb 2017 06:42:35 +0000 (14:42 +0800)]
MGS-2133-4 [#imx-199] fix gpu hang with power management

power management is only disabled for GPU0, but NOT disabled for GPU1,
need apply this patch to configure power management for all GPU cores.

also configure fast clear and gpu profiler for all GPU cores.

Date: Feb 06, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
7 years agoMXSCM-240-4 arm: imx: add missing brackets to mmdc_clk check
Juan Gutierrez [Wed, 8 Feb 2017 01:05:37 +0000 (19:05 -0600)]
MXSCM-240-4 arm: imx: add missing brackets to mmdc_clk check

Even though is not affecting the behaviour, the brackets are missing
to limit this check for imx6q as was intended in first place

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
7 years agoMLK-13895 ARM: dts: imx7ulp: correct the device node name of lpi2c5
Fancy Fang [Wed, 8 Feb 2017 09:23:43 +0000 (17:23 +0800)]
MLK-13895 ARM: dts: imx7ulp: correct the device node name of lpi2c5

Correct this spelling mistake error for lpi2c5 node.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
7 years agoMLK-13894 ARM: imx: Add low power run voltage change support on i.mx6ull
Bai Ping [Wed, 8 Feb 2017 09:22:58 +0000 (17:22 +0800)]
MLK-13894 ARM: imx: Add low power run voltage change support on i.mx6ull

Drop the VDD_SOC and VDD_ARM voltage to 0.9V when system runs at low
power run mode.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
7 years agoMLK-13887: rpmsg: virtio_rpmsg_bus: fix high memory case
Robin Gong [Tue, 7 Feb 2017 05:43:41 +0000 (13:43 +0800)]
MLK-13887: rpmsg: virtio_rpmsg_bus: fix high memory case

rpmsg core didn't take care of high memory case which may be triggered
in 1:3 kernel/userspace memory split. Get correct page by vmalloc_to_page
instead of virt_to_page.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13733-5 ARM: imx: imx_rpmsg: add shutdown for rpmsg
Robin Gong [Mon, 6 Feb 2017 05:33:42 +0000 (13:33 +0800)]
MLK-13733-5 ARM: imx: imx_rpmsg: add shutdown for rpmsg

Add shutdown message to notify m4 side so that rpmsg can work
after A7 boot again.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13733-4 ARM: imx: pm-rpmsg: allign header format as M4 defined
Robin Gong [Fri, 20 Jan 2017 04:53:52 +0000 (12:53 +0800)]
MLK-13733-4 ARM: imx: pm-rpmsg: allign header format as M4 defined

Alllign header format as M4 defined, no need revert order. Correct
the data to u8 instead of u32 as M4 defined. Call the header define
in imx_rpmsg.h derectly.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13733-3 regulator: pf1550-regulator-rpmsg: update pf1550-rpmsg interface
Robin Gong [Wed, 18 Jan 2017 06:58:18 +0000 (14:58 +0800)]
MLK-13733-3 regulator: pf1550-regulator-rpmsg: update pf1550-rpmsg interface

update driver since m4 side refine the header structure.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
7 years agoMLK-13733-2 ARM: imx: add pm rpmsg for i.mx7ulp
Anson Huang [Mon, 9 Jan 2017 09:34:29 +0000 (17:34 +0800)]
MLK-13733-2 ARM: imx: add pm rpmsg for i.mx7ulp

Add PM RPMSG for i.MX7ULP power management, currently
it handles heart beat function which will notify M4
that linux is alive every 30 seconds, and when system
enters/exit VLLS mode, it will notify M4 for proper
power management.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
7 years agoMLK-13733-1 ARM: dts: imx7ulp: add rpmsg instance for power management
Anson Huang [Mon, 9 Jan 2017 09:49:25 +0000 (17:49 +0800)]
MLK-13733-1 ARM: dts: imx7ulp: add rpmsg instance for power management

On i.MX7ULP, add a new RPMSG instance for power management.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
7 years agoMLK-13851-1 usb: chipidea: otg: delete the workaround code
Peter Chen [Fri, 3 Feb 2017 03:16:21 +0000 (11:16 +0800)]
MLK-13851-1 usb: chipidea: otg: delete the workaround code

After commit 49670184289e ("usb: chipidea: otg: change workqueue
ci_otg as freezable"), we have fixed the bug that ID removed
wakeup (ID: 0->1) will lock up system resume, we delete the
workaround code in this commit.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
7 years agoMXSCM-243-2 arm: imx6q: mmdc handshake for lpddr2 2ch-mode on low-power
Juan Gutierrez [Mon, 16 Jan 2017 19:52:40 +0000 (13:52 -0600)]
MXSCM-243-2 arm: imx6q: mmdc handshake for lpddr2 2ch-mode on low-power

For i.mx6q systems the mmdc handshake on channel 0 is kept enabled (while
channel 1 is bypassed). This is ok for lpddr2 systems operating on 1ch-mode,
but not true for 2ch-mode. On this case the handshake needs to be set for
both channels, otherwise a kernel panic or Oops error might be observed
after resuming from suspend.

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
7 years agoMXSCM-243-1 arm: imx: get the mmdc 2ch-mode api for lpddr2
Juan Gutierrez [Tue, 31 Jan 2017 16:32:19 +0000 (10:32 -0600)]
MXSCM-243-1 arm: imx: get the mmdc 2ch-mode api for lpddr2

To configure the suspend settings for lpddr2 systems is necessary
to know if mmdc is operating on 1ch-mode or 2ch-mode.
Here, the imx_get_lpddr2_2ch_mode api is introduced to get this info
when needed and decide accordingly.

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>