Dan Douglass [Mon, 15 Aug 2016 01:59:14 +0000 (20:59 -0500)]
MLK-13074 ARM: config: Enable hardware RNG for i.mx6ull
Enable the RNG driver in imx_v7_defconfig
Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
Dong Aisheng [Fri, 12 Aug 2016 09:29:08 +0000 (17:29 +0800)]
MLK-13072 dts: mx6ull: add 9x9 evk btwifi support
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Ye Li [Fri, 12 Aug 2016 01:17:17 +0000 (09:17 +0800)]
MLK-13071 ARM: dts: imx6ullevk: Add support for imx6ull 9x9 EVK board
Add DTS file imx6ull-9x9-evk.dts which is originated from i.MX6UL EVK with
some changes:
1. Include imx6ull.dtsi as base
2. sim2 is removed.
3. Move GPIO5 pins setting to iomuxc-snvs
4. Enable CSI and ov5640
Signed-off-by: Ye Li <ye.li@nxp.com>
Robby Cai [Thu, 11 Aug 2016 13:04:59 +0000 (21:04 +0800)]
MLK-12881 media: camera: add error handing for BIT_RFF_OR_INT
running following vte stress test will meet "mx6s-csi
21c4000.csi: mx6s_csi_irq_handler Rx fifo overflow"
and cannot be stopped to capture again.
i=0; while [ $i -lt 3000 ];do v4l2_capture_emma -D /dev/video1 -C 2 -M 0 -J 30,4 -W 640 -H 480;i=`expr $i + 1`;done
This patch adds the same handling as BIT_HRESP_ERR_INT for BIT_RFF_OR_INT
(RxFiFo OverFlow) to reset CSI as a recovery.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Anson Huang [Wed, 10 Aug 2016 13:56:44 +0000 (21:56 +0800)]
MLK-13062 arm: imx: correct PLL2 rate calculation
As i.MX6's PLL2 also support a fractional-N
synthesizer, so we need to consider the NUM
and DENOM's value to get a correct rate, as
fraction may be used in some cases.
Remove round_rate and set_rate for PLL2, as
it is NOT allowed to be changed in kernel
dynamically, otherwise, PFDs and DDR may NOT
work normally, it normally should be changed
in u-boot before DDR is enabled.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Haibo Chen [Tue, 9 Aug 2016 09:51:04 +0000 (17:51 +0800)]
MLK-13022-3 arm: dts: imx6ull-14x14-evk-emmc.dts: set usdhc2 per clock to 132MHz
For imx6ull-14x14-evk emmc rework board, usdhc2 HS200 I/O timing is
not stable @176MHz, for write operation, crc error shows up. So this
patch change the frequence to 132MHz.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Haibo Chen [Tue, 2 Aug 2016 07:48:04 +0000 (15:48 +0800)]
MLK-13022-2 arm: dts: new dts for eMMC support on i.MX6UL EVK reworked board
Enable eMMC for i.MX6UL EVK rework board due to the pad conflict with NAND
and Micro-SD.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Haibo Chen [Mon, 1 Aug 2016 07:22:59 +0000 (15:22 +0800)]
MLK-13022-1 arm: dts: new dts for eMMC support on i.MX6ULL EVK reworked board
Enable eMMC for i.MX6ULL EVK rework board due to the pad conflict with NAND
and Micro-SD.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Sandor Yu [Mon, 8 Aug 2016 03:58:01 +0000 (11:58 +0800)]
MLK-12932-02: dts: imx6sx: Add lcdif alias name
Add lcdif alias name.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Mon, 8 Aug 2016 03:54:03 +0000 (11:54 +0800)]
MLK-12932-01: pwm backlight: Add fb name check feature
Add fb name check function pwm_backlight_check_fb_name(),
pwm driver can banding to fb with fb name when driver working
in device tree architecture.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Wed, 3 Aug 2016 07:06:57 +0000 (15:06 +0800)]
MLK-12997: dts: hdmicec: Fix hdmicec pinctrl setting error
Fix hdmicec pinctrl setting error.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Thu, 21 Jul 2016 09:44:51 +0000 (17:44 +0800)]
MLK-12978: arm: clk: i.MX6SX set lcdif2 pixel clk parent to ldb_di0
i.MX6SX LDB will connect to LCDIF2.
And LCDIF2 pixel clock can not re-parent when it's on.
So default setting clock parent to ldb_di0.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Peter Chen [Mon, 1 Aug 2016 08:55:19 +0000 (16:55 +0800)]
MLK-13023 ARM: dts: imx6ull-14x14-evk-usb-certi: add dts for USB certification
Add dts for imx6ull 14x14 evk board's USB certification test
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Bai Ping [Fri, 29 Jul 2016 07:25:26 +0000 (15:25 +0800)]
MLK-13014 ARM: imx: fix system hang when run cpufreq-info in low bus mode
On i.MX6ULL, when the system entering the low bus mode, system will enter
low power run mode in which the cpufreq is at 24MHz. If we run
'cpufreq-info' until, the cpu frequency will be change from 24MHz to 99MHz,
this will lead to system enter low power idle wrong, and system will hang
in low power idle.
Add the ARM core clock handling code to fix this issue.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Han Xu [Thu, 28 Jul 2016 15:54:37 +0000 (10:54 -0500)]
MLK-13013: arm: dts: new dts for gpmi nand support on i.MX6ULL EVK reworked board
Enable NAND for i.MX6ULL EVK board which need to be reworked due to the
pin conflict with QSPI and SD2.
Signed-off-by: Han Xu <han.xu@nxp.com>
Andy Duan [Tue, 26 Jul 2016 09:17:25 +0000 (17:17 +0800)]
MLK-13008 dts: imx6ll-evk: add Murata BT/WiFi module support
Add Murata Type ZP (BCM4339) module support on i.MX6ULL platforms:
- i.MX6ULL EVK (SD1 slot) + Murata adapter V2.0
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Xianzhong [Tue, 26 Jul 2016 07:58:43 +0000 (15:58 +0800)]
MGS-2027 [#ccc] integrate 6.1.1 gpu kernel driver
Integrate gpu kernel driver part for 6.1.1 release
Date: Jul 26, 2016
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Robby Cai [Mon, 18 Jul 2016 09:30:16 +0000 (17:30 +0800)]
MLK-12994 ARM: dts: imx6ull-evk: enable csi and camera ov564x
enable csi and ov564x
Signed-off-by: Robby Cai <robby.cai@gmail.com>
Robby Cai [Wed, 29 Jun 2016 06:27:44 +0000 (14:27 +0800)]
MLK-12931 lcdif: fix "lcd-3v3: Failed to request enable GPIO91: -16"
The PIN is conflicted with CSI camera. Need to disable CSI to make lcdif work.
Signed-off-by: Robby Cai <robby.cai@gmail.com>
ye li [Fri, 1 Jul 2016 03:41:53 +0000 (11:41 +0800)]
MLK-12989 ARM: dts: imx6ullevk: Add support for imx6ull 14x14 EVK board
Add DTS file imx6ull-14x14-evk.dts which is originated from i.MX6UL EVK with
some changes:
1. sim2 is removed.
2. Move GPIO5 pins setting to iomuxc-snvs
Signed-off-by: ye li <ye.li@nxp.com>
Fancy Fang [Wed, 13 Jul 2016 01:40:54 +0000 (09:40 +0800)]
MLK-12983 dma: pxp: add sanity check in pxp_set_scaling()
Add the sanity check for drect's width and height in
pxp_set_scaling() to avoid div0 exception.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Tue, 12 Jul 2016 06:48:40 +0000 (14:48 +0800)]
MLK-12980-3 video: mxsfb: free 'pseudo_palette' to avoid memory leak
The dynamicly allocated 'pseudo_palette' area should be
freed when unused to avoid memory leak.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Tue, 12 Jul 2016 06:25:10 +0000 (14:25 +0800)]
MLK-12980-2 video: mxsfb: change the 'fb_info' field of 'mxsfb_info' structure
Refine the 'fb_info' field in 'mxsfb_info' that change this
field to be a pointer which can reduce the 'mxsfb_info' size.
Besides, store the 'host' data to fb_info->par to replace the
unnecessary 'to_imxfb_host' macro.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Mon, 11 Jul 2016 09:14:22 +0000 (17:14 +0800)]
MLK-12980-1 video: mxsfb: refine the driver data usage logic
The function 'platform_set_drvdata' will be called twice
during the probing stage. And the second calling is not
good and not necessary.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Han Xu [Mon, 11 Jul 2016 22:27:50 +0000 (17:27 -0500)]
MLK-12981: mtd: fsl-quadspi: QSPI support dynamic LUT change
QSPI only support upto 16 LUT slots while the QSPI commands are more
than this number, reserve the last two slots for dynamic change (most
commands used in pairs). Later all extra supported commands will be add
in dynamic lut table.
Signed-off-by: Han Xu <han.xu@nxp.com>
Fancy Fang [Fri, 8 Jul 2016 07:30:33 +0000 (15:30 +0800)]
MLK-12975-2 video: mxsfb: missing a 'break' in the case statement.
Missing the 'break' will cause the function return failure
when the 'bits_per_pixel' is 32 which should be supported.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Fri, 8 Jul 2016 07:20:16 +0000 (15:20 +0800)]
MLK-12975-1 video: mipi_dsi_samsung: set default bpp to 32 if not set
The default bpp should be set to a proper value if it is
not set yet during mipi panel display initialization.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Thu, 7 Jul 2016 02:09:25 +0000 (10:09 +0800)]
MLK-12972 dma: pxp-v3: add asynchronous multi-task support
Using a dedicated kernel thread to dispatch all the client
requests which can support asynchronous multi-task.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Shengjiu Wang [Thu, 30 Jun 2016 09:45:05 +0000 (17:45 +0800)]
MLK-12771: ASoC: fsl_asrc: fix dma task timeout issue
The test case is one p2p playback + two m2m converter running
simultaneously. There are three root cause for this issue:
1. hw_free() of p2p may be called twice in the end, which cause
release twice of one pair, if another pair request is called between
this two release, there will be issue.
2. In m2m close(), the asrc_priv->pair[i] will be set NULL twice,
which is same issue as 1.
3. when output rate is more than eight multiple of input rate for m2m,
the last_period_size should be larger.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Richard Zhu [Fri, 8 Jul 2016 02:48:13 +0000 (10:48 +0800)]
MLK-12974 ARM: dts: imx7d: corret the pcie legacy interrupters
Correct the imx7d pcie legacy interrupters.
INTA <---> 157
INTB <---> 156
INTC <---> 155
INTD <---> 154
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Fancy Fang [Thu, 30 Jun 2016 05:38:39 +0000 (13:38 +0800)]
MLK-12948 ARM: dts: imx7d-sdb: change the hardware reset gpio for mipi dsi
Change the hardware reset gpio to 'GPIO6_IO15' for mipi dsi to
allow fec2 and mipi dsi can run at the same time. This needs
some hardware rework as follows:
"
1. Replace R631 with 100K resistor;
2. Remove D14, D24;
3. Solder the Cathode of the diode to R471,
you can use BAT54HT1(ONSEMI) or NSR0320MW2T1G(ONSEMI);
4. Solder the wire to the Anode end of the diode;
5. Scrape the solder mask(Green oil) of the MIPI Reset via,
then solder the end of the wire to the via.
"
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Tue, 28 Jun 2016 09:18:17 +0000 (17:18 +0800)]
MLK-12946 media: pxp-v4l2: correct the 32 bpp pixel format passed to pxp
The 32 bpp pixel format which is passed to pxp should be
'PXP_PIX_FMT_RGB32' instead of 'PXP_PIX_FMT_RGB24', since
only 'PXP_PIX_FMT_RGB32' can be recognized by lcdif.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Frank Li [Wed, 22 Jun 2016 15:48:41 +0000 (10:48 -0500)]
MLK-12944 fix makefile miss imx7d-12x12-lpddr3-arm2-pcie.dtb
Added imx7d-12x12-lpddr3-arm2-pcie.dtb to makefile
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Anson Huang [Wed, 22 Jun 2016 15:11:04 +0000 (23:11 +0800)]
MLK-12935 ARM: imx: switch system counter clock to 32K in suspend
During suspend, as 24MHz will be disabled, but system counter
needs to be running in order to maintain accurate clock source,
so we need to switch system counter's clock from base clock(24MHz)
to alternate clock(32K) before system enter STOP mode, otherwise,
the suspend time will NOT be counted into system time when issue
a "date" command.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit
470f930321d7633ea9844a1ebf6784cafd8b7372)
Robby Cai [Tue, 21 Jun 2016 08:14:02 +0000 (16:14 +0800)]
MLK-12758 ARM: dts: imx6sx-sdb: fix brightness can't be adjusted
set PWM4 pin correctly for the LVDS backlight.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Wed, 15 Jun 2016 15:36:59 +0000 (23:36 +0800)]
MLK-12908-2 damengine: pxp: fix the histogram setting for i.mx7d
the commit
1b98a9be39a37c2d3ad239c3a1a3a1af1d4ac637 breaks the setting for mx7d.
the patch fixes it.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Wed, 15 Jun 2016 15:17:35 +0000 (23:17 +0800)]
MLK-12908-1 damengine: pxp: correct dithering setting
dithering test will met timeout issue on i.MX6ULL platform.
to reproduce, run ' /unit_tests/mxc_epdc_v2_fb_test.out -n 17 -d 1 -q 1'
Ginger dithering mode "Floyd-Steinberg" and quant_bit 1
imx_epdc_v2_fb
228c000.epdc: PxP operation failed due to timeout
imx_epdc_v2_fb
228c000.epdc: Unable to complete PxP update task: dithering process
imx_epdc_v2_fb
228c000.epdc: Timed out waiting for update completion
This patch corrects the setting (different from V3 on i.MX7D).
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Shengjiu Wang [Thu, 16 Jun 2016 06:35:52 +0000 (14:35 +0800)]
MLK-12907: ASoC: imx_mqs: mqs can't be recorder
mqs can't be used as recorder, the capture property need to be zero.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Haibo Chen [Tue, 14 Jun 2016 05:52:16 +0000 (13:52 +0800)]
MLK-12902: usdhc: Revert "MLK-11685-5 mmc: sdhci-esdhc-imx: no need busfreq for imx6qdl"
This reverts commit
312979d1fcbd068d4ba0f461e974e7cbcc889548.
When busfreq is at low bus mode, which is 24MHz, it means DDR/AHB/AXI
will drop to 24MHz. At the same time, when in low busfreq mode, cpuidle
can be in low power idle, DRAM will be put into self-refresh and DRAM IO
will in low power mode to save power, so DMA will NOT work.
So all peripherals that needs DMA, need to request bus freq to high
setpoint when it is active.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Fancy Fang [Mon, 23 May 2016 06:12:59 +0000 (14:12 +0800)]
MLK-12899-2 video: mipi_dsi_samsung: add panel 'TFT3P5581' driver.
Add the mipi panel 'TFT3P5581' driver.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Thu, 26 May 2016 02:28:57 +0000 (10:28 +0800)]
MLK-12899-1 ARM: dts: imx7d-sdb: add dts support for panel 'TFT3P5581'.
Add the dts support for the new mipi panel 'TFT3P5581'.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Mon, 13 Jun 2016 09:38:47 +0000 (17:38 +0800)]
MLK-12901-3 video: mipi_dsi_samsung: alwasy use video mode to transfer data and cmds.
Since the lcdif uses RGB interface to transfer image data to
mipi dsi, video mode should be used to transfer the image data.
So, the commands transfer should also use video mode to avoid
unnecessary mode switches.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Mon, 13 Jun 2016 06:16:19 +0000 (14:16 +0800)]
MLK-12901-2 video: mipi_dsi_samsung: add 10msec delay after all the pkt write operation.
Add 10msec delay after all the pkt write operations to let
the data to take effect on the panel's side.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Mon, 13 Jun 2016 06:08:46 +0000 (14:08 +0800)]
MLK-12901-1 video: mipi_dsi_samsung: correct the hardware reset calling position.
The hardware reset should be done on LP-11 mode which
is the data/clk stop state.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Mon, 6 Jun 2016 06:07:54 +0000 (14:07 +0800)]
MLK_12886-2 video: mxsfb: handle the assert gpio in driver to support deferred probe
The assert gpio comes from 'gpio_spi' module, so the framebuffer
depends on the 'gpio_spi' driver loading. And in the case that
the framebuffer driver is loaded earlier than the 'gpio_spi'
driver, the gpio asserting will fail. So handle this gpio in
the framebuffer driver and add deferred probed support.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Fancy Fang [Mon, 6 Jun 2016 05:49:22 +0000 (13:49 +0800)]
MLK-12886-1 ARM: dts: imx7d-sdb: the assert gpio for lcdif should be active low
According to the 7d sdb schematic, only when the 'LCD_PWR_EN' is
low voltage, the 'LCD_3V3' can has the 3.3V voltage. And 'LCD_3V3'
is used to provide 3.3V power for lcd peripherals.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Sandor Yu [Mon, 13 Jun 2016 06:36:08 +0000 (14:36 +0800)]
MLK-12898: ov5640 mipi: Add more delay to wait sensor stable
Add more delay to wait sensor stable.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
(cherry picked from commit
c1d7c35b6d2c8b6ec69b90bac6febf673d04acc5)
Shengjiu Wang [Mon, 13 Jun 2016 04:06:19 +0000 (12:06 +0800)]
MLK-12900-2: ARM: dts: fix asrc mqs noise issue
Change the spdif's clock frequency for the frequency is too high
for asrc, which will cause the asrc p2p + mqs noise.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit
e623ad471a46cbe7d12f1ae8a58d5ea53129db22)
Shengjiu Wang [Mon, 13 Jun 2016 04:05:10 +0000 (12:05 +0800)]
MLK-12900-1: ARM: dts: pin confict for spdif and wdog
Disable wdog in wm8958.dts for conflict with spdif
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit
71863bcd34420384f5ef5eeecc2c8ca45389db24)
Han Xu [Fri, 10 Jun 2016 16:04:59 +0000 (11:04 -0500)]
MLK-12897: ARM: dts: add one more dts for all qspi chip support on i.MX6ULL
change the qspi dts for default one qspi scenario and add one more for
all four qspi chip support.
Signed-off-by: Han Xu <han.xu@nxp.com>
Robby Cai [Wed, 8 Jun 2016 06:22:12 +0000 (14:22 +0800)]
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>
Anson Huang [Wed, 8 Jun 2016 10:52:38 +0000 (18:52 +0800)]
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>
Peng Fan [Fri, 3 Jun 2016 01:30:04 +0000 (09:30 +0800)]
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>
Shengjiu Wang [Mon, 6 Jun 2016 08:52:52 +0000 (16:52 +0800)]
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>
Peng Fan [Fri, 3 Jun 2016 03:15:48 +0000 (11:15 +0800)]
MLK-12879 char: otp: support i.MX6ULL
Add ocotp support for i.MX6ULL.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Andy Duan [Fri, 3 Jun 2016 03:18:02 +0000 (11:18 +0800)]
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>
Robin Gong [Wed, 1 Jun 2016 09:35:25 +0000 (17:35 +0800)]
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>
Sandor Yu [Thu, 2 Jun 2016 07:30:26 +0000 (15:30 +0800)]
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
c29dda8f4092cdeff7f7661f8ac2a05f98a71296)
Peter Chen [Fri, 10 Jul 2015 07:46:04 +0000 (15:46 +0800)]
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>
Peter Chen [Fri, 10 Jul 2015 07:41:30 +0000 (15:41 +0800)]
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>
Peter Chen [Wed, 25 May 2016 08:46:27 +0000 (16:46 +0800)]
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>
Peter Chen [Thu, 26 May 2016 08:56:01 +0000 (16:56 +0800)]
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>
Shengjiu Wang [Tue, 31 May 2016 01:33:39 +0000 (09:33 +0800)]
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>
Richard Liu [Tue, 31 May 2016 10:08:39 +0000 (18:08 +0800)]
MA-8225 [#2406] add feature table for gc355_v121_rc5
There is below log when use gpu 6.1 driver on android, root
cause is feature table is missing for VG core.
error log:
Galcore version 6.1.0.60705
[galcore]: Feature database is not found,chipModel=0x355,
chipRevision=0x1215, productID=0x0, ecoID=0x0
Date: May 30, 2016
Signed-off-by: Richard Liu <xuegang.liu@nxp.com>
Anson Huang [Mon, 30 May 2016 19:18:52 +0000 (03:18 +0800)]
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
e28ae270b6e23a6b5ba86112592bc2b767c68f8d)
Anson Huang [Mon, 30 May 2016 16:34:55 +0000 (00:34 +0800)]
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
02a2e8d73bcb8d2b8362b4328976dfcdc502a19c)
Andy Duan [Wed, 25 May 2016 08:32:22 +0000 (16:32 +0800)]
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>
Robby Cai [Tue, 24 May 2016 09:29:48 +0000 (17:29 +0800)]
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>
Li Jun [Tue, 17 May 2016 02:45:08 +0000 (10:45 +0800)]
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>
Shengjiu Wang [Thu, 19 May 2016 10:24:06 +0000 (18:24 +0800)]
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>
Robin Gong [Wed, 18 May 2016 07:22:09 +0000 (15:22 +0800)]
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>
Han Xu [Wed, 18 May 2016 20:03:43 +0000 (15:03 -0500)]
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>
Robby Cai [Wed, 18 May 2016 10:37:38 +0000 (18:37 +0800)]
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>
Robby Cai [Fri, 13 May 2016 02:03:35 +0000 (10:03 +0800)]
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>
Robby Cai [Fri, 13 May 2016 01:59:46 +0000 (09:59 +0800)]
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>
Robby Cai [Fri, 13 May 2016 01:18:40 +0000 (09:18 +0800)]
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>
yong.gan [Thu, 19 May 2016 01:02:36 +0000 (09:02 +0800)]
MGS-1685 [#2356] fix vg context buffer memory leak
gcoVGHARDWARE_FreeVideoMemory user space implementation has some problem,
the asynchronous unlock/free is required by kernel memory managment, by not available in this function.
because user command buffer & struct cannot be freed through committing new vg command to hardware,
the new workaround is to double unlock the video memory for gcvHAL_RELEASE_VIDEO_MEMORY,
also removed the database as the asynchronous unlock is not available in vg user space driver.
Date: May 18, 2016
Signed-off-by: Yong Gan <yong.gan@freescale.com>
Bai Ping [Tue, 17 May 2016 05:01:24 +0000 (13:01 +0800)]
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>
Bai Ping [Mon, 16 May 2016 09:45:39 +0000 (17:45 +0800)]
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>
Bai Ping [Mon, 16 May 2016 06:01:06 +0000 (14:01 +0800)]
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>
Bai Ping [Mon, 16 May 2016 05:38:02 +0000 (13:38 +0800)]
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>
Haibo Chen [Tue, 17 May 2016 08:14:32 +0000 (16:14 +0800)]
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>
Shengjiu Wang [Sat, 14 May 2016 06:50:22 +0000 (14:50 +0800)]
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>
Andy Duan [Wed, 11 May 2016 06:47:18 +0000 (14:47 +0800)]
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>
Shengjiu Wang [Thu, 12 May 2016 10:00:49 +0000 (18:00 +0800)]
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>
Shengjiu Wang [Thu, 12 May 2016 09:56:45 +0000 (17:56 +0800)]
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>
Shengjiu Wang [Thu, 12 May 2016 09:54:08 +0000 (17:54 +0800)]
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>
Shengjiu Wang [Thu, 12 May 2016 09:51:53 +0000 (17:51 +0800)]
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>
Shengjiu Wang [Wed, 11 May 2016 08:34:38 +0000 (16:34 +0800)]
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>
Bai Ping [Wed, 11 May 2016 04:36:32 +0000 (12:36 +0800)]
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>
Andy Duan [Wed, 11 May 2016 06:59:09 +0000 (14:59 +0800)]
MLK-12763 ARM: imx7d: iomux: correct uart input sel option value
GPIO0~GPIO7 part:
- Commit(
c8cabda5ab07) 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)
Peter Chen [Fri, 6 May 2016 06:21:21 +0000 (14:21 +0800)]
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>
Peter Chen [Fri, 29 Apr 2016 02:42:47 +0000 (10:42 +0800)]
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>
Han Xu [Mon, 9 May 2016 22:36:01 +0000 (17:36 -0500)]
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>
Xianzhong [Mon, 9 May 2016 06:28:54 +0000 (14:28 +0800)]
MGS-1806 integrate VSI 6.1.0 gpu kernel driver
Integrate gles base driver of 6.1.0 gpu release,
hal/security_v1 is the new added feature.
Date: May 09, 2016
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Anson Huang [Mon, 9 May 2016 06:45:14 +0000 (14:45 +0800)]
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
07c9f26b19b3ce05719d5634f1f56790b7ecf6af)
Anson Huang [Sun, 8 May 2016 06:26:33 +0000 (14:26 +0800)]
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>
Anson Huang [Wed, 4 May 2016 02:56:40 +0000 (10:56 +0800)]
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>
Anson Huang [Wed, 4 May 2016 06:25:35 +0000 (14:25 +0800)]
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>
Haibo Chen [Wed, 4 May 2016 07:12:32 +0000 (15:12 +0800)]
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>