Commit Graph

637823 Commits

Author SHA1 Message Date
ca756501fa MLK-12893 dma-engine: pxp: correct histogram setting
- HIST_A as collision, need set to 1 for wfb_store
- WFE-A flag0~3 changed to WFE-B flag4~7 on i.MX6ULL

This patch fixes the collision issue and some part of
updated region can not display with auto waveform mode.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2017-06-08 19:23:39 +08:00
fd0ea9792b MLK-12890 rtc: snvs: update time read function
When CPU/AXI/AHB are running at 24MHz, IPG at
12MHz, two consecutive reads of RTC timer registers
never get same value, so we need to skip the low
15 bits, only make sure the second value are same
during two consecutive reads.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2017-06-08 19:23:39 +08:00
0d980646ee MLK-12740 cpuidle: imx6q: configure CCM to RUN mode when CPU is active
There are two states in i.MX6Q cpuidle driver.
state[1]: ARM WFI mode
state[2]: i.MX6Q WAIT mode

Take i.MX6DL as example, think out such a case:
1. CPU0/1 both run at normal mode
2. On CPU0, `sleep 1` is executed. And there are no workload on CPU1.
3. CPU0 first runs into state[2] and 'wfi' instruction. Switched to use
   GPT broadcast.
4. CPU1 runs into state[2] and configure CCM to WAIT MODE,
   then 'wfi' instruction. Now arm_clk and local timer clock are
   shutdown. Switched to use GPT broadcast
5. GPT broadcast timer interrupt comes to GPC/GIC, then CPU0 wakes up.
   CPU0 switched to use arm local timer. CPU1 is still sleeping.
6. No workload on CPU0, CPU0 runs into state[1]. But CCM register
   is still not restored to Normal RUN mode. 'wfi' + CCM WAIT will
   cause arm_clk and arm core clk.
   Now CPU0 stops, which is not correct.

So, need to make sure CCM configured to RUN mode when any cpu exit
state[2].

In this patch,
When CPU exits state[2], it configures CCM to RUN mode.
When all CPUs enters state[2], the last CPU needs to check
whether it's ok to configure CCM to WAIT mode or not.

In imx6q_set_lpm, we only need to unmask GINT when not WAIT_CLOCKED,
so add a check condition.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
2017-06-08 19:23:38 +08:00
e65f5933d9 MLK-12887: ARM: dts: fix noise issue for mono playback
Using pull-up or pull down will cause that codec can get
big data in right channel. using keeper to fix this issue.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-08 19:23:37 +08:00
e3027623c5 MLK-12879 char: otp: support i.MX6ULL
Add ocotp support for i.MX6ULL.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
2017-06-08 19:23:36 +08:00
80d98b470b MLK-12880 arm: dts: imx7d: correct the PAD_GPIO1_IO01 pin ctrl setting
PAD_GPIO1_IO01 bit[31:7] are reserved, remove the setting mapping to
this reserved field.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2017-06-08 19:23:35 +08:00
37c62fb626 MLK-12864: ARM: dts: imx6ull-14x14-ddr3-arm2: enable WDOG_B reset
enable WDOG_B reset pin on i.mx6ull-14x14-ddr3-arm2 board

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2017-06-08 19:23:34 +08:00
65a57b7e1b MLK-12876: mipi csi: Remove regulator enable code when driver probe
Mipi CSI PHY regulator will enabled in function of s_power.
So remove regulator enable code when driver probe.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
(cherry picked from commit c29dda8f40)
2017-06-08 19:23:33 +08:00
e11a98cb07 MLK-12860-4 usb: chipidea: imx: add HSIC support for imx7d
Add HSIC support for imx7d. We have not supported HSIC as system
wakeup as well as HSIC remote wakeup function at DSM mode, since
the 24M OSC can't be off and the SoC internal regulators can't be
off at this mode, that will keep power consumption much higher.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
2017-06-08 19:23:33 +08:00
557dd65f04 MLK-12860-3 ARM: imx: gpcv2: add reg_1p2's notifier
In this notifier, we can power on/off the two LDO's which are needed
for USB HSIC.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
2017-06-08 19:23:30 +08:00
b2833e6776 MLK-12860-2 ARM: dts: add imx7d 12x12 ARM2 ddr3 board dts
Add imx7d 12x12 ARM2 ddr3 board dts

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2017-06-08 19:23:29 +08:00
e74bd3400b MLK-12860-1 ARM: dts: imx7d: add vcc-supply at gpc node
It is missing at imx7d.dtsi, but used at source code.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2017-06-08 19:23:29 +08:00
f1251fe1e7 MLK-12862: ARM: dts: fix mqs no sound issue
The MQS can only work when the mclk1 is selected as the mclk
of sai.  On other hand, the mclk0 use same clock root
(sai_clk_root) as mclk1. so removing mclk0 won't impact the sai
features.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-08 19:23:28 +08:00
34c2a1731a MLK-12861-2 ARM: imx: enable necessary clock for RDC resume on i.mx7d
When Mega/Fast Mix off in DSM mode, RDC recovery needs PCIe/PXP/EIM
clock to be enabled, otherwise, with M4 enabled, DSM resume will fail.

