MLK-12688-02: arm dts: Add csis-clk-settle property

Add csis-clk-settle property to imx7D SDB mipi csi.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12692 ARM: dts: imx6ull-ddr3-arm2-ecspi: enable ecspi1 on arm2 board

Add new dtb file since ecspi share pins with csi and esai.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12685 ARM: dts: imx6sx-sabreauto.dts: improve usdhc4 pad drive strength

For imx6sx-sabreauto board, the usdhc4 is used for the sd slot locate on
the base board, so need to improve the pad drive strength, otherwise we
will meet many CRC error or timeout error when insert a sd card.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12676-2 arm: dts: enable usb otg2 for imx6ull arm2 board

Use a dedicatd dts file to enable both OTG1 and OTG2 ports in OTG mode,
- otg2 ID pin is muxed with SD1 vselect, so move it out of hog and don't
  use it in usdhc1 in usb dts.
- otg2 vbus control use GPIO1_IO09 since the original gpio is shared
  with i2c1(with pmic chip connected).

Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12676-1 arm: dts: enable usb otg for imx6ull arm2 board

Enable otg mode for OTG1 port for imx6ull arm2 board.

Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12683 ARM: dts: imx6ull: add uart2 support

Enable uart2 port in ddr3 ARM2 board.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12682 ARM: dts: imx6ull: add adc support

Add extra dts file to enable adc to avoid pin conflict with usbotg1.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12681 ARM: dts: imx6ull: enable fec1 port in ddr3 ARM2 board

Enable fec1 port in ddr3 ARM2 board.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12684-1: ARM: dts: imx6ull: add NAND support

Support NAND on imx6ull

Signed-off-by: Han Xu <han.xu@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12679 ARM: dts: imx6ull: correct pxp clock settings

Correct pxp clock settings according to the commit
'MLK-12669-2 dma: pxp-v3: add 'ipg' and 'axi' clocks'.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12678 ARM: dts: imx6ull-ddr3-arm2: solve pin conflict for pwm3 and otg1

The pwm3 and otg1 share the same pin 'GPIO1_IO04'. And default,
the pin is used for otg1. So create a new dts file to solve
this conflict.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12675 ARM: dts: imx: keep RTC enabled for software poweroff

SRTC needs to be kept enabled during system poweroff,
SNVS_LP control register bit 0 SRTC_ENV must be set
to enable RTC, for software poweroff, kernel just
read the register offset and value from dtb and write
to SNVS_LP control register to poweroff system, need
to make sure bit 0 SRTC_ENV is set to enable RTC during
system poweroff.

Previous setting did NOT enable it which will cause
RTC stop running if using software poweroff.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12627-04 ARM: dts: imx: Add dts support for imx6ull DDR3 ARM2 board

