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

Commit 712a9fa2 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: sun7i: cubietruck: 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 b5ec9938

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

+157 −159
Original line number Diff line number Diff line
@@ -59,108 +59,74 @@ 
	model = "Cubietech Cubietruck";

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



	soc@01c00000 {

		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";

		};



		mmc3: mmc@01c12000 {

	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

			pinctrl-0 = <&mmc3_pins_a>;

			vmmc-supply = <&reg_vmmc3>;

			bus-width = <4>;

			non-removable;

			status = "okay";

		};



		usbphy: phy@01c13400 {

			usb0_vbus-supply = <&reg_usb0_vbus>;

			usb1_vbus-supply = <&reg_usb1_vbus>;

			usb2_vbus-supply = <&reg_usb2_vbus>;

			status = "okay";

		};



		ehci0: usb@01c14000 {

			status = "okay";

		};

		pinctrl-0 = <&led_pins_cubietruck>;



		ohci0: usb@01c14400 {

			status = "okay";

		blue {

			label = "cubietruck:blue:usr";

			gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;

		};



		ahci: sata@01c18000 {

			target-supply = <&reg_ahci_5v>;

			status = "okay";

		orange {

			label = "cubietruck:orange:usr";

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;

		};



		ehci1: usb@01c1c000 {

			status = "okay";

		white {

			label = "cubietruck:white:usr";

			gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>;

		};



		ohci1: usb@01c1c400 {

			status = "okay";

		green {

			label = "cubietruck:green:usr";

			gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;

		};



		pinctrl@01c20800 {

			mmc3_pins_a: mmc3@0 {

				/* AP6210 requires pull-up */

				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

	};



			vmmc3_pin_cubietruck: vmmc3_pin@0 {

				allwinner,pins = "PH9";

				allwinner,function = "gpio_out";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	reg_vmmc3: vmmc3 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&vmmc3_pin_cubietruck>;

		regulator-name = "vmmc3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>;

	};



			ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {

				allwinner,pins = "PH12";

				allwinner,function = "gpio_out";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

};



			led_pins_cubietruck: led_pins@0 {

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

				allwinner,function = "gpio_out";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

&ahci {

	target-supply = <&reg_ahci_5v>;

	status = "okay";

};



			usb0_vbus_pin_a: usb0_vbus_pin@0 {

				allwinner,pins = "PH17";

				allwinner,function = "gpio_out";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

&cpu0 {

	cpu-supply = <&reg_dcdc2>;

};



		pwm: pwm@01c20e00 {

			pinctrl-names = "default";

			pinctrl-0 = <&pwm0_pins_a>, <&pwm1_pins_a>;

&ehci0 {

	status = "okay";

};



		ir0: ir@01c21800 {

			pinctrl-names = "default";

			pinctrl-0 = <&ir0_pins_a>;

&ehci1 {

	status = "okay";

};



		uart0: serial@01c28000 {

&gmac {

	pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&gmac_pins_rgmii_a>;

	phy = <&phy1>;

	phy-mode = "rgmii";

	status = "okay";



	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};



		i2c0: i2c@01c2ac00 {

&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";
@@ -172,95 +138,100 @@ 
	};

};



		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";

};



		gmac: ethernet@01c50000 {

&ir0 {

	pinctrl-names = "default";

			pinctrl-0 = <&gmac_pins_rgmii_a>;

			phy = <&phy1>;

			phy-mode = "rgmii";

	pinctrl-0 = <&ir0_pins_a>;

	status = "okay";



			phy1: ethernet-phy@1 {

				reg = <1>;

			};

		};

};



	leds {

		compatible = "gpio-leds";

&mmc0 {

	pinctrl-names = "default";

		pinctrl-0 = <&led_pins_cubietruck>;



		blue {

			label = "cubietruck:blue:usr";

			gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;

	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";

};



		orange {

			label = "cubietruck:orange:usr";

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;

&mmc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins_a>;

	vmmc-supply = <&reg_vmmc3>;

	bus-width = <4>;

	non-removable;

	status = "okay";

};



		white {

			label = "cubietruck:white:usr";

			gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>;

&mmc3_pins_a {

	/* AP6210 requires pull-up */

	allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

};



		green {

			label = "cubietruck:green:usr";

			gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;

		};

&ohci0 {

	status = "okay";

};



	reg_ahci_5v: ahci-5v {

		pinctrl-0 = <&ahci_pwr_pin_cubietruck>;

		gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;

&ohci1 {

	status = "okay";

};



	reg_usb0_vbus: usb0-vbus {

		pinctrl-0 = <&usb0_vbus_pin_a>;

		gpio = <&pio 7 17 GPIO_ACTIVE_HIGH>;

		status = "okay";

&pio {

	vmmc3_pin_cubietruck: vmmc3_pin@0 {

		allwinner,pins = "PH9";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	reg_usb1_vbus: usb1-vbus {

		status = "okay";

	ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {

		allwinner,pins = "PH12";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	reg_usb2_vbus: usb2-vbus {

		status = "okay";

	led_pins_cubietruck: led_pins@0 {

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

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	reg_vmmc3: vmmc3 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&vmmc3_pin_cubietruck>;

		regulator-name = "vmmc3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>;

	usb0_vbus_pin_a: usb0_vbus_pin@0 {

		allwinner,pins = "PH17";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



#include "axp209.dtsi"

&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_pins_a>, <&pwm1_pins_a>;

	status = "okay";

};



&cpu0 {

	cpu-supply = <&reg_dcdc2>;

&reg_ahci_5v {

	pinctrl-0 = <&ahci_pwr_pin_cubietruck>;

	gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



#include "axp209.dtsi"



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1000000>;
@@ -285,3 +256,30 @@ 
	regulator-max-microvolt = <3000000>;

	regulator-name = "avcc";

};



&reg_usb0_vbus {

	pinctrl-0 = <&usb0_vbus_pin_a>;

	gpio = <&pio 7 17 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



&reg_usb1_vbus {

	status = "okay";

};



&reg_usb2_vbus {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usbphy {

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};