Commit Graph

27 Commits

Author SHA1 Message Date
Peng Fan 5c8b3b8a18 ARM: dts: imx: add usb alias
Add usb alias for bootloader searching the controller in correct order.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-11-03 08:08:34 +08:00
Horia Geantă 79428026bd ARM: dts: imx6sll: add rng
Add node for the RNGB block.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-08-17 16:06:33 +08:00
Uwe Kleine-König fa28d8212e ARM: dts: imx: default to #pwm-cells = <3> in the SoC dtsi files
The imx-pwm driver supports 3 cells and this is the more flexible setting.
So use it by default and overwrite it back to two for the files that
reference the PWMs with just 2 cells to minimize changes.

This allows to drop explicit setting to 3 cells for the boards that already
depend on this. The boards that are now using 2 cells explicitly can be
converted to 3 individually.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-07-13 19:48:53 +08:00
Krzysztof Kozlowski 69cc1502a8 ARM: dts: imx: Align L2 cache-controller nodename with dtschema
Fix dtschema validator warnings like:
    l2-cache@a02000: $nodename:0:
        'l2-cache@a02000' does not match '^(cache-controller|cpu)(@[0-9a-f,]+)*$'

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-07-13 19:48:53 +08:00
Shengjiu Wang 5da1b522cf ARM: dts: imx6sll: Make ssi node name same as other platforms
In imx6sll.dtsi, the ssi node name is different with other
platforms (imx6qdl, imx6sl, imx6sx), but the
sound/soc/fsl/fsl-asoc-card.c machine driver needs to check
ssi node name for audmux configuration, then different ssi
node name causes issue on imx6sll platform.

So we change ssi node name to make all platforms have same
name.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-07-13 18:44:42 +08:00
Anson Huang a1abd6777f ARM: dts: imx: change ocotp node name on i.MX6/7 SoCs
Change OCOTP node name from ocotp-ctrl to efuse to be compliant with
yaml schema, it requires the nodename to be one of "eeprom|efuse|nvram".

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-07-13 18:44:42 +08:00
Anson Huang 915e19686f ARM: dts: imx: Make tempmon node as child of anatop node
i.MX6/7 SoCs' temperature sensor is inside anatop module from HW
perspective, so it should be a child node of anatop.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-07-13 18:44:42 +08:00
Peng Fan f5d35d87ef ARM: dts: imx: add nvmem property for cpu0
Add nvmem related property for cpu0, then nvmem API could be used
to read cpu speed grading to avoid directly read OCOTP registers
mapped which could not handle defer probe.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-03-16 09:18:29 +08:00
Horia Geantă 6cef60ff17 ARM: dts: imx: align name for crypto node and child nodes
crypto node should use the "crypto" generic naming,
and not a specific one ("sahara", "dcp", "caam").

Child nodes of the crypto node for caam crypto engine
should use the "jr" name (without an index),
as indicated in the DT binding.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-03-11 16:53:01 +08:00
Peng Fan c0157bdcaf ARM: dts: imx: use generic name bus
Per devicetree specification, generic names
are recommended to be used, such as bus.

i.MX AIPS is a AHB - IP bridge bus, so
we could use bus as node name.

Script:
sed -i "s/\<aips@/bus@/" arch/arm/boot/dts/imx*.dtsi
sed -i "s/\<aips@/bus@/" arch/arm/boot/dts/vf*.dtsi
sed -i "s/\<aips-bus@/bus@/" arch/arm/boot/dts/imx*.dtsi
sed -i "s/\<aips-bus@/bus@/" arch/arm/boot/dts/vf*.dtsi

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2020-02-17 14:39:34 +08:00
Andreas Kemnade 75d91c0dcd ARM: dts: imx6sll: add PXP module
While the EPDC is optional, both consumer and industrial editions
have the PXP module, so adding it to the corresponding .dtsi
Information taken from freescale kernel, compared with the
reference manual and tested by a separate program.

Since it does not depend on external wiring, the
status = "disabled" is left out here.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2019-12-23 09:23:51 +08:00
Fabio Estevam 16d46c5da6 ARM: dts: imx: Replace "simple-bus" with "simple-mfd" for anatop
Replace "simple-bus" with "simple-mfd" for anatop node in order
to fix the following build warnings with W=1:

arch/arm/boot/dts/imx6sx.dtsi:603.31-616.7: Warning (simple_bus_reg): /soc/aips-bus@2000000/anatop@20c8000/regulator-1p1: missing or empty reg/ranges property
arch/arm/boot/dts/imx6sx.dtsi:618.31-631.7: Warning (simple_bus_reg): /soc/aips-bus@2000000/anatop@20c8000/regulator-3p0: missing or empty reg/ranges property
arch/arm/boot/dts/imx6sx.dtsi:633.31-646.7: Warning (simple_bus_reg): /soc/aips-bus@2000000/anatop@20c8000/regulator-2p5: missing or empty reg/ranges property
arch/arm/boot/dts/imx6sx.dtsi:648.32-663.7: Warning (simple_bus_reg): /soc/aips-bus@2000000/anatop@20c8000/regulator-vddcore: missing or empty reg/ranges property
arch/arm/boot/dts/imx6sx.dtsi:665.33-679.7: Warning (simple_bus_reg): /soc/aips-bus@2000000/anatop@20c8000/regulator-vddpcie: missing or empty reg/ranges property
arch/arm/boot/dts/imx6sx.dtsi:681.31-696.7: Warning (simple_bus_reg): /soc/aips-bus@2000000/anatop@20c8000/regulator-vddsoc: missing or empty reg/ranges property

