Commit 75a21ed9 authored by Stefan Wahren's avatar Stefan Wahren Committed by Shawn Guo
Browse files

ARM: dts: imx28-apf28: Convert to use label references 



These Armadeus board files still use node name and unit address
to reference parts from the imx28.dtsi . This causes a lot of
redundancy. So use label references in order to make it easier
to maintain.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Cc: <support@armadeus.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 615e841d

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

+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";

};
 
	};

};

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

+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";

};