We only enable them before entering DSM and hardware will disable
them when DSM is entered and they will be re-enabled after resume,
then in low level resume phase, we will disable them again.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit e28ae270b6)
2017-06-08 19:23:27 +08:00
7633078ed1 MLK-12861-1 ARM: imx: support runtime clock management on i.mx7d when M4 is enabled
For i.MX7D, current runtime clock management code will skip all
PLL/PFD/GATE enable/disable when M4 is enabled, this is NOT good
for power number in low power idle and audio playback, as M4 only
uses one high speed PFD which is from system PLL, it is never
disabled runtimely, so we can just enable the hardware operation of
PLL/PFD/GATE for A7.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit 02a2e8d73b)
2017-06-08 19:23:26 +08:00
d2e7e3feee MLK-12851 ARM: dts: imx6ull: add uart1 as Mega/Fast mix wakeup source
Add uart1 as Mega/Fast mix wakeup source for i.MX6ull.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2017-06-08 19:23:25 +08:00
00df71c8e5 MLK-12849 ARM: dts: imx6ull-ddr3-arm2: add a new dts file for TSC
Since TSC has pin conflict with I2C1 which is used by PMIC and Camera,
we need to move TSC setting from LCDIF dts file into a separated one to
achieve the LCDIF and Camera feature in one DTS file. After the change,
we can get the supported features as follows.

-lcdif.dtb: lcd and camera, but no tsc
-tsc.dtb:   lcd and tsc, but no camera

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2017-06-08 19:23:25 +08:00
1e3654ff4c MLK-12781 ARM: dts: imx7d-12x12-lpddr3-arm2: add pinctrl for usb vbus
Add pinctrls for usbotg1 and usbotg2 vbus control. This missing keeps
the vbus enable pin is high after power up, so vbus is on and otg port
will not enter suspend in device mode, as active usb port has high
bus freq requested, this prevents system enter low bus freq.

Signed-off-by: Li Jun <jun.li@nxp.com>
2017-06-08 19:23:24 +08:00
43a4158d6f MLK-12836: ARM: dts: support display in audio dts on imx6ull
support display in audio dts imx6ull-14x14-ddr3-arm2-cs42888.dts

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-08 19:23:23 +08:00
03a5e11745 MLK-1277: ARM: dts: imx6sx-sabreauto: enable WDOG_B on i.mx6sx-auto board
The same issue: "MLK-9773: warm reset fail in kernel when booting from QSPI
NOR Flash", thus enable WDOG_B on the reworked board to make sure power off
the QSPI-NOR Flash.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2017-06-08 19:23:22 +08:00
7497ee595e MLK-12814: ARM: dts: support NAND on i.MX6UL EVK board
add new dts to support NAND on i.MX6UL 14x14 EVK board.

Signed-off-by: Han Xu <han.xu@nxp.com>
2017-06-08 19:23:21 +08:00
41bdf7d579 MLK-12811-4 ARM: dts: fix EPDC register region
privious size is overlapped with iomux_snvs. decrease it to fix it.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2017-06-08 19:23:21 +08:00
6b8fa94ba2 MLK-12811-3 ARM: dts: add new dts file for EPDC on i.MX6ULL DDR3 VAL board
EPDC has pin conflict with FEC2, LCDIF.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2017-06-08 19:23:20 +08:00
5878cd4999 MLK-12811-2 ARM: dts: pxp: add compatible property for i.MX6ULL
to accommodate the PXP change on i.MX6ULL over i.MX7D

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2017-06-08 19:23:19 +08:00
f562045c88 MLK-12811-1 pxp-dma: update PxP driver for i.MX6ULL
on i.MX6ULL, the WFE_A is removed due to die size, but instead use WFE_B
to the task for WFE_A. We may call this version as V3P - V3 patch.

