| Message ID | 56FE5DA5.6070705@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, Apr 01, 2016 at 01:38:13PM +0200, Hans de Goede wrote: > Hi Tom, > > Here is a sunxi pull-req for v2016.05, it contains: > > - A few bugfixes, including a fix for the gigabit > ethernet problems on the Lime2 ! > - Support for USB on the A83t SoC > - Support for A64 SoCs (u-boot.bin only, no SPL) > > The A64 support involves moving a bunch of files > from arch/arm/cpu/armv7/sunxi to /arch/arm/mach-sunxi. > > The following changes since commit 080c499df689e8c42df70de44502c0d71533dda8: > > Merge branch 'master' of git://git.denx.de/u-boot-tegra (2016-03-29 13:33:13 -0400) > > are available in the git repository at: > > http://git.denx.de/u-boot-sunxi.git master > > for you to fetch changes up to 3ffe39ed2b66af71c7271d0cef2a248b5bf7dfdb: > > sunxi: Reserve ATF memory space on A64 (2016-04-01 09:52:28 +0200) > Applied to u-boot/master, thanks!
On Fri, Apr 01, 2016 at 01:00:16PM -0400, Tom Rini wrote: > On Fri, Apr 01, 2016 at 01:38:13PM +0200, Hans de Goede wrote: > > > Hi Tom, > > > > Here is a sunxi pull-req for v2016.05, it contains: > > > > - A few bugfixes, including a fix for the gigabit > > ethernet problems on the Lime2 ! > > - Support for USB on the A83t SoC > > - Support for A64 SoCs (u-boot.bin only, no SPL) > > > > The A64 support involves moving a bunch of files > > from arch/arm/cpu/armv7/sunxi to /arch/arm/mach-sunxi. > > > > The following changes since commit 080c499df689e8c42df70de44502c0d71533dda8: > > > > Merge branch 'master' of git://git.denx.de/u-boot-tegra (2016-03-29 13:33:13 -0400) > > > > are available in the git repository at: > > > > http://git.denx.de/u-boot-sunxi.git master > > > > for you to fetch changes up to 3ffe39ed2b66af71c7271d0cef2a248b5bf7dfdb: > > > > sunxi: Reserve ATF memory space on A64 (2016-04-01 09:52:28 +0200) > > > > Applied to u-boot/master, thanks! Hello, this has pulled in the RTL8211 fixes required for stable gigabit ethernet on the Olimex A20-SOM-EVB and A20-Olinuxino-Lime2, but those depend on another phy fix that hasn't yet gone into master: https://patchwork.ozlabs.org/patch/600290/ This patch has been acked by Joe Hershberger, but AFAICS it hasn't yet entered the u-boot-net tree. As the other sunxi-related RTL phy patches have gone through the sunxi tree as agreed in http://lists.denx.de/pipermail/u-boot/2016-March/249916.html, the question is what to do with the missing patch? Could this patch be applied directly to master to make the sunxi-related fixes in master functional, or shall it go through either the net tree or the sunxi tree? Regards, Karsten
Hi, On 04/02/2016 08:27 PM, Karsten Merker wrote: > On Fri, Apr 01, 2016 at 01:00:16PM -0400, Tom Rini wrote: >> On Fri, Apr 01, 2016 at 01:38:13PM +0200, Hans de Goede wrote: >> >>> Hi Tom, >>> >>> Here is a sunxi pull-req for v2016.05, it contains: >>> >>> - A few bugfixes, including a fix for the gigabit >>> ethernet problems on the Lime2 ! >>> - Support for USB on the A83t SoC >>> - Support for A64 SoCs (u-boot.bin only, no SPL) >>> >>> The A64 support involves moving a bunch of files >>> from arch/arm/cpu/armv7/sunxi to /arch/arm/mach-sunxi. >>> >>> The following changes since commit 080c499df689e8c42df70de44502c0d71533dda8: >>> >>> Merge branch 'master' of git://git.denx.de/u-boot-tegra (2016-03-29 13:33:13 -0400) >>> >>> are available in the git repository at: >>> >>> http://git.denx.de/u-boot-sunxi.git master >>> >>> for you to fetch changes up to 3ffe39ed2b66af71c7271d0cef2a248b5bf7dfdb: >>> >>> sunxi: Reserve ATF memory space on A64 (2016-04-01 09:52:28 +0200) >>> >> >> Applied to u-boot/master, thanks! > > Hello, > > this has pulled in the RTL8211 fixes required for stable gigabit > ethernet on the Olimex A20-SOM-EVB and A20-Olinuxino-Lime2, but > those depend on another phy fix that hasn't yet gone into master: > > https://patchwork.ozlabs.org/patch/600290/ > > This patch has been acked by Joe Hershberger, but AFAICS it hasn't > yet entered the u-boot-net tree. As the other sunxi-related RTL > phy patches have gone through the sunxi tree as agreed in > http://lists.denx.de/pipermail/u-boot/2016-March/249916.html, the > question is what to do with the missing patch? Could this patch be > applied directly to master to make the sunxi-related fixes in > master functional, or shall it go through either the net tree or the > sunxi tree? Tom, if you could pick this one up directly, that would probably be best. I've also added this to my personal sunxi tree to make sure it does not fall through the cracks (again). Regards, Hans
On Sat, Apr 02, 2016 at 11:42:55PM +0200, Hans de Goede wrote: > Hi, > > On 04/02/2016 08:27 PM, Karsten Merker wrote: > >On Fri, Apr 01, 2016 at 01:00:16PM -0400, Tom Rini wrote: > >>On Fri, Apr 01, 2016 at 01:38:13PM +0200, Hans de Goede wrote: > >> > >>>Hi Tom, > >>> > >>>Here is a sunxi pull-req for v2016.05, it contains: > >>> > >>>- A few bugfixes, including a fix for the gigabit > >>> ethernet problems on the Lime2 ! > >>>- Support for USB on the A83t SoC > >>>- Support for A64 SoCs (u-boot.bin only, no SPL) > >>> > >>>The A64 support involves moving a bunch of files > >>>from arch/arm/cpu/armv7/sunxi to /arch/arm/mach-sunxi. > >>> > >>>The following changes since commit 080c499df689e8c42df70de44502c0d71533dda8: > >>> > >>> Merge branch 'master' of git://git.denx.de/u-boot-tegra (2016-03-29 13:33:13 -0400) > >>> > >>>are available in the git repository at: > >>> > >>> http://git.denx.de/u-boot-sunxi.git master > >>> > >>>for you to fetch changes up to 3ffe39ed2b66af71c7271d0cef2a248b5bf7dfdb: > >>> > >>> sunxi: Reserve ATF memory space on A64 (2016-04-01 09:52:28 +0200) > >>> > >> > >>Applied to u-boot/master, thanks! > > > >Hello, > > > >this has pulled in the RTL8211 fixes required for stable gigabit > >ethernet on the Olimex A20-SOM-EVB and A20-Olinuxino-Lime2, but > >those depend on another phy fix that hasn't yet gone into master: > > > > https://patchwork.ozlabs.org/patch/600290/ > > > >This patch has been acked by Joe Hershberger, but AFAICS it hasn't > >yet entered the u-boot-net tree. As the other sunxi-related RTL > >phy patches have gone through the sunxi tree as agreed in > >http://lists.denx.de/pipermail/u-boot/2016-March/249916.html, the > >question is what to do with the missing patch? Could this patch be > >applied directly to master to make the sunxi-related fixes in > >master functional, or shall it go through either the net tree or the > >sunxi tree? > > Tom, if you could pick this one up directly, that would probably be > best. Done.
Hi Tom, Here is a sunxi pull-req for v2016.05, it contains: - A few bugfixes, including a fix for the gigabit ethernet problems on the Lime2 ! - Support for USB on the A83t SoC - Support for A64 SoCs (u-boot.bin only, no SPL) The A64 support involves moving a bunch of files from arch/arm/cpu/armv7/sunxi to /arch/arm/mach-sunxi. The following changes since commit 080c499df689e8c42df70de44502c0d71533dda8: Merge branch 'master' of git://git.denx.de/u-boot-tegra (2016-03-29 13:33:13 -0400) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to 3ffe39ed2b66af71c7271d0cef2a248b5bf7dfdb: sunxi: Reserve ATF memory space on A64 (2016-04-01 09:52:28 +0200) ---------------------------------------------------------------- Alexander Graf (4): sunxi: Move cpu independent code to mach directory sunxi: Depend SPL configs on SUPPORT_SPL sunxi: Explicitly cast u32 pointer conversions sunxi: Reserve ATF memory space on A64 Chen-Yu Tsai (17): power: axp818: Remove undefined axp818_init() musb: sunxi: Add support for A83T sunxi: axp: Generalize register macros for VBUS drive GPIO sunxi: axp: Support VBUS drive GPIO on AXP818 power: axp818: Fix DCDC5 default voltage power: axp818: Add support for FLDOs sunxi: h8_homlet_v2: Set DCDC1 to default voltage (3.3V) sunxi: h8_homlet_v2: Set DLDO4 to 3.3V sunxi: usb_phy: Add support for A83T USB PHYs sunxi: clk: Fix USB PHY clock macros for A83T sunxi: ehci: Add A83T compatible sunxi: ohci: Add A83T compatible sunxi: h8_homlet_v2: Enable USB Kconfig options in defconfig sunxi: Cubietruck Plus: Enable USB Kconfig options in defconfig sunxi: Add USB and R_PIO nodes to sun8i-a83t.dtsi sunxi: Enable USB on Cubietruck Plus sunxi: Enable USB nodes for H8Homlet v2 Hans de Goede (3): sunxi: Add conditional magic sram poke for A33 sunxi: Print soc-id from sram controller for sun8i boards sunxi: Enable LDO3 and LDO4 at 2.8V on OLinuxIno Lime boards Michael Haas (3): net: phy: Optionally force master mode for RTL PHY sunxi: A20-Olimex-SOM-EVB: Force 8211CL to master sunxi: A20-OLinuXino-Lime2: Force 8211CL to master Siarhei Siamashka (2): sunxi: Add support for Allwinner A64 SoCs sunxi: Add Pine64+ support arch/arm/Kconfig | 4 +- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/sunxi/Makefile | 38 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/a64.dtsi | 564 +++++++++++++++++++++ arch/arm/dts/pine64.dts | 62 +++ arch/arm/dts/pine64_common.dtsi | 76 +++ arch/arm/dts/pine64_plus.dts | 63 +++ arch/arm/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 12 + arch/arm/dts/sun8i-a83t-cubietruck-plus.dts | 12 + arch/arm/dts/sun8i-a83t.dtsi | 34 ++ arch/arm/include/asm/arch-sunxi/clock.h | 3 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 8 +- arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h | 6 +- arch/arm/include/asm/arch-sunxi/gpio.h | 1 + arch/arm/include/asm/arch-sunxi/spl.h | 5 +- arch/arm/mach-sunxi/Makefile | 51 ++ arch/arm/{cpu/armv7/sunxi => mach-sunxi}/board.c | 50 +- arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock.c | 0 .../{cpu/armv7/sunxi => mach-sunxi}/clock_sun4i.c | 0 .../{cpu/armv7/sunxi => mach-sunxi}/clock_sun6i.c | 0 .../armv7/sunxi => mach-sunxi}/clock_sun8i_a83t.c | 0 .../{cpu/armv7/sunxi => mach-sunxi}/clock_sun9i.c | 0 .../arm/{cpu/armv7/sunxi => mach-sunxi}/cpu_info.c | 28 +- .../{cpu/armv7/sunxi => mach-sunxi}/dram_helpers.c | 4 +- .../{cpu/armv7/sunxi => mach-sunxi}/dram_sun4i.c | 0 .../{cpu/armv7/sunxi => mach-sunxi}/dram_sun6i.c | 0 .../armv7/sunxi => mach-sunxi}/dram_sun8i_a23.c | 0 .../armv7/sunxi => mach-sunxi}/dram_sun8i_a33.c | 0 .../armv7/sunxi => mach-sunxi}/dram_sun8i_a83t.c | 0 .../armv7/sunxi => mach-sunxi}/dram_sun8i_h3.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/p2wi.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/pinmux.c | 0 .../arm/{cpu/armv7/sunxi => mach-sunxi}/pmic_bus.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/prcm.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/rsb.c | 0 arch/arm/{cpu/armv7/sunxi => mach-sunxi}/usb_phy.c | 50 +- board/sunxi/Kconfig | 9 +- board/sunxi/MAINTAINERS | 2 + board/sunxi/board.c | 50 +- configs/A10-OLinuXino-Lime_defconfig | 2 + configs/A20-OLinuXino-Lime2_defconfig | 3 + configs/A20-OLinuXino-Lime_defconfig | 2 + configs/A20-Olimex-SOM-EVB_defconfig | 1 + configs/Cubietruck_plus_defconfig | 10 +- configs/h8_homlet_v2_defconfig | 8 +- configs/pine64_plus_defconfig | 12 + drivers/gpio/axp_gpio.c | 25 +- drivers/mmc/sunxi_mmc.c | 6 +- drivers/net/Kconfig | 21 + drivers/net/phy/realtek.c | 13 +- drivers/power/Kconfig | 32 +- drivers/power/axp818.c | 34 ++ drivers/usb/host/ehci-sunxi.c | 1 + drivers/usb/host/ohci-sunxi.c | 1 + drivers/usb/musb-new/musb_regs.h | 2 +- include/axp221.h | 8 +- include/axp818.h | 9 +- include/axp_pmic.h | 1 + include/configs/sun50i.h | 25 + include/configs/sun6i.h | 1 - include/configs/sun7i.h | 1 - include/configs/sun8i.h | 4 +- include/configs/sunxi-common.h | 21 +- 64 files changed, 1275 insertions(+), 103 deletions(-) create mode 100644 arch/arm/dts/a64.dtsi create mode 100644 arch/arm/dts/pine64.dts create mode 100644 arch/arm/dts/pine64_common.dtsi create mode 100644 arch/arm/dts/pine64_plus.dts create mode 100644 arch/arm/mach-sunxi/Makefile rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/board.c (85%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock_sun4i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock_sun6i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock_sun8i_a83t.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/clock_sun9i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/cpu_info.c (77%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_helpers.c (87%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun4i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun6i.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun8i_a23.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun8i_a33.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun8i_a83t.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/dram_sun8i_h3.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/p2wi.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/pinmux.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/pmic_bus.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/prcm.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/rsb.c (100%) rename arch/arm/{cpu/armv7/sunxi => mach-sunxi}/usb_phy.c (86%) create mode 100644 configs/pine64_plus_defconfig create mode 100644 include/configs/sun50i.h Regards, Hans