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

Commit b96b3b22 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: sun5i: a10s: 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 5e877369
Loading
Loading
Loading
Loading
+157 −158
Original line number Diff line number Diff line
@@ -65,86 +65,56 @@
		serial2 = &uart3;
	};

	soc@01c00000 {
		emac: ethernet@01c0b000 {
	leds {
		compatible = "gpio-leds";
		pinctrl-names = "default";
			pinctrl-0 = <&emac_pins_a>;
			phy = <&phy1>;
			status = "okay";
		};

		mdio@01c0b080 {
			status = "okay";
		pinctrl-0 = <&led_pins_olinuxino>;

			phy1: ethernet-phy@1 {
				reg = <1>;
		green {
			label = "a10s-olinuxino-micro:green:usr";
			gpios = <&pio 4 3 GPIO_ACTIVE_HIGH>;
			default-state = "on";
		};
	};

		mmc0: mmc@01c0f000 {
			pinctrl-names = "default";
			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
			vmmc-supply = <&reg_vcc3v3>;
			bus-width = <4>;
			cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
			cd-inverted;
			status = "okay";
};

		mmc1: mmc@01c10000 {
			pinctrl-names = "default";
			pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
			vmmc-supply = <&reg_vcc3v3>;
			bus-width = <4>;
			cd-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
			cd-inverted;
&ehci0 {
	status = "okay";
};

		usbphy: phy@01c13400 {
			usb1_vbus-supply = <&reg_usb1_vbus>;
&emac {
	pinctrl-names = "default";
	pinctrl-0 = <&emac_pins_a>;
	phy = <&phy1>;
	status = "okay";
};

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

		ohci0: usb@01c14400 {
&i2c1 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c1_pins_a>;
	status = "okay";
		};

		pinctrl@01c20800 {
			mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {
				allwinner,pins = "PG1";
				allwinner,function = "gpio_in";
				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
	at24@50 {
		compatible = "at,24c16";
		pagesize = <16>;
		reg = <0x50>;
		read-only;
	};

			mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
				allwinner,pins = "PG13";
				allwinner,function = "gpio_in";
				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
};

			led_pins_olinuxino: led_pins@0 {
				allwinner,pins = "PE3";
				allwinner,function = "gpio_out";
				allwinner,drive = <SUN4I_PINCTRL_20_MA>;
				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
			};

			usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 {
				allwinner,pins = "PB10";
				allwinner,function = "gpio_out";
				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
			};
&i2c2 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c2_pins_a>;
	status = "okay";
};

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

@@ -184,65 +154,94 @@
	};
};

		uart0: serial@01c28000 {
			pinctrl-names = "default";
			pinctrl-0 = <&uart0_pins_a>;
&mdio {
	status = "okay";

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

		uart2: serial@01c28800 {
&mmc0 {
	pinctrl-names = "default";
			pinctrl-0 = <&uart2_pins_a>;
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
	cd-inverted;
	status = "okay";
};

		uart3: serial@01c28c00 {
&mmc1 {
	pinctrl-names = "default";
			pinctrl-0 = <&uart3_pins_a>;
	pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
	cd-inverted;
	status = "okay";
};

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

		i2c1: i2c@01c2b000 {
			pinctrl-names = "default";
			pinctrl-0 = <&i2c1_pins_a>;
			status = "okay";
&pio {
	mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {
		allwinner,pins = "PG1";
		allwinner,function = "gpio_in";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
	};

			at24@50 {
				compatible = "at,24c16";
				pagesize = <16>;
				reg = <0x50>;
				read-only;
	mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
		allwinner,pins = "PG13";
		allwinner,function = "gpio_in";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
	};

	led_pins_olinuxino: led_pins@0 {
		allwinner,pins = "PE3";
		allwinner,function = "gpio_out";
		allwinner,drive = <SUN4I_PINCTRL_20_MA>;
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	};

		i2c2: i2c@01c2b400 {
			pinctrl-names = "default";
			pinctrl-0 = <&i2c2_pins_a>;
			status = "okay";
	usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 {
		allwinner,pins = "PB10";
		allwinner,function = "gpio_out";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	};
};

	leds {
		compatible = "gpio-leds";
		pinctrl-names = "default";
		pinctrl-0 = <&led_pins_olinuxino>;
&reg_usb1_vbus {
	pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
	gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
	status = "okay";
};

		green {
			label = "a10s-olinuxino-micro:green:usr";
			gpios = <&pio 4 3 GPIO_ACTIVE_HIGH>;
			default-state = "on";
&uart0 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart0_pins_a>;
	status = "okay";
};

&uart2 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart2_pins_a>;
	status = "okay";
};

	reg_usb1_vbus: usb1-vbus {
		pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
		gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
&uart3 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart3_pins_a>;
	status = "okay";
};

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