From: Tom Rini <trini@konsulko.com>
Date: Tue, 12 Oct 2021 12:58:58 +0000 (-0400)
Subject: Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi
X-Git-Tag: v2022.01~92
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2aab77f7263bb6e27120cfea82fc5efa4f625014;p=platform%2Fkernel%2Fu-boot.git

Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi

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).
---

2aab77f7263bb6e27120cfea82fc5efa4f625014
diff --cc drivers/power/pmic/Kconfig
index cf2a9b2,fcb517f..92e2ace
--- a/drivers/power/pmic/Kconfig
+++ b/drivers/power/pmic/Kconfig
@@@ -313,16 -308,15 +308,8 @@@ config PMIC_LP8756
  	The LP87565 is a PMIC containing a bunch of SMPS.
  	This driver binds the pmic children.
  
--config POWER_MC34VR500
--	bool "Enable driver for Freescale MC34VR500 PMIC"
--	---help---
--	The MC34VR500 is used in conjunction with the FSL T1 and LS1 series
--	SoC. It provides 4 buck DC-DC convertors and 5 LDOs, and it is accessed
--	via an I2C interface.
--
  config DM_PMIC_TPS65910
  	bool "Enable driver for Texas Instruments TPS65910 PMIC"
- 	depends on DM_PMIC
  	---help---
  	The TPS65910 is a PMIC containing 3 buck DC-DC converters, one boost
  	DC-DC converter, 8 LDOs and a RTC. This driver binds the SMPS and LDO
@@@ -363,4 -357,5 +350,13 @@@ config PMIC_TPS6594
  	help
  	The TPS65941 is a PMIC containing a bunch of SMPS & LDOs.
  	This driver binds the pmic children.
+ 
+ endif
++
++config POWER_MC34VR500
++	bool "Enable driver for Freescale MC34VR500 PMIC"
++	depends on !DM_PMIC
++	---help---
++	The MC34VR500 is used in conjunction with the FSL T1 and LS1 series
++	SoC. It provides 4 buck DC-DC convertors and 5 LDOs, and it is accessed
++	via an I2C interface.