1
0
Fork 0
Commit Graph

717183 Commits (38fb0e7a0e0b86f139a3d66deb1975eaf15101ab)

Author SHA1 Message Date
Shengjiu Wang 38fb0e7a0e MLK-13608: mfd: mxc-hdmi-core: fix the dependency of alsa sound
When remove sound card build config, there will be error

drivers/built-in.o: In function `mxc_hdmi_register_audio':
vf610_adc.c:(.text+0xd64f8): undefined reference to `_snd_pcm_stream_lock_irqsave'
vf610_adc.c:(.text+0xd6518): undefined reference to `snd_pcm_stream_unlock_irqrestore'
drivers/built-in.o: In function `mxc_hdmi_abort_stream':
vf610_adc.c:(.text+0xd65a4): undefined reference to `_snd_pcm_stream_lock_irqsave'
vf610_adc.c:(.text+0xd65d0): undefined reference to `snd_pcm_stream_unlock_irqrestore'
make: *** [vmlinux] Error 1

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2018-10-29 11:10:38 +08:00
Haibo Chen 957da032f1 MLK-13610-2 ARM: dts: imx7ulp-evk: add base board sd slot support
On imx7ulp-evk board, the SD slot on base board is conflict with BT/WiFi.
This patch seperate the usdhc1 from imx7ulp-evk.dts, and create new dts.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Haibo Chen d32a4761b7 MLK-13610-1 ARM: dts: add SD3.0 support for usdhc0 on imx7ulp-evk
Add SD3.0 support for usdhc0 on imx7ulp-evk board. Currently the
usdhc0 root clock is 158.4MHz.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Gao Pan f344a67745 MLK-13618 arm: dts: enable lpspi3 in imx7ulp-evk.dts
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
2018-10-29 11:10:38 +08:00
Dong Aisheng 70cba2a5c1 MLK-13615-1 regulator: pf1550-regulator-rpmsg: should set voltage closest to min_uV
According to API definition, Set the voltage for the regulator within the
range specified, the driver should select the voltage closest to min_uV.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
2018-10-29 11:10:38 +08:00
Fabio Estevam d43c7a6a91 MLK-9987: Input: imx_keypad: Fix suspend/resume while keypad is pressed
Since commit commit 560a64749d1dd0ff ("ENGR00318936-2 input: keyboard: imx:
remove usless release interrupt enabled) the following problem happens:

- Keep any keypad key pressed
- Enter low power mode via "echo mem > /sys/power/state"
- Then we are no longer able to wake-up the system via the keypad

The reason for this behaviour is that the KRIE (Release Interrupt) is not
enabled.

In order to fix this problem, we should enable KRIE when a key is pressed
(KPKD bit is set) or enable KDIE when no key is pressed (KPKR is set).

This way we will always have a valid source of keypad interrupt no matter if
the system entered low power mode while a keypad key was pressed or not.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
(cherry picked from commit 5a7ab47e67d1045cb2f5d408c112617dff48dee2)
(cherry picked from commit f75c35512bd3df7dbb26f4a35cf17dcbb6ffb724)
2018-10-29 11:10:38 +08:00
Robin Gong 483dcd919c ENGR00318936-2 input: keyboard: imx: remove usless release interrupt enabled code
Remove useless code for release interrupt enabled, because we check status by
timer rather than release interrupt. Remove the code which may disable depress
interrupt. Also make sure enable depress interrupt in suspend function.

Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit 806ed5b9769efff2c9d8c66ed19315b48ec6fd57)
(cherry picked from commit 307d613b1f363f802433cd2debbb2b28ddc17a06)
2018-10-29 11:10:38 +08:00
Robin Gong e74c5a8105 ENGR00318936-1 input: keyboard: imx: add pm_stay_awake and pm_relax
There is a small window after system suspend but timer scan function
didn't finish timely, in this case,  system enter suspend without kpp
interrupt enabled and failed to resume back if key depressed.We add
pm_stay_awake and pm_relax to make sure system suspend flow abort in
this case.

Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit 3868f06af8f39673f270643ada63dd88e2f5699e)
(cherry picked from commit 529dee44f7da0ad6d57a3e8ccd942af944f6723b)
2018-10-29 11:10:38 +08:00
Han Xu ab3b114704 MLK-13612-3: mtd: spi-nor: add new NOR chip MX25R6435F info
ULP1 use new QSPI NOR chip MX25R6435F which is not in default id table.

