Commit d27895a1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

i.MX device tree update for 5.9:

- New board support: Protonic PRTI6Q/WD2/VT7/RVT and MYiR MYS-6ULX SBC.
- Update IIM, OCOTP and SD/MMC device node name to match .yaml bindings.
- Make tempmon node as child of anatop node according to hardware
  architecture.
- The vf610-zii device update: configure fiber port to 1000BaseX, add
  switch watchdog, MDIO speed and preamble.
- A series from Fabio Estevam to update imx6qdl-sabresd and
  imx6q-tbs2910 for using MDIO node and reset-assert-us.
- Align L2 cache-controller device node name with .yaml schema.
- Enable SATA support for imx6qp-sabreauto and imx6qp-sabresd board.
- A series of patches from Shengjiu Wang to enable various audio
  support on i.MX6 devices.
- Add Gateworks System Controller support for imx6qdl-gw devices.
- Change default #pwm-cells setting to <3> in the SoC dtsi files.
- Other small random changes.

* tag 'imx-dt-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (43 commits)
  ARM: dts: vf610-zii-ssmb-spu3: Add node for switch watchdog
  ARM: dts: vf610-zii-ssmb-dtu: Add no-sdio/no-sd properties
  ARM: dts: imx6q-tbs2910: Pass reset-assert-us
  ARM: dts: imx6q-tbs2910: Add an mdio node
  ARM: dts: imx6qdl-sabresd: Pass reset-assert-us
  ARM: dts: imx6qdl-sabresd: Add an mdio node
  ARM: dts: imx6qdl-gw: add Gateworks System Controller support
  ARM: dts: imx6ull: add MYiR MYS-6ULX SBC
  ARM: dts: vf610-zii-spb4: Add node for switch watchdog
  ARM: dts: colibri-imx6: remove pinctrl-names orphan
  ARM: dts: imx: default to #pwm-cells = <3> in the SoC dtsi files
  ARM: dts: vf610-zii-scu4-aib: Configure fibre ports to 1000BaseX
  ARM: dts: vf610-zii-dev-rev-c: Configure fiber port to 1000BaseX
  ARM: dts: ZII: update MDIO speed and preamble
  ARM: dts: vfxxx: Add node for CAAM
  ARM: dts: imx6qp-sabresd: enable sata
  ARM: dts: imx6qp-sabreauto: enable sata
  ARM: dts: add Protonic RVT board
  ARM: dts: add Protonic VT7 board
  ARM: dts: add Protonic WD2 board
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8fc5082a 983467be

arch/arm/boot/dts/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -455,6 +455,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-pico-hobbit.dtb \

	imx6dl-pico-nymph.dtb \

	imx6dl-pico-pi.dtb \

	imx6dl-prtrvt.dtb \

	imx6dl-prtvt7.dtb \

	imx6dl-rex-basic.dtb \

	imx6dl-riotboard.dtb \

	imx6dl-sabreauto.dtb \
@@ -543,6 +545,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-pico-nymph.dtb \

	imx6q-pico-pi.dtb \

	imx6q-pistachio.dtb \

	imx6q-prti6q.dtb \

	imx6q-prtwd2.dtb \

	imx6q-rex-pro.dtb \

	imx6q-sabreauto.dtb \

	imx6q-sabrelite.dtb \
@@ -592,6 +596,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
	imx6sx-sdb-reva.dtb \

	imx6sx-sdb-sai.dtb \

	imx6sx-sdb.dtb \

	imx6sx-sdb-mqs.dtb \

	imx6sx-softing-vining-2000.dtb \

	imx6sx-udoo-neo-basic.dtb \

	imx6sx-udoo-neo-extended.dtb \
@@ -617,6 +622,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ull-14x14-evk.dtb \

	imx6ull-colibri-eval-v3.dtb \

	imx6ull-colibri-wifi-eval-v3.dtb \

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

	imx6ull-opos6uldev.dtb \

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

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

