Unverified Commit 0efb9fa0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

i.MX arm32 device tree changes for 6.4:

- New board device trees: Tolino Vison, chargebyte Tarragon,
  new revision of the IOTA board.
- A couple of imx7d-remarkable2 update to enable cyttsp5 touch and
  BD71815 PMIC.
- A series from Oleksij Rempel to configure Ethernet reference clock
  from device tree.
- A series from Stefan Wahren to use label references for i.MX28 based
  boards.

* tag 'imx-dt-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

: (31 commits)
  ARM: dts: imx6ull: Add chargebyte Tarragon support
  ARM: dts: imx: Add devicetree for Tolino Vison
  ARM: dts: imx6dl-yapp43: Add support for new HW revision of the IOTA board
  ARM: dts: imx6dl-yapp4: Remove unneeded status "okay"
  ARM: dts: imx6dl-yapp4: Move status to the end of property list
  ARM: dts: imx6dl-yapp4: Move phy reset into switch node
  ARM: dts: imx28-tx28: add SPDX-License-Identifier
  ARM: dts: imx28-ts4600: Convert to use label references
  ARM: dts: imx28-evk: Convert to use label references
  ARM: dts: imx28-duckbill-2: Include base board
  ARM: dts: imx28-duckbill: Convert to use label references
  ARM: dts: imx28-cfa10036: Convert to use label references
  ARM: dts: imx28-apx4devkit: Convert to use label references
  ARM: dts: imx28-m28/sps1: Convert to use label references
  ARM: dts: imx28-apf28: Convert to use label references
  ARM: dts: imx7d-remarkable2: Enable the rohm,bd71815
  ARM: dts: imx7d-remarkable2: Enable the cyttsp5
  ARM: dts: imx6dl-yapp4: Use reset-gpios property name
  ARM: dts: imx6ul-prti6g: configure ethernet reference clock parent
  ARM: dts: imx6ul: set enet_clk_ref to CLK_ENETx_REF_SEL
  ...

Link: https://lore.kernel.org/r/20230408101928.280271-4-shawnguo@kernel.org
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 86724b74 5e4f393c
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -561,7 +561,9 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
	imx6dl-wandboard-revd1.dtb \
	imx6dl-yapp4-draco.dtb \
	imx6dl-yapp4-hydra.dtb \
	imx6dl-yapp4-lynx.dtb \
	imx6dl-yapp4-orion.dtb \
	imx6dl-yapp4-phoenix.dtb \
	imx6dl-yapp4-ursa.dtb \
	imx6q-apalis-eval.dtb \
	imx6q-apalis-ixora.dtb \
@@ -668,6 +670,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
	imx6q-wandboard-revb1.dtb \
	imx6q-wandboard-revd1.dtb \
	imx6q-yapp4-crux.dtb \
	imx6q-yapp4-pegasus.dtb \
	imx6q-zii-rdu2.dtb \
	imx6qp-mba6b.dtb \
	imx6qp-nitrogen6_max.dtb \
@@ -683,6 +686,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
	imx6qp-vicutp.dtb \
	imx6qp-wandboard-revd1.dtb \
	imx6qp-yapp4-crux-plus.dtb \
	imx6qp-yapp4-pegasus-plus.dtb \
	imx6qp-zii-rdu2.dtb \
	imx6s-dhcom-drc02.dtb
dtb-$(CONFIG_SOC_IMX6SL) += \
@@ -690,6 +694,7 @@ dtb-$(CONFIG_SOC_IMX6SL) += \
	imx6sl-kobo-aura2.dtb \
	imx6sl-tolino-shine2hd.dtb \
	imx6sl-tolino-shine3.dtb \
	imx6sl-tolino-vision.dtb \
	imx6sl-tolino-vision5.dtb \
	imx6sl-warp.dtb
