diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-14 23:38:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-14 23:38:56 +0200 |
| commit | a5c3378290dd8a3e352079b865cf45044fd54ef8 (patch) | |
| tree | 8f3334a95d4c02a08b08acc8a264b07072a99980 /arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | |
| parent | 1d9140d2af8bcbd0551d483d6b5b5d6154a122e7 (diff) | |
| parent | db92a8d917c7d959584cc15f838a134c1b115915 (diff) | |
Merge tag 'imx-dt-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX ARM device tree change for 6.6:
- New device tree for TQ-Systems MBLS102xA board.
- A bunch of dtschema warning fixes from Fabio Estevam and
Krzysztof Kozlowski.
- Add missing supply regulator for imx6qdl-mba6 and imx6qdl-tqma6x.
- Replace deprecated extcon-usb-gpio id-gpio/vbus-gpio properties.
- Disable the internal i.MX6 watchdog and rely on PMIC reboot handler
for phycore and pfla02 boards.
- Replace NO_PAD_CTL by explicit pad configuration for karo-tx25 board.
* tag 'imx-dt-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (35 commits)
ARM: dts: imx6qdl: mba6: Fix gpio-keys button node names
ARM: dts: imx6ul: Fix nand-controller #size-cells
ARM: dts: imx6ul: mba6ulx: Fix stmpe811 node warnings
ARM: dts: imx6dl-b1x5pv2: Fix simple-audio routing property
ARM: dts: imx6q-prti6q: Fix the SDIO wifi node
ARM: dts: vfxxx: Pass 'mmc' as the esdhc node names
ARM: dts: imx53-smd: Remove invalid SPI flash entry
ARM: dts: imx50-evk: Use generic node name for SPI NOR flash
ARM: dts: imx6q-cm-fx6: Remove invalid SPI flash entry
ARM: dts: ls1021a: add TQMLS1021A flash partition layout
ARM: dts: ls1021a: add TQ-Systems MBLS102xA device tree
ARM: dts: imx: Remove 'compatible' from the pfuze nodes
ARM: dts: imx: Pass #sound-dai-cells to sgtl5000
ARM: dts: nxp: mxs: split interrupts per cells
ARM: dts: imx6ul-geam: Remove invalid sgtl5000 property
ARM: dts: imx28: drop incorrect reg in fixed regulators
ARM: dts: imx27: drop incorrect reg in fixed regulators
ARM: dts: imx25: drop incorrect reg in fixed regulators
ARM: dts: imx23: drop incorrect reg in fixed regulators
ARM: dts: imx50-kobo-aura: switch to enable-gpios
...
Link: https://lore.kernel.org/r/20230813133354.847010-4-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/nxp/imx/imx6sx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi index 3a4308666552..2b4a191750c5 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi @@ -221,7 +221,7 @@ clocks = <&clks IMX6SX_CLK_APBH_DMA>; }; - gpmi: nand-controller@1806000{ + gpmi: nand-controller@1806000 { compatible = "fsl,imx6sx-gpmi-nand"; #address-cells = <1>; #size-cells = <1>; @@ -1306,6 +1306,10 @@ <&clks IMX6SX_CLK_LCDIF_APB>, <&clks IMX6SX_CLK_DISPLAY_AXI>; clock-names = "pix", "axi", "disp_axi"; + assigned-clocks = <&clks IMX6SX_CLK_LCDIF1_PRE_SEL>, + <&clks IMX6SX_CLK_LCDIF1_SEL>; + assigned-clock-parents = <&clks IMX6SX_CLK_PLL5_VIDEO_DIV>, + <&clks IMX6SX_CLK_LCDIF1_PODF>; power-domains = <&pd_disp>; status = "disabled"; |