Based on a patch from Marco Felsch for the imx6qdl.dtsi.

Cc: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2019-10-06 16:00:31 +08:00
Krzysztof Kozlowski 2a44db1303 ARM: dts: imx: Cleanup style around assignment operator
Use a space before and after assignment operator to have consistent
style.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2019-08-03 16:49:56 +02:00
Anson Huang df7126cc42 ARM: dts: imx6sll: move GIC to right location in DT
GIC is inside of SoC from architecture perspective, it should
be located inside of soc node in DT.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2019-07-23 15:47:54 +08:00
Robin Gong 779988c5e6 ARM: dts: imx6sll: correct sdma compatible
Correct sdma compatible since ecspi errata ERR009165 has been fixed
on i.mx6sll as i.mx6ul.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2019-07-22 09:37:24 +08:00
Anson Huang 6869114832 ARM: dts: imx6sll: Enable SNVS poweroff according to board design
The SNVS poweroff depends on board design, by default it should
be disabled in SoC DT and ONLY be enabled on board DT if it is
wired up to external PMIC.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2019-06-18 15:15:04 +08:00
Anson Huang bbfba8c715 ARM: dts: imx6sll: Enable SNVS power key according to board design
The SNVS power key depends on board design, by default it should
be disabled in SoC DT and ONLY be enabled on board DT if it is
wired up.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2019-06-18 15:14:59 +08:00
Anson Huang 4b08ecc7c6 ARM: dts: imx6sll: add cooling-cells for cpu-freq cooling device
Add #cooling-cells for i.MX6SLL cpu-freq cooling device usage.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2019-04-11 13:08:55 +08:00
Andrey Smirnov c5ed5daa65 ARM: dts: imx6sll: Specify IMX6SLL_CLK_IPG as "ipg" clock to SDMA
Since 25aaa75df1 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 IMX6SLL_CLK_SDMA result in driver incorrectly thinking that
ratio is 1:1 which results in broken SDMA funtionality. Fix the code
to specify IMX6SLL_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>
2019-04-11 10:27:25 +08:00
Olof Johansson 80b451cd68 i.MX device tree update for 4.21:
- New boards support: emtrion emCON-MX6, imx6ul-pico-pi, imx7d-sdb-reva
    and vf610 based Liebherr's BK4 device, ZII SCU4 AIB board.
  - Add flexcan support for i.MX6UL SoC, turn on stop mode wakeup feature
    for flexcan, and enable devices on a few i.MX6 NXP boards.
  - Enable AUO G101EVN010 lcd panel and Goodix touch support for
    imx6ul-ccimx6ulsbcpro board.
  - Enable sensors support for imx6qdl-sabresd board: egalax touch, light,
    magnetometer and accelerometer sensor.
  - Switch more boards to use SPDX identifier.
  - Fix memory node duplication in i.MX device tree sources.
  - Correct GIC PPI interrupts mask for i.MX6UL and i.MX7 SoCs.
  - Drop 'snps,dw-pcie' compatible from LS1021A PCIe device to avoid
    incorrect device matching.
  - Add the gpu nodes for the adreno 200 GPU on iMX51 and iMX53, which
    are now supported by the freedreno driver.
  - Add DCP device support for i.MX6ULL, which requires explicit clock
    enabling.
  - Add '#thermal-sensor-cells' for thermal device and '#cooling-cells'
    for cooling devices.
  - Add missing clock information for EPIT on i.MX25 SoC.
  - Add PWM and qdma devices for LS1021A SoC.
  - Update cooling maps of LS1021A SoC to include all devices affected by
    individual trip points.
  - Random device addition and cleanup on various boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJcDcmeAAoJEFBXWFqHsHzO9uIH/2e87ayMkmIugUt57aJUOWRG
 pbNZZQXHsupVVu0VtYnKp3XBuhMXzvbhhihn9x9pyV+EJ2V4dgtU6gS2EDH2G9pl
 TCJItVDOZgllamIg2/McVkuQLsH8tEybud4wlWve96eP22mn6CyCPiDtmdvKYigA
 QQEFeSI8YgG1VLbXmhmox0HcowOm2C8asw8sSuo15Y2tWjAcCzKK0p3izRJQhSWn
 G/uAUwQQB7e2zrTXfTiJpMWEt664C0tqlhZLlfaPpvmufIbDcpbLHp7mK3iW0rZA
 Pjr1uT00rpnRkPkLvtT6tKTi2KviCwua1R58aUXW3ju1Fw6DJC1vSuPyNClCuyk=
 =dGG8
 -----END PGP SIGNATURE-----

Merge tag 'imx-dt-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