Add dts file for i.MX6ULL DDR3 ARM2 board.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
[Arul: Fix merge conficts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12623-02 ARM: dts: imx: Add 700MHz setpoint define in dts

According to the latest datasheet(Rev. 0, 12/2015),
When the chip is run at LDO enabled mode, the highest
setpoint can be set to 700MHz in overdrive mode.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12432-03: arm: dts: Replace ov5647 mipi sensor with ov5640

ov5647 mipi camera sensor is replaced by ov5640
on imx7D SDB RevB board.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12573 ARM: dts: set LCD_nPWREN low to make VLCD_3V3 output 3V3.

Q901 (IRLML6401) is p-channel MOSET, need set pin1 (LCD_nPWREN) to low
to let pin3 output be 3V3. Normally when pin1 is high, then pin3
output should be gated. It was working previously due to some leakage.
Correct the enable logic from the software viewpoint.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12569 ARM: dts: imx6sx-sabreauto: add pfuze100

Add pfuze100 on imx6sx-sabreauto board to align with v3.14, although
no driver use pfuze100 regulator now.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12556 dts: i.mx6ul: configure the CMA region by default

CMA region is a must to avoid the multile memory mapping
for the DMAed memory and also benifit the large continuous
phisical memory allocation.

The default value is depend on the target system design and
user cases definition. This is not suitable to put this into
the soc.dtsi, thus we put it into the board DTS.

customer can override the value by changing cma size in DTS file.

Again, customer need set the CMA size correctly according to the
target system. The incorrectly CMA size can cause Linux kernel fail
to boot up.CMA disabled or CMA size set to zero is also not allowed.

Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12509-1 video: mipi_dsi_samsung: create a new dts for mipi dsi.

Create a new dts for the 'TFT3P5079E' mipi panel on
imx7d sabresd revb board.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12478-2 dts: imx7d-lpddr3-arm2: add lpsr mode state for flexcan pins

add lpsr mode state for flexcan pins

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12480 dts: imx7d-12x12-lpddr3-arm2: remove extended enet dts file

There have two same extended enet dts file to enable fec2 port, so
remove the redundant enet dts file.

The issue is caused by the commit 370426c2a918 that was cherry picked
after commit b74c6b9c7fdc.

Signed-off-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12462-2 dts: imx: add pm-ignore-notify for WiFi card

MMC core pm_notify will re-detect card after system suspend/resume,
regardless of post-cd claim.
Since in current MMC implement, non-removable card only detects once,
this will break post card detect which happens next.
e.g. when we suspend/resume system first, then load Broadcom wifi module,
we will get below dump:

root@imx6qdlsolo:/mnt/nfs/vte_IMX6QP-Sabre-SD# modprobe bcmdhd firmware_path=/lib/firmware/bcm/ZP_BCM4339/fw_bcmdhd.bin nvram_path=/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.SDIO.cal
dhd_module_init in
Power-up adapter 'DHD generic adapter'
wifi_platform_bus_enumerate device present 1
failed to power up DHD generic adapter, 3 retry left
wifi_platform_bus_enumerate device present 0
-----------[ cut here ]-----------
Kernel BUG at 80513170 [verbose debug info unavailable]
Internal error: Oops - BUG: 0 1 PREEMPT SMP ARM
Modules linked in: bcmdhd ov5642_camera ov5640_camera_mipi_int ov5640_camera_int mxc_v4l2_capture mxc_dcic ipu_bg_overlay_sdc ipu_still v4l2_int_device ipu_prp_enc ipu_csi_enc ipu_fg_overlay_sdc
CPU: 1 PID: 1487 Comm: modprobe Not tainted 4.1.15-1.0.0+g54cf6a2 #1
Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree)
task: a881e3c0 ti: a9152000 task.ti: a9152000
PC is at mmc_sdio_remove+0x7c/0x80
LR is at mmc_sdio_force_remove+0xc/0x34
pc : [<80513170>] lr : [<80513180>] psr: 60030013
sp : a9153d28 ip : 00000000 fp : 00000000
r10: 00000000 r9 : 00000000 r8 : 7f0f76e0
r7 : a9153d58 r6 : 00000000 r5 : 00000000 r4 : a83f1800
r3 : 00000000 r2 : 00000000 r1 : 809c02f4 r0 : a83f1800
Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user
Control: 10c53c7d Table: 38d7804a DAC: 00000015
Process modprobe (pid: 1487, stack limit = 0xa9152210)
Stack: (0xa9153d28 to 0xa9154000)
3d20: 00000000 7f0c569c a9ffe440 00000003 00000000 7f0c58f4
3d40: a81942c0 8032e33c a8195960 7f0fbf68 00020002 00000000 a9153d58 a9153d58
3d60: fffffdfb 80bc0db4 a81af810 7f0f9518 fffffdfb 00000008 00000000 5624ce5c
3d80: 00000124 80381140 80bc0db4 a81af810 7f0f9518 00000000 00000008 8037f9dc
3da0: a81af810 7f0f9518 a81af844 80b288b0 00000000 8037fbec 00000000 7f0f9518
3dc0: 8037fb60 8037e068 a8025c5c a818fa34 7f0f9518 a20ff280 00000000 8037f16c
3de0: 7f0f0330 a9ffe440 00000000 7f0f9518 a9ffe440 00000000 80bb18f4 803801ec
3e00: 7f0fbf68 a9ffe440 00000000 7f0c5fdc 80b01720 80b01720 a9ffe440 7f11f000
3e20: 00000000 00000001 5624ce5c 80009730 abc7b120 800e316c 000000c8 a9209a00
3e40: 8040003f 00000001 00010000 800b0dfc 000000c8 8040003f abc7dc60 80afc2b0
3e60: abc75880 80afc260 a8001f00 80afe6c0 00000124 800e4944 7f0f9718 00000001
3e80: 7f0f9718 00000001 a9ffeb00 7f0f9718 a9db31c0 8078e47c 7f0f9718 a9db31c0
3ea0: a9153f58 00000001 a9db31c8 80094094 7f0f9724 00007fff 800910d4 00000000
3ec0: 00000000 7f0f9760 00000000 7f0f9860 c0fce8f4 7f0f9724 00000000 8079aa0c
3ee0: c0f07000 000c7944 00b6817a 00000000 0000000e 00000000 00000000 00000000
3f00: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
3f20: 00000000 00000000 00000000 00000000 00000640 00000000 00000003 01608348
3f40: 0000017b 8000f604 a9152000 00000000 01608270 800944f8 c0f07000 000c7944
3f60: c0fce28c c0f83439 c0f99248 0007aff8 0008f968 00000000 00000000 00000000
3f80: 00000029 0000002a 00000020 00000024 00000015 00000000 01608348 00000073
3fa0: 00000000 8000f480 01608348 00000073 00000003 01608348 00000000 00000000
3fc0: 01608348 00000073 00000000 0000017b 01608218 00000000 00000073 01608270
3fe0: 7e9ab8c0 7e9ab8b0 0001f2c0 76eac340 600d0010 00000003 00000000 00000000
[<80513170>] (mmc_sdio_remove) from [<7f0c58f4>] (dhd_wifi_platform_load+0x180/0x39c [bcmdhd])
[<7f0c58f4>] (dhd_wifi_platform_load [bcmdhd]) from [<80381140>] (platform_drv_probe+0x44/0xac)
[<80381140>] (platform_drv_probe) from [<8037f9dc>] (driver_probe_device+0x174/0x2b4)
[<8037f9dc>] (driver_probe_device) from [<8037fbec>] (__driver_attach+0x8c/0x90)
[<8037fbec>] (__driver_attach) from [<8037e068>] (bus_for_each_dev+0x68/0x9c)
[<8037e068>] (bus_for_each_dev) from [<8037f16c>] (bus_add_driver+0x148/0x1f0)
[<8037f16c>] (bus_add_driver) from [<803801ec>] (driver_register+0x78/0xf8)
[<803801ec>] (driver_register) from [<7f0c5fdc>] (dhd_wifi_platform_register_drv+0x1bc/0x208 [bcmdhd])
[<7f0c5fdc>] (dhd_wifi_platform_register_drv [bcmdhd]) from [<80009730>] (do_one_initcall+0x8c/0x1d4)
[<80009730>] (do_one_initcall) from [<8078e47c>] (do_init_module+0x5c/0x1a8)
[<8078e47c>] (do_init_module) from [<80094094>] (load_module+0x1ba8/0x1e50)
[<80094094>] (load_module) from [<800944f8>] (SyS_finit_module+0x80/0x90)
[<800944f8>] (SyS_finit_module) from [<8000f480>] (ret_fast_syscall+0x0/0x3c)

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
(cherry picked from commit 2ce993c504798e7fad0910432bd2c6cbd332120d)

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12457 dts: imx7d-12x12-lpddr3-arm2: correct pwm1 pinctrl settings

