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

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

ARM: sun7i: cubieboard2: 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 d540b7cc

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

+98 −100
Original line number Original line Diff line number Diff line
@@ -59,66 +59,53 @@ 
	model = "Cubietech Cubieboard2";

	model = "Cubietech Cubieboard2";

	compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";

	compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";





	soc@01c00000 {

	leds {

		mmc0: mmc@01c0f000 {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-names = "default";

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

		pinctrl-0 = <&led_pins_cubieboard2>;

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

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

			cd-inverted;

			status = "okay";

		};





		usbphy: phy@01c13400 {

		blue {

			usb1_vbus-supply = <&reg_usb1_vbus>;

			label = "cubieboard2:blue:usr";

			usb2_vbus-supply = <&reg_usb2_vbus>;

			gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;

			status = "okay";

		};

		};





		ehci0: usb@01c14000 {

		green {

			status = "okay";

			label = "cubieboard2:green:usr";

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;

		};

	};

	};



		ohci0: usb@01c14400 {

			status = "okay";

};

};





		ahci: sata@01c18000 {

&ahci {

	target-supply = <&reg_ahci_5v>;

	target-supply = <&reg_ahci_5v>;

	status = "okay";

	status = "okay";

};

};





		ehci1: usb@01c1c000 {

&cpu0 {

			status = "okay";

	cpu-supply = <&reg_dcdc2>;

};

};





		ohci1: usb@01c1c400 {

&ehci0 {

	status = "okay";

	status = "okay";

};

};





		pinctrl@01c20800 {

&ehci1 {

			led_pins_cubieboard2: led_pins@0 {

				allwinner,pins = "PH20", "PH21";

				allwinner,function = "gpio_out";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

		};



		ir0: ir@01c21800 {

			pinctrl-names = "default";

			pinctrl-0 = <&ir0_pins_a>;

	status = "okay";

	status = "okay";

};

};





		uart0: serial@01c28000 {

&gmac {

	pinctrl-names = "default";

	pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&gmac_pins_mii_a>;

	phy = <&phy1>;

	phy-mode = "mii";

	status = "okay";

	status = "okay";



	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};

};





		i2c0: i2c@01c2ac00 {

&i2c0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";

	status = "okay";
@@ -130,60 +117,51 @@ 
	};

	};

};

};





		i2c1: i2c@01c2b000 {

&i2c1 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins_a>;

	pinctrl-0 = <&i2c1_pins_a>;

	status = "okay";

	status = "okay";

};

};





		gmac: ethernet@01c50000 {

&ir0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

			pinctrl-0 = <&gmac_pins_mii_a>;

	pinctrl-0 = <&ir0_pins_a>;

			phy = <&phy1>;

			phy-mode = "mii";

	status = "okay";

	status = "okay";



			phy1: ethernet-phy@1 {

				reg = <1>;

			};

		};

};

};





	leds {

&mmc0 {

		compatible = "gpio-leds";

	pinctrl-names = "default";

	pinctrl-names = "default";

		pinctrl-0 = <&led_pins_cubieboard2>;

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



	vmmc-supply = <&reg_vcc3v3>;

		blue {

	bus-width = <4>;

			label = "cubieboard2:blue:usr";

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

			gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	status = "okay";

};

};





		green {

&ohci0 {

			label = "cubieboard2:green:usr";

	status = "okay";

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;

		};

};

};





	reg_ahci_5v: ahci-5v {

&ohci1 {

	status = "okay";

	status = "okay";

};

};





	reg_usb1_vbus: usb1-vbus {

&pio {

		status = "okay";

	led_pins_cubieboard2: led_pins@0 {

		allwinner,pins = "PH20", "PH21";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};

};





	reg_usb2_vbus: usb2-vbus {

&reg_ahci_5v {

	status = "okay";

	status = "okay";

};

};

};





#include "axp209.dtsi"

#include "axp209.dtsi"





&cpu0 {

	cpu-supply = <&reg_dcdc2>;

};



&reg_dcdc2 {

&reg_dcdc2 {

	regulator-always-on;

	regulator-always-on;

	regulator-min-microvolt = <1000000>;

	regulator-min-microvolt = <1000000>;
@@ -208,3 +186,23 @@ 
	regulator-max-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "avcc";

	regulator-name = "avcc";

};

};



&reg_usb1_vbus {

	status = "okay";

};



&reg_usb2_vbus {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usbphy {

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};