i.MX device tree update for 4.21:
 - New boards support: emtrion emCON-MX6, imx6ul-pico-pi, imx7d-sdb-reva
   and vf610 based Liebherr's BK4 device, ZII SCU4 AIB board.
 - Add flexcan support for i.MX6UL SoC, turn on stop mode wakeup feature
   for flexcan, and enable devices on a few i.MX6 NXP boards.
 - Enable AUO G101EVN010 lcd panel and Goodix touch support for
   imx6ul-ccimx6ulsbcpro board.
 - Enable sensors support for imx6qdl-sabresd board: egalax touch, light,
   magnetometer and accelerometer sensor.
 - Switch more boards to use SPDX identifier.
 - Fix memory node duplication in i.MX device tree sources.
 - Correct GIC PPI interrupts mask for i.MX6UL and i.MX7 SoCs.
 - Drop 'snps,dw-pcie' compatible from LS1021A PCIe device to avoid
   incorrect device matching.
 - Add the gpu nodes for the adreno 200 GPU on iMX51 and iMX53, which
   are now supported by the freedreno driver.
 - Add DCP device support for i.MX6ULL, which requires explicit clock
   enabling.
 - Add '#thermal-sensor-cells' for thermal device and '#cooling-cells'
   for cooling devices.
 - Add missing clock information for EPIT on i.MX25 SoC.
 - Add PWM and qdma devices for LS1021A SoC.
 - Update cooling maps of LS1021A SoC to include all devices affected by
   individual trip points.
 - Random device addition and cleanup on various boards.

* tag 'imx-dt-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (82 commits)
  ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1
  ARM: dts: imx6ul: Remove extra space between node name and brace
  ARM: dts: imx6qdl-sabresd: Use GPIO_ACTIVE_HIGH for regulators
  ARM: dts: imx6ul: add flexcan support
  ARM: dts: imx5: add gpu nodes
  ARM: dts: imx6qdl-sabresd: add accelerometer sensor support
  ARM: dts: imx6qdl-sabresd: add magnetometer sensor support
  ARM: dts: imx6qdl-sabresd: add light sensor support
  ARM: dts: imx6qdl-sabresd: Move regulators outside of "simple-bus"
  ARM: dts: imx6qdl: Fix memory node duplication
  ARM: dts: imx6dl-mamoj: Add a memory node
  ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
  ARM: dts: vf610-zii-scu4-aib: Add HI8435 support
  ARM: dts: imx6qdl-sabresd: add egalax touch screen support on i2c2 bus
  ARM: dts: imx7s: Add flexcan stop mode wakeup support
  ARM: dts: imx6ul: Add flexcan stop mode wakeup support
  ARM: dts: imx6qdl: Add flexcan stop mode wakeup support
  ARM: dts: imx6sx: Add flexcan stop mode wakeup support
  ARM: dts: imx6ul-pico: Add the imx6ul-pico-pi variant
  ARM: dts: imx6ul-pico-hobbit: Extend peripherals support
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12 12:54:48 -08:00
Anson Huang 48dd72f82a ARM: dts: imx6sll: remove unused property in gpc node
The "fsl,mf-mix-wakeup-irq" is ONLY used as a temporary
solution in NXP's internal tree for Mega/Fast Mix off
feature after suspend, upstream kernel does NOT need it,
remove it.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2018-12-10 10:02:10 +08:00
Anson Huang 39db0e136b ARM: dts: imx6: add mmdc ipg clock
i.MX6 SoCs has MMDC clock gates in CCM CCGR, add
clock property for MMDC driver's clock operation.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2018-11-05 10:19:09 +08:00
Oleksij Rempel 438ad09af5 ARM: dts: imx6sll: fix typo for fsl,imx6sll-i2c node
Fix the type of compatible string "fs,imx6sll-i2c" which should be
"fsl,imx6sll-i2c".

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2018-11-05 10:09:02 +08:00
Anson Huang 9945583745 ARM: dts: imx6sll: add gpio clocks
i.MX6SLL has GPIO clock gates in CCM CCGR, add
clock property for GPIO driver to make sure all
GPIO banks work as expected.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2018-09-03 12:25:23 +08:00
Anson Huang ec16e9bc7b ARM: dts: imx6sll: add gpio-ranges property
Add "gpio-ranges" property to establish connections between GPIOs
and PINs on i.MX6SLL pinctrl driver, for details, please refer to
Documentation/devicetree/bindings/gpio/gpio.txt of "gpio-ranges"
property.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2018-09-03 12:25:20 +08:00
Anson Huang eecd78bc78 ARM: dts: imx6sll: declare src module to be compatible to imx51's src
i.MX6SLL uses same SRC module as i.MX51, add "fsl,imx51-src"
compatible string to enable SRC driver to support setting
CPU resume address for cpu-idle and suspend/resume.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2018-06-28 11:24:40 +08:00
Bai Ping 9f30b6b1a9 ARM: dts: imx: Add basic dtsi file for imx6sll
Add dtsi file for imx6sll.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Dong Aisheng <Aisheng.dong@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2018-06-17 14:22:33 +08:00