use device_id to differentiate the operations on different version.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2017-06-08 19:23:18 +08:00
01dc684345 MLK-12807 ARM: dts: imx: Add ldo enable support on imx6ull
Add LDO enable dts support on i.MX6ULL ARM2 board.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2017-06-08 19:23:18 +08:00
b45eafe179 MLK-12803 ARM: dts: imx: enable snvs poweroff on 6qdl sabreauto
Enable snvs poweroff on i.MX6Q/DL sabreauto board.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2017-06-08 19:23:17 +08:00
3098dcd6b0 MLK-12796-02 ARM: dts: imx: Add additional pinfunc define for imx6ull
On i.MX6ULL, the pin MUX and CTRL register of BOOT_MODEx and TAMPERx
pins have been move to the IOMUXC_SNVS. Add additional pinfunc define
and correct the pinctrl binding.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2017-06-08 19:23:16 +08:00
6c9b82d9f9 MLK-12796-01 pinctrl: imx: Add iomuxc_snvs pinctrl driver for i.mx6ull
On i.MX6ULL, the BOOT_MODEx and TAMPERx pin MUX and CTRL register
have been moved from IOMUXC to IOMUXC_SNVS, so the pinctrl driver
should be modified to support the IOMUXC_SNVS.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2017-06-08 19:23:15 +08:00
1d345fa6e1 MLK-12808 ARM: dts: imx6ull-14x14-ddr3-arm2.dts: move usdhc pin setting out of hog
Move usdhc1 wp/cd/reset/vselect pin setting and usdhc2 reset pin
setting out of hog. Due to many pin conflict with usdhc1 and usdhc2,
this patch can let other modules do not touch the iomuxc.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2017-06-08 19:23:14 +08:00
40eb8c96b3 MLK-12794: ASoC: fsl_asrc: fix underrun issue when convert 192k to 96kHz.
The maximum divider of asrc clock is 1024, but there is no judgement
for this limitaion in driver, which may cause the divider setting not
correct.

When IDEAL_RATIO_RATE 200kHZ, the cost time of conversion from 192kHz
to 96kHz is 24ms every 1024 sample, but these sample's playback time
is 1024/96=11ms, so there will be underrun. So need to enlarge this RATE.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-08 19:23:13 +08:00
5b527de9b0 MLK-12792 ARM: dts: imx6ull-14x14-ddr3-arm2: improve enet clock timing
Improve enet data/txc clock timing suggested by HW team.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2017-06-08 19:23:13 +08:00
8325e77209 MLK-12787-2: ARM: dts: set codec-master as default mode
wm8962 sound card work in codec master mode as before

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-08 19:23:12 +08:00
ac178db7d4 MLK-12787-1: ASoC: imx-wm8962: Add codec-master property
Add codec-master property for imx-wm8962. If set this in device
tree, the codec will work as master, if don't set it, the cpu dai
will work as master.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-08 19:23:11 +08:00
d4dbb79227 MLK-12786-2: ASoC: fsl_sai: correct the clock source for mclk0
mclk0 is assigned through the device tree.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-08 19:23:10 +08:00
4a01d339e2 MLK-12786-1: ARM: dts: add mclk0 clock for sai
SAI has 4 clock source, even the mclk0 is always same as
the mclk1, but it is need to add in device tree.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-08 19:23:09 +08:00
a45807684d MLK-12782: ARM: dts: Add wm8958 sound card in imx6ull-ddr3-arm2-cs42888 dts
Add wm8958 sound card in cs42888 dts, SAI2 conflict with SD1.
So disable usdhc1.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-08 19:23:09 +08:00
a3451c35dd MLK-12776 ARM: dts: imx: rename the imx6ull dts by adding the die size
Add the dize size info in the ARM2 board dts file name to align with
i.MX6UL, so mfgtool and yocto script can handle the naming rule easily.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2017-06-08 19:23:08 +08:00
4e212b56c0 MLK-12763 ARM: imx7d: iomux: correct uart input sel option value
GPIO0~GPIO7 part:
- Commit(c8cabda5ab) add some wrong input sel value for uart, return
  them to origin setting.
