Commit 970d180b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

i.MX device tree changes for 5.14:

- New board support: i.MX6Q DaSheng COM-9XX SBC board, i.MX28 based XEA
  board, GE B1x5v2 boards.
- A series from Christoph Niedermaier to correct imx6q-dhcom
  descriptions, add device aliases and ethernet VIO regulator.
- Correct Ethernet node name for imx51-digi-connectcore-som and
  imx53-ard board to comply DT schema.
- A couple of update on imx6dl-yapp4 board, configuring OLED display
  segment offset, and using aliases to set custom MMC device indexes.
- A series from Oleksij Rempel and Robin van der Gracht to update
  Protonic boards: imx6dl-prtvt7, imx6dl-plym2m and imx6qdl-vicut1.
- A series from Shengjiu Wang to improve various audio support on NXP
  reference boards.
- Rename pinfunc for i.MX25 GPIO_[A-F] pads for consistency.

* tag 'imx-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (30 commits)
  ARM: dts: imx6: Add GE B1x5v2
  ARM: dts: imx6q-dhcom: Add ethernet VIO regulator
  ARM: dts: imx6q-dhcom: Add aliases for i2c, serial and rtc
  ARM: dts: imx6q-dhcom: Add gpios pinctrl for i2c bus recovery
  ARM: dts: imx6q-dhcom: Fix ethernet plugin detection problems
  ARM: dts: imx6q-dhcom: Fix ethernet reset time properties
  ARM: dts: imx6dl-prtvt7: Remove unused 'sound-dai-cells' from ssi1 node
  ARM: dts: imx6dl-prtvt7: The sgtl5000 uses i2s not ac97
  ARM: dts: imx6qdl-vicut1: add interrupt-counter nodes
  ARM: dts: imx6dl-prtvt7: Enable the VPU
  ARM: dts: imx6dl: enable touchscreen debounce filter on PLYM2M and PRTVT7 boards
  ARM: dts: imx6dl-plym2m: remove touchscreen-size-* properties
  ARM: dts: imx6dl-prtvt7: fix PWM cell count for the backlight node.
  ARM: dts: imx6dl-prtvt7: Remove backlight enable gpio
  ARM: dts: imx6dl-prtvt7: add TSC2046 touchscreen node
  ARM: dts: imx53-ard: Correct Ethernet node name
  ARM: dts: i.MX51: digi-connectcore-som: Correct Ethernet node name
  ARM: dts: imx6dl-riotboard: configure PHY clock and set proper EEE value
  ARM: dts: imx6: edmqmx6: set phy-mode to RGMII-ID
  ARM: dts: imx6qdl-sabresd: Configure the gpio for hp detect
  ...

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bb1a7fce 1fac5db3

arch/arm/boot/dts/Makefile

+8 −1
Original line number Diff line number Diff line
@@ -515,8 +515,14 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-display5-tianma-tm070-1280x768.dtb \

	imx6q-dmo-edmqmx6.dtb \

	imx6q-dms-ba16.dtb \

	imx6q-ds.dtb \

	imx6q-emcon-avari.dtb \

	imx6q-evi.dtb \

	imx6dl-b105pv2.dtb \

	imx6dl-b105v2.dtb \

	imx6dl-b125v2.dtb \

	imx6dl-b125pv2.dtb \

	imx6dl-b155v2.dtb \

	imx6q-gk802.dtb \

	imx6q-gw51xx.dtb \

	imx6q-gw52xx.dtb \
@@ -727,7 +733,8 @@ dtb-$(CONFIG_ARCH_MXS) += \ 
	imx28-m28evk.dtb \

	imx28-sps1.dtb \

	imx28-ts4600.dtb \

	imx28-tx28.dtb

	imx28-tx28.dtb \

	imx28-xea.dtb

dtb-$(CONFIG_ARCH_NOMADIK) += \

	ste-nomadik-s8815.dtb \

	ste-nomadik-nhk15.dtb

arch/arm/boot/dts/imx25-pinfunc.h

+6 −6
Original line number Diff line number Diff line
@@ -563,15 +563,15 @@ 
#define MX25_PAD_DE_B__DE_B			0x1f0 0x3ec 0x000 0x00 0x000

#define MX25_PAD_DE_B__GPIO_2_20		0x1f0 0x3ec 0x000 0x05 0x000



#define MX25_PAD_GPIO_A__GPIO_A			0x1f4 0x3f0 0x000 0x00 0x000

#define MX25_PAD_GPIO_A__GPIO_1_0		0x1f4 0x3f0 0x000 0x00 0x000

#define MX25_PAD_GPIO_A__CAN1_TX		0x1f4 0x3f0 0x000 0x06 0x000

#define MX25_PAD_GPIO_A__USBOTG_PWR		0x1f4 0x3f0 0x000 0x02 0x000



#define MX25_PAD_GPIO_B__GPIO_B			0x1f8 0x3f4 0x000 0x00 0x000

#define MX25_PAD_GPIO_B__GPIO_1_1		0x1f8 0x3f4 0x000 0x00 0x000

#define MX25_PAD_GPIO_B__USBOTG_OC		0x1f8 0x3f4 0x57c 0x02 0x001

#define MX25_PAD_GPIO_B__CAN1_RX		0x1f8 0x3f4 0x480 0x06 0x001



#define MX25_PAD_GPIO_C__GPIO_C			0x1fc 0x3f8 0x000 0x00 0x000

#define MX25_PAD_GPIO_C__GPIO_1_2		0x1fc 0x3f8 0x000 0x00 0x000

#define MX25_PAD_GPIO_C__PWM4_PWMO		0x1fc 0x3f8 0x000 0x01 0x000

#define MX25_PAD_GPIO_C__I2C2_SCL		0x1fc 0x3f8 0x51c 0x02 0x001

#define MX25_PAD_GPIO_C__KPP_COL4		0x1fc 0x3f8 0x52c 0x03 0x001
@@ -580,18 +580,18 @@ 
#define MX25_PAD_GPIO_C__CAN2_TX		0x1fc 0x3f8 0x000 0x06 0x000

#define MX25_PAD_GPIO_C__CSPI2_SS2		0x1fc 0x3f8 0x000 0x07 0x000



#define MX25_PAD_GPIO_D__GPIO_D			0x200 0x3fc 0x000 0x00 0x000

#define MX25_PAD_GPIO_D__GPIO_1_3		0x200 0x3fc 0x000 0x00 0x000

#define MX25_PAD_GPIO_D__I2C2_SDA		0x200 0x3fc 0x520 0x02 0x001

#define MX25_PAD_GPIO_D__CAN2_RX		0x200 0x3fc 0x484 0x06 0x001

#define MX25_PAD_GPIO_D__CSPI3_SS2		0x200 0x3fc 0x4c4 0x07 0x001



#define MX25_PAD_GPIO_E__GPIO_E			0x204 0x400 0x000 0x00 0x000

#define MX25_PAD_GPIO_E__GPIO_1_4		0x204 0x400 0x000 0x00 0x000

#define MX25_PAD_GPIO_E__I2C3_CLK		0x204 0x400 0x524 0x01 0x002

#define MX25_PAD_GPIO_E__LD16			0x204 0x400 0x000 0x02 0x000

#define MX25_PAD_GPIO_E__AUD7_TXD		0x204 0x400 0x000 0x04 0x000

#define MX25_PAD_GPIO_E__UART4_RXD		0x204 0x400 0x570 0x06 0x002



#define MX25_PAD_GPIO_F__GPIO_F			0x208 0x404 0x000 0x00 0x000

#define MX25_PAD_GPIO_F__GPIO_1_5		0x208 0x404 0x000 0x00 0x000

#define MX25_PAD_GPIO_F__LD17			0x208 0x404 0x000 0x02 0x000

#define MX25_PAD_GPIO_F__AUD7_TXC		0x208 0x404 0x000 0x04 0x000

#define MX25_PAD_GPIO_F__UART4_TXD		0x208 0x404 0x000 0x06 0x000

arch/arm/boot/dts/imx28-lwe.dtsi

0 → 100644
+170 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * Copyright 2021

 * Lukasz Majewski, DENX Software Engineering, lukma@denx.de

 */



/dts-v1/;

#include "imx28.dtsi"



/ {

	aliases {

		spi2 = &ssp3;

	};



	chosen {

		bootargs = "root=/dev/mmcblk0p2 rootfstype=ext4 ro rootwait console=ttyAMA0,115200 panic=1";

	};



	memory@40000000 {

		reg = <0x40000000 0x08000000>;

	};



	reg_3v3: regulator-reg-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	reg_usb_5v: regulator-reg-usb-5v {

		compatible = "regulator-fixed";

		regulator-name = "usb_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	reg_fec_3v3: regulator-reg-fec-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "fec-phy";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

};



&duart {

	pinctrl-names = "default";

	pinctrl-0 = <&duart_pins_a>;

	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";

};



&saif0 {

	pinctrl-names = "default";

	pinctrl-0 = <&saif0_pins_a>;

	#sound-dai-cells = <0>;

	assigned-clocks = <&clks 53>;

	assigned-clock-rates = <12000000>;

	status = "okay";

};



&saif1 {

	pinctrl-names = "default";

	pinctrl-0 = <&saif1_pins_a>;

	fsl,saif-master = <&saif0>;

	#sound-dai-cells = <0>;

	status = "okay";

};



&spi3_pins_a {

	fsl,pinmux-ids = <

		MX28_PAD_AUART2_RX__SSP3_D4

		MX28_PAD_AUART2_TX__SSP3_D5

		MX28_PAD_SSP3_SCK__SSP3_SCK

		MX28_PAD_SSP3_MOSI__SSP3_CMD

		MX28_PAD_SSP3_MISO__SSP3_D0

		MX28_PAD_SSP3_SS0__SSP3_D3

		MX28_PAD_AUART2_TX__GPIO_3_9

	>;

};



&ssp0 {

	compatible = "fsl,imx28-mmc";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_8bit_pins_a>;

	bus-width = <8>;

	vmmc-supply = <&reg_3v3>;

	non-removable;

	status = "okay";

};



&ssp2 {

	compatible = "fsl,imx28-spi";

	pinctrl-names = "default";

	pinctrl-0 = <&spi2_pins_a>;

	status = "okay";

};



&ssp3 {

	compatible = "fsl,imx28-spi";

	pinctrl-names = "default";

	pinctrl-0 = <&spi3_pins_a>;

	status = "okay";



	flash@0 {

		compatible = "jedec,spi-nor";

		spi-max-frequency = <40000000>;

		reg = <0>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "u-boot";

				reg = <0 0x80000>;

				read-only;

			};



			partition@80000 {

				label = "env0";

				reg = <0x80000 0x10000>;

			};



			partition@90000 {

				label = "env1";

				reg = <0x90000 0x10000>;

			};



			partition@100000 {

				label = "kernel";

				reg = <0x100000 0x400000>;

			};



			partition@500000 {

				label = "swupdate";

				reg = <0x500000 0x800000>;

			};

		};

	};

};



&usb0 {

	vbus-supply = <&reg_usb_5v>;

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_pins_b>, <&usb0_id_pins_a>;

	dr_mode = "host";

	status = "okay";

};



&usbphy0 {

	status = "okay";

};



&usb1 {

	vbus-supply = <&reg_usb_5v>;

	pinctrl-names = "default";

	pinctrl-0 = <&usb1_pins_b>;

	dr_mode = "host";

	status = "okay";

};



&usbphy1 {

	status = "okay";

};

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

0 → 100644
+99 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * Copyright 2021

 * Lukasz Majewski, DENX Software Engineering, lukma@denx.de

 */



/dts-v1/;

#include "imx28-lwe.dtsi"



/ {

	compatible = "lwn,imx28-xea", "fsl,imx28";

};



&can0 {

	pinctrl-names = "default";

	pinctrl-0 = <&can1_pins_a>;

	status = "okay";

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins_b>;

	status = "okay";

};



&pinctrl {

	pinctrl-names = "default";

	pinctrl-0 = <&hog_pins_a &hog_pins_tiva>;



	hog_pins_a: hog@0 {

		reg = <0>;

		fsl,pinmux-ids = <

			MX28_PAD_GPMI_D00__GPIO_0_0

			MX28_PAD_GPMI_D02__GPIO_0_2

			MX28_PAD_GPMI_D05__GPIO_0_5

			MX28_PAD_GPMI_CE1N__GPIO_0_17

			MX28_PAD_GPMI_RDY0__GPIO_0_20

			MX28_PAD_GPMI_RDY1__GPIO_0_21

			MX28_PAD_GPMI_RDY2__GPIO_0_22

			MX28_PAD_GPMI_RDN__GPIO_0_24

			MX28_PAD_GPMI_CLE__GPIO_0_27

			MX28_PAD_LCD_VSYNC__GPIO_1_28

			MX28_PAD_SSP1_SCK__GPIO_2_12

			MX28_PAD_SSP1_CMD__GPIO_2_13

			MX28_PAD_SSP2_SS1__GPIO_2_20

			MX28_PAD_SSP2_SS2__GPIO_2_21

			MX28_PAD_LCD_D00__GPIO_1_0

			MX28_PAD_LCD_D01__GPIO_1_1

			MX28_PAD_LCD_D02__GPIO_1_2

			MX28_PAD_LCD_D03__GPIO_1_3

			MX28_PAD_LCD_D04__GPIO_1_4

			MX28_PAD_LCD_D05__GPIO_1_5

			MX28_PAD_LCD_D06__GPIO_1_6

		>;

		fsl,drive-strength = <MXS_DRIVE_4mA>;

		fsl,voltage = <MXS_VOLTAGE_HIGH>;

		fsl,pull-up = <MXS_PULL_DISABLE>;

	};



	hog_pins_tiva: hog@1 {

		reg = <1>;

		fsl,pinmux-ids = <

			MX28_PAD_GPMI_RDY3__GPIO_0_23

			MX28_PAD_GPMI_WRN__GPIO_0_25

		>;

		fsl,voltage = <MXS_VOLTAGE_HIGH>;

		fsl,pull-up = <MXS_PULL_DISABLE>;

	};



	hog_pins_coding: hog@2 {

		reg = <2>;

		fsl,pinmux-ids = <

			MX28_PAD_GPMI_D01__GPIO_0_1

			MX28_PAD_GPMI_D03__GPIO_0_3

			MX28_PAD_GPMI_D04__GPIO_0_4

			MX28_PAD_GPMI_D06__GPIO_0_6

			MX28_PAD_GPMI_D07__GPIO_0_7

		>;

		fsl,voltage = <MXS_VOLTAGE_HIGH>;

		fsl,pull-up = <MXS_PULL_DISABLE>;

	};

};



&reg_fec_3v3 {

	gpio = <&gpio0 0 0>;

};



&reg_usb_5v {

	gpio = <&gpio0 2 0>;

};



&spi2_pins_a {

	fsl,pinmux-ids = <

		MX28_PAD_SSP2_SCK__SSP2_SCK

		MX28_PAD_SSP2_MOSI__SSP2_CMD

		MX28_PAD_SSP2_MISO__SSP2_D0

		MX28_PAD_SSP2_SS0__GPIO_2_19

	>;

};

arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ &weim { 
	pinctrl-0 = <&pinctrl_weim>;

	status = "okay";



	lan9221: lan9221@5,0 {

	lan9221: ethernet@5,0 {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_lan9221>;

		compatible = "smsc,lan9221", "smsc,lan9115";