dtb-$(CONFIG_SOC_IMX6SLL) += \
@@ -755,6 +760,10 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
	imx6ull-phytec-segin-lc-rdk-nand.dtb \
	imx6ull-phytec-tauri-emmc.dtb \
	imx6ull-phytec-tauri-nand.dtb \
	imx6ull-tarragon-master.dtb \
	imx6ull-tarragon-micro.dtb \
	imx6ull-tarragon-slave.dtb \
	imx6ull-tarragon-slavext.dtb \
	imx6ull-tqma6ull2-mba6ulx.dtb \
	imx6ull-tqma6ull2l-mba6ulx.dtb \
	imx6ulz-14x14-evk.dtb \
+44 −52
Original line number Diff line number Diff line
@@ -14,10 +14,15 @@ memory@40000000 {
		device_type = "memory";
		reg = <0x40000000 0x08000000>;
	};
};

&duart {
	pinctrl-names = "default";
	pinctrl-0 = <&duart_pins_a>;
	status = "okay";
};

	apb@80000000 {
		apbh@80000000 {
			nand-controller@8000c000 {
&gpmi {
	pinctrl-names = "default";
	pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
	status = "okay";
@@ -57,24 +62,11 @@ partition@d00000 {
		reg = <0xd00000 0xf300000>;
	};
};
		};

		apbx@80040000 {
			duart: serial@80074000 {
				pinctrl-names = "default";
				pinctrl-0 = <&duart_pins_a>;
				status = "okay";
			};
		};
	};

	ahb@80080000 {
		mac0: ethernet@800f0000 {
&mac0 {
	phy-mode = "rmii";
	pinctrl-names = "default";
	pinctrl-0 = <&mac0_pins_a>;
	phy-reset-gpios = <&gpio4 13 GPIO_ACTIVE_LOW>;
	status = "okay";
};
	};
};
+152 −160
Original line number Diff line number Diff line
@@ -10,70 +10,81 @@ / {
	model = "Armadeus Systems APF28Dev docking/development board";
	compatible = "armadeus,imx28-apf28dev", "armadeus,imx28-apf28", "fsl,imx28";

	apb@80000000 {
		apbh@80000000 {
			ssp0: spi@80010000 {
				compatible = "fsl,imx28-mmc";
				pinctrl-names = "default";
				pinctrl-0 = <&mmc0_4bit_pins_a
					&mmc0_cd_cfg &mmc0_sck_cfg>;
				bus-width = <4>;
				status = "okay";
	regulators {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <0>;

		reg_usb0_vbus: regulator@0 {
			compatible = "regulator-fixed";
			reg = <0>;
			regulator-name = "usb0_vbus";
			regulator-min-microvolt = <5000000>;
			regulator-max-microvolt = <5000000>;
			gpio = <&gpio1 23 1>;
			enable-active-high;
		};

			ssp2: spi@80014000 {
				compatible = "fsl,imx28-spi";
				pinctrl-names = "default";
				pinctrl-0 = <&spi2_pins_a>;
				status = "okay";
		reg_can0_vcc: regulator@1 {
			compatible = "regulator-fixed";
			reg = <1>;
			regulator-name = "can0_vcc";
			regulator-min-microvolt = <5000000>;
			regulator-max-microvolt = <5000000>;
		};
	};

			pinctrl@80018000 {
				pinctrl-names = "default";
				pinctrl-0 = <&hog_pins_apf28dev>;
	leds {
		compatible = "gpio-leds";

				hog_pins_apf28dev: hog@0 {
					reg = <0>;
					fsl,pinmux-ids = <
						MX28_PAD_LCD_D16__GPIO_1_16
						MX28_PAD_LCD_D17__GPIO_1_17
						MX28_PAD_LCD_D18__GPIO_1_18
						MX28_PAD_LCD_D19__GPIO_1_19
						MX28_PAD_LCD_D20__GPIO_1_20
						MX28_PAD_LCD_D21__GPIO_1_21
						MX28_PAD_LCD_D22__GPIO_1_22
						MX28_PAD_GPMI_CE1N__GPIO_0_17
					>;
					fsl,drive-strength = <MXS_DRIVE_4mA>;
					fsl,voltage = <MXS_VOLTAGE_HIGH>;
					fsl,pull-up = <MXS_PULL_DISABLE>;
		user {
			label = "Heartbeat";
			gpios = <&gpio0 21 0>;
			linux,default-trigger = "heartbeat";
		};
	};

				lcdif_pins_apf28dev: lcdif-apf28dev@0 {
					reg = <0>;
					fsl,pinmux-ids = <
						MX28_PAD_LCD_RD_E__LCD_VSYNC
						MX28_PAD_LCD_WR_RWN__LCD_HSYNC
						MX28_PAD_LCD_RS__LCD_DOTCLK
						MX28_PAD_LCD_CS__LCD_ENABLE
					>;
					fsl,drive-strength = <MXS_DRIVE_4mA>;
					fsl,voltage = <MXS_VOLTAGE_HIGH>;
					fsl,pull-up = <MXS_PULL_DISABLE>;
	backlight {
		compatible = "pwm-backlight";

		pwms = <&pwm 3 191000>;
		brightness-levels = <0 4 8 16 32 64 128 255>;
		default-brightness-level = <6>;
	};

				usb0_otg_apf28dev: otg-apf28dev@0 {
					reg = <0>;
					fsl,pinmux-ids = <
						MX28_PAD_LCD_D23__GPIO_1_23
					>;
					fsl,drive-strength = <MXS_DRIVE_4mA>;
					fsl,voltage = <MXS_VOLTAGE_HIGH>;
					fsl,pull-up = <MXS_PULL_DISABLE>;
	gpio-keys {
		compatible = "gpio-keys";

		user-button {
			label = "User button";
			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
			linux,code = <0x100>;
			wakeup-source;
		};
	};
};

&auart0 {
	pinctrl-names = "default";
	pinctrl-0 = <&auart0_pins_a>;
	uart-has-rtscts;
	status = "okay";
};

&can0 {
	pinctrl-names = "default";
	pinctrl-0 = <&can0_pins_a>;
	xceiver-supply = <&reg_can0_vcc>;
	status = "okay";
};

&i2c0 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c0_pins_a>;
	status = "okay";
};

			lcdif@80030000 {
&lcdif {
	pinctrl-names = "default";
	pinctrl-0 = <&lcdif_16bit_pins_a
		     &lcdif_pins_apf28dev>;
@@ -105,121 +116,102 @@ timing0: timing0 {
	};
};

			can0: can@80032000 {
				pinctrl-names = "default";
				pinctrl-0 = <&can0_pins_a>;
				xceiver-supply = <&reg_can0_vcc>;
				status = "okay";
			};
		};

		apbx@80040000 {
			lradc@80050000 {
&lradc {
	fsl,lradc-touchscreen-wires = <4>;
	status = "okay";
};

			i2c0: i2c@80058000 {
&mac1 {
	phy-mode = "rmii";
	pinctrl-names = "default";
				pinctrl-0 = <&i2c0_pins_a>;
	pinctrl-0 = <&mac1_pins_a>;
	phy-reset-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
	status = "okay";
};

			pwm: pwm@80064000 {
&pinctrl {
	pinctrl-names = "default";
				pinctrl-0 = <&pwm3_pins_a &pwm4_pins_a>;
				status = "okay";
			};
	pinctrl-0 = <&hog_pins_apf28dev>;

			auart0: serial@8006a000 {
				pinctrl-names = "default";
				pinctrl-0 = <&auart0_pins_a>;
				uart-has-rtscts;
				status = "okay";
	hog_pins_apf28dev: hog@0 {
		reg = <0>;
		fsl,pinmux-ids = <
			MX28_PAD_LCD_D16__GPIO_1_16
			MX28_PAD_LCD_D17__GPIO_1_17
			MX28_PAD_LCD_D18__GPIO_1_18
			MX28_PAD_LCD_D19__GPIO_1_19
			MX28_PAD_LCD_D20__GPIO_1_20
			MX28_PAD_LCD_D21__GPIO_1_21
			MX28_PAD_LCD_D22__GPIO_1_22
			MX28_PAD_GPMI_CE1N__GPIO_0_17
		>;
		fsl,drive-strength = <MXS_DRIVE_4mA>;
		fsl,voltage = <MXS_VOLTAGE_HIGH>;
		fsl,pull-up = <MXS_PULL_DISABLE>;
	};

			usbphy0: usbphy@8007c000 {
				status = "okay";
	lcdif_pins_apf28dev: lcdif-apf28dev@0 {
		reg = <0>;
		fsl,pinmux-ids = <
			MX28_PAD_LCD_RD_E__LCD_VSYNC
			MX28_PAD_LCD_WR_RWN__LCD_HSYNC
			MX28_PAD_LCD_RS__LCD_DOTCLK
			MX28_PAD_LCD_CS__LCD_ENABLE
		>;
		fsl,drive-strength = <MXS_DRIVE_4mA>;
		fsl,voltage = <MXS_VOLTAGE_HIGH>;
		fsl,pull-up = <MXS_PULL_DISABLE>;
	};

			usbphy1: usbphy@8007e000 {
				status = "okay";
			};
	usb0_otg_apf28dev: otg-apf28dev@0 {
		reg = <0>;
		fsl,pinmux-ids = <
			MX28_PAD_LCD_D23__GPIO_1_23
		>;
		fsl,drive-strength = <MXS_DRIVE_4mA>;
		fsl,voltage = <MXS_VOLTAGE_HIGH>;
		fsl,pull-up = <MXS_PULL_DISABLE>;
	};
};

	ahb@80080000 {
		usb0: usb@80080000 {
&pwm {
	pinctrl-names = "default";
			pinctrl-0 = <&usb0_otg_apf28dev
					&usb0_id_pins_b>;
			vbus-supply = <&reg_usb0_vbus>;
	pinctrl-0 = <&pwm3_pins_a &pwm4_pins_a>;
	status = "okay";
};

		usb1: usb@80090000 {
&ssp0 {
	compatible = "fsl,imx28-mmc";
	pinctrl-names = "default";
	pinctrl-0 = <&mmc0_4bit_pins_a
		     &mmc0_cd_cfg &mmc0_sck_cfg>;
	bus-width = <4>;
	status = "okay";
};

		mac1: ethernet@800f4000 {
			phy-mode = "rmii";
&ssp2 {
	compatible = "fsl,imx28-spi";
	pinctrl-names = "default";
			pinctrl-0 = <&mac1_pins_a>;
			phy-reset-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
	pinctrl-0 = <&spi2_pins_a>;
	status = "okay";
};
	};

	regulators {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <0>;

		reg_usb0_vbus: regulator@0 {
			compatible = "regulator-fixed";
			reg = <0>;
			regulator-name = "usb0_vbus";
			regulator-min-microvolt = <5000000>;
			regulator-max-microvolt = <5000000>;
			gpio = <&gpio1 23 1>;
			enable-active-high;
		};

		reg_can0_vcc: regulator@1 {
			compatible = "regulator-fixed";
			reg = <1>;
			regulator-name = "can0_vcc";
			regulator-min-microvolt = <5000000>;
			regulator-max-microvolt = <5000000>;
		};
&usb0 {
	pinctrl-names = "default";
	pinctrl-0 = <&usb0_otg_apf28dev
		     &usb0_id_pins_b>;
	vbus-supply = <&reg_usb0_vbus>;
	status = "okay";
};

	leds {
		compatible = "gpio-leds";

		user {
			label = "Heartbeat";
			gpios = <&gpio0 21 0>;
			linux,default-trigger = "heartbeat";
		};
&usb1 {
	status = "okay";
};

	backlight {
		compatible = "pwm-backlight";

		pwms = <&pwm 3 191000>;
		brightness-levels = <0 4 8 16 32 64 128 255>;
		default-brightness-level = <6>;
&usbphy0 {
	status = "okay";
};

	gpio-keys {
		compatible = "gpio-keys";

		user-button {
			label = "User button";
			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
			linux,code = <0x100>;
			wakeup-source;
		};
	};
&usbphy1 {
	status = "okay";
};
+186 −194
Original line number Diff line number Diff line
@@ -11,31 +11,130 @@ memory@40000000 {
		reg = <0x40000000 0x04000000>;
	};

	apb@80000000 {
		apbh@80000000 {
			nand-controller@8000c000 {
	regulators {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <0>;

		reg_3p3v: regulator@0 {
			compatible = "regulator-fixed";
			reg = <0>;
			regulator-name = "3P3V";
			regulator-min-microvolt = <3300000>;
			regulator-max-microvolt = <3300000>;
			regulator-always-on;
		};
	};

	sound {
		compatible = "bluegiga,apx4devkit-sgtl5000",
			     "fsl,mxs-audio-sgtl5000";
		model = "apx4devkit-sgtl5000";
		saif-controllers = <&saif0 &saif1>;
		audio-codec = <&sgtl5000>;
	};

	leds {
		compatible = "gpio-leds";

		user {
			label = "Heartbeat";
			gpios = <&gpio3 28 0>;
			linux,default-trigger = "heartbeat";
		};
	};
};

&auart0 {
	pinctrl-names = "default";
	pinctrl-0 = <&auart0_pins_a>;
	status = "okay";
};

&auart1 {
	pinctrl-names = "default";
	pinctrl-0 = <&auart1_2pins_a>;
	status = "okay";
};

&auart2 {
	pinctrl-names = "default";
	pinctrl-0 = <&auart2_2pins_a>;
	status = "okay";
};

&duart {
	pinctrl-names = "default";
	pinctrl-0 = <&duart_pins_a>;
	status = "okay";
};

&gpmi {
	pinctrl-names = "default";
	pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
	status = "okay";
};

			ssp0: spi@80010000 {
				compatible = "fsl,imx28-mmc";
&lcdif {
	pinctrl-names = "default";
				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>;
				bus-width = <4>;
	pinctrl-0 = <&lcdif_24bit_pins_a
		     &lcdif_pins_apx4>;
	display = <&display0>;
	status = "okay";

	display0: display0 {
		bits-per-pixel = <32>;
		bus-width = <24>;

		display-timings {
			native-mode = <&timing0>;
			timing0: timing0 {
				clock-frequency = <30000000>;
				hactive = <800>;
				vactive = <480>;
				hback-porch = <88>;
				hfront-porch = <40>;
				vback-porch = <32>;
				vfront-porch = <13>;
				hsync-len = <48>;
				vsync-len = <3>;
				hsync-active = <1>;
				vsync-active = <1>;
				de-active = <1>;
				pixelclk-active = <0>;
			};
		};
	};
};

			ssp2: spi@80014000 {
				compatible = "fsl,imx28-mmc";
&i2c0 {
	pinctrl-names = "default";
				pinctrl-0 = <&mmc2_4bit_pins_apx4 &mmc2_sck_cfg_apx4>;
				bus-width = <4>;
	pinctrl-0 = <&i2c0_pins_a>;
	status = "okay";

	sgtl5000: codec@a {
		compatible = "fsl,sgtl5000";
		reg = <0x0a>;
		#sound-dai-cells = <0>;
		VDDA-supply = <&reg_3p3v>;
		VDDIO-supply = <&reg_3p3v>;
		clocks = <&saif0>;
	};

			pinctrl@80018000 {
	pcf8563: rtc@51 {
		compatible = "phg,pcf8563";
		reg = <0x51>;
	};
};

&mac0 {
	phy-mode = "rmii";
	pinctrl-names = "default";
	pinctrl-0 = <&mac0_pins_a>;
	status = "okay";
};

&pinctrl {
	pinctrl-names = "default";
	pinctrl-0 = <&hog_pins_a>;

@@ -93,148 +192,41 @@ MX28_PAD_SSP0_DATA7__SSP2_SCK
	};
};

			lcdif@80030000 {
				pinctrl-names = "default";
				pinctrl-0 = <&lcdif_24bit_pins_a
					     &lcdif_pins_apx4>;
				display = <&display0>;
				status = "okay";

				display0: display0 {
					bits-per-pixel = <32>;
					bus-width = <24>;

					display-timings {
						native-mode = <&timing0>;
						timing0: timing0 {
							clock-frequency = <30000000>;
							hactive = <800>;
							vactive = <480>;
							hback-porch = <88>;
							hfront-porch = <40>;
							vback-porch = <32>;
							vfront-porch = <13>;
							hsync-len = <48>;
							vsync-len = <3>;
							hsync-active = <1>;
							vsync-active = <1>;
							de-active = <1>;
							pixelclk-active = <0>;
						};
					};
				};
			};
		};

		apbx@80040000 {
			saif0: saif@80042000 {
&saif0 {
	pinctrl-names = "default";
	pinctrl-0 = <&saif0_pins_a>;
	status = "okay";
};

			saif1: saif@80046000 {
&saif1 {
	pinctrl-names = "default";
	pinctrl-0 = <&saif1_pins_a>;
	fsl,saif-master = <&saif0>;
	status = "okay";
};

			i2c0: i2c@80058000 {
				pinctrl-names = "default";
				pinctrl-0 = <&i2c0_pins_a>;
				status = "okay";

				sgtl5000: codec@a {
					compatible = "fsl,sgtl5000";
					reg = <0x0a>;
					#sound-dai-cells = <0>;
					VDDA-supply = <&reg_3p3v>;
					VDDIO-supply = <&reg_3p3v>;
					clocks = <&saif0>;
				};

				pcf8563: rtc@51 {
					compatible = "phg,pcf8563";
					reg = <0x51>;
				};
			};

			duart: serial@80074000 {
				pinctrl-names = "default";
				pinctrl-0 = <&duart_pins_a>;
				status = "okay";
			};

			auart0: serial@8006a000 {
&ssp0 {
	compatible = "fsl,imx28-mmc";
	pinctrl-names = "default";
				pinctrl-0 = <&auart0_pins_a>;
	pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>;
	bus-width = <4>;
	status = "okay";
};

			auart1: serial@8006c000 {
&ssp2 {
	compatible = "fsl,imx28-mmc";
	pinctrl-names = "default";
				pinctrl-0 = <&auart1_2pins_a>;
	pinctrl-0 = <&mmc2_4bit_pins_apx4 &mmc2_sck_cfg_apx4>;
	bus-width = <4>;
	status = "okay";
};

			auart2: serial@8006e000 {
				pinctrl-names = "default";
				pinctrl-0 = <&auart2_2pins_a>;
&usb1 {
      status = "okay";
};

			usbphy1: usbphy@8007e000 {
&usbphy1 {
	pinctrl-names = "default";
	pinctrl-0 = <&usb1_pins_a>;
	status = "okay";
};
		};
	};

	ahb@80080000 {
		usb1: usb@80090000 {
		      status = "okay";
		};

		mac0: ethernet@800f0000 {
			phy-mode = "rmii";
			pinctrl-names = "default";
			pinctrl-0 = <&mac0_pins_a>;
			status = "okay";
		};
	};

	regulators {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <0>;

		reg_3p3v: regulator@0 {
			compatible = "regulator-fixed";
			reg = <0>;
			regulator-name = "3P3V";
			regulator-min-microvolt = <3300000>;
			regulator-max-microvolt = <3300000>;
			regulator-always-on;
		};
	};

	sound {
		compatible = "bluegiga,apx4devkit-sgtl5000",
			     "fsl,mxs-audio-sgtl5000";
		model = "apx4devkit-sgtl5000";
		saif-controllers = <&saif0 &saif1>;
		audio-codec = <&sgtl5000>;
	};

	leds {
		compatible = "gpio-leds";

		user {
			label = "Heartbeat";
			gpios = <&gpio3 28 0>;
			linux,default-trigger = "heartbeat";
		};
	};
};
+92 −101
Original line number Diff line number Diff line
@@ -16,9 +16,56 @@ memory@40000000 {
		reg = <0x40000000 0x08000000>;
	};

	apb@80000000 {
		apbh@80000000 {
			pinctrl@80018000 {
	leds {
		compatible = "gpio-leds";
		pinctrl-names = "default";
		pinctrl-0 = <&led_pins_cfa10036>;

		power {
			gpios = <&gpio3 4 1>;
			default-state = "on";
		};
	};

	reg_vddio_sd0: vddio-sd0 {
		compatible = "regulator-fixed";
		pinctrl-names = "default";
		pinctrl-0 = <&mmc_pwr_cfa10036>;
		regulator-name = "vddio-sd0";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		gpio = <&gpio3 28 0>;
	};
};

&duart {
	pinctrl-names = "default";
	pinctrl-0 = <&duart_pins_b>;
	status = "okay";
};

&i2c0 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c0_pins_b>;
	clock-frequency = <400000>;
	status = "okay";

	ssd1306: oled@3c {
		compatible = "solomon,ssd1306fb-i2c";
		pinctrl-names = "default";
		pinctrl-0 = <&ssd1306_cfa10036>;
		reg = <0x3c>;
		reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
		solomon,height = <32>;
		solomon,width = <128>;
		solomon,page-offset = <0>;
		solomon,com-lrremap;
		solomon,com-invdir;
		solomon,com-offset = <32>;
	};
};

&pinctrl {
	ssd1306_cfa10036: ssd1306-10036@0 {
		reg = <0>;
		fsl,pinmux-ids = <
@@ -59,10 +106,9 @@ MX28_PAD_PWM3__GPIO_3_28 */
		fsl,voltage = <1>;
		fsl,pull-up = <0>;
	};

};

			ssp0: spi@80010000 {
&ssp0 {
	compatible = "fsl,imx28-mmc";
	pinctrl-names = "default";
	pinctrl-0 = <&mmc0_4bit_pins_a
@@ -71,70 +117,15 @@ ssp0: spi@80010000 {
	bus-width = <4>;
	status = "okay";
};
		};

		apbx@80040000 {
			duart: serial@80074000 {
				pinctrl-names = "default";
				pinctrl-0 = <&duart_pins_b>;
				status = "okay";
			};

			i2c0: i2c@80058000 {
				pinctrl-names = "default";
				pinctrl-0 = <&i2c0_pins_b>;
				clock-frequency = <400000>;
				status = "okay";

				ssd1306: oled@3c {
					compatible = "solomon,ssd1306fb-i2c";
					pinctrl-names = "default";
					pinctrl-0 = <&ssd1306_cfa10036>;
					reg = <0x3c>;
					reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
					solomon,height = <32>;
					solomon,width = <128>;
					solomon,page-offset = <0>;
					solomon,com-lrremap;
					solomon,com-invdir;
					solomon,com-offset = <32>;
				};
			};

			usbphy0: usbphy@8007c000 {
				status = "okay";
			};
		};
	};

	ahb@80080000 {
		usb0: usb@80080000 {
&usb0 {
	pinctrl-names = "default";
	pinctrl-0 = <&usb0_otg_cfa10036>;
	dr_mode = "peripheral";
	phy_type = "utmi";
	status = "okay";
};
	};

	leds {
		compatible = "gpio-leds";
		pinctrl-names = "default";
		pinctrl-0 = <&led_pins_cfa10036>;

		power {
			gpios = <&gpio3 4 1>;
			default-state = "on";
		};
	};

	reg_vddio_sd0: vddio-sd0 {
		compatible = "regulator-fixed";
		pinctrl-names = "default";
		pinctrl-0 = <&mmc_pwr_cfa10036>;
		regulator-name = "vddio-sd0";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		gpio = <&gpio3 28 0>;
	};
&usbphy0 {
	status = "okay";
};
Loading