- Add uart DTE pin mode setting.

UART2_TX_DATA pin part:
- RM doc "iMX7D_RM_Rev0_Approval.pdf" (2016.04.25 updated in compass)
  updated input sel define for UART2_RX_DATA, then set the correct input
  sel for the pin.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit: 90a8b06b9735dd5b8d2023ff3b95886441e0e8d9)
2017-06-08 19:23:07 +08:00
74bfe74e23 MLK-12731-2 ARM: dts: Makefile: add dts entry for imx6q-arm2-hsic
This dts is only for USB HSIC controller test which needs
Validation Port Card on it.

Disable controller 3 due to strange signal on it at arm2 board.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2017-06-08 19:23:06 +08:00
a95afafeff MLK-12731 usb: chipidea: imx: add missing HSIC initialization for imx6qdl/sl
This piece of code is existed at imx_3.10, but missing at imx_3.14 and
imx_4.1, port it from imx_3.10.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2017-06-08 19:23:05 +08:00
ec261bf350 MLK-12769: ARM: dts: fix the optional QSPI pin conflict with SD2
The optional QSPI pin should be only enabled on reworked board, fix the
issue which conflict with SD2.

Signed-off-by: Han Xu <han.xu@nxp.com>
2017-06-08 19:23:05 +08:00
695462a050 MLK-12765 ARM: imx: make sure DLL is locked on i.MX7D
On i.MX7D, per design team's require, need to make sure
DLL is locked after DDR frequency scaled done. Although
normally there should be no issue, but it is better to
add it.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit 07c9f26b19)
2017-02-23 15:21:52 +02:00
e2741096ad MLK-12748-3 ARM: imx: adjust imx7d lpddr3 retention exit flow
On i.MX7D lpddr3, retention mode exit flow should restore
more registers to make sure the ddr controller and ddr phy
settings restored properly, otherwise, some of the boards
can NOT pass memtester after retention mode exited.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2017-02-23 15:21:51 +02:00
5a69f89bdb MLK-12748-2 ARM: imx: remove IOMUXC GPR setting for i.mx7d TO1.2
i.MX7D TO1.2 removes the DDR PAD retention mode setting
in IOMUXC GPR, it is same as TO1.0, so only apply the
IOMUXC GPR setting for TO1.1.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2017-02-23 15:21:51 +02:00
1767e612da MLK-12748-1 ARM: dts: imx7d: correct usdhc1 cd pin setting
i.MX7D 19x19 LPDDR2 ARM2 board's uSDHC1 CD pin should be
LOW active, correct it.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2017-02-23 15:21:50 +02:00
73f12a4b3f MLK-12757-3: ARM: dts: imx6ull-ddr3-arm2-emmc.dts: add eMMC support
For imx6ull-ddr3-arm2 board, eMMC and SD1 slot share usdhc1, so
this patch add another dts file imx6ull-ddr3-arm2-emmc.dts to
support eMMC.

eMMC data4~data7 share the same I/O domain with sd2, so this patch
only enable eMMC 4bit mode.

Due to the eMMC on imx6ull-ddr3-arm2 board support HS200 mode, and
need the VCCQ to be 1.8v, this patch keep usdhc vselect, let usdhc
to change the I/O voltage to 1.8v automatically. Otherwise, another
rework needed: remove R95, add R94.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2017-02-23 15:21:50 +02:00
161a124411 MLK-12757-2 ARM: dts: imx6ull-ddr3-arm2.dts: add usdhc2 support
Add usdhc2 support, due to cd/wp pin conflict with usdhc1, this
patch drop these two pins, and make usdhc2 as no removeable.
Moreover, due to VSELECT pin is not connected by default, we also
add no-1-8-v property.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2017-02-23 15:21:50 +02:00
37798ef35e MLK-12757-1 ARM: dts: imx6ull-ddr3-arm2.dts: change usdhc2 pad setting
According to Hardware team's suggestion, for usdhc2, this patch change
the drive strength for clock pin and data pin, which can make the signal
meet the requirement for DDR50 mode.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2017-02-23 15:21:49 +02:00
363aae67ab MLK-12761 ARM: imx: add mu as wakeup source for i.mx7d
When A7 platform is in low power mode while M4 is NOT,
M4 should be able to send message to wake up A7, so
MU must be always as wake up source.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2017-02-23 15:21:49 +02:00