The pwm1's pin belongs to lpsr iomux. So this should
be corrected.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12454 ARM: dts: imx7d-12x12-lpddr3-arm2: add adc support

Add ADC support for imx7d-12x12-lpddr3-arm2 board.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
(cherry picked from commit 8ed7b52849feced89e8ddcbea49ec7426fa4d8bf)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12466 ARM: dts: imx6ul-14x14-evk-usb-certi: add USB certification dts

Below are the differences between standard evk:
- Enable tpl
- Enable software control vbus for otg2 (hardware rework is needed)
- Disable TSC due to the pin conflict with above vbus regulator

Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12456 ARM: dts : add spi1 IOMUX sleep state

Add spi1 IOMUX sleep state in imx7d-12x12-lpddr3-arm2.dts.

Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12433: arm: dts: imx: disable tempmon device when cpufreq is disabled

In the lpddr3-arm2-m4 dts, the I2C1 is disabled, so PMIC is disabled,
the cpufreq is not support. As thermal driver is depended on cpufreq
driver, if cpufreq is not support, the tempmon device can be disabled.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12423: ARM: dts: imx6sl: remove always-on for vddpu

PU can be dynamically turned off or on, so we need remove
"regulator-always-on" property.

Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit f3c0df15fbecce36cae531a4a919d544f9ea8e2a)
(cherry picked from commit ec113127f090c225dd731383b6fb950c02ae1f0b)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-10190 ARM: dts: disable disp mix on imx6sl by default

The cause is EPDC works not stable if DISP mix is enabled.

Signed-off-by: Robby Cai <r63905@freescale.com>
(cherry picked from commit db5b89bd35d259504da1c15d62f898f1291541e2)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12077-4 dts: imx6: add cd-post property for BCM WiFi devices

BCM WiFi driver needs to take care of card detect by itself.
Using cd-post property to tell MMC core not detect card automatically
during host driver probe and post it until client driver tells it to
do it.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12307: ARM: imx: imx6q arm2 use lpddr2 in 2 channel fixed mode

Set usable memory to 2 channel fixed mode
MMDC0 0x80000000 512M
MMDC1 0x10000000 512M
MMDC 2 channel fixed mode is enabled by setting
BOOT_CFG3[5:4] = 01 for Fixed 2x32 map

Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12023-1: ARM: dts: imx: imx6q add busfreq device node label

Add busfreq device node label to allow override busfreq
properties on machine device tree descriptor

Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Signed-off-by: Anson Huang <b20788@freescale.com>
(cherry picked from commit fd8faeb7a40fc2f9fb331d6ca6a60b64c95d7ee6)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11890: ARM: dts: imx: add imx6q arm2 lpddr2 target

Add device tree for imx6q arm2 lpddr2 pop target platform
Enable common imx6q features, uart, usb, usdhc, fec.
Set DDR max frequency to 400Mhz which is the clock rate
for MT42L128M64D2-25

Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Signed-off-by: Anson Huang <b20788@freescale.com>
(cherry picked from commit 06783aba18bda32f25107485891fc4bafc609abf)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12370 ARM: dts: imx7d-12x12-lpddr3-arm2: disable sim1 node in flexcan dts file

