Unverified Commit 739a7c29 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

i.MX arm device tree change for 6.3:

- New board support: SK-iMX53, DHCOM i.MX6ULL based boards.
- Increase MMC maximum frequency for i.MXRT1050.
- A series from Krzysztof Kozlowski to align LED node names with
  dtschema, and use use generic node name for rave-sp device.
- Use new media bus type macros for i.MX device trees.
- A series from Marcel Ziswiler to improve gpio-key for Colibri and
  Apalis device trees.
- A series from Marek Vasut to drop interrupt-names from dma-apb device.
- A series from Philippe Schenker to disable USB over-current for
  Colibri and Apalis boards.
- A few other small corrections and random changes.

* tag 'imx-dt-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (29 commits)
  ARM: dts: imx6ull-dhcom: Add DHSOM based DRC02 board
  ARM: dts: imx6ull-dhcom: Add DHCOM based PicoITX board
  ARM: dts: imx6ull-dhcom: Add DH electronics DHCOM i.MX6ULL SoM and PDK2 board
  ARM: dts: imx7s: correct iomuxc gpr mux controller cells
  ARM: dts: imx: use generic node name for rave-sp
  ARM: dts: ls1021a: Disable CAN nodes by default
  ARM: dts: apalis/colibri-imx6/6ull/7: proper gpio-key node names
  ARM: dts: colibri-imx6ull: improve wake-up with gpio key
  ARM: dts: colibri-imx6: improve wake-up with gpio key
  ARM: dts: imx: e70k02: Add touchscreen
  ARM: dts: vfxxx: Swap SAI DMA order
  ARM: dts: freescale: Use new media bus type macros
  ARM: dts: tqma6ul + mba6ulx: Fix temperature sensor compatible
  ARM: dts: imx: Add support for SK-iMX53 board
  ARM: dts: imx7s: Drop dma-apb interrupt-names
  ARM: dts: imx6ul: Drop dma-apb interrupt-names
  ARM: dts: imx6sx: Drop dma-apb interrupt-names
  ARM: dts: imx6qdl: Drop dma-apb interrupt-names
  ARM: dts: mxs: Drop dma-apb interrupt-names
  ARM: dts: imx6qdl: use MAC-address from nvmem
  ...

Link: https://lore.kernel.org/r/20230130023947.11780-4-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ae3ddc20 addaaf0a

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ dtb-$(CONFIG_SOC_IMX53) += \ 
	imx53-ppd.dtb \

	imx53-qsb.dtb \

	imx53-qsrb.dtb \

	imx53-sk-imx53.dtb \

	imx53-smd.dtb \

	imx53-tx53-x03x.dtb \

	imx53-tx53-x13x.dtb \
@@ -741,6 +742,9 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ull-colibri-wifi-eval-v3.dtb \

	imx6ull-colibri-wifi-iris.dtb \

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

	imx6ull-dhcom-drc02.dtb \

	imx6ull-dhcom-pdk2.dtb \

	imx6ull-dhcom-picoitx.dtb \

	imx6ull-jozacp.dtb \

	imx6ull-kontron-bl.dtb \

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

arch/arm/boot/dts/e70k02.dtsi

+10 −1
Original line number Diff line number Diff line
@@ -122,7 +122,16 @@ &i2c2 { 
	clock-frequency = <100000>;

	status = "okay";



	/* TODO: CYTTSP5 touch controller at 0x24 */

	touchscreen@24 {

		compatible = "cypress,tt21000";

		reg = <0x24>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_cyttsp5_gpio>;

		interrupt-parent = <&gpio4>;

		interrupts = <24 IRQ_TYPE_EDGE_FALLING>;

		reset-gpios = <&gpio4 18 GPIO_ACTIVE_LOW>;

		vdd-supply = <&ldo5_reg>;

	};



	/* TODO: SY7636 PMIC for E Ink at 0x62 */

arch/arm/boot/dts/imx23.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ dma_apbh: dma-apbh@80004000 { 
				reg = <0x80004000 0x2000>;

				interrupts = <0 14 20 0

					      13 13 13 13>;

				interrupt-names = "empty", "ssp0", "ssp1", "empty",

						  "gpmi0", "gpmi1", "gpmi2", "gpmi3";

				#dma-cells = <1>;

				dma-channels = <8>;

				clocks = <&clks 15>;

arch/arm/boot/dts/imx28.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ dma_apbh: dma-apbh@80004000 { 
					      88 88 88 88

					      88 88 88 88

					      87 86 0 0>;

				interrupt-names = "ssp0", "ssp1", "ssp2", "ssp3",

						  "gpmi0", "gmpi1", "gpmi2", "gmpi3",

						  "gpmi4", "gmpi5", "gpmi6", "gmpi7",

						  "hsadc", "lcdif", "empty", "empty";

				#dma-cells = <1>;

				dma-channels = <16>;

				clocks = <&clks 25>;
@@ -1001,10 +997,6 @@ dma_apbx: dma-apbx@80024000 { 
					      80 81 68 69

					      70 71 72 73

					      74 75 76 77>;

				interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",

						  "saif0", "saif1", "i2c0", "i2c1",

						  "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",

						  "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

				#dma-cells = <1>;

				dma-channels = <16>;

				clocks = <&clks 26>;

arch/arm/boot/dts/imx50-kobo-aura.dts

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ gpio-leds { 
		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_leds>;



		on {

		led-on {

			label = "kobo_aura:orange:on";

			gpios = <&gpio6 24 GPIO_ACTIVE_LOW>;

			panic-indicator;