diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-08-16 23:09:45 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-08-16 23:09:46 +0200 |
| commit | 6d640913126db109f2e3389173f0fe42413a8183 (patch) | |
| tree | 81d9ba7e29820176eb9704d8dd1c2042309220b2 /arch/arm64/boot/dts/freescale/imx8qxp.dtsi | |
| parent | fe3be9941e3c5cebd59d3ad02477db86af85e2da (diff) | |
| parent | 418962eea35869b8e07766d8728ae660d75800a9 (diff) | |
Merge tag 'imx-dt64-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX arm64 device tree changes for 5.15:
- New board support: Nitrogen8 SoM and MNT Reform2, LS1088A based
Traverse Ten64, i.MX8M based GW7902.
- A series from Ioana Ciornei to update PHY IRQ configuration for
LayerScape SoCs.
- A series from Tim Harvey to update Gateworks imx8mm-venice devices.
- Replace deprecated `fsl,usbphy` property with phys phandle.
- Add MIPI CSI phy and bridge descriptions for i.MX8MQ SoC.
- Add JPEG encoder/decoder device nodes for i.MX8M SoCs.
- Update PMU compatible and drop interrupt-affinity for i.MX8M SoCs.
- Add Cadence HIFI4 DSP for i.MX8 MPlus SoC.
- A few small and random updates on various boards.
* tag 'imx-dt64-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (27 commits)
arm64: dts: add device tree for Traverse Ten64 (LS1088A)
arm64: dts: ls1088a: add missing PMU node
arm64: dts: ls1088a: add internal PCS for DPMAC1 node
arm64: dts: imx8mq-reform2: add sound support
arm64: dts: imx8m: drop interrupt-affinity for pmu
arm64: dts: imx8qxp: update pmu compatible
arm64: dts: imx8mm: update pmu compatible
arm64: dts: ls1046a: fix eeprom entries
arm64: dts: imx8mm-venice-gw7901: enable pull-down on gpio outputs
arm64: dts: imx8mm-venice-gw7901: add support for USB hub subload
arm64: dts: imx8mm-venice-gw71xx: fix USB OTG VBUS
arm64: dts: imx8mm-venice-gw700x: fix invalid pmic pin config
arm64: dts: imx8mm-venice-gw700x: fix mp5416 pmic config
arm64: dts: imx8mq: add mipi csi phy and csi bridge descriptions
arm64: dts: imx: Add i.mx8mm/imx8mn Gateworks gw7902 dts support
arm64: dts: imx8mp: Add dsp node
arm64: dts: imx8m: Replace deprecated fsl,usbphy DT props with phys
arm64: dts: imx8mq-evk: Remove unnecessary blank lines
arm64: dts: imx8mq-evk: add CD pinctrl for usdhc2
arm64: dts: imx8mm-venice-gw7901: Remove unnecessary #address-cells/#size-cells
...
Link: https://lore.kernel.org/r/20210814133853.9981-3-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/imx8qxp.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi index 1e6b4995091e..617618edf77e 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi @@ -141,7 +141,7 @@ }; pmu { - compatible = "arm,armv8-pmuv3"; + compatible = "arm,cortex-a35-pmu"; interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>; }; @@ -258,12 +258,14 @@ }; /* sorted in register address */ + #include "imx8-ss-img.dtsi" #include "imx8-ss-adma.dtsi" #include "imx8-ss-conn.dtsi" #include "imx8-ss-ddr.dtsi" #include "imx8-ss-lsio.dtsi" }; +#include "imx8qxp-ss-img.dtsi" #include "imx8qxp-ss-adma.dtsi" #include "imx8qxp-ss-conn.dtsi" #include "imx8qxp-ss-lsio.dtsi" |