Unverified Commit f50a4e59 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

i.MX ARM device tree for 6.5:

- New board support: Marantec Maveo Box.
- Add HDMI support for TQMa6x/MBa6 board.
- A series from Andrew Lunn to add phy-mode and fixed links for Ethernet
  devices on imx51, imx6qdl and vf610.
- A bunch of changes from Fabio Estevam to clean up deprecated and
  invalid properies, fix up node names to remove dt-schema warnings.
- A series of maintenance updates for Protonic Holland boards, mostly
  on the USB subsystem configuration, thermal zones, and the naming of
  GPIO keys.
- Update dma-apbh device node name to remove dtbs_check warnings.
- Remove invalid nodes from fan-controller for a couple of Gateworks
  boards.
- Small random updates and clean-ups on various boards.

* tag 'imx-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (53 commits)
  ARM: dts: imx6qdl: vicut1: rename power to power-button
  ARM: dts: imx6dl: prtrvt, prtvt7, prti6q, prtwd2: fix USB related warnings
  ARM: dts: imx6dl: plybas: fix USB over-current detection on USB OTG port
  ARM: dts: imx6ul: prti6g: fix USB over-current detection on USB OTG port
  ARM: dts: imx6qp: prtwd3: Enable USB over current detection on USB OTG port
  ARM: dts: imx6dl: prtmvt: fix different USB related warnings
  ARM: dts: imx6dl: alti6p: fix different USB related warnings
  ARM: dts: imx6dl: vicut1: Address USB related warnings
  ARM: dts: imx6dl: Add trip points to thermal zones on several devices
  ARM: dts: imx6dl: lanmcu: Configure over-current polarity for USB OTG node
  ARM: dts: imx6dl: lanmcu: Disable unused USB PHY nodes
  ARM: dts: imx6q: prtwd2: Correct iomux configuration for ENET MDIO and MDC
  ARM: dts: imx6dl: prtvt7: Remove touchscreen inversion
  ARM: dts: imx6dl: prtvt7: Adjust default backlight brightness to 65
  ARM: dts: imx6qdl: vicut1: The sgtl5000 uses i2s not ac97
  ARM: dts: imx: Use 'eeprom' as node name
  ARM: dts: imx6ul-ccimx6ulsom: Fix the "coin" regulator name
  ARM: dts: imx: Use 'pmic' as node name
  ARM: dts: imx6: Use the mux- prefix
  ARM: dts: imx7d-sdb: Allow UHS modes
  ...

Link: https://lore.kernel.org/r/20230610072530.418847-2-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 32302719 5ef0f31f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -751,6 +751,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
	imx6ull-dhcom-drc02.dtb \
	imx6ull-dhcom-pdk2.dtb \
	imx6ull-dhcom-picoitx.dtb \
	imx6ull-dhcor-maveo-box.dtb \
	imx6ull-jozacp.dtb \
	imx6ull-kontron-bl.dtb \
	imx6ull-myir-mys-6ulx-eval.dtb \
+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@
				reg = <0x80000000 0x2000>;
			};

			dma_apbh: dma-apbh@80004000 {
			dma_apbh: dma-controller@80004000 {
				compatible = "fsl,imx23-dma-apbh";
				reg = <0x80004000 0x2000>;
				interrupts = <0 14 20 0
+5 −5
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@
		pinctrl-names = "default";
		pinctrl-0 = <&spi2_pins_cfa10049>;
		status = "okay";
		gpio-sck = <&gpio2 16 0>;
		gpio-mosi = <&gpio2 17 0>;
		gpio-miso = <&gpio2 18 0>;
		sck-gpios = <&gpio2 16 0>;
		mosi-gpios = <&gpio2 17 0>;
		miso-gpios = <&gpio2 18 0>;
		cs-gpios = <&gpio3 5 0>;
		num-chipselects = <1>;
		#address-cells = <1>;
@@ -124,8 +124,8 @@
		pinctrl-names = "default";
		pinctrl-0 = <&spi3_pins_cfa10049>;
		status = "okay";
		gpio-sck = <&gpio0 24 0>;
		gpio-mosi = <&gpio0 28 0>;
		sck-gpios = <&gpio0 24 0>;
		mosi-gpios = <&gpio0 28 0>;
		cs-gpios = <&gpio0 17 0 &gpio0 26 0 &gpio0 27 0>;
		num-chipselects = <3>;
		#address-cells = <1>;
+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@
		pinctrl-names = "default";
		pinctrl-0 = <&spi2_pins_cfa10055>;
		status = "okay";
		gpio-sck = <&gpio2 16 0>;
		gpio-mosi = <&gpio2 17 0>;
		gpio-miso = <&gpio2 18 0>;
		sck-gpios = <&gpio2 16 0>;
		mosi-gpios = <&gpio2 17 0>;
		miso-gpios = <&gpio2 18 0>;
		cs-gpios = <&gpio3 5 0>;
		num-chipselects = <1>;
		#address-cells = <1>;
+3 −3
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@
		pinctrl-names = "default";
		pinctrl-0 = <&spi2_pins_cfa10056>;
		status = "okay";
		gpio-sck = <&gpio2 16 0>;
		gpio-mosi = <&gpio2 17 0>;
		gpio-miso = <&gpio2 18 0>;
		sck-gpios = <&gpio2 16 0>;
		mosi-gpios = <&gpio2 17 0>;
		miso-gpios = <&gpio2 18 0>;
		cs-gpios = <&gpio3 5 0>;
		num-chipselects = <1>;
		#address-cells = <1>;
Loading