sunxi: Sync h3-orangepi dts files with kernel
Subsystems (2)
PATCH 1/3 sunxi: Sync h3-orangepi dts files with kernel
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.
--- arch/arm/dts/sun8i-h3-orangepi-2.dts | 11 +++++ arch/arm/dts/sun8i-h3-orangepi-pc.dts | 1 + arch/arm/dts/sun8i-h3-orangepi-plus.dts | 72 ++++++++++++--------------------- 3 files changed, 37 insertions(+), 47 deletions(-)
arch/arm/dts/sun8i-h3-orangepi-2.dts +11 -0
@@ -109,6 +109,17 @@ status = "okay"; }; +&emac { + phy = <&phy1>; + phy-mode = "mii"; + allwinner,use-internal-phy; + allwinner,leds-active-low; + status = "okay"; + phy1: ethernet-phy at 1 { + reg = <1>; + }; +}; + &ir { pinctrl-names = "default"; pinctrl-0 = <&ir_pins_a>;
arch/arm/dts/sun8i-h3-orangepi-pc.dts +1 -0
@@ -169,6 +169,7 @@ &emac { phy = <&phy1>; phy-mode = "mii"; + allwinner,use-internal-phy; allwinner,leds-active-low; status = "okay"; phy1: ethernet-phy at 1 {
arch/arm/dts/sun8i-h3-orangepi-plus.dts +25 -47
108 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH 2/3 sunxi: Enable emac on H3 orangepi boards
The Orange Pi 2 and Orange Pi Plus also come with ethernet, enable support for this.
--- configs/orangepi_2_defconfig | 1 + configs/orangepi_plus_defconfig | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
configs/orangepi_2_defconfig +1 -0
@@ -15,3 +15,4 @@ CONFIG_SPL=y # CONFIG_CMD_FPGA is not set CONFIG_SY8106A_POWER=y CONFIG_USB_EHCI_HCD=y +CONFIG_SUN8I_EMAC=y
configs/orangepi_plus_defconfig +2 -1
@@ -11,9 +11,10 @@ CONFIG_USB1_VBUS_PIN="PG13" CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPG(11)" +CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPG(11),MACPWR=SUNXI_GPD(6)" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set CONFIG_SY8106A_POWER=y CONFIG_USB_EHCI_HCD=y +CONFIG_SUN8I_EMAC=y
Signature · 1 line
2.9.3
PATCH 3/3 sunxi: Add defconfig and dts file for the Orange Pi Plus2E SBC
In reply to Hans de GoedeThe Orange Pi Plus2E is an extended version of the Orange Pi Pc Plus, with 2G RAM and an external gbit ethernet phy.
The dts file is identical to the one submitted to the upstream kernel, except that it has the pending patch to enable the ethernet controller squashed in, as u-boot already has sun8i-emac support.
--- arch/arm/dts/Makefile | 3 +- arch/arm/dts/sun8i-h3-orangepi-plus2e.dts | 83 +++++++++++++++++++++++++++++++ board/sunxi/MAINTAINERS | 1 + configs/orangepi_plus2e_defconfig | 19 +++++++ 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/sun8i-h3-orangepi-plus2e.dts create mode 100644 configs/orangepi_plus2e_defconfig
arch/arm/dts/Makefile +2 -1
@@ -260,7 +260,8 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ sun8i-h3-orangepi-one.dtb \ sun8i-h3-orangepi-pc.dtb \ sun8i-h3-orangepi-pc-plus.dtb \ - sun8i-h3-orangepi-plus.dtb + sun8i-h3-orangepi-plus.dtb \ + sun8i-h3-orangepi-plus2e.dtb dtb-$(CONFIG_MACH_SUN50I) += \ sun50i-a64-pine64-plus.dtb \ sun50i-a64-pine64.dtb
arch/arm/dts/sun8i-h3-orangepi-plus2e.dts new file +83 -0
83 lines not on this page · raw message
board/sunxi/MAINTAINERS +1 -0
@@ -63,6 +63,7 @@ F: configs/orangepi_one_defconfig F: configs/orangepi_pc_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_plus_defconfig +F: configs/orangepi_plus2e_defconfig F: configs/polaroid_mid2407pxe03_defconfig F: configs/polaroid_mid2809pxe04_defconfig F: configs/q8_a23_tablet_800x480_defconfig
configs/orangepi_plus2e_defconfig new file +19 -0
@@ -0,0 +1,19 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN8I_H3=y +CONFIG_DRAM_CLK=672 +CONFIG_DRAM_ZQ=3881979 +CONFIG_DRAM_ODT_EN=y +CONFIG_MMC0_CD_PIN="PF6" +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +# CONFIG_VIDEO is not set +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus2e" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="MACPWR=SUNXI_GPD(6)" +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_SY8106A_POWER=y +CONFIG_USB_EHCI_HCD=y +CONFIG_SUN8I_EMAC=y
Signature · 1 line
2.9.3
PATCH 1/3 sunxi: Sync h3-orangepi dts files with kernel
In reply to Hans de GoedeQuoted 9 lines · Hans de Goede
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 insun8i-h3-orangepi-plus.dtsand disables some usb controllers insun8i-h3-orangepi-plus.dtswhich 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 <[email protected]>
After these three patches does the state of the dts files now match the state of the files upstream, modulo things which are still in flight to upstream (so maybe I should ask "...match the intended/eventual state...")? If so then:
PATCH 1/3 sunxi: Sync h3-orangepi dts files with kernel
Hi,
Quoted 9 lines · Ian Campbell
Quoted 8 lines · Hans de Goede
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 insun8i-h3-orangepi-plus.dtsand disables some usb controllers insun8i-h3-orangepi-plus.dtswhich are only used on the plus2e, as upstream has decided to do a separate dts files for the plus2e.
Quoted 6 lines
Quoted 1 line
Signed-off-by Hans de Goede <[email protected]>After these three patches does the state of the dts files now match the state of the files upstream, modulo things which are still in flight to upstream (so maybe I should ask "...match the intended/eventual state...")?
Yes this will make the dts files match the intended/eventual state.
Regards,
Hans