The sim1 has pin conflicts with flexcan1,flexcan2 and sai1.
By default, imx7d 12x12 lpddr3 arm2 default dts enable sim1 node
and disable flexcan1, flexcan2, sai1 nodes.

The patch do two things:
- disable sim1 node in extended flexcan dts file
- remove redundant sim1 node in default dts file

Signed-off-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

ARM: dts: imx6ul: Add caam

[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

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>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

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>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-16134 ARM: dts: imx6ull: update imx6ull header file with the latest imx6ull RDP

Update imx6ull header file with the latest imx6ull RDP.
- add new pin function definitions.
- update pin function changes.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12627-03 ARM: dts: imx: Add dtsi file for imx6ull

Add dtsi file for i.MX6ULL.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12364-2: DTS: Add pmic 5v supply to i.MX6qdl sabresd

Add pmic 5v supply to i.MX6qdl sabresd dts.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12358: ARM: dts: imx7d-val-m4: disable sim1 and reg_can2_3v3

- Disable the sim1 on imx7d val board, because that there
are pin conflictions between sim1 and flexcan2 used by M4.
- Disable can2 is not enough, since the reg_can2_3v3 will be
turned off by the regulator framework and that will impact
can2 in m4 side even if can2 driver disabled in A7 side.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Tested-by: Ge Wang <G.Wang@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12339 Security: Missing caam support.

Added CAAM to the device tree for imx6sx in imx6sx.dtsi.

Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11830 ARM: dts: add tcm address info for imx7d 12x12 lpddr3 board

When M4 is enabled, Linux has to do save/restore for M4 TCM during
suspend/resume, dtb should pass the TCM address for kernel, without
this TCM info, kernel will boot up fail:

------------[ cut here ]------------
WARNING: CPU: 0 PID: 1 at arch/arm/mach-imx/pm-imx7.c:1030 imx7d_pm_init+0x58/0)
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.14.52-02791-g1babdb1-dirty #2093
[<80014b40>] (unwind_backtrace) from [<80011798>] (show_stack+0x10/0x14)
[<80011798>] (show_stack) from [<807199ec>] (dump_stack+0x7c/0xbc)
[<807199ec>] (dump_stack) from [<80032d78>] (warn_slowpath_common+0x6c/0x88)
[<80032d78>] (warn_slowpath_common) from [<80032e30>] (warn_slowpath_null+0x1c/)
[<80032e30>] (warn_slowpath_null) from [<80a09760>] (imx7d_pm_init+0x58/0x67c)
[<80a09760>] (imx7d_pm_init) from [<80a08d3c>] (imx7d_init_machine+0x3c/0xe4)
[<80a08d3c>] (imx7d_init_machine) from [<809e52e4>] (customize_machine+0x20/0x4)
[<809e52e4>] (customize_machine) from [<800089bc>] (do_one_initcall+0xf8/0x144)
[<800089bc>] (do_one_initcall) from [<809e2c4c>] (kernel_init_freeable+0x138/0x)
[<809e2c4c>] (kernel_init_freeable) from [<807159b8>] (kernel_init+0x8/0xf0)
[<807159b8>] (kernel_init) from [<8000e580>] (ret_from_fork+0x14/0x34)
---[ end trace fdb0885876d7ac0b ]---
Unable to handle kernel NULL pointer dereference at virtual address 00000000
pgd = 80004000
[00000000] *pgd=00000000
Internal error: Oops: 5 [#1] PREEMPT SMP ARM
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Tainted: G        W    3.14.52-02791-g1babdb1-dir3
task: a8084000 ti: a8090000 task.ti: a8090000
PC is at memcpy+0x48/0x330
LR is at imx7d_pm_init+0xd0/0x67c
pc : [<8028e768>]    lr : [<80a097d8>]    psr: 20000013
sp : a8091e8c  ip : 00000000  fp : 00000000
r10: a8090030  r9 : 0000010b  r8 : 809e52c4
r7 : 80ab9380  r6 : 80ab9380  r5 : 80abb5a4  r4 : 80a411cc
r3 : 00080000  r2 : 00007f80  r1 : 00000000  r0 : a8140000
Flags: nzCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
Control: 10c53c7d  Table: 8000406a  DAC: 00000015
Process swapper/0 (pid: 1, stack limit = 0xa8090238)

Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
(cherry picked from commit c3dc7c16660200f3de8cbbdd1f215ae6a779a039)

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12303 Add CAAM support to the imx6QDL device tree for kernel v4.1

The CAAM nodes have been added in imx6qdl.dtsi.

Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11262-4: ARM: imx: add m4_tcm to dtsi

add tcm to dtsi for saving FreeRTOS image

Signed-off-by: Teo Hall <teo.hall@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12282 ARM: dts: imx6sx-sabreauto: add mlb support

Add mlb support for imx6sx-sabreauto platform.

Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12170-3 dts: imx7d: move uSDHC fsl,tuning-step property into SoC.dtsi

Moving fsl,tuning-step property into SoC.dtsi due to it's mainly SoC
dependent. User could also overwrite it in board.dts for special board
requirement.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12170-2 dts: imx7d: add tuning-start-tap for usdhc

MX7D uSDHC has a bit long delay line in SoC internally, pre-set a safe
tuning start point to skip first 20 meaningless cells tuning.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-9501 dts: imx6sx-sdb: optimize usdhc3 pad settings

Detailed reproduce steps:
1. boot-up to Linux command prompt .
2. Plug SD3.0 UHS-I SD Card into SD3 Connector (make sure SD Card
   running at SD3.0 DDR50/1.8V).
2. write data to SD3 using "dd" command (SD3_CLK running at 1.8V/50MHz).
3. capture the SD3_CLK, SD3_DATA, SD3_CMD waveforms during data write
   using FET probe (>=1GHz)
4. CLK waveforms like triangular wave are observed.

HW team found that the pad setting of the SD3_CLK, SD3_DATA, SD3_CMD
signal pins are not optimized. In existing BSP, when running at
SD3.0/DDR50/1.8V, SPEED/DSE/SRE = 01/011/1 is used.
They propose change it to -  SD3_CLK: SPEED/DSE/SRE = 01/110/1.
SD3_DATA/SD3_CMD: SPEED/DSE/SRE = 01/101/1.

SDHC high speed cards also had such issue(refer to MLK-9500).

We only changed the default state (<50Mhz) pad setting, for ultra high
speed state like 100Mhz and 200Mhz, it does not have such issue since
they already set to the maximum Drive Strength value.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 69d4195c741050e0bc78d3005f8ff4f51990d1ae)

Conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-9833-2 dts: imx6sx: do not touch CAN gpios pads if M4 is enabled

CAN devices are allocated to run on M4.
So do not touch CAN pads setting if M4 is enabled.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 9d2605e51b9ba83382c5da3a838656c9910d75a1)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12248-2 ARM: imx6sl-evk: add tx-d-cal property for usbphy

Set tx-d-cal to be 0x5 to improve usb signal quality.

Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12248-1 ARM: imx6qdl-sabresd: add tx-d-cal property for usbphy

Set tx-d-cal to be 0x5 to improve usb signal quality for all imx6qdl
sabresd boards.

Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-10196-1 ARM: imx6: change anatop 3p0 property

- Delete regulator-always-on for 3p0 since it needs to enable/disable
on the fly.
- Add "anatop-enable-bit" property as the offset of enable bit for
3p0, 1p1, and 2p5.
- USB PHY refers "reg_3p0" phandle at its node.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Renamed reg_3p0 to anatop_reg_3p0 because of conflict with
imx6qdl-gw551x.dtsi

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-14977: ARM: dts: imx7: Use IMX7D_GPT_3M_CLK for GPT1

On most imx SOCs GPT1 takes it's clock from the oscillator 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>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12257 ARM: dts: imx6qdl/imx6sx: add enet magic packet support

Add imx6q/dl/qp sabresd, imx6sx sabreauto magic packet support.

Signed-off-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12189 imx: mx7d correct iomux error for SAI3 and ENET2_EN

pinmux settings using GPIO1_IO0[0-7] should use iomuxc_lpsr,
but not iomuxc. If use iomuxc, you will set wrong register
and may impact other functions.

Without this patch, SAI3_MCLK use GPIO1_IO03 pinmux and impacts
QSPI function.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12205 ARM: dts: 6sx-ard: add sensor node

Add sensor node in 6sx-ard dts. The sensors are mma8451,
mag3110 and isl29023.

Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12211-1: ARM: dts: imx6/imx7: enable snvs-poweroff

enable snvs-poweroff driver on imx6sx(except sabreauto board),imx6ul and
imx7d all boards.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12190 ARM: dts: imx7d-sdb-revb: change pad setting to remove stripe

Change GPIO pad setting to control EPDC/ENET signals on REV B board
from 0x59 to default one 0x14 in order to remove stripe when do EPDC
unit test.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12172: ARM: dts: imx7d-sdb-m4: disable reg_can2_3v3

Disable can2 is not enough, since the reg_can2_3v3 will be turned off by
the regulator framework and that will impact can2 in m4 side even if can2
driver disabled in A7 side.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
(cherry picked from commit f1bd999df30c6e88c1a967856304086aa72f2db0)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-9699: ARM: dts: imx6: enable spi dma support

This patch cherry-pick from the below commit, but make little change:
align i.mx6dl with i.mx6q, since TKT238285 should be exit on other chips
although it can't reproduced by SPI-NOR, now there is official workaround
for this bug(a619a00e11a67b00805b9148f004a3c94d54f863). So this patch just
enable dma support on i.mx6sl and i.mx6sx.

