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

Commit 9bb08254 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: sun7i: hummingbird: Convert to DT label based syntax 



In order to lessen the amount of duplication of the DT tree, ease the
new and follow the trend that prefers to use label based references
when overriding DTSI nodes, convert the board to this syntax

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 712a9fa2

arch/arm/boot/dts/sun7i-a20-hummingbird.dts

+191 −193
Original line number Diff line number Diff line
@@ -67,54 +67,127 @@ 
		serial4 = &uart5;

	};



	soc@01c00000 {

		mmc0: mmc@01c0f000 {

	reg_mmc3_vdd: mmc3_vdd {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

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

			vmmc-supply = <&reg_vcc3v0>;

			bus-width = <4>;

			cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

			cd-inverted;

		pinctrl-0 = <&mmc3_vdd_pin_a20_hummingbird>;

		regulator-name = "mmc3_vdd";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		enable-active-high;

		gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */

	};



	reg_gmac_vdd: gmac_vdd {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&gmac_vdd_pin_a20_hummingbird>;

		regulator-name = "gmac_vdd";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		enable-active-high;

		gpio = <&pio 7 16 GPIO_ACTIVE_HIGH>; /* PH16 */

	};

};



&ahci {

	target-supply = <&reg_ahci_5v>;

	status = "okay";

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



		mmc3: mmc@01c12000 {

&gmac {

	pinctrl-names = "default";

			pinctrl-0 = <&mmc3_pins_a>;

			vmmc-supply = <&reg_mmc3_vdd>;

			bus-width = <4>;

			non-removable;

	pinctrl-0 = <&gmac_pins_rgmii_a>;

	phy = <&phy1>;

	phy-mode = "rgmii";

	phy-supply = <&reg_gmac_vdd>;

	/* phy reset config */

	snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */

	snps,reset-active-low;

	/* wait 1s after reset, otherwise fail to read phy id */

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

	status = "okay";



	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};



		usbphy: phy@01c13400 {

			usb1_vbus-supply = <&reg_usb1_vbus>;

			usb2_vbus-supply = <&reg_usb2_vbus>;

&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";



	axp209: pmic@34 {

		compatible = "x-powers,axp209";

		reg = <0x34>;

		interrupt-parent = <&nmi_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

		interrupt-controller;

		#interrupt-cells = <1>;

	};

};



		ehci0: usb@01c14000 {

&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins_a>;

	status = "okay";

};



		ohci0: usb@01c14400 {

&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";

};



		ahci: sata@01c18000 {

			target-supply = <&reg_ahci_5v>;

&i2c3 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c3_pins_a>;

	status = "okay";

};



		ehci1: usb@01c1c000 {

&ir0 {

	pinctrl-names = "default";

	pinctrl-0 = <&ir0_pins_a>;

	status = "okay";

};



		ohci1: usb@01c1c400 {

&mmc0 {

	pinctrl-names = "default";

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

	vmmc-supply = <&reg_vcc3v0>;

	bus-width = <4>;

	cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

	cd-inverted;

	status = "okay";

};



		pio: pinctrl@01c20800 {

&mmc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins_a>;

	vmmc-supply = <&reg_mmc3_vdd>;

	bus-width = <4>;

	non-removable;

	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&pio {

	ahci_pwr_pin_a20_hummingbird: ahci_pwr_pin@0 {

		allwinner,pins = "PH15";

		allwinner,function = "gpio_out";
@@ -144,141 +217,66 @@ 
	};

};



		pwm: pwm@01c20e00 {

&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_pins_a>;

	status = "okay";

};



		ir0: ir@01c21800 {

			pinctrl-names = "default";

			pinctrl-0 = <&ir0_pins_a>;

			status = "okay";

		};



		uart0: serial@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

			status = "okay";

		};



		uart2: serial@01c28800 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart2_pins_a>;

			status = "okay";

		};



		uart3: serial@01c28c00 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart3_pins_a>;

&reg_ahci_5v {

	pinctrl-0 = <&ahci_pwr_pin_a20_hummingbird>;

	gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */

	status = "okay";

};



		uart4: serial@01c29000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart4_pins_a>;

&reg_usb1_vbus {

	pinctrl-0 = <&usb1_vbus_pin_a20_hummingbird>;

	gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */

	status = "okay";

};



		uart5: serial@01c29400 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart5_pins_a>;

&reg_usb2_vbus {

	status = "okay";

};



		i2c0: i2c@01c2ac00 {

&spi2 {

	pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins_a>;

	pinctrl-0 = <&spi2_pins_b>;

	status = "okay";



			axp209: pmic@34 {

				compatible = "x-powers,axp209";

				reg = <0x34>;

				interrupt-parent = <&nmi_intc>;

				interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

				interrupt-controller;

				#interrupt-cells = <1>;

			};

};



		i2c1: i2c@01c2b000 {

&uart0 {

	pinctrl-names = "default";

			pinctrl-0 = <&i2c1_pins_a>;

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



		i2c2: i2c@01c2b400 {

&uart2 {

	pinctrl-names = "default";

			pinctrl-0 = <&i2c2_pins_a>;

	pinctrl-0 = <&uart2_pins_a>;

	status = "okay";

};



		i2c3: i2c@01c2b800 {

&uart3 {

	pinctrl-names = "default";

			pinctrl-0 = <&i2c3_pins_a>;

	pinctrl-0 = <&uart3_pins_a>;

	status = "okay";

};



		spi2: spi@01c17000 {

&uart4 {

	pinctrl-names = "default";

			pinctrl-0 = <&spi2_pins_b>;

	pinctrl-0 = <&uart4_pins_a>;

	status = "okay";

};



		gmac: ethernet@01c50000 {

&uart5 {

	pinctrl-names = "default";

			pinctrl-0 = <&gmac_pins_rgmii_a>;

			phy = <&phy1>;

			phy-mode = "rgmii";

			phy-supply = <&reg_gmac_vdd>;

			/* phy reset config */

			snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */

			snps,reset-active-low;

			/* wait 1s after reset, otherwise fail to read phy id */

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

			status = "okay";



			phy1: ethernet-phy@1 {

				reg = <1>;

			};

		};

	};



	reg_ahci_5v: ahci-5v {

		pinctrl-0 = <&ahci_pwr_pin_a20_hummingbird>;

		gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */

		status = "okay";

	};



	reg_usb1_vbus: usb1-vbus {

		pinctrl-0 = <&usb1_vbus_pin_a20_hummingbird>;

		gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */

	pinctrl-0 = <&uart5_pins_a>;

	status = "okay";

};



	reg_usb2_vbus: usb2-vbus {

&usbphy {

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};
 


	reg_mmc3_vdd: mmc3_vdd {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&mmc3_vdd_pin_a20_hummingbird>;

		regulator-name = "mmc3_vdd";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		enable-active-high;

		gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */

	};



	reg_gmac_vdd: gmac_vdd {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&gmac_vdd_pin_a20_hummingbird>;

		regulator-name = "gmac_vdd";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		enable-active-high;

		gpio = <&pio 7 16 GPIO_ACTIVE_HIGH>; /* PH16 */

	};

};