Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19f3af1d authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard
Browse files

ARM: dts: sun6i: Convert hummingbird a31 dts to label references 



Using label references is preferred when override settings from the
included dtsi.

Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent cd23e2e5

arch/arm/boot/dts/sun6i-a31-hummingbird.dts

+88 −93
Original line number Diff line number Diff line
@@ -61,72 +61,41 @@ 
	chosen {

		bootargs = "earlyprintk console=ttyS0,115200";

	};



	soc@01c00000 {

		mmc0: mmc@01c0f000 {

			pinctrl-names = "default";

			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>;

			vmmc-supply = <&reg_vcc3v0>;

			bus-width = <4>;

			cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */

			cd-inverted;

			status = "okay";

};



		usbphy: phy@01c19400 {

			usb1_vbus-supply = <&reg_usb1_vbus>;

&ehci0 {

	status = "okay";

};



		ehci0: usb@01c1a000 {

			status = "okay";

		};



		ohci0: usb@01c1a400 {

&gmac {

	pinctrl-names = "default";

	pinctrl-0 = <&gmac_pins_rgmii_a>;

	phy = <&phy1>;

	phy-mode = "rgmii";

	snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 30000>;

	status = "okay";

		};



		pio: pinctrl@01c20800 {

			mmc0_pins_a: mmc0@0 {

				/* external pull-ups missing for some pins */

				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

			};



			mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {

				allwinner,pins = "PA8";

				allwinner,function = "gpio_in";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

			};



			usb1_vbus_pin_a: usb1_vbus_pin@0 {

				allwinner,pins = "PH24";

				allwinner,function = "gpio_out";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

	phy1: ethernet-phy@1 {

		reg = <1>;

	};



		uart0: serial@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

			status = "okay";

};



		i2c0: i2c@01c2ac00 {

&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	/* pull-ups and devices require AXP221 DLDO3 */

	status = "failed";

};



		i2c1: i2c@01c2b000 {

&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins_a>;

	status = "okay";

};



		i2c2: i2c@01c2b400 {

&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";
@@ -137,25 +106,51 @@ 
	};

};



		gmac: ethernet@01c30000 {

&mmc0 {

	pinctrl-names = "default";

			pinctrl-0 = <&gmac_pins_rgmii_a>;

			phy = <&phy1>;

			phy-mode = "rgmii";

			snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;

			snps,reset-active-low;

			snps,reset-delays-us = <0 10000 30000>;

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>;

	vmmc-supply = <&reg_vcc3v0>;

	bus-width = <4>;

	cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */

	cd-inverted;

	status = "okay";

};



			phy1: ethernet-phy@1 {

				reg = <1>;

&mmc0_pins_a {

	/* external pull-ups missing for some pins */

	allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

};



&ohci0 {

	status = "okay";

};



&pio {

	mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {

		allwinner,pins = "PA8";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

	};

};



	reg_usb1_vbus: usb1-vbus {

		pinctrl-0 = <&usb1_vbus_pin_a>;

&reg_usb1_vbus {

	gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usb1_vbus_pin_a {

	/* different pin from sunxi-common-regulators */

	allwinner,pins = "PH24";

};



&usbphy {

	usb1_vbus-supply = <&reg_usb1_vbus>;

	status = "okay";

};