*****************
There is one BUG(TKT238285) in ecspi module in DMA mode,but
it only found on i.mx6dl now, so enable dma support on all
i.mx6 chips except i.mx6dl

Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit fa9ef1796819aadbb1ea184613d4fdd3de1b46c6)
(cherry picked from commit cfedad0e853fbcd5e57591b559734d54cdb782c8)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12140 ARM: dts: imx7d-sdb-epdc: add EPDC touch support for imx7d-sdb

EPDC board has touch screen, this patch add touch support on imx7d-sdb
TO1.1 board, due to the touch pin conflict with UART5 and GPMI,
so disable UART5 in imx7d-sdb-epdc.dtsi. For GPMI, it default disabled
in imx7d-sdb.dts, so do not impact touch.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12126 ARM: dts: imx6/imx7d: correct wdog pinctrl setting

We move WDOG_B pinctrl setting from pinctrl_hog to wdog driver, so need to
remove the original setting in pinctl_hog device node, otherwise the below
warning message will be caught:

[    1.284161] imx6ul-pinctrl 20e0000.iomuxc: pin MX6UL_PAD_LCD_RESET already requested by 20e0000.iomuxc; cannot claim for 20bc000.wdog
[    1.294990] imx6ul-pinctrl 20e0000.iomuxc: pin-69 (20bc000.wdog) status -22
[    1.300689] imx6ul-pinctrl 20e0000.iomuxc: could not request pin 69 (MX6UL_PAD_LCD_RESET) from group wdoggrp  on device 20e0000.iomuxc
[    1.311550] imx2-wdt 20bc000.wdog: Error applying setting, reverse things back

Signed-off-by: Robin Gong <b38343@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11790 dts: imx6: fix wlreg_on regulator always on issue

wlreg_on regulator always on will make WiFi module unable to do reset
during rmmod, then the re-insmod will fail.

In stead of make wlreg_on always on, we make vmmc regulator always on
for BT to work properly.
Then WiFi can still function well on wlreg_on regulator enable/disable.

Fixes: commit f17b5e5be (dts: mx6ul evk: set regulator wlreg_on always on)
Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
(cherry picked from commit e92b727494b10c7a13e9491f55fc07a7ed7622a3)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12081 ARM: dts: imx6qp-sabresd: remove the power on gpio

In regulator implementation, the gpio power on is used
as the fixed regulator, it is already manipulated by
the regulator driver, and always enabled.
Remove the power on gpio in pcie dts

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11681-1 ARM: imx: enable sata on imx6qp sdb board

enable sata support on imx6qp sdb board.

Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit 8b08d0e657a121136eebe5bb6a998b7c9a6bff25)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12087 ARM: dts: imx6ul-9x9-evk.dts: add dual-role support for otg port

Add dual-role support for imx6ul-9x9 evk board, the full otg function
is not supported at this board due to the vbus can't be controlled
by software.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12086-3 dts: imx6: enable sdio wakeup for corresponding boards

Enable the sdio wakeup capability for SDIO cards.
Note: we do not enable it for sabresd usdhc4 since it has a solid
eMMC card on it.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 9ea7e84fe686a5c959aebbbf4a1b81dcb1c3e3fd)
(cherry picked from commit 58a5347a1b3a6b8970ac7ddc8e336c5d9adf4ddb)
Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12086-2 dts: imx6: enable keep power capability for corresponding boards

All i.MX6 SabreAuto/SabreSD/EVK has the ability to keep card power
during suspend. So add this capability for them.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 3f18df4746eb33e934c55de23d6496bb4adad33b)
(cherry picked from commit 55553b7300fb3d0e3a7961f569a42bd689b3670f)
Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12086-1 dts: imx6qdl-sabreauto: use external vmmc for sd3 optionally

SD3.0 cards require power cycle the card during suspend/resume,
or the card re-enumeration after resume will fail to be identified
as UHS card since the card is already working on 1.8v mode and refuse
to ack the S18R request, thus, it will then work on normal high speed
mode instead.

We have to use external vmmc regulator to power cycle the card during
suspend/resume to reset card signal voltage to 3.3v frist for the later
1.8v voltage switch.

However, due to the sabreauto board limitation, we can not use external
regulator to powere off card by default since the card power is shared
with card detect pullup. Disabling the vmmc regulator will also shutdown
the cd pullup which causes incorrect illusion of card exist.
(e.g. plug out the card, mmc core wll think the card is exist since cd pin
is low but it never can find the card)
HW rework removing R695 and enable PAD internal pullup is needed to
fix this issue.

User can manually open the mask of vmmc in dts to enable using external
regulator if your board has done the rework as said above.
Or by default we still do not power off card during suspend.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 2fd1bf9320bce1c22f2406c74277b7422653511e)
(cherry picked from commit 0804d85c137129db17766c3f4e236ae722d9b7db)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12075 ARM: dts: add imx7d-sdb-reva-touch.dtb