Signed-off-by: Han Xu <han.xu@nxp.com>
2018-10-29 11:10:38 +08:00
Han Xu 15ce2158ba MLK-13612-1: ARM: dts: enable QSPI for i.MX7ULP1
Add one more dts for QSPI on i.MX7ULP1 for mfgtool purpose.

Signed-off-by: Han Xu <han.xu@nxp.com>
2018-10-29 11:10:38 +08:00
Peter Chen b7b59ff2f5 MLK-13605 ARM: dts: imx7d.dtsi: configure USB burst properly
After testing, it can give the best performance.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 21c6656467 MLK-13597-2 ARM: imx: update i.mx7d ddr3 script
Update i.MX7D DDR3 script to V2.0 for bank interleave.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 3825bb0da6 MLK-13597-1 ARM: imx: update i.mx7d lpddr3 script
Update i.MX7D LPDDR3 script to V2.0 for bank interleave.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Peter Chen 5c630c6abe MLK-13570-8 usb: chpidea: usbmisc_imx: add non-burst setting for both imx7d and imx7ulp
For all imx Socs later than imx6 (including imx6), the USB_nSBUSCFG.AHBBRST
will be set as 0 at dtsi file, so the non-burst setting needs to be
set at non-core register, or there will be no burst for USB AHB/AXI
transfer.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Peter Chen 5e8c709f87 MLK-13570-7 ARM: dts: imx7ulp.dtsi: change burst size as 0x8
According to test, 0x8 is better than 0x10.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Peter Chen 96981f213b MLK-13570-6 ARM: configs: imx_v7_defconfig: Enable extcon USB GPIO
It is used for imx7ulp evk which uses GPIO for USB dual-role switch
function.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Peter Chen 2452f593d2 MLK-13570-5 usb: chipidea: imx: introduce pmqos for imx7ulp
At imx7ulp, if the system enters idle, it will close some clocks and affect
USB transfer. In order to avoid it, we request pmqos to avoid system
entering idle when the USB is in use.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Peter Chen bee188567a MLK-13570-4 usb: chipidea: usbmisc_imx: add imx7ulp entry
imx7ulp non core register mapping is similar with imx7d, and the
initialization is the same, but lacks of USB charger detection support.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Li Jun 0d8b0537fd MLK-15032-3 usb: chipidea: core: remove the extcon change for imx_4.1.y
commit 916e43e1d6fb ("MLK-13570-3 usb: chipidea: core: change extcon
usage for imx_4.1.y") is directly cherry-picked from 4.1.y, but which
is not valid anymore on 4.y kernel, so revert most part and only keep
the irq check after resume.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
2018-10-29 11:10:38 +08:00
Peter Chen 250779ccff MLK-13570-3 usb: chipidea: core: change extcon usage for imx_4.1.y
At v4.1 kernel, we can't get cable type at notifier, but at
extcon-usb-gpio.c notifies both VBUS and ID event, we had to
do special handling for ID event, and omit VBUS event. Current
implementation only supports ID extcon event.

If wakeup event occurs by extcon, it needs to call ci_irq again since the
first ci_irq calling at extcon notifier only wakes up controller, but
do noop for event handling.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Peter Chen 9aadcd6717 MLK-13570-2 usb: phy: phy-mxs-usb: add imx7ulp support
At imx7ulp, the USB related analog register is located in PHY register
region too, so we need to control PLL at PHY driver directly.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Peter Chen e26d6439ce MLK-13570-1 ARM: dts: imx7ulp-evk: add USB support
Add USBOTG1 support, we use GPIO as ID function for dual-role switch.
Besides, #define <dt-bindings/gpio/gpio.h> to imx7ulp.dtsi since
lots of boards may need it.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Shengjiu Wang c36decc75e MLK-13418: ASoC: wm8960: workaround no sound issue in master mode
The input MCLK is 12.288MHz, The desired output sysclk is 11.2896MHz
the sample rate is 44100Hz, with the pllprescale=2, postscale=sysclkdiv=1,
some chip may have wrong bclk and lrclk output in master mode. then there
will be no sound.
With the pllprescale=1, postscale=2, the output clock is correct. so use
this configuration to workaround this issue.
Tested 8k/11k/16k/22k/32k/44k/48kHz case.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2018-10-29 11:10:38 +08:00
Shengjiu Wang 3a3b178d8d MLK-13422: ASoC: wm8960: fix the pitch shift issue after suspend/resume
Before suspend, the sysclock select pll out as source, after resume
sysclock select the mlck as the source, so the sample rate is changed
the sound's pitch is shifted.
The issue is caused by the commit c1845da3d08de6cf2642fec74f7a46d05de6314d
Which removed the wm8960_configure_clocking() when bias level changes
from STANDBY to PREPARE, this patch is to add it back.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2018-10-29 11:10:38 +08:00
Juan Gutierrez fe1ca0b161 MXSCM-217 imx: keep weak 2p5 power up when ENET WOL wakeup is enabled
When ENET wake up is enabled by wake-on-lan (WOL), the weak 2P5
ldo needs to keep power up even for LPDDR2 due to the ENET_PLL is
feed by the weak 2p5 ldo during DSM. If the weak 2P5 ldo is power
down the ENET module is power off hence it is not able to sense the
WOL interrupt and trigger the system resume.

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
2018-10-29 11:10:38 +08:00
Juan Gutierrez f8903e353c MXSCM-235 dts: add support for scm qwks rev3
Add support for SCM i.MX6DQ 1Gb QWKS rev3

Support the next features for 1Gb qwks rev3 boards:

 - Support for fix lpddr2 mode
 - hdcp and enetirq
 - bluetooth and wifi for Murata ZP SDIO dongle

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
2018-10-29 11:10:38 +08:00
Juan Gutierrez 597e498dcf MXSCM-234 dts: imx: adjust the sd3 drive strength for 6sxscm evb
For some SD Ultra (40MB/s) the drive strength/speed settings
on the iomux ctrl pads for SD3 is not enougn causing some
error by transfering data as below:

mmcblk2: error -84 transferring data, sector 2250553, nr 151,
cmd response 0x900, card status 0x0

Updating the DSE and Speed on the pad ctrl fixes the issue.

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
2018-10-29 11:10:38 +08:00
Song Bing 9f5dfc91b1 MLK-13563 ion: Enable ion driver on imx7ulp
Enable ion driver on imx7ulp

Signed-off-by: Song Bing <bing.song@nxp.com>
2018-10-29 11:10:38 +08:00
Song Bing 61ec18fbc7 MLK-13562 ion: Add devicetree bindings for mxc ion
Add devicetree bindings for mxc ion

Signed-off-by: Song Bing <bing.song@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang fd74f89795 MLK-13583 ARM: imx: fix build warning on i.mx7ulp clock driver
This patch fixes below build warning:

CC      arch/arm/mach-imx/clk-imx7ulp.o
LD      init/built-in.o
arch/arm/mach-imx/clk-imx7ulp.c:42:20: warning: 'cm4_periph_plat_sels' defined but not used [-Wunused-variable]
LD      arch/arm/mach-imx/built-in.o
CC      kernel/module.o
GZIP    kernel/config_data.gz

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang ee0c28df5e MLK-13580 ARM: imx: update DGO register to SNVS domain on i.MX7ULP
On i.MX7ULP, the resume entry and parameter are saved
in DGO_GP registers, it has two power domains, one
is normal domain, the other is SNVS domain, if M4 also
enters VLLS mode, DGO needs to be updated into SNVS
domain to avoid power lost and lead to resume fail.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 7214dc04c4 MLK-13579-2 ARM: imx: update suspend ocram location on i.mx7ulp
Adjust i.MX7ULP suspend ocram location from
SRAM_U to SRAM_L, occupy last 16K.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 00043633ad MLK-13579-1 ARM: dts: imx7ulp: adjust suspend ocram location
Adjust suspend ocram location for i.MX7ULP, since previous
location is used by M4.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Peng Fan 874185c733 MLK-13557 imx6sll: add fsl,wdog_b and pinmux settings
Add fsl,wdog_b and pinmux settings.
We need to use wdog_b to trigger pmic reset, when we trigger
wdog_b reset, we should not trigger wdog_reset_b_deb.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 0400ecd8fb3a3772dfb3a68c55960419a63f1650)
2018-10-29 11:10:38 +08:00
Robin Gong ca347e6656 MLK-13577-5: ARM: dts: imx7ulp-evk: add pf1550 pmic
add pf1550-regulator-rpmsg driver node in dts.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 0f0bdd7aa5 MLK-13577-4: ARM: configs: imx_v7_defconfig: enable pf1550-regulator-rpmsg driver
enable pf1550-regulator-rpmsg driver by default.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong b4a4b821f4 MLK-13577-3 regulator: pf1550-regulator-rpmsg: add pf1550 regulator rpmsg driver
add pf1550 regulator rpmsg driver to control pf1550 on the m4 side
by rpmsg.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 9ed7abb41c MLK-13577-2 ARM: imx7: mu: set ABF0 of MU_CR to notify M4 MU finish initialization
set ABF0 of MU_CR to let M4 know MU is ready, thus MU can initialize rpmsg
later.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
(cherry picked from commit 4969903fc8d32c5e6dfc4fe5f2f68e52aef080bc)
2018-10-29 11:10:38 +08:00
Robin Gong a484151a5e MLK-13577-1: ARM: imx: mu: support rpmsg/mu on i.mx7ulp
Enable rpmsg/mu support on i.mx7ulp, since some mu register and
rmpsg buffer different as before

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Gao Pan 53d5fb47c4 MLK-13573 arm: dts: add sensors node in imx7ulp-evk.dts
sensor node: fxas2100x, fxos8700, mpl3115