arch/arm/boot/dts/imx1.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ uart2: serial@207000 { 
			};



			pwm: pwm@208000 {

				#pwm-cells = <2>;

				#pwm-cells = <3>;

				compatible = "fsl,imx1-pwm";

				reg = <0x00208000 0x1000>;

				interrupts = <34>;

arch/arm/boot/dts/imx23.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ pxp@8002a000 { 
				status = "disabled";

			};



			ocotp@8002c000 {

			efuse@8002c000 {

				compatible = "fsl,imx23-ocotp", "fsl,ocotp";

				#address-cells = <1>;

				#size-cells = <1>;

arch/arm/boot/dts/imx25.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ gpio4: gpio@53f9c000 { 


			pwm2: pwm@53fa0000 {

				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";

				#pwm-cells = <2>;

				#pwm-cells = <3>;

				reg = <0x53fa0000 0x4000>;

				clocks = <&clks 106>, <&clks 52>;

				clock-names = "ipg", "per";
@@ -430,7 +430,7 @@ gpio3: gpio@53fa4000 { 


			pwm3: pwm@53fa8000 {

				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";

				#pwm-cells = <2>;

				#pwm-cells = <3>;

				reg = <0x53fa8000 0x4000>;

				clocks = <&clks 107>, <&clks 52>;

				clock-names = "ipg", "per";
@@ -453,7 +453,7 @@ rngb: rngb@53fb0000 { 
				interrupts = <22>;

			};



			esdhc1: esdhc@53fb4000 {

			esdhc1: mmc@53fb4000 {

				compatible = "fsl,imx25-esdhc";

				reg = <0x53fb4000 0x4000>;

				interrupts = <9>;
@@ -462,7 +462,7 @@ esdhc1: esdhc@53fb4000 { 
				status = "disabled";

			};



			esdhc2: esdhc@53fb8000 {

			esdhc2: mmc@53fb8000 {

				compatible = "fsl,imx25-esdhc";

				reg = <0x53fb8000 0x4000>;

				interrupts = <8>;
@@ -488,7 +488,7 @@ slcdc@53fc0000 { 


			pwm4: pwm@53fc8000 {

				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";

				#pwm-cells = <2>;

				#pwm-cells = <3>;

				reg = <0x53fc8000 0x4000>;

				clocks = <&clks 108>, <&clks 52>;

				clock-names = "ipg", "per";
@@ -535,14 +535,14 @@ wdog@53fdc000 { 


			pwm1: pwm@53fe0000 {

				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";

				#pwm-cells = <2>;

				#pwm-cells = <3>;

				reg = <0x53fe0000 0x4000>;

				clocks = <&clks 105>, <&clks 52>;

				clock-names = "ipg", "per";

				interrupts = <26>;

			};



			iim: iim@53ff0000 {

			iim: efuse@53ff0000 {

				compatible = "fsl,imx25-iim", "fsl,imx27-iim";

				reg = <0x53ff0000 0x4000>;

				interrupts = <19>;

arch/arm/boot/dts/imx27.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ gpt3: timer@10005000 { 
			};



			pwm: pwm@10006000 {

				#pwm-cells = <2>;

				#pwm-cells = <3>;

				compatible = "fsl,imx27-pwm";

				reg = <0x10006000 0x1000>;

				interrupts = <23>;
@@ -265,7 +265,7 @@ i2c1: i2c@10012000 { 
				status = "disabled";

			};



			sdhci1: sdhci@10013000 {

			sdhci1: mmc@10013000 {

				compatible = "fsl,imx27-mmc", "fsl,imx21-mmc";

				reg = <0x10013000 0x1000>;

				interrupts = <11>;
@@ -277,7 +277,7 @@ sdhci1: sdhci@10013000 { 
				status = "disabled";

			};



			sdhci2: sdhci@10014000 {

			sdhci2: mmc@10014000 {

				compatible = "fsl,imx27-mmc", "fsl,imx21-mmc";

				reg = <0x10014000 0x1000>;

				interrupts = <10>;
@@ -431,7 +431,7 @@ i2c2: i2c@1001d000 { 
				status = "disabled";

			};



			sdhci3: sdhci@1001e000 {

			sdhci3: mmc@1001e000 {

				compatible = "fsl,imx27-mmc", "fsl,imx21-mmc";

				reg = <0x1001e000 0x1000>;

				interrupts = <9>;
@@ -540,7 +540,7 @@ clks: ccm@10027000{ 
				#clock-cells = <1>;

			};



			iim: iim@10028000 {

			iim: efuse@10028000 {

				compatible = "fsl,imx27-iim";

				reg = <0x10028000 0x1000>;

				interrupts = <62>;