Unverified Commit 07d0db46 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

i.MX device tree change for 6.1

- A series from Alexander Stein to add missing properties for i.MX6 SRAM.
- Drop 'interrupts' property when 'interrupts-extended' is present. This
  fixes a dtbs_check warning with i.MX6 DT.
- Update device trees to use generic name 'dma-controller' for SDMA.
- A set of changes from Krzysztof Kozlowski to align SPI, LED and
  gpio-keys node name with dtschema.
- A series of indentation and white-space cleanups from Marcel Ziswiler
  to address various checkpatch warnings.
- Add DDR pinmux defines to VF610 DT header.
- A couple of changes from Peng Fan to update clock-names and add IPG
  clock for i.MX7ULP LPI2C devices.
- Improve device tree structure for Kontron i.MX6UL/ULL based boards.
- A series of changes from Tim Harvey to add CAN regulator for Gateworks
  i.MX6QDL boards.
- Various small and random board specific updates.

* tag 'imx-dt-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (40 commits)
  ARM: dts: imx6qdl-gw54xx: add CAN regulator
  ARM: dts: imx6qdl-gw53xx: add CAN regulator
  ARM: dts: imx6qdl-gw52xx: add CAN regulator
  ARM: dts: imx: update sdma node name format
  ARM: dts: imx6: skov: migrate to resistive-adc-touch
  ARM: dts: imx6sx-udoo-neo: don't use multiple blank lines
  ARM: dts: imx6sl: use tabs for code indent
  ARM: dts: imx6sx: add missing properties for sram
  ARM: dts: imx6sll: add missing properties for sram
  ARM: dts: imx6sl: add missing properties for sram
  ARM: dts: imx6qp: add missing properties for sram
  ARM: dts: imx6dl: add missing properties for sram
  ARM: dts: imx6q: add missing properties for sram
  ARM: dts: imx7ulp: Add IPG clock for lpi2c
  ARM: dts: imx7ulp: update the LPI2C clock-names
  ARM: dts: vf610: ddr pinmux
  ARM: dts: imx6qdl-dhcom: Move IPU iomux node from PDK2 to SoM file
  ARM: dts: imx6ul-kontron: Add imx6ull-kontron-bl to Makefile
  ARM: dts: imx6ul-kontron: Simplify devicetree structure
  ARM: dts: vf610: align SPI node name with dtschema
  ...

Link: https://lore.kernel.org/r/20220918092806.2152700-3-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2b14d7da b7fd68ac

arch/arm/boot/dts/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -707,8 +707,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ul-geam.dtb \

	imx6ul-isiot-emmc.dtb \

	imx6ul-isiot-nand.dtb \

	imx6ul-kontron-n6310-s.dtb \

	imx6ul-kontron-n6310-s-43.dtb \

	imx6ul-kontron-bl.dtb \

	imx6ul-kontron-bl-43.dtb \

	imx6ul-liteboard.dtb \

	imx6ul-tqma6ul1-mba6ulx.dtb \

	imx6ul-tqma6ul2-mba6ulx.dtb \
@@ -737,6 +737,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ull-colibri-wifi-iris.dtb \

	imx6ull-colibri-wifi-iris-v2.dtb \

	imx6ull-jozacp.dtb \

	imx6ull-kontron-bl.dtb \

	imx6ull-myir-mys-6ulx-eval.dtb \

	imx6ull-opos6uldev.dtb \

	imx6ull-phytec-segin-ff-rdk-nand.dtb \

arch/arm/boot/dts/imx23-xfi3.dts

+3 −3
Original line number Diff line number Diff line
@@ -158,19 +158,19 @@ backlight { 
		default-brightness-level = <6>;

	};



	gpio_keys {

	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&key_pins_a>;



		voldown {

		key-voldown {

			label = "volume-down";

			linux,code = <114>;

			gpios = <&gpio2 7 0>;

			debounce-interval = <20>;

		};



		volup {

		key-volup {

			label = "volume-up";

			linux,code = <115>;

			gpios = <&gpio2 8 0>;

arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts

+2 −2
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ / { 
	model = "Eukrea MBIMXSD25";

	compatible = "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25";



	gpio_keys {

	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpiokeys>;



		bp1 {

		button {

			label = "BP1";

			gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;

			linux,code = <BTN_MISC>;

arch/arm/boot/dts/imx25.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ gpio2: gpio@53fd0000 { 
				#interrupt-cells = <2>;

			};



			sdma: sdma@53fd4000 {

			sdma: dma-controller@53fd4000 {

				compatible = "fsl,imx25-sdma";

				reg = <0x53fd4000 0x4000>;

				clocks = <&clks 112>, <&clks 68>;

arch/arm/boot/dts/imx28-cfa10049.dts

+4 −4
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ mac0: ethernet@800f0000 { 
		};

	};



	spi2 {

	spi-2 {

		compatible = "spi-gpio";

		pinctrl-names = "default";

		pinctrl-0 = <&spi2_pins_cfa10049>;
@@ -351,7 +351,7 @@ hx8357: hx8357@0 { 
		};

	};



	spi3 {

	spi-3 {

		compatible = "spi-gpio";

		pinctrl-names = "default";

		pinctrl-0 = <&spi3_pins_cfa10049>;
@@ -388,12 +388,12 @@ dac0: dh2228@2 { 
		};

	};



	gpio_keys {

	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&rotary_btn_pins_cfa10049>;



		rotary_button {

		rotary-button {

			label = "rotary_button";

			gpios = <&gpio3 26 1>;

			debounce-interval = <10>;