Pull request: u-boot-sunxi/master for v2022.01
Hi Tom,
please pull the sunxi/master branch, containing the first part of the 2022.01 changes.
The bulk of it is Samuel's DM_I2C rework, which removes the nasty I2C deprecation warnings for most 32-bit boards. It also includes some smaller refactorings that pave the way for more changes, mostly driven by needing to support the Allwinner RISC-V SoC later on.
Board wise we gain support for the FriendlyARM NanoPi R1S H5 router board and official Pinetab support.
Build-tested for all 160 sunxi boards, and boot tested on a A64, A20, H3, H6, and H616 board. USB, SD card, eMMC, and Ethernet all work there (where applicable).
Thanks, Andre
============== The following changes since commit f331497d3ad4166f9826e7674793ae04094b29c1:
Merge tag 'video-20211009' of https://source.denx.de/u-boot/custodians/u-boot-video (2021-10-09 17:47:27 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to f9437b00c06382d3edc623c10c69901786ad6317:
sunxi: Enable DM_I2C for all sunxi boards (2021-10-12 11:01:27 +0100)
---------------------------------------------------------------- Arnaud Ferraris (3): configs: add PineTab defconfig board: sunxi: enable status LED early pinephone_defconfig: add support for early-boot status LED
Chukun Pan (1): sunxi: Add support for FriendlyARM NanoPi R1S H5
Samuel Holland (20): clk: sunxi: Move header out of arch directory sunxi: Simplify MMC pinmux selection gpio: sunxi: Remove the sunxi_name_to_gpio_bank function sunxi: Clean up inclusions of asm/arch/gpio.h sunxi: gpio: Remove name_to_gpio macro sunxi: gpio: Remove bank-specific size macros clk: sunxi: Add support for I2C gates/resets clk: sunxi: Add drivers for A31 and H6 PRCM CCUs power: pmic: Consistently depend on DM_PMIC power: pmic: Consistently depend on SPL_DM_PMIC power: pmic: Add a driver for X-Powers AXP PMICs sunxi: Only initialize legacy I2C when enabled sunxi: Select SUN8I_RSB more carefully sunxi: pmic_bus: Fix Kconfig dependencies i2c: Add a DM_I2C driver for the sun6i P2WI controller i2c: Add a DM_I2C driver for the sun8i RSB controller sunxi: pmic_bus: Clean up preprocessor conditions sunxi: pmic_bus: Use the DM PMIC interface when possible sunxi: video: Convert panel I2C to use DM_I2C sunxi: Enable DM_I2C for all sunxi boards
arch/arm/Kconfig | 1 + arch/arm/dts/Makefile | 1 + arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts | 195 ++++++++++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 20 +- arch/arm/mach-sunxi/Kconfig | 79 ++---- arch/arm/mach-sunxi/Makefile | 2 - arch/arm/mach-sunxi/board.c | 3 +- arch/arm/mach-sunxi/clock.c | 1 - arch/arm/mach-sunxi/clock_sun4i.c | 1 - arch/arm/mach-sunxi/p2wi.c | 117 --------- arch/arm/mach-sunxi/pmic_bus.c | 109 ++++---- arch/arm/mach-sunxi/rsb.c | 175 ------------- board/sunxi/MAINTAINERS | 10 + board/sunxi/board.c | 152 +++-------- board/sunxi/gmac.c | 1 - configs/A20-Olimex-SOM-EVB_defconfig | 1 - configs/Colombus_defconfig | 6 - configs/Cubieboard4_defconfig | 1 + configs/Merrii_A80_Optimus_defconfig | 1 + configs/Sinlinx_SinA31s_defconfig | 1 - configs/UTOO_P66_defconfig | 3 - configs/Yones_Toptech_BD1078_defconfig | 2 +- configs/nanopi_r1s_h5_defconfig | 14 + configs/parrot_r16_defconfig | 1 - configs/pinephone_defconfig | 6 + configs/pinetab_defconfig | 10 + drivers/clk/sunxi/Kconfig | 14 + drivers/clk/sunxi/Makefile | 2 + drivers/clk/sunxi/clk_a10.c | 7 +- drivers/clk/sunxi/clk_a10s.c | 5 +- drivers/clk/sunxi/clk_a23.c | 8 +- drivers/clk/sunxi/clk_a31.c | 10 +- drivers/clk/sunxi/clk_a31_r.c | 59 +++++ drivers/clk/sunxi/clk_a64.c | 8 +- drivers/clk/sunxi/clk_a80.c | 12 +- drivers/clk/sunxi/clk_a83t.c | 8 +- drivers/clk/sunxi/clk_h3.c | 8 +- drivers/clk/sunxi/clk_h6.c | 12 +- drivers/clk/sunxi/clk_h616.c | 14 +- drivers/clk/sunxi/clk_h6_r.c | 61 +++++ drivers/clk/sunxi/clk_r40.c | 12 +- drivers/clk/sunxi/clk_sunxi.c | 2 +- drivers/clk/sunxi/clk_v3s.c | 6 +- drivers/gpio/axp_gpio.c | 1 - drivers/gpio/sunxi_gpio.c | 17 -- drivers/i2c/Kconfig | 16 ++ drivers/i2c/Makefile | 2 + drivers/i2c/sun6i_p2wi.c | 220 ++++++++++++++++ drivers/i2c/sun8i_rsb.c | 281 +++++++++++++++++++++ drivers/mmc/sunxi_mmc.c | 3 +- drivers/net/sun8i_emac.c | 5 +- drivers/power/axp809.c | 1 - drivers/power/axp818.c | 1 - drivers/power/pmic/Kconfig | 69 +++-- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/axp.c | 38 +++ drivers/reset/reset-sunxi.c | 2 +- drivers/spi/spi-sunxi.c | 2 +- drivers/usb/musb-new/sunxi.c | 2 - drivers/video/Kconfig | 10 +- drivers/video/anx9804.c | 103 ++++---- drivers/video/anx9804.h | 5 +- drivers/video/hitachi_tx18d42vm_lcd.c | 6 +- drivers/video/sunxi/sunxi_display.c | 66 +++-- drivers/video/sunxi/sunxi_lcd.c | 1 - include/axp_pmic.h | 12 + .../asm/arch-sunxi/ccu.h => include/clk/sunxi.h | 8 +- include/configs/sunxi-common.h | 17 -- 68 files changed, 1307 insertions(+), 743 deletions(-) create mode 100644 arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts delete mode 100644 arch/arm/mach-sunxi/p2wi.c delete mode 100644 arch/arm/mach-sunxi/rsb.c create mode 100644 configs/nanopi_r1s_h5_defconfig create mode 100644 configs/pinetab_defconfig create mode 100644 drivers/clk/sunxi/clk_a31_r.c create mode 100644 drivers/clk/sunxi/clk_h6_r.c create mode 100644 drivers/i2c/sun6i_p2wi.c create mode 100644 drivers/i2c/sun8i_rsb.c create mode 100644 drivers/power/pmic/axp.c rename arch/arm/include/asm/arch-sunxi/ccu.h => include/clk/sunxi.h (94%)
On Tue, Oct 12, 2021 at 01:58:18PM +0100, Andre Przywara wrote:
Hi Tom,
please pull the sunxi/master branch, containing the first part of the 2022.01 changes.
The bulk of it is Samuel's DM_I2C rework, which removes the nasty I2C deprecation warnings for most 32-bit boards. It also includes some smaller refactorings that pave the way for more changes, mostly driven by needing to support the Allwinner RISC-V SoC later on.
Board wise we gain support for the FriendlyARM NanoPi R1S H5 router board and official Pinetab support.
Build-tested for all 160 sunxi boards, and boot tested on a A64, A20, H3, H6, and H616 board. USB, SD card, eMMC, and Ethernet all work there (where applicable).
Thanks, Andre
============== The following changes since commit f331497d3ad4166f9826e7674793ae04094b29c1:
Merge tag 'video-20211009' of https://source.denx.de/u-boot/custodians/u-boot-video (2021-10-09 17:47:27 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to f9437b00c06382d3edc623c10c69901786ad6317:
sunxi: Enable DM_I2C for all sunxi boards (2021-10-12 11:01:27 +0100)
Note that the POWER_MC34VR500 PMIC driver is NOT converted to DM, so I had to move the Kconfig entry for that around in order to avoid a new Kconfig warning when building. I've added some NXP folks to the email here because that's a conversion that needs doing ASAP.
With that said, this PR is applied to u-boot/master, thanks!
On Tue, 12 Oct 2021 11:49:02 -0400 Tom Rini trini@konsulko.com wrote:
Hi Tom,
On Tue, Oct 12, 2021 at 01:58:18PM +0100, Andre Przywara wrote:
Hi Tom,
please pull the sunxi/master branch, containing the first part of the 2022.01 changes.
The bulk of it is Samuel's DM_I2C rework, which removes the nasty I2C deprecation warnings for most 32-bit boards. It also includes some smaller refactorings that pave the way for more changes, mostly driven by needing to support the Allwinner RISC-V SoC later on.
Board wise we gain support for the FriendlyARM NanoPi R1S H5 router board and official Pinetab support.
Build-tested for all 160 sunxi boards, and boot tested on a A64, A20, H3, H6, and H616 board. USB, SD card, eMMC, and Ethernet all work there (where applicable).
Thanks, Andre
============== The following changes since commit f331497d3ad4166f9826e7674793ae04094b29c1:
Merge tag 'video-20211009' of https://source.denx.de/u-boot/custodians/u-boot-video (2021-10-09 17:47:27 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to f9437b00c06382d3edc623c10c69901786ad6317:
sunxi: Enable DM_I2C for all sunxi boards (2021-10-12 11:01:27 +0100)
Note that the POWER_MC34VR500 PMIC driver is NOT converted to DM, so I had to move the Kconfig entry for that around in order to avoid a new Kconfig warning when building.
Oh, sorry for that! I just see that the commit message speaks of DM_PMIC_MC34708, but it's indeed POWER_MC34VR500 that (wrongfully) gains the dependency. For the next tests I will try to find some idle machine and build more boards than just sunxi! So thanks for the heads up and the quick fix!
I've added some NXP folks to the email here because that's a conversion that needs doing ASAP.
With that said, this PR is applied to u-boot/master, thanks!
Many thanks!
Cheers, Andre
On Tue, Oct 12, 2021 at 05:15:55PM +0100, Andre Przywara wrote:
On Tue, 12 Oct 2021 11:49:02 -0400 Tom Rini trini@konsulko.com wrote:
Hi Tom,
On Tue, Oct 12, 2021 at 01:58:18PM +0100, Andre Przywara wrote:
Hi Tom,
please pull the sunxi/master branch, containing the first part of the 2022.01 changes.
The bulk of it is Samuel's DM_I2C rework, which removes the nasty I2C deprecation warnings for most 32-bit boards. It also includes some smaller refactorings that pave the way for more changes, mostly driven by needing to support the Allwinner RISC-V SoC later on.
Board wise we gain support for the FriendlyARM NanoPi R1S H5 router board and official Pinetab support.
Build-tested for all 160 sunxi boards, and boot tested on a A64, A20, H3, H6, and H616 board. USB, SD card, eMMC, and Ethernet all work there (where applicable).
Thanks, Andre
============== The following changes since commit f331497d3ad4166f9826e7674793ae04094b29c1:
Merge tag 'video-20211009' of https://source.denx.de/u-boot/custodians/u-boot-video (2021-10-09 17:47:27 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to f9437b00c06382d3edc623c10c69901786ad6317:
sunxi: Enable DM_I2C for all sunxi boards (2021-10-12 11:01:27 +0100)
Note that the POWER_MC34VR500 PMIC driver is NOT converted to DM, so I had to move the Kconfig entry for that around in order to avoid a new Kconfig warning when building.
Oh, sorry for that! I just see that the commit message speaks of DM_PMIC_MC34708, but it's indeed POWER_MC34VR500 that (wrongfully) gains the dependency. For the next tests I will try to find some idle machine and build more boards than just sunxi! So thanks for the heads up and the quick fix!
Note that you should be able to enable CI runs in the custodian tree, if they aren't enabled by default. That said, you'll only spot this type of error if you check out the job output / summary as it's not a fatal error. That said, if there's some way to make Kconfig errors like this fatal, adding it to CI like we do for -Werror would be good :)
participants (2)
-
Andre Przywara -
Tom Rini