Gao Pan [Fri, 26 May 2017 03:30:03 +0000 (11:30 +0800)]
MLK-14982-2 arm64: imx8qm: add ipg clk for lpi2c device node
add ipg clk for lpi2c device node
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Gao Pan [Thu, 25 May 2017 13:51:23 +0000 (21:51 +0800)]
MLK-14982-1 imx8: lpi2c: add ipg clk for lpi2c driver
The lpi2c IP needs two clks: ipg clk and per clk. The old lpi2c
driver missed ipg clk. This patch adds ipg clk for lpi2c driver.
V2: enable ipg clk before module clock
disable module clock before ipg clk
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Gao Pan [Thu, 25 May 2017 12:29:49 +0000 (20:29 +0800)]
MLK-14981-3 defconfig: enable CONFIG_I2C_IMX_LPI2C
enable CONFIG_I2C_IMX_LPI2C
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Gao Pan [Thu, 25 May 2017 12:27:16 +0000 (20:27 +0800)]
MLK-14981-2 Kconfig: add lpi2c driver dependency for ARM64
add lpi2c driver dependency for ARM64
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Gao Pan [Thu, 25 May 2017 09:41:44 +0000 (17:41 +0800)]
MLK-14981-1 arm64: dts: enable i2c for imx8qm
1. enable lpi2c of lvds, hdmi and DMA subsystem
2. change dts property assigned-clock-name to assigned-clocks
3. enable gpio expander pca9557
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Nitin Garg [Thu, 1 Jun 2017 17:40:33 +0000 (12:40 -0500)]
MLK-14998: Remove the dts change in last commit
made the commit by mistake. DTS change isnt required.
Signed-off-by: Nitin Garg <nitin.garg@nxp.com>
Ranjani Vaidyanathan [Fri, 26 May 2017 22:00:44 +0000 (17:00 -0500)]
MLK-14998: i.MX8: Update to the latest SCFW API
Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@nxp.com>
Yong Gan [Fri, 2 Jun 2017 01:20:55 +0000 (09:20 +0800)]
arm64: imx8dv: Fix drm_addmap_core fail for aarch64
Fix error on mapping fb in exa driver starting.
Signed-off-by: Yong Gan <yong.gan@nxp.com>
Han Xu [Thu, 1 Jun 2017 03:25:37 +0000 (22:25 -0500)]
MLK-14995: ARM: dts: nand-on-flash flag set in wrong device node
nand-on-flash-bbt flag for i.mx6sx sabreauto dtb was set in wrong device
node, move it back to gpmi node.
Signed-off-by: Han Xu <han.xu@nxp.com>
Bai Ping [Tue, 23 May 2017 01:34:51 +0000 (09:34 +0800)]
MLK-14965 driver: clk: Add dc dpr1 clocks on i.mx8qm
Add DC0 and DC1's DPR1 APB_CLK and B_CLK on i.MX8QM
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Shengjiu Wang [Wed, 31 May 2017 03:04:52 +0000 (11:04 +0800)]
MLK-14989: ASoC: fsl_rpmsg_i2s: enable pm_qos for audio
with "echo 1 > /sys/class/graphics/fb0/blank", and there is no
usb connected on board, the system may enter low power mode,
then audio playback will be failed. use pm_qos to prevent A7
core enter low power mode during audio playback and recording.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Leonard Crestez [Thu, 25 May 2017 13:51:57 +0000 (16:51 +0300)]
MLK-14874 ARM: imx7d: Ensure ARM clock only disabled if cpus in same state
GPC will stop ARM clock if both CPUs are in idle and CPU_CLK_ON_LPM is
set in GPC_LPCR_A7_BSC. Make sure that doesn't happen when cpu1 enters
state2 and cpu0 enters state0 because the default arm WFI state is not
marked with CPUIDLE_FLAG_TIMER_STOP and it can result in arch_sys_timer
being stopped unexpectedly.
It is possible to reproduce incorrect behavior by explicitly disabling
other idle states for cpu0/cpu1 and timing how much sleep calls take on
cpu0. Ocassionaly something like "sleep 1" will take 3-4 seconds to
complete.
Make sure that both CPUs are in the same idle state before entering
WAIT.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Prabhu Sundararaj [Mon, 24 Apr 2017 19:47:25 +0000 (14:47 -0500)]
ARM64: DMA: Export dma operation APIs for arm64 platform
Some DMA operation APIs are not exported, so when load driver as module,
there will error saying some APIs can not be found.
This patch exported these DMA related APIs.
Signed-off-by: Shawn Xiao <b49994@freescale.com>
Fugang Duan [Fri, 26 May 2017 02:53:37 +0000 (10:53 +0800)]
MLK-14980 tty: serial: fsl_lpuart: remove unnecessary .async_tx_ack()
lpuart only use NXP/FSL eDMA dmaengine in i.MX/Vybrid/LS1021a platform,
and eDMA driver don't reuse descriptor then no need to check the
flag DMA_CTRL_ACK. And current eDMA driver use virt chan mechanism and
free tx_descriptor memory after .callback(), but .lpuart_timer_func()
first to terminate the chans that free the tx_descriptor memory, then
access the tx->flags, which cause kmem_cache_alloc() failed to allocate
the freed memory. So remove the unnecessary .async_tx_ack().
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Sat, 13 May 2017 11:19:29 +0000 (19:19 +0800)]
MLK-14978 irqchip: irqsteer: add NXP imx8 irq steer controller support
The IrqSteer module redirects/steers the incoming interrupts to output
interrupts of a selected/designated channel as specified by a set of
configuration registers.
NXP i.MX8x chips integrate IrqSteer controller for some DSC to share irq
line for all modules in the subsystem which can reduce the IRQ lines
connected to the parent interrupt controller GIC, so IrqSteer irqchip
acts as the second irq domain in the system.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Richard Zhu [Fri, 26 May 2017 01:10:42 +0000 (09:10 +0800)]
PCI: imx6: Allow probe deferral by reset GPIO
Some designs implement reset GPIO via a GPIO expander connected to a
peripheral bus. One such example would be i.MX7 Sabre board where said
GPIO is provided by SPI shift register connected to a bitbanged SPI bus.
To support such designs, allow reset GPIO request to defer probing of the
driver.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Cc: yurovsky@gmail.com
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Dong Aisheng <dongas86@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
(cherry picked from commit
bde4a5a00e761f55be92f62378cf5024ced79ee3)
Peng Fan [Tue, 23 May 2017 09:30:39 +0000 (17:30 +0800)]
MLK-14957 clk: imx8qm/qxp: delay the clk driver initialization
Using CLK_OF_DECLARE will register clks at very early stage
that AP-SC communication still not ready.
MU driver is registered by early_initcall, so using core_initcall
to delay the registeration of clk driver is ok.
Move channel open function into probe to avoid core_init sequence
not in our expected order. If MU not ready, return defer probe
for clk driver.
Later when we switch to use interrupt driver AP-SC communication,
we could also return defer probe in clk probe function to wait
until AP-SC communication ready.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Guoniu.Zhou [Mon, 22 May 2017 11:08:41 +0000 (19:08 +0800)]
MLK-14963 PXP: enable pxp interrupt after soft reset
After soft reset, the irq register value will be zero, so we need set it to enable
all pxp interrupts.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Leonard Crestez [Fri, 19 May 2017 15:24:34 +0000 (18:24 +0300)]
MLK-14977: ARM: dts: imx7: Use IMX7D_GPT_3M_CLK for GPT1
On most imx SOCs GPT1 takes it's clock from the oscillater because
otherwise it might get confusing when bus frequency is decreased.
Right now imx7 is an exception because imx7s.dtsi comes from upstream
rather than a port of imx_4.1.y.
On the imx_4.1.y branch imx7 uses GPT_3M as well, adopt that approach.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Robin Gong [Thu, 25 May 2017 05:59:21 +0000 (13:59 +0800)]
MLK-14960-3: ARM: dts: imx6: remove 'fsl,wdog-reset'
Remove usless 'fsl,wdog-reset' property in dts on v4.9
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Wed, 24 May 2017 10:19:27 +0000 (18:19 +0800)]
MLK-14960-2: ARM: dts: imx6/imx7: correct to "fsl,ext-reset-output"
align watchdog external reset output property with community
instead of "fsl,wdog_b".
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Wed, 24 May 2017 10:16:53 +0000 (18:16 +0800)]
MLK-14960-1: watchdog: imx2_wdt: remove wdog_b
ext_reset used instead of wdog_b on v4.9, no need wdog_b anymore.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Anson Huang [Wed, 24 May 2017 16:19:08 +0000 (00:19 +0800)]
MLK-14975-2 ARM64: dts: freescale: imx8qxp: increase DDR space for M4
M4 has use case of video and need more DDR space
for video buffer, reserve more DDR space for it.
0x80000000 - 0x800fffff: ARM Trusted Firmware;
0x80100000 - 0x87ffffff: M4/RPMSG;
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Wed, 24 May 2017 16:16:14 +0000 (00:16 +0800)]
MLK-14975-1 ARM64: dts: freescale: imx8qm: increase DDR space for M4
M4 has use case of video and need more DDR space
for video buffer, reserve more DDR space for it.
0x80000000 - 0x800fffff: ARM Trusted Firmware;
0x80100000 - 0x87ffffff: M4/RPMSG;
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Radu Solea [Tue, 23 May 2017 12:13:50 +0000 (15:13 +0300)]
MLK-14785 CAAM: Fix gcm.c to work correctly with CAAM
CAAM uses DMA to transfer data to and from memory, if
DMA and CPU accessed data share the same cacheline cache
pollution will occur. Marking the result as cacheline aligned
moves it to a separate cache line.
Signed-off-by: Radu Solea <radu.solea@nxp.com>
Robin Gong [Wed, 24 May 2017 08:28:43 +0000 (16:28 +0800)]
MLK-14976: dma: virt-dma: free description after callback
Some drivers may access dma_async_tx_descriptor in callback such as
tty/serial/fsl_lpuart.c, but the description has already been freed
before callback, memory corrupt here. Move the free description
behind of callback.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Fugang Duan [Wed, 24 May 2017 07:44:46 +0000 (15:44 +0800)]
MLK-14973 arm64: dts: imx8qm: add DMA subsystem UART ports and DMA chans
Add DMA subsystem UART ports and related DMA channels for i.MX8QM
lpddr4 arm2 board.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Li Jun [Thu, 18 May 2017 22:55:45 +0000 (06:55 +0800)]
MLK-14947-6 arm64: defconfig: enable chipidea controller driver and mxs phy driver
Enable chipidea usb controller driver and mxs usb phy driver for imx8.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Thu, 18 May 2017 16:07:42 +0000 (00:07 +0800)]
MLK-14947-5 chipidea: imx: add usb vbus power polarity setting
If the vbus is controlled by ehci port power bit, we need set power
polarity of vbus enable signal according to the vbus power supply
chip on board.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Thu, 18 May 2017 16:06:48 +0000 (00:06 +0800)]
MLK-14947-4 ARM: dts: set usb1 vbus power polarity for imx8qm arm2
Set the OTG1 vbus power polarity to be active high on
fsl-imx8qm-lpddr4-arm2.dts.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 24 May 2017 14:45:36 +0000 (22:45 +0800)]
MLK-14947-3 usb: doc: chipidea: imx: add power-polarity-active-high property
USB host vbus control can be via port power(PP) bit of ehci, there
is a polarity setting in controller register for this signal, if
power supply chip use active high, add this property.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Thu, 18 May 2017 16:05:44 +0000 (00:05 +0800)]
MLK-14947-2 usb: phy: add mxs phy driver dependency for ARM64
Add mxs phy driver dependency on ARCH_MXC_ARM64.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Thu, 18 May 2017 16:03:49 +0000 (00:03 +0800)]
MLK-14947-1 gpc: imx: empty imx_gpc_mf_request_on if imx gpc is not used
Empty imx_gpc_mf_request_on() if imx gpc is not available to pass compile
on i.mx8x.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Sekhar Nori [Mon, 3 Apr 2017 08:26:52 +0000 (13:56 +0530)]
usb: hcd: use correct device pointer for dma ops
commit
a8c06e407ef9 ("usb: separate out sysdev pointer from
usb_bus") converted to use hcd->self.sysdev for DMA
operations instead of hcd->self.controller but forgot to do
it for one instance.
This gets caught when DMA debugging is enabled since dma map
and unmap end up using different device pointers.
Fix it.
Fixes:
a8c06e407ef9 ("usb: separate out sysdev pointer from usb_bus")
Reported-by: Carlos Hernandez <ceh@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
bde654a55adca166641361332e1f141de5197b02)
Peter Chen [Mon, 13 Mar 2017 02:18:45 +0000 (10:18 +0800)]
usb: ehci: use bus->sysdev for DMA configuration
Set the dma for ehci from sysdev. The sysdev is pointing to device that
is known to the system firmware or hardware.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Sriram Dash <sriram.dash@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
8b373ffc797713337f42f0e58d832d5cae86752c)
Arnd Bergmann [Mon, 13 Mar 2017 02:18:44 +0000 (10:18 +0800)]
usb: xhci: use bus->sysdev for DMA configuration
For xhci-hcd platform device, all the DMA parameters are not
configured properly, notably dma ops for dwc3 devices. So, set
the dma for xhci from sysdev. sysdev is pointing to device that
is known to the system firmware or hardware.
Cc: Baolin Wang <baolin.wang@linaro.org>
Tested-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Tested-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
4c39d4b949d36faffbc726525b469886cf311d1c)
Arnd Bergmann [Mon, 13 Mar 2017 02:18:42 +0000 (10:18 +0800)]
usb: chipidea: use bus->sysdev for DMA configuration
Set the dma for chipidea from sysdev. This is inherited from its
parent node. Also, do not set dma mask for child as it is not required
now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
aeb78cda51005fa00943e331c1fb47c6ad74015d)
Arnd Bergmann [Mon, 13 Mar 2017 02:18:41 +0000 (10:18 +0800)]
usb: separate out sysdev pointer from usb_bus
For xhci-hcd platform device, all the DMA parameters are not
configured properly, notably dma ops for dwc3 devices.
The idea here is that you pass in the parent of_node along with
the child device pointer, so it would behave exactly like the
parent already does. The difference is that it also handles all
the other attributes besides the mask.
sysdev will represent the physical device, as seen from firmware
or bus.Splitting the usb_bus->controller field into the
Linux-internal device (used for the sysfs hierarchy, for printks
and for power management) and a new pointer (used for DMA,
DT enumeration and phy lookup) probably covers all that we really
need.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
Tested-by: Baolin Wang <baolin.wang@linaro.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Tested-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Tested-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Sinjan Kumar <sinjank@codeaurora.org>
Cc: David Fisher <david.fisher1@synopsys.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: "Thang Q. Nguyen" <tqnguyen@apm.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Ming Lei <tom.leiming@gmail.com>
Cc: Jon Masters <jcm@redhat.com>
Cc: Dann Frazier <dann.frazier@canonical.com>
Cc: Peter Chen <peter.chen@nxp.com>
Cc: Leo Li <pku.leo@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
a8c06e407ef969461b7f51ec72839fe382dd3c29)
Mihai Serban [Thu, 27 Apr 2017 15:47:42 +0000 (18:47 +0300)]
MLK-14935: ASoC: fsl_sai: Fix mixing initialization data with actual audio samples
When starting a playback the initialization data used to reduce underruns
was send to the transmit data register after the DMA requests were enabled.
This patch moves the initialization phase before enabling the DMA so the
data is transmitted in correct order.
Signed-off-by: Mihai Serban <mihai.serban@nxp.com>
Frank Li [Fri, 19 May 2017 20:48:20 +0000 (15:48 -0500)]
MLK-14955-2 arm64: defconfig: remove COMPILE_TEST
Auto Enable LOCALVERSION_AUTO
so show git commit hash value in boot log
Linux version
4.9.11-02242-gf4b0aff-dirty
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Frank Li [Fri, 19 May 2017 20:44:47 +0000 (15:44 -0500)]
MLK-14955-1 imx8: Added MXC_ARM64 into dependent
Otherwise there are warning when remove COMPILE_TEST
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Mihai Serban [Mon, 15 May 2017 12:52:57 +0000 (15:52 +0300)]
MLK-14778: ASoC: fsl: imx-cs42888: Improve support for odd number of channels
For samples with more than 2 and odd number of channels the I2S mode
does not work correctly. In I2S mode we are required to activate an even
number of channels (possibly on multiple datalines) and thus configure
the BCLK for even channels. In this case samples with odd (smaller) number
of channels are played faster and the sound is distorted.
To fix this behavior we can enable TDM mode for the special cases of
samples with 3, 5 or 7 channels. But even TDM has some restrictions that
prevent us from having full support for the special cases:
1. TDM is not supported by codec in master mode so 3, 5 and 7 channels
usage is denied.
2. In codec slave mode TDM works only with 8 slots and slot width of 32
bits. For an often used MCLK frequency of 24MHz and the above restrictions
the maximum sample rate is limited to 48KHz =
24576000/(2*8*32).
The 2 denominator is required by ESAI BCLK divisors.
Signed-off-by: Mihai Serban <mihai.serban@nxp.com>
Anson Huang [Tue, 23 May 2017 12:06:40 +0000 (20:06 +0800)]
MLK-14967-2 ARM64: dts: freescale: imx8qxp: reserve DDR for M4
Reserve first 4M memory for below usage:
0x80000000 - 0x800fffff: ARM Trusted Firmware;
0x80100000 - 0x803fffff: M4/RPMSG;
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Tue, 23 May 2017 12:05:28 +0000 (20:05 +0800)]
MLK-14967-1 ARM64: dts: freescale: imx8qm: reserve DDR space for M4
Reserve first 4M memory for below usage:
0x80000000 - 0x800fffff: ARM Trusted Firmware;
0x80100000 - 0x803fffff: M4/RPMSG;
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Tue, 23 May 2017 10:09:00 +0000 (18:09 +0800)]
MLK-14966-6 mxc: Kconfig: improve build dependency
Use ARCH_MXC_ARM64 instead of ARCH_FSL_IMX8QM
to improve MXC build dependency.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Tue, 23 May 2017 10:07:15 +0000 (18:07 +0800)]
MLK-14966-5 mmc: imx: add ARCH_MXC_ARM64 into build dependency
Add ARCH_MXC_ARM64 for i.MX mmc driver to support
ARM64 platforms.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Tue, 23 May 2017 10:05:57 +0000 (18:05 +0800)]
MLK-14966-4 gpio: imx: add build dependency
Add build dependency for i.MX gpio driver.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Tue, 23 May 2017 10:04:06 +0000 (18:04 +0800)]
MLK-14966-3 clk: makefile: use ARCH_MXC_ARM64 for imx dependency
Use ARCH_MXC_ARM64 instead of ARCH_FSL_IMX8QM for i.MX
ARM64 platforms build dependency.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Tue, 23 May 2017 10:03:10 +0000 (18:03 +0800)]
MLK-14966-2 ARM64: configs: select ARCH_MXC_ARM64 by default
Enable ARCH_MXC_ARM64 by default for i.MX ARM64 platforms.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Anson Huang [Tue, 23 May 2017 10:01:15 +0000 (18:01 +0800)]
MLK-14966-1 soc: imx: add ARCH_MXC_ARM64 menuconfig
Add ARCH_MXC_ARM64 for i.MX ARM64 platforms, this
can improve the modules dependency logic.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Fugang Duan [Fri, 19 May 2017 10:12:23 +0000 (18:12 +0800)]
MLK-14952 arm64: dts: imx8qm/qxp: add enet support
Add enet support for i.MX8QM and i.MX8QXP lpddr4 arm2 board.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Fri, 19 May 2017 10:05:35 +0000 (18:05 +0800)]
MLK-14951 clk: imx8: correct enet txclk clock tree for i.MX8qm and i.MX8qxp
Correct enet txclk clock tree for i.MX8qm and i.MX8qxp.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Peng Fan [Thu, 18 May 2017 10:06:58 +0000 (18:06 +0800)]
MLK-14946-2: pinctrl: imx8qm/qxp: switch to use new format
switch to use new format. Split mux out from pad config.
Change the high two bits in pad config to 0, because driver
will automatically set that two bits to 1.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Peng Fan [Thu, 18 May 2017 05:56:03 +0000 (13:56 +0800)]
MLK-14946-1: dt-bindings: pinctrl: imx8qm/qxp: add new format define
Add new format definition.
The new format is #define [name] [pinid] [muxvalue]
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Peng Fan [Thu, 18 May 2017 09:30:29 +0000 (17:30 +0800)]
MLK-14949 arm64: dts: imx8qm/qxp add usdhc alias node
Add usdhc alias node. To i.MX8QXP ARM2 board,
kernel will panic if no alias node provided.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Peng Fan [Thu, 18 May 2017 09:23:05 +0000 (17:23 +0800)]
MLK-14948 arm64: dts: imx8qxp: fix usdhc power domain name
Fix usdhc power domain name.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Irina Tirdea [Fri, 12 May 2017 10:00:24 +0000 (13:00 +0300)]
MLK-14706 clk: imx7d: fix whitespace
Remove whitespace.
Signed-off-by: Irina Tirdea <irina.tirdea@nxp.com>
Irina Tirdea [Fri, 12 May 2017 10:00:23 +0000 (13:00 +0300)]
MLK-14706 clk: imx7d: remove duplicate empty line
Signed-off-by: Irina Tirdea <irina.tirdea@nxp.com>
Irina Tirdea [Fri, 12 May 2017 10:00:22 +0000 (13:00 +0300)]
MLK-14706 clk: imx7d: align with upstream: update arm a7 root clock init
In upstream, IMX7D_ARM_A7_ROOT_SRC uses imx_clk_mux2 for initialization,
while our code uses imx_clk_mux_flags_bus with additional flags
CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE. In the end, both calls
set the flags of IMX7D_ARM_A7_ROOT_SRC clock to
CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE.
To align our code to upstream, we can safely use imx_clk_mux2.
Signed-off-by: Irina Tirdea <irina.tirdea@nxp.com>
Irina Tirdea [Fri, 12 May 2017 10:00:21 +0000 (13:00 +0300)]
MLK-14706 clk: imx7d: align with upstream: ipg_root_clk
Update imx7d clk platform code according to upstream commit
40e00ef ("clk: imx7d: add the missing ipg_root_clk").
Signed-off-by: Irina Tirdea <irina.tirdea@nxp.com>
Xianzhong [Tue, 16 May 2017 09:50:56 +0000 (17:50 +0800)]
MGS-2907 [#imx-560] fix wrong cache invalidate with dma_map_area
dma_map_area function is used for both cache clean and invalidate mistakenly,
need correct the cache invalidate with dma_unmap_area function.
Date: May 16, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Xianzhong [Mon, 15 May 2017 09:14:39 +0000 (17:14 +0800)]
MGS-2902 [#imx-557] fix wrong release_mem_region
the dma allocated memory do not call additional request_mem_region,
but gckGALDEVICE_Destroy call into release_mem_region mistakenly.
this fix the following warning message with rmmod galcore:
Trying to free nonexistent resource <
000000003cc00000-
0000000044bfffff>
Date: May 15, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Peng Fan [Wed, 17 May 2017 09:04:07 +0000 (17:04 +0800)]
MLK-14940-2 pinctrl: imx8qm: correct pin name and id
Correct pin name and id.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Peng Fan [Wed, 17 May 2017 08:58:51 +0000 (16:58 +0800)]
MLK-14940-1 pinctrl: imx8qxp: correct pin name and id
Correct pin name and id.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Haibo Chen [Tue, 16 May 2017 07:31:05 +0000 (15:31 +0800)]
MLK-14932-2 arm64: defconfig: set usdhc driver compile into kernel
Default compile the usdhc driver into kernel
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Haibo Chen [Tue, 16 May 2017 07:14:42 +0000 (15:14 +0800)]
MLK-14932-1 mmc: sdhci-esdhc-imx: add depends on COMPILE_TEST
i.MX8 don't define ARCH_MXC, so add COMPILE_TEST to let usdhc driver
also support for i.MX8.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Anson Huang [Tue, 16 May 2017 15:57:00 +0000 (23:57 +0800)]
MLK-14933 gpio: kconfig: remove mxc gpio dependency
Remove dependency of ARCH_MXC to support GPIO driver on
both ARMv7 and ARMv8 i.MX platforms.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Robert Chiras [Thu, 11 May 2017 13:01:00 +0000 (16:01 +0300)]
MLK-14800: fbdev: Refactor printed information
Debug info should not be printed using pr_info on init. Use pr_debug
instead.
Also, verify the cable state before reading the EDID. There is no point
in trying to read EDID (and print an error message), when there is no
device connected to HDMI connector.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Robert Chiras [Thu, 11 May 2017 13:00:39 +0000 (16:00 +0300)]
MLK-14800: fbdev: Refactor printed information
Debug info should not be printed using pr_info on init. Use pr_debug
instead.
Also, use the driver name, since there is more than one MIPI DSI driver.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Robert Chiras [Thu, 11 May 2017 13:00:15 +0000 (16:00 +0300)]
MLK-14800: fbdev: Refactor printed information
Debug info should not be printed using pr_info on init. Use pr_debug
instead.
Also, use the driver name, since there is more than one MIPI DSI driver.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Robert Chiras [Thu, 11 May 2017 12:59:07 +0000 (15:59 +0300)]
MLK-14800: fbdev: Refactor printed information
Debug info should not be printed using pr_info on init. Use pr_debug
instead.
Also, use the driver name, since there is more than one MIPI DSI driver.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Robert Chiras [Thu, 11 May 2017 12:57:06 +0000 (15:57 +0300)]
MLK-14800: fbdev: Refactor printed information
Debug info should not be printed using pr_info on init. Use pr_debug
instead.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Robin Gong [Tue, 16 May 2017 02:30:18 +0000 (10:30 +0800)]
MLK-14925: ARM: dts: imx6qdl-sabresd-hdcp: fix gpu/vpu probe fail on hdcp board
Fix the same issue as commit
bf23e0c5ea31 on imx6qp-saresd-hdcp board
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robert Chiras [Thu, 11 May 2017 11:34:01 +0000 (14:34 +0300)]
MLK-14857: mxc_hdmi: Set default mode a CEA mode
When using fb_find_mode from fbdev/core with a specified user more,
it will return a screeninfo structure with the pixclock corresponding to
a different refresh rate than the requested one. For example, for
1920x1080@60 it will return pixclock=5780. When we get the videmode for
this screeninfo, it will have a refresh of 59Hz, instead of 60Hz.
If we use this mode as default mode when EDID cannot be read, on a
monitor with fixed refresh rate of 60Hz, it won't work. Therefore, we
should save the default mode, the nearest mode from CEA modes defined by
our own driver (which will have the correct refresh rate and pixclock for
the requested resolution).
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Anson Huang [Tue, 16 May 2017 14:26:15 +0000 (22:26 +0800)]
MLK-14927 ARM64: dts: freescale: imx8qxp: add lpddr4 arm2 board support
Add dtb to support i.MX8QXP LPDDR4 ARM2 board.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Anson Huang [Tue, 16 May 2017 10:17:04 +0000 (18:17 +0800)]
MLK-14917 ARM: dts: imx6ul-14x14-ddr3-arm2: fix pfuze200 probe error
Fix below pfuze probe issue by setting correct range of SW3B:
pfuze100-regulator 0-0008: pfuze200 found.
SW3B: Bringing 3300000uV into
1975000-1975000uV
SW3B: failed to apply
1975000-1975000uV constraint(-22)
pfuze100-regulator 0-0008: register regulatorSW3B failed
pfuze100-regulator: probe of 0-0008 failed with error -22
2020000.serial: ttymxc0 at MMIO 0x2020000 (irq = 19, base_baud =
5000000) is a IMX
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Haibo Chen [Mon, 15 May 2017 09:25:31 +0000 (17:25 +0800)]
MLK-14861-1 mmc: sdhci: make DDR50 tuning optionally
commit
70f2d20917bc ("MLK-14884 mmc: sdhci: make DDR50 tuning optionally")
want to make DDR50 card tuning optionally, but the code logic is not
right, the tuning of DDR50 card will also be impacted by the flag
'SDHCI_SDR50_NEEDS_TUNING'. e.g. imx6sl/imx6sx/imx6ul/imx7d default set
USE_TUNING_SDR50, which means on these SoC, DDR50 card still do tuning
even haven't the flag 'SDHCI_DDR50_NEEDS_TUNING'.
This patch fix the logic issue, separate DDR50 and SDR50 card.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Li Jun [Mon, 15 May 2017 15:02:56 +0000 (23:02 +0800)]
MLK-14895-2 ARM: dts: add usb otg1 ID pinctrl for i.mx6ul evk
Add USB OTG1 port ID pin for imx6ul-14x14-evk.dts
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Mon, 15 May 2017 15:00:33 +0000 (23:00 +0800)]
MLK-14895-1 ARM: dts: add usb otg1 ID pinctrl for i.mx6ull evk
Add USB OTG1 port ID pin for imx6ull-14x14-evk.dts
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Gao Pan [Tue, 25 Aug 2015 06:00:32 +0000 (14:00 +0800)]
MLK-11403: I2C: imx: restore pin setting for i2c
restore pin setting for i2c in suspend/resume
Signed-off-by: Gao Pan <gaopan@freescale.com>
(cherry picked from commit
8aed73af218f25e0677b8980b3706246dd68790d)
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Conflicts:
drivers/i2c/busses/i2c-imx.c
Anson Huang [Mon, 15 May 2017 09:08:58 +0000 (17:08 +0800)]
MLK-14902 ARM64: dts: freescale: imx8qm: make default dtb boot up all cores
Change dtb's core settings as below on i.MX8QM:
boot up 4 CA53 and 2 CA72 (using CA53 specific flash.bin)
fsl-imx8qm-lpddr4-arm2.dts
boot up 4 CA53 (using CA53 specific flash.bin)
fsl-imx8qm-lpddr4-arm2_ca53.dts
boot up 2 CA72 (using CA72 specific flash.bin)
fsl-imx8qm-lpddr4-arm2_ca72.dts
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Fugang Duan [Fri, 12 May 2017 03:12:59 +0000 (11:12 +0800)]
MLK-14736 net: fec: move the ahb clock to runtime pm
Some SOC clock have some limits:
- ahb clock should be disabled before ipg.
- ahb and ipg clocks are required for MAC mii to work.
So, move the ahb clock to runtime pm together with ipg clock.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Anson Huang [Fri, 12 May 2017 13:16:47 +0000 (21:16 +0800)]
MLK-14893 ARM64: dts: freescale: imx8qm: add CA72 only dtb
Add CA72 only dtb to support booting up kernel with
CA72 cluster only, need to use CA72 specific flash.bin
and CA72 specific dtb to boot up kernel.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Viorel Suman [Thu, 11 May 2017 16:04:26 +0000 (19:04 +0300)]
MLK-13967 ARM64: dts: imx8qxp: add SAI0 and ASRC0 nodes
Add audio SAI0 and ASRC0 nodes.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Dong Aisheng [Thu, 11 May 2017 12:38:17 +0000 (20:38 +0800)]
MLK-14774 mmc: sdhci-esdhc-imx: restore pins state after suspend
After commit
3e3274ab9ff3 ("mmc: sdhci-esdhc-imx: Use common
sdhci_suspend|resume_host()"), we lost the pins state store and save
in common sdhci_pltfm_{suspend|resume} API which results in the
pins state lost in state un-retainable suspend/resume, then
CMD transfer will meet timeout subsequently.
Due to sdhci_pltfm_{suspend|resume} API becomes static after
that commit later, we then do manual pins state save and restore
in our platform suspend/resume API instead.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Viorel Suman [Wed, 10 May 2017 13:49:15 +0000 (16:49 +0300)]
MLK-13972-4 ARM64: dts: imx8qxp: add EDMA2 and ACM nodes
Add audio EDMA2 and ACM nodes.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Viorel Suman [Wed, 10 May 2017 13:45:36 +0000 (16:45 +0300)]
MLK-13972-3 ARM64: dts: imx8qxp: add audio power domain
Add audio power domain definitions.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Viorel Suman [Wed, 10 May 2017 13:28:51 +0000 (16:28 +0300)]
MLK-13972-2 clk: imx8qxp: add audio clocks
Add audio clocks.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Viorel Suman [Wed, 10 May 2017 13:21:08 +0000 (16:21 +0300)]
MLK-13972-1 soc: scfw: imx8qxp: fix audio LPCGs
Cleanup audio LPCGs: add missing, fix names, remove unneeded.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Dong Aisheng [Thu, 11 May 2017 08:46:54 +0000 (16:46 +0800)]
MLK-14823 dts: imx6sx-sabreauto: correct cd and wp pin
Correct CD/WP pin in dts. Otherwise the card detection and write
protection function does not work.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Dong Aisheng [Thu, 11 May 2017 08:08:08 +0000 (16:08 +0800)]
MLK-14884 mmc: sdhci: make DDR50 tuning optionally
DDR50 tuning is optinally defined in sd 3.0 spec. Per IC guys
suggestion, it internally already uses a fixed optimized timing
and normally does not require tuning.
Make it optionally and platform can claim SDHCI_DDR50_NEEDS_TUNING
support if it wants tuning.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Dong Aisheng [Wed, 10 May 2017 07:09:09 +0000 (15:09 +0800)]
MLK-14866-2: dts: imx7ulp-evk: remove duplicated mux setting in config
According to RM, Bit[11-8] is MUX_MODE which is configured by
the PIN_FUNC_ID automatically, specify it in config part is wrong
and violates the binding doc. So remove them all.
It can also avoid the future confusing when customer wants to
configure a pad by following the exist code.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Dong Aisheng [Wed, 10 May 2017 07:04:14 +0000 (15:04 +0800)]
MLK-14866-1 dt-bindings: pinctrl: add imx7ulp binding doc
Add i.MX7ULP binding doc. Note i.MX7ULP PIN_FUNC_ID consists of 4
integers as it shares one mux and config register as follows:
<mux_conf_reg input_reg mux_mode input_val>
Also fix the copyright.
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Robin Gong [Tue, 9 May 2017 02:49:10 +0000 (10:49 +0800)]
MLK-14807-2: ARM: dts: imx6: correct all ldo-enable dts
'vin-supply' property used in ldo-bypass mode while 'vin-supply' deleted
in ldo-enable mode on v4.9 rather than dirctly switch 'supply' to internal
regulator and external pmic regulator on v4.1. Correct it for all *-ldo.dts,
otherwise, still work in ldo-bypass mode.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Robin Gong [Tue, 9 May 2017 02:10:37 +0000 (10:10 +0800)]
MLK-14807-1: ARM: dts: imx6qp-sabresd-hdcp: gpu probe failed
I2C2 have to be disabled on hdcp board since those I2C2 bus pins
used for others, that said there is no all pmic regulators. In this
case, ldo-enable mode should be used and reg_arm/reg_soc/reg_pu should
be swithed to internal ldo instead. Otherwise, no reg_pu regulator
probed successfully by gpu driver, and cause gpu probe failed. Also,
cause cpufreq probe failed too.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Daniel Baluta [Wed, 10 May 2017 11:21:40 +0000 (14:21 +0300)]
MLK-14870: ASoC: fsl_sai: Remove support for S20_3LE
With current clock configuration we cannot derive bitclk for S20_3LE
format in SAI master mode. There was an attempt to fix this in commit
65e6b5f1b4a7 ("MLK-14536: ASoC: wm8960: Fix playback in CPU DAI master mode")
but this broke codec-master mode, thus the patch was partially reverted in
96f0d36e420 ("MLK-14798: arm: dts: imx6ul: Fix wm8960 codec master mode")
So, remove S20_3LE support for SAI master mode. Clients using this
feature should use codec master mode, which is the default one in the
dts anyway.
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Fancy Fang [Thu, 11 May 2017 08:23:56 +0000 (16:23 +0800)]
MLK-14885 dma: pxp: fix potential multi-definition issue
When 'CONFIG_MXC_PXP_CLIENT_DEVICE' disabled, the
'register_pxp_device' and 'unregister_pxp_device'
may cause multiple definitions compiling error.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Daniel Baluta [Wed, 10 May 2017 13:46:00 +0000 (16:46 +0300)]
MLK-14841: ARM: dts: Fix DAI CPU node name
For wm8962 we use imx-wm8962 machine driver which expects DAI CPU node
name to be "cpu-dai".
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Richard Zhu [Fri, 5 May 2017 09:22:39 +0000 (17:22 +0800)]
MLK-14795 PCI: designware: fail to read the ep mem on rc board
The mem_base address is configured as the outbound
memory region twice when imx pcie ep/rc validation
is enabled.
Mask the one contained in desigware driver to fix
this issue.
Remove the usleep_range usage in designware driver,
since that function maybe used in imx noirq pm
calls.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Viorel Suman [Wed, 10 May 2017 10:37:49 +0000 (13:37 +0300)]
MLK-13853-3 ARM64: dts: imx8qm: Enable SPDIF0
Add SPDIF0 node and the related EDMA configuration:
channels and interrupts. Comments provided for
component's related EDMA configuration given the
increased number of channels and interrupts.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>