summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6sx.dtsi
AgeCommit message (Collapse)Author
2020-02-07Merge tag 'v4.14.164' into 4.14-2.3.x-imxMarcel Ziswiler
This is the 4.14.164 stable release Conflicts: arch/arm/Kconfig.debug arch/arm/boot/dts/imx7s.dtsi arch/arm/mach-imx/cpuidle-imx6q.c arch/arm/mach-imx/cpuidle-imx6sx.c arch/arm64/kernel/cpu_errata.c arch/arm64/kvm/hyp/tlb.c drivers/crypto/caam/caamalg.c drivers/crypto/mxs-dcp.c drivers/dma/imx-sdma.c drivers/gpio/gpio-vf610.c drivers/gpu/drm/bridge/adv7511/adv7511_drv.c drivers/input/keyboard/imx_keypad.c drivers/input/keyboard/snvs_pwrkey.c drivers/mmc/core/block.c drivers/mmc/core/queue.h drivers/mmc/host/sdhci-esdhc-imx.c drivers/net/can/flexcan.c drivers/net/can/rx-offload.c drivers/net/ethernet/freescale/fec_main.c drivers/net/wireless/ath/ath10k/pci.c drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c drivers/pci/dwc/pci-imx6.c drivers/spi/spi-fsl-lpspi.c drivers/usb/dwc3/gadget.c include/net/tcp.h sound/soc/fsl/Kconfig sound/soc/fsl/fsl_esai.c
2019-06-15ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ipg" clock to SDMAAndrey Smirnov
[ Upstream commit 8979117765c19edc3b01cc0ef853537bf93eea4b ] Since 25aaa75df1e6 SDMA driver uses clock rates of "ipg" and "ahb" clock to determine if it needs to configure the IP block as operating at 1:1 or 1:2 clock ratio (ACR bit in SDMAARM_CONFIG). Specifying both clocks as IMX6SX_CLK_SDMA results in driver incorrectly thinking that ratio is 1:1 which results in broken SDMA funtionality. Fix the code to specify IMX6SX_CLK_IPG as "ipg" clock for SDMA, to avoid detecting incorrect clock ratio. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Cc: Angus Ainslie (Purism) <angus@akkea.ca> Cc: Chris Healy <cphealy@gmail.com> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Shawn Guo <shawnguo@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-02-12MLK-15975-2: ARM: dts: change dual fifo script to multi fifo scriptShengjiu Wang
change dual fifo script to multi fifo script for SSI. Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> (cherry picked from commit 417c76c51f0fde7b66cd499e405b1465df18da57)
2019-02-12MLK-18082: ARM: dts: imx: Change size of caam-sm to correct sizeFranck LENORMAND
The resources retrieved by CAAM driver was wrong as the size was not correct hence future uses might have issues. before: [ 3.010744] caam 30900000.caam: sm res: [start: 0000000000100000, end: 0000000000107ffe, name: /caam-sm@00100000, flags:0x200 desc:0x0] -> size: 0x7fff modif to actual size: [ 3.012495] caam 30900000.caam: sm res: [start: 0000000000100000, end: 0000000000107fff, name: /caam-sm@00100000, flags:0x200 desc:0x0] -> size: 0x8000 Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
2019-02-12MLK-18082: boot: Fix range of SM available for imx7dFranck LENORMAND
Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
2019-02-12MLK-18138-2: soc: imx: gpc: Convert imx6sx to new bindingsLeonard Crestez
This fixes graphics on imx6sx by aligning closer to upstream instead of adding new features to old bindings. Upstream adds a 4th power domain for PCI but this is is wrong: the PCI block is in the DISPMIX domain and only PCIE_PHY is in the PCIE_PHY power domain. Manual is not very clear on this but in section 10.4.1.4.1 there is this statement: "The DISPLAY domain contains GIS, CSI, PXP, LCDIF, PCIe, DCIC, and LDB. It is supplied by internal regulator." Placing pcie in a 4th power domain makes lspci hang when display is turned off. In upstream the dispmix domain is not actually touched on 6sx so it's always on, this is why pci seems to work. Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> Acked-by: Richard Zhu <hongxing.zhu@nxp.com>
2019-02-12MLK-18036-1 Add "fsl,optee-lpm-sram" node for optee os power management.Clement Faure
This node will be used by the OCRAM driver in optee to: * Get the OCRAM start address for power management in optee. * Add an entry that will overwrite ocrams nodes and dynamically reduce the OCRAM available for mmio-sram in Linux. That way we do not touch the legacy Linux boot and remove the dedicated optee device tree. Signed-off-by: Clement Faure <clement.faure@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2019-02-12MGS-3705-1 gpu: dts: enable gpu devices for imx6Xianzhong
set GPU baseAddress with 256M on IMX6Q and iMX6QP, add reserved cma in DTB to support different size, the default cma size is 320M on all imx6 boards. integrated patches from imx_4.9.y: 1.MGS-955 GPU:Integrate GPU module commit: 73183c14a20d4f1d02317f80db3d90b3be1546fc 2.MGS-1211 gpu: add GPU for 6sl,6sx,6dl commit: 80a8994c47cbb97fb31ef0efab92ddb29002448e 3.MGS-1087 gpu: Move the GPU reserved memory to DTS file commit: ea0111da6892b52c790da607a3d91140d1ebf936 4.MGS-2540 [#ccc] Need set baseAddress with RAM start address on IMX6Q commit: de838d99d9264884cbaaa601ab323a70b62634d9 Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
2019-02-12MLK-16959: crypto: caam Add CAAM page 0 definition in device treeCedric Neveux
Add definition of CAAM page 0 in the device tree. This page is only accessible by the CPU in secure world. this is defined by the secure-status. Signed-off-by: Cedric Neveux <cedric.neveux@nxp.com>
2019-02-12MLK-14284 Fix CAAM Errata err005766 handlingRadu Solea
* Update ERA detection code to check 3 sources CCBVID, CAAMVID and the device tree. * Fix bit handling of CAAMVID data to obtain correct results. * Remove default device tree values. * Update errata handling to target known affected platforms. Signed-off-by: Radu Solea <radu.solea@nxp.com>
2019-02-12MLK-14325-1 ARM: dts: enable imx pcie gen2 linkRichard Zhu
Set the max link capability of the imx pcie to gen2 Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
2019-02-12MLK-13237: dts: Add vadc to i.MX6SX display power domainSandor Yu
VADC module is in i.MX6SX display power domain. It should enabled with display power domain, otherwise vadc will fail to be work when display in low power mode. Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> (cherry picked from commit 8ab2cc06a6900889bd61e8de6f5436523e8227d2)
2019-02-12MLK-12990 arm: dts: Fix CAAM JR interrupt parent issue on i.MX6SXye li
To enable a IRQ as a wakeup source, we should set its interrupt parent to gpc not the intc. Fix the wrong CAAM JR interrupts setting by removing the its interrupt parent to use default SOC's interrupt parent "gpc". Otherwise, irq_set_irq_wake will return error. Signed-off-by: ye li <ye.li@nxp.com>
2019-02-12MLK-12932-02: dts: imx6sx: Add lcdif alias nameSandor Yu
Add lcdif alias name. Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
2019-02-12MLK-12862: ARM: dts: fix mqs no sound issueShengjiu Wang
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>
2019-02-12MLK-12786-1: ARM: dts: add mclk0 clock for saiShengjiu Wang
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>
2019-02-12MLK-10086-2 ARM: imx6: add dts entries for hsic controllerLi Jun
- Add usbphy_nop, hsic uses nop phy driver - Add anatop phandle, hsic needs to access anatop register to change osc clock for different boards - Add phy_type, hsic needs to config PHY parameters at portsc - For imx6q-arm2 board, hsic has pin conflict with ethernet, we create a dedicated dts(imx6q-arm2-hsic.dts) for it with ethernet disabled, besides please make sure keep the line of data and strobe unchanged between board boots up and enable hsic controller. Signed-off-by: Peter Chen <peter.chen@freescale.com> (cherry picked from commit 2f8a266d271874cd398d14556752ab4ab0be27ba)
2019-02-12MLK-12675 ARM: dts: imx: keep RTC enabled for software poweroffAnson Huang
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>
2019-02-12MLK-11922 i.mx6: Linux 3.14.28 CAAM & SNVS enabled by default.ulises
JTAG, DS-5 attachment causes exceptions Added properties to device tree, in order to enable and disable alarms. The following are the available alarms: -JTAG active -WatchDOG 2 reset -Internal Boot -External Tamper Detection pad
2019-02-12MLK-12339 Security: Missing caam support.Dan Douglass
Added CAAM to the device tree for imx6sx in imx6sx.dtsi. Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
2019-02-12MLK-10196-1 ARM: imx6: change anatop 3p0 propertyPeter Chen
- 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>
2019-02-12MLK-12257 ARM: dts: imx6qdl/imx6sx: add enet magic packet supportFugang Duan
Add imx6q/dl/qp sabresd, imx6sx sabreauto magic packet support. Signed-off-by: Fugang Duan <B38611@freescale.com>
2019-02-12MLK-9699: ARM: dts: imx6: enable spi dma supportRobin Gong
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)
2019-02-12MLK-12016-2 dts: imx6sx: add flexcan stop mode supportDong Aisheng
Add flexcan stop mode support. Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
2019-02-12MLK-11979 arm: imx: enable rpmsg on imx6sx platformsRichard Zhu
enable rpmsg on imx6sx platforms - imx6sx sdb board - imx6sx sabreauto board Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
2019-02-12MGS-1276 ENGR00306443-2 dts:Add QoS description in imx6sx dtsShawn Xiao
(cherry-pick from f9759787e60ad3422d2119f9f25ac320ca58f5df) confilict: arch/arm/boot/dts/imx6sx.dtsi The dts file arch has changed in 3.14. Add QoS description in imx6sx dts manually and solve the conflict. Date Feb 2, 2015 Signed-off-by: Shawn Xiao <b49994@freescale.com>
2019-02-12MLK-11838 ARM: dts: imx6sx: fix suspend/resume failed on i.mx6sx-sdb-reva boardRobin Gong
There is one ROM bug on i.mx6sx TO1.1 that default ROM code use the old ocram space 0x900000, but it should be 0x8f8000. So SW workaround need to be added, unfortunately, the 'romcp' device node not added in i.mx6sx dtsi on v4.1, thus i.mx6sx-sdb-reva board will be failed to resume back, add them back. Signed-off-by: Robin Gong <b38343@freescale.com>
2019-02-12MLK-11724: ARM: dts: add mqs support mx6sx-sd-exp1 boardShengjiu Wang
Add mqs support for mx6sx-sd-exp1 board Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2019-02-12MLK-11701-1 ARM: dts: imx6sx-sdb: add dts support for pxpFancy Fang
Add dts support for pxp module on the imx6sx sdb board. Signed-off-by: Fancy Fang <chen.fang@freescale.com>
2019-02-12MLK-11606-02: dts: Enable mxc dcic driveSandor Yu
Add dcic driver property to imx6q/dl sabresd/auto and imx6sx sdb board. Signed-off-by: Sandor Yu <R01008@freescale.com>
2019-02-12MLK-11371-2 imx: fix ocotp dts nodePeng Fan
Fix imx6/7 ocotp dts node. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
2019-02-12MLK-11603-3: dts: Enable sii902x hdmi driver on 4.1.y branchSandor Yu
Add sii902x hdmi driver to imx6sl, imx6sx and imx7d boards. Signed-off-by: Sandor Yu <R01008@freescale.com>
2019-02-12MLK-11612-01 ARM: dts: imx6sx-sabreauto: add esai<->cs42888 sound card supportZidan Wang
add esai<->cs42888 sound card support for imx6sx-sabreauto board. Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
2019-02-12MLK-12402-1 ARM: dts: imx6sx: add power-domains for display domainFancy Fang
Add power-domains for display domain for imx6sx. Signed-off-by: Fancy Fang <chen.fang@nxp.com> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-02-12MLK-11561-1 ARM: imx: enable pcie on imx6sx platformsRichard Zhu
enable pcie support on imx6sx platforms. Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
2019-02-12MLK-11508-5: dts: Add imx v4l2 capture driverSandor Yu
Add imx v4l2 capture driver. Signed-off-by: Sandor Yu <R01008@freescale.com>
2019-02-12MLK-11437-01 ARM: dts: imx: correct the clock info of cpu nodeBai Ping
The pll1_bypass and pll1_bypass_src clock index in cpu node should be IMX6SX_PLL1_BYPASS and IMX6SX_PLL1_BYPASS_SRC, so correct this. Signed-off-by: Bai Ping <b51503@freescale.com>
2019-02-12MLK-11488-6 arm: dts: imx6sx: add mu supportAnson Huang
add MU support for i.MX6SX. Signed-off-by: Anson Huang <b20788@freescale.com>
2019-02-12MLK-11488-5 arm: dts: imx6sx: add m4 dts supportAnson Huang
1. add i.MX6SX SabreAuto board M4 dts support; 2. add shared memory node support for AMP clk/power management; 3. add qspi restore node for suspend/resume with Mega/Fast off when M4 is enabled and running on QSPI flash. Signed-off-by: Anson Huang <b20788@freescale.com> Fixed adding in Makefile for wrong SOC Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-02-12MLK-11488-4 arm: dts: imx6sx: add sema4 supportAnson Huang
Add SEMA4 support for i.MX6SX. Signed-off-by: Anson Huang <b20788@freescale.com> During 4.14 rebase squashed with the following: MLK-11566-5 drvier: imx_sema4: add dummy function When CONFIG_IMX_SEMA4 is NOT set, some modules may still call SEMA4 APIs, need to add dummy function to make sure build pass. Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-02-12MLK-11480-02 ARM: dts: add sai<->wm8962 sound card support for imx6sx-sdb boardZidan Wang
add sai<->wm8962 sound card support for imx6sx-sdb board Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
2019-02-12MLK-10105 ARM: dtsi: Add MLB50 support for the i.MX6SXLuwei Zhou
Add MLB50 support on the i.MX6SX-ARD platform. Signed-off-by: Luwei Zhou <b45643@freescale.com>
2019-02-12MLK-11475 ARM: dts: i.mx6sx: Add ADC device tree support on i.MX6SX-SDBFugang Duan
Add ADC dts support on i.MX6SX-SDB platform. Signed-off-by: Luwei Zhou <b45643@freescale.com> Signed-off-by: Fugang Duan <B38611@freescale.com>
2019-02-12MLK-11458 ARM: dts: imx6sx: enable fec2 MAC multiqueueFugang Duan
Enable fec2 MAC multiqueue. Signed-off-by: Fugang Duan <B38611@freescale.com>
2019-02-12MLK-10375: ARM: dts: Enable dual fifo for ssi in imx6Shengjiu Wang
There is a specific DMATYPE (IMX_DMATYPE_SSI_DUAL) for ssi dual fifo mode. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> (cherry picked from commit 26fbde0839ec018d02fdb9c5b7c10808a583596a)
2019-02-12MLK-11429-2: ARM: dts: imx6sx: update dts for asrcShengjiu Wang
cherry-pick below patch from imx_3.14.y ENGR00331799-3: ARM: dts: imx6sx: update dts for asrc As we use the upstreamed asrc driver in imx_3.14, the device tree need to be updated. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2019-02-12MLK-11390-3 ARM: dts: add busfreq support for imx6sxAnson Huang
Add busfreq support for i.MX6SX. Signed-off-by: Anson Huang <b20788@freescale.com>
2019-02-12MLK-11389-02 ARM: dts: imx: add M/F mix property for imx6sxBai Ping
Add 'fsl,mf-mix-wakeup-irq' property used for M/F mix in gpc node on i.MX6SX. Signed-off-by: Bai Ping <b51503@freescale.com>
2019-02-12MLK-11343-03 ARM: dts: imx: add clocks in cpu modeBai Ping
Add pll1, pll1_bypass and pll1_bypass_src clock reference define in dts file. Signed-off-by: Bai Ping <b51503@freescale.com>
2019-02-12MLK-11322-01 ARM: dts: imx: add ocram node used for lpm codeBai Ping
Reserve iram space for low power code. The first 16KB space is used for suspend/resume and cpuidle. Another 4KB space is for busfreq code. for i.MX6SX, it has a dedicated ocram space start at 0x8f8000 for low power code. Signed-off-by: Bai Ping <b51503@freescale.com>
generated by cgit v1.2.3 (git 2.0.4) at 2024-04-28 05:25:43 +0000