For imx7d-sdb TO1.1 board, the touch interrupt pin no longer conflict
with HDMI, so move touch support is now inside imx7d-sdb.dts. To
compatible with TO1.0 board, still use imx7d-sdb-reva-touch.dts to
support touch.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12058 ARM: dts: add audio support for imx7d-sdb revb board

add audio support for imx7d-sdb revb board.

Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12035 dts: imx7d-sdb-revb: add i.MX7d sdb revb support

Base on i.MX7d sdb revb board change list, below modules has changed:
 - enet2 and epdc enable pin
 - usb_otg2 pwr enable pin
 - ov5647_mipi pwr pin
 - tsc2046 touch pendown pin
 - uart5 tx/rx pins
 - sensor INT pin
 - pcie power is controlled by por_b, not gpio_spi pin6
 - hdmi audio change to SAI3 from SAI1

The patch add the changes for revb, and keep the original functions for
reva board. Remove redundancy sim and enet dts files to avoid excessive
dts file for reva and revb.

After the patch, there have below diff:
- default dts file: imx7d-sdb.dts for revb board, imx7d-sdb-reva.dts for reva board
- remove enet, sim extended dts files, so these modules are enabled in default dts
  file for reva and revb board.

The change of expanded dts due to pin confliction:
- Keep the original expanded name of dts file for revb board, add suffix "-reva" in dts
  file name for reva board.
- Like:
  hdmi/codec audio:
    hdmi audio and wm8960 codec are enabled in default dts file for revb board,
    no extended dts files to separate them.
    Keep original extended dts files for reva board:
imx7d-sdb-reva-hdmi-audio.dts
imx7d-sdb-reva-wm8960.dts
  epdc:
    imx7d-sdb-epdc.dts is for revb board, imx7d-sdb-reva-epdc.dts is for reva board.
  gpmi-weim:
    imx7d-sdb-gpmi-weim.dtsi for revb, imx7d-sdb-reva-gpmi-weim.dtsi for reva.
  m4:
    imx7d-sdb-m4.dts for revb, imx7d-sdb-reva-m4.dts for reva.
  qspi:
    imx7d-sdb-qspi.dts for revb, imx7d-sdb-reva-qspi.dts for reva.
  touchscreen:
    imx7d-sdb-touch.dts for revb, imx7d-sdb-reva-touch.dts for reva.

Cherry picked from commit: 2be1a236696d, and disable sai3 since there have many
Transmit underrun on kernel 4.1.

Signed-off-by: Fugang Duan <B38611@freescale.com>
Acked-by: Robby Cai <robby.cai@nxp.com>
Acked-by: Gao Pan <pandy.gao@nxp.com>
Acked-by: Peter Chen <peter.chen@freescale.com>
Acked-by: Chen Bough <Haibo.Chen@freescale.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12046-2 ARM: dts: imx6sl-evk.dts: add elan touch support

Add elan touch screen support on imx6sl-evk board.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12042 ARM: dts: imx6sl.dtsi: add mmc aliase

This patch add mmc aliase support, to make every sd slot index
fixed.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12049 ARM: dts: imx6qdl-sabreauto.dtsi: add usdhc1 support

Add usdhc1 support for the baseboard.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12033 ARM: dts: imx6qdl-sabreauto: add enet irq dts files to avoid conflict with MLB

ENET gpio irq pin conlict with MLB on i.MX6qdl sabreauto board, since enet
gpio irq is extended feature for performance improvement, so let MLB enable
in default dts file and newly create sabreauto enet irq dts files.

Signed-off-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12027: ARM: dts: fix the sample rate clock not accurate for spdif tx

Clock of spdif tx is derived from clk_ipg and clk_osc, which is not the
integer multiple size of sample rate, can't generate accurate clock for
each sample rate. Use pll4 as the clk_spdif's parent, because the clk_spdif
is the one of source clock of tx, use a proper frequency for pll4, then it
can generate more accurate clock for sample rate (32k,48k,96k,192k).

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11526-2 ARM: dts: add imx6qp sabresd board ldo enable support

Add LDO enable mode support for i.MX6QP SabreSD board.

Signed-off-by: Anson Huang <b20788@freescale.com>
Signed-off-by: Robin Gong <b38343@freescale.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12016-5 dts: imx6sx-sabreauto: add flexcan support

The CAN transceiver on MX6SX Sabreauto board seems in sleep mode
by default after power up the board. User has to press the wakeup
key on ARD baseboard before using the transceiver, or it may not
work properly when power up the board at the first time(warm reset
does not have such issue).

This patch operates the wake pin too besides stby/en pins by chaining
them together in regulator mode.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12016-4 dts: imx6: remove flexcan for pin conflict devices

Removing flexcan for pin conflict devices such as ecspi/gpmi.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12016-3 dts: sabreauto: add flexcan support

The flexcan1 is pin conflict with fec. So we add a new dts file with
flexcan1 enabled with fec disabled for user to use.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12016-2 dts: imx6sx: add flexcan stop mode support

Add flexcan stop mode support.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12016-1 dts: imx6sx-sdb: add flexcan support

CAN transceiver is different on RevA and RevB board.
It's active high on RevA while active low on Rev B.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12029 ARM: dts: imx6qp-sabreauto.dts: add vmmc supply for usdhc3

For imx6qp-ard board, it is okay to use external regulator for card slot,
so this patch add vmmc-supply for usdhc3.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12021 ARM: dts: add sim1 support for imx7d-sdb board

Enable sim1 in imx7d-sdb.dts. To avoid the pin confict with epdc,
disable sim1 in imx7d-sdb-epdc.dts.

Signed-off-by: Gao Pan <B54642@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-12010 ARM: dts: add emmc support for imx6sx-sdb board

Add emmc support for imx6sx-sdb board, due to this support
need remove sd4 sd card slot and solder an eMMC chip, so
this patch add imx6sx-sdb-emmc.dts file.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11999: ARM: dts: change the platform compatibility for i.MX6qp gpmi dts

change the compatibility for i.MX6qp gpmi dts file to distinguish it
from i.MX6q

Signed-off-by: Han Xu <b45815@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11997 dts: add hdcp dts file for imx6qp sabresd board

Add hdcp dts file for imx6qp sabresd board.

Signed-off-by: Sandor Yu <R01008@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11953: arm: dts: Fix HDMI compliance test 7-15 failed

i.MX6QP SabreSD board HDMI compliance test 7-15 Vcec2 test failed,
the value is 0.403V, which should be 0.274V>Vcec2>0.196V.

Disable the pad internal PU resistor, and change the external PU
resistor(R647) from 47K to 100K.
With all the changes, the calculated voltage on CEC is 0.248V, and the
test value is 0.250V.

In the patch disable CEC pin internal PULL/Keep function.

Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit 0a9388ff8ef77778f5e81d8dbc980cacf87fc12b)
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11979 arm: imx: enable rpmsg on imx6sx platforms

enable rpmsg on imx6sx platforms
 - imx6sx sdb board
 - imx6sx sabreauto board

Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
[Arul: Fix merge conflictsu
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11123-22 ARM: dts: disable otg features for imx6qdl-sabreauto board

Disable all otg features for otg1 port of imx6qdl-sabreauto board, then
the otg port can only do role switch by ID pin state.

Signed-off-by: Li Jun <jun.li@freescale.com>
(cherry picked from commit b4082a9456f735b664fd125e2e6964963ac9c8d0)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11123-20 ARM: dts: disable otg features for imx6q-arm2 board

Disable all otg features for otg1 port of imx6q-arm2 board, then
the otg port can only do role switch by ID pin state.

Signed-off-by: Li Jun <jun.li@freescale.com>
(cherry picked from commit 70c4fe93ac7064f5128ae2275b766fb00c4cd6ef)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11947 ARM: dts: add missing dtb names in Makefile for imx7d-sdb

Making those dtb files to be complied by make dtbs command.

Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MGS-1087: ARM: dts: Add CMA setting to 7d dtsi

Since the cma setting has been moved to dts file. Add this partation to
7d dtsi to make cma pool building successful on 7d soc.

Signed-off-by: Shawn Xiao <b49994@freescale.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11801 imx: mx7d: resolve conflicts with A7 and M4

M4 will use UART2, and RDC is configured that kernel can not
access. If still enable it, kernel will panic.

To validation board, disable gpio-keys, since m4 will use volume keys.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit ccd54fd2096b8f3443bafd0b86499e1eda027fc9)

Conflicts:
arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-10646: ARM: dts: Add independent dts for hdmi audio and wm8960 audio

wm8960, hdmi can't be used together for they use same SAI interface.
Which is hardware limitation.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit 56514bac9745ec263b84adc0479c0c0314902ab9)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11944-1 ARM: dts: disable sii902x due to pin conflict with EPDC

Disable sii902x to avoid pin conflict

Signed-off-by: Robby Cai <r63905@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11800 dts: imx7d-sdb: correct flexcan stby gpio pin

According to schematic, the pad used for CAN STBY signal
should be EPDC_DATA14, not GPIO1_IO07. So correct it.
And due to pin is conflict with epdc, so we also update
the imx7d-sdb-epdc.dts.

Reported-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

MLK-11573: ARM: dts: fix the iomux pin conflict for LPSR mode

add the pinctrl-1 for iomux in ecspi device tree to avoid conflict.

Signed-off-by: Han Xu <b45815@freescale.com>
(cherry picked from commit edacd0568487815ca3a0821c25912133cb6c1731)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>