Commit b96b3b22 authored by Maxime Ripard's avatar Maxime Ripard

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
...@@ -65,86 +65,56 @@ aliases { ...@@ -65,86 +65,56 @@ aliases {
serial2 = &uart3; serial2 = &uart3;
}; };
soc@01c00000 { leds {
emac: ethernet@01c0b000 { compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>; pinctrl-0 = <&led_pins_olinuxino>;
phy = <&phy1>;
status = "okay";
};
mdio@01c0b080 {
status = "okay";
phy1: ethernet-phy@1 { green {
reg = <1>; label = "a10s-olinuxino-micro:green:usr";
gpios = <&pio 4 3 GPIO_ACTIVE_HIGH>;
default-state = "on";
}; };
}; };
};
mmc0: mmc@01c0f000 { &ehci0 {
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"; status = "okay";
}; };
mmc1: mmc@01c10000 { &emac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>; pinctrl-0 = <&emac_pins_a>;
vmmc-supply = <&reg_vcc3v3>; phy = <&phy1>;
bus-width = <4>;
cd-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
cd-inverted;
status = "okay"; status = "okay";
}; };
usbphy: phy@01c13400 { &i2c0 {
usb1_vbus-supply = <&reg_usb1_vbus>; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
}; };
ehci0: usb@01c14000 { &i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
status = "okay"; status = "okay";
};
ohci0: usb@01c14400 { at24@50 {
status = "okay"; compatible = "at,24c16";
}; pagesize = <16>;
reg = <0x50>;
pinctrl@01c20800 { read-only;
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>;
};
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 { &i2c2 {
allwinner,pins = "PB10"; pinctrl-names = "default";
allwinner,function = "gpio_out"; pinctrl-0 = <&i2c2_pins_a>;
allwinner,drive = <SUN4I_PINCTRL_10_MA>; status = "okay";
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; };
};
};
lradc: lradc@01c22800 { &lradc {
vref-supply = <&reg_vcc3v0>; vref-supply = <&reg_vcc3v0>;
status = "okay"; status = "okay";
...@@ -182,67 +152,96 @@ button@987 { ...@@ -182,67 +152,96 @@ button@987 {
channel = <0>; channel = <0>;
voltage = <987387>; voltage = <987387>;
}; };
}; };
uart0: serial@01c28000 { &mdio {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
status = "okay"; status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
}; };
};
uart2: serial@01c28800 { &mmc0 {
pinctrl-names = "default"; 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"; status = "okay";
}; };
uart3: serial@01c28c00 { &mmc1 {
pinctrl-names = "default"; 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"; status = "okay";
}; };
i2c0: i2c@01c2ac00 { &ohci0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; 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>;
}; };
i2c1: i2c@01c2b000 { mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
pinctrl-names = "default"; allwinner,pins = "PG13";
pinctrl-0 = <&i2c1_pins_a>; allwinner,function = "gpio_in";
status = "okay"; allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
};
at24@50 { led_pins_olinuxino: led_pins@0 {
compatible = "at,24c16"; allwinner,pins = "PE3";
pagesize = <16>; allwinner,function = "gpio_out";
reg = <0x50>; allwinner,drive = <SUN4I_PINCTRL_20_MA>;
read-only; 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: i2c@01c2b400 { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
status = "okay";
};
&uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&uart0_pins_a>;
status = "okay"; status = "okay";
}; };
};
leds { &uart2 {
compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&led_pins_olinuxino>; pinctrl-0 = <&uart2_pins_a>;
status = "okay";
};
green { &uart3 {
label = "a10s-olinuxino-micro:green:usr"; pinctrl-names = "default";
gpios = <&pio 4 3 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&uart3_pins_a>;
default-state = "on"; status = "okay";
}; };
};
reg_usb1_vbus: usb1-vbus { &usbphy {
pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>; usb1_vbus-supply = <&reg_usb1_vbus>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
};
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment