Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

sunxi: Sync h3-orangepi dts files with kernel

Browse source 
This adds an emac node to the orangepi-2 dts (not yet merged upstream,
but in u-boot we already have emac support); fixes the alphetically
sorting of nodes in sun8i-h3-orangepi-plus.dts and disables some
usb controllers in sun8i-h3-orangepi-plus.dts which are only used
on the plus2e, as upstream has decided to do a separate dts files
for the plus2e.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2016-09-03 10:21:35 +02:00
parent 68871efe1d
commit 019731a88f
3 changed files with 37 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/dts/sun8i-h3-orangepi-2.dts
View file

@ -109,6 +109,17 @@
status = "okay"; status = "okay";
}; };
&emac {
phy = <&phy1>;
phy-mode = "mii";
allwinner,use-internal-phy;
allwinner,leds-active-low;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&ir_pins_a>;

1
arch/arm/dts/sun8i-h3-orangepi-pc.dts
View file

@ -169,6 +169,7 @@
&emac { &emac {
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
allwinner,use-internal-phy;
allwinner,leds-active-low; allwinner,leds-active-low;
status = "okay"; status = "okay";
phy1: ethernet-phy@1 { phy1: ethernet-phy@1 {

72
arch/arm/dts/sun8i-h3-orangepi-plus.dts
View file

@ -44,21 +44,9 @@
#include "sun8i-h3-orangepi-2.dts" #include "sun8i-h3-orangepi-2.dts"
/ { / {
model = "Xunlong Orange Pi Plus / Plus 2 / Plus 2E"; model = "Xunlong Orange Pi Plus / Plus 2";
compatible = "xunlong,orangepi-plus", "allwinner,sun8i-h3"; compatible = "xunlong,orangepi-plus", "allwinner,sun8i-h3";
reg_usb3_vbus: usb3-vbus {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&usb3_vbus_pin_a>;
regulator-name = "usb3-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-boot-on;
enable-active-high;
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
};
reg_gmac_3v3: gmac-3v3 { reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default"; pinctrl-names = "default";
@ -70,16 +58,33 @@
enable-active-high; enable-active-high;
gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
}; };
};
&ehci2 { reg_usb3_vbus: usb3-vbus {
status = "okay"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&usb3_vbus_pin_a>;
regulator-name = "usb3-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-boot-on;
enable-active-high;
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
};
}; };
&ehci3 { &ehci3 {
status = "okay"; status = "okay";
}; };
&emac {
/* The Orange Pi Plus uses an external phy */
pinctrl-names = "default";
pinctrl-0 = <&emac_rgmii_pins>;
phy-supply = <&reg_gmac_3v3>;
phy-mode = "rgmii";
/delete-property/allwinner,use-internal-phy;
};
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_8bit_pins>; pinctrl-0 = <&mmc2_8bit_pins>;
@ -97,28 +102,16 @@
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
&ohci1 {
status = "okay";
};
&ohci2 {
status = "okay";
};
&ohci3 {
status = "okay";
};
&pio { &pio {
usb3_vbus_pin_a: usb3_vbus_pin@0 { gmac_power_pin_orangepi: gmac_power_pin@0 {
allwinner,pins = "PG11"; allwinner,pins = "PD6";
allwinner,function = "gpio_out"; allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
gmac_power_pin_orangepi: gmac_power_pin@0 { usb3_vbus_pin_a: usb3_vbus_pin@0 {
allwinner,pins = "PD6"; allwinner,pins = "PG11";
allwinner,function = "gpio_out"; allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
@ -128,18 +121,3 @@
&usbphy { &usbphy {
usb3_vbus-supply = <&reg_usb3_vbus>; usb3_vbus-supply = <&reg_usb3_vbus>;
}; };
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_rgmii_pins>;
phy-supply = <&reg_gmac_3v3>;
phy = <&phy1>;
phy-mode = "rgmii";
allwinner,leds-active-low;
status = "okay";
phy1: ethernet-phy@1 {
reg = <0>;
};
};