Signed-off-by: Gao Pan <pandy.gao@nxp.com>
2018-10-29 11:10:38 +08:00
Shengjiu Wang cd61e41202 MLK-13574-3: ARM: dts: enable audio in a seperate dts
Audio is in M4 domain, so we need an indepenent dts for audio.
M4 domain is controled by RTOS, this dts is for demo purpose in
linux

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2018-10-29 11:10:38 +08:00
Shengjiu Wang 337d59e9b4 MLK-13574-2: ASoC: fsl_sai: refine driver for ip upgrade
In imx7ulp1, the sai can support two TX channel and two RX
channels, So the usage need to be updated.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2018-10-29 11:10:38 +08:00
Shengjiu Wang 6f52b7e85e MLK-13574-1: ASoC: imx-wm8960: remove the gpr dependency
There is no gpr setting in some board. so we can't return
a fatal error.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2018-10-29 11:10:38 +08:00
Shengjiu Wang 113d8e639a MLK-13568: ARM: clk-imx7ulp: Add clock tree for m4 core
SAI in M4 domain, and the clock used by SAI is in M4 domain

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2018-10-29 11:10:38 +08:00
Bai Ping d473d51dc3 MLK-13548 ARM: dts: imx: Add 1.2GHz setpoint for imx7d
Add 1.2GHz setpoint for i.MX7D.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Bai Ping 2d0915105a MLK-13564 driver: watchdog: Add system reboot support on imx7ulp
Add system reboot for i.MX7ULP. As there is no other way to reboot the
system, so use wdog restart handler to trigger the system reboot.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Gao Pan 2806b7d558 MLK-13572 i2c: imx-lpi2c: add imx8qm binding
During the 4.14 rebase the only relevant change was moving from imx8dv
to an imx8qm binding.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2018-10-29 11:10:38 +08:00
Gao Pan 920fbac4fb MLK-13571 dt-bindings: i2c: imx-lpi2c: add imx8qm binding
Add a binding document for lpi2c driver.

Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
2018-10-29 11:10:38 +08:00
Juan Gutierrez 1c3de11b25 MXSCM-226 dts: imx: add pm-ignore-notify option for sd3 on mx6sxscm evb
There is no card-detection pad connected for sd3 on the i.mx6 SX
EVB board. The card is assumed to be non-removable, hence, there is
no need to redetect the card during the pm callbacks. This can be
reached by including the pm-ignore-notify option on the usdhc3 device
on the dtb file.

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
2018-10-29 11:10:38 +08:00
Juan Gutierrez 02b74a5cf1 MXSCM-225 dts: imx: fix the power gpio for usb otg2 on 6sxscm evb
The usb otg2, on the SXSCM EVB board is powered up directly by the
GEN_V5 signal from the PMIC, so there is no gpio assigned.

The wrong assignation was preventing the busfreq driver to switch
to any other frequency, since the usb otg2 looks to be always
active.

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
2018-10-29 11:10:38 +08:00