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

Commit 581b19e5 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: sun7i: olinuxino micro: 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 6bd0027e
Loading
Loading
Loading
Loading
+181 −183
Original line number Diff line number Diff line
@@ -68,83 +68,73 @@
		spi1 = &spi2;
	};

	soc@01c00000 {
		spi1: spi@01c06000 {
	leds {
		compatible = "gpio-leds";
		pinctrl-names = "default";
			pinctrl-0 = <&spi1_pins_a>;
			status = "okay";
		};
		pinctrl-0 = <&led_pins_olinuxino>;

		mmc0: mmc@01c0f000 {
			pinctrl-names = "default";
			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
			vmmc-supply = <&reg_vcc3v3>;
			bus-width = <4>;
			cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
			cd-inverted;
			status = "okay";
		green {
			label = "a20-olinuxino-micro:green:usr";
			gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>;
			default-state = "on";
		};
	};

		mmc3: mmc@01c12000 {
			pinctrl-names = "default";
			pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>;
			vmmc-supply = <&reg_vcc3v3>;
			bus-width = <4>;
			cd-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */
			cd-inverted;
			status = "okay";
};

		usbphy: phy@01c13400 {
			usb1_vbus-supply = <&reg_usb1_vbus>;
			usb2_vbus-supply = <&reg_usb2_vbus>;
&ahci {
	target-supply = <&reg_ahci_5v>;
	status = "okay";
};

		ehci0: usb@01c14000 {
&ehci0 {
	status = "okay";
};

		ohci0: usb@01c14400 {
&ehci1 {
	status = "okay";
};

		spi2: spi@01c17000 {
&gmac {
	pinctrl-names = "default";
			pinctrl-0 = <&spi2_pins_a>;
	pinctrl-0 = <&gmac_pins_mii_a>;
	phy = <&phy1>;
	phy-mode = "mii";
	status = "okay";
		};

		ahci: sata@01c18000 {
			target-supply = <&reg_ahci_5v>;
			status = "okay";
	phy1: ethernet-phy@1 {
		reg = <1>;
	};

		ehci1: usb@01c1c000 {
			status = "okay";
};

		ohci1: usb@01c1c400 {
&i2c0 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c0_pins_a>;
	status = "okay";
		};

		pinctrl@01c20800 {
			mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
				allwinner,pins = "PH11";
				allwinner,function = "gpio_in";
				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
	axp209: pmic@34 {
		compatible = "x-powers,axp209";
		reg = <0x34>;
		interrupt-parent = <&nmi_intc>;
		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

		interrupt-controller;
		#interrupt-cells = <1>;
	};
};

			led_pins_olinuxino: led_pins@0 {
				allwinner,pins = "PH2";
				allwinner,function = "gpio_out";
				allwinner,drive = <SUN4I_PINCTRL_20_MA>;
				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
&i2c1 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c1_pins_a>;
	status = "okay";
};

&i2c2 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c2_pins_a>;
	status = "okay";
};

		lradc: lradc@01c22800 {
&lradc {
	vref-supply = <&reg_vcc3v0>;
	status = "okay";

@@ -198,86 +188,94 @@
	};
};

		uart0: serial@01c28000 {
&mmc0 {
	pinctrl-names = "default";
			pinctrl-0 = <&uart0_pins_a>;
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
	cd-inverted;
	status = "okay";
};

		uart6: serial@01c29800 {
&mmc3 {
	pinctrl-names = "default";
			pinctrl-0 = <&uart6_pins_a>;
	pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */
	cd-inverted;
	status = "okay";
};

		uart7: serial@01c29c00 {
			pinctrl-names = "default";
			pinctrl-0 = <&uart7_pins_a>;
&ohci0 {
	status = "okay";
};

		i2c0: i2c@01c2ac00 {
			pinctrl-names = "default";
			pinctrl-0 = <&i2c0_pins_a>;
&ohci1 {
	status = "okay";
};

			axp209: pmic@34 {
				compatible = "x-powers,axp209";
				reg = <0x34>;
				interrupt-parent = <&nmi_intc>;
				interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
&pio {
	mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
		allwinner,pins = "PH11";
		allwinner,function = "gpio_in";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
	};

				interrupt-controller;
				#interrupt-cells = <1>;
	led_pins_olinuxino: led_pins@0 {
		allwinner,pins = "PH2";
		allwinner,function = "gpio_out";
		allwinner,drive = <SUN4I_PINCTRL_20_MA>;
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	};
};

		i2c1: i2c@01c2b000 {
			pinctrl-names = "default";
			pinctrl-0 = <&i2c1_pins_a>;
&reg_ahci_5v {
	status = "okay";
};

		i2c2: i2c@01c2b400 {
			pinctrl-names = "default";
			pinctrl-0 = <&i2c2_pins_a>;
&reg_usb1_vbus {
	status = "okay";
};

		gmac: ethernet@01c50000 {
			pinctrl-names = "default";
			pinctrl-0 = <&gmac_pins_mii_a>;
			phy = <&phy1>;
			phy-mode = "mii";
&reg_usb2_vbus {
	status = "okay";

			phy1: ethernet-phy@1 {
				reg = <1>;
			};
		};
};

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

		green {
			label = "a20-olinuxino-micro:green:usr";
			gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>;
			default-state = "on";
	pinctrl-0 = <&spi1_pins_a>;
	status = "okay";
};

&spi2 {
	pinctrl-names = "default";
	pinctrl-0 = <&spi2_pins_a>;
	status = "okay";
};

	reg_ahci_5v: ahci-5v {
&uart0 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart0_pins_a>;
	status = "okay";
};

	reg_usb1_vbus: usb1-vbus {
&uart6 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart6_pins_a>;
	status = "okay";
};

	reg_usb2_vbus: usb2-vbus {
&uart7 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart7_pins_a>;
	status = "okay";
};

&usbphy {
	usb1_vbus-supply = <&reg_usb1_vbus>;
	usb2_vbus-supply = <&reg_usb2_vbus>;
	status = "okay";
};