Update to version 2024.01 to remove upstream patches. The remaining patches come from this repository: https://github.com/smaeul/u-boot/tree/d1-wip [for Dongshan Nezha STU, Nezha D1] Tested-by: Zoltan HERPAI <wigyori@uid0.hu> Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
222 lines
7.9 KiB
Diff
222 lines
7.9 KiB
Diff
From 1c71f4fd1b2b3d7145780dc5516e4d6f38539b1c Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Thu, 26 Aug 2021 21:05:33 -0500
|
|
Subject: [PATCH 44/68] sunxi: Enable PMIC drivevbus regulator support for USB
|
|
supplies
|
|
|
|
On many boards, the USB ports are powered by the PMIC's "drivevbus"
|
|
regulator. In preparation for switching the USB PHY driver to use the
|
|
regulator uclass instead of a virtual GPIO pin, ensure these boards
|
|
have AXP PMIC regulator support enabled.
|
|
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|
---
|
|
configs/A33-OLinuXino_defconfig | 1 +
|
|
configs/Cubieboard4_defconfig | 1 +
|
|
configs/Cubietruck_plus_defconfig | 1 +
|
|
configs/MSI_Primo81_defconfig | 1 +
|
|
configs/Merrii_A80_Optimus_defconfig | 1 +
|
|
configs/Sinovoip_BPI_M3_defconfig | 1 +
|
|
configs/Yones_Toptech_BS1078_V2_defconfig | 1 +
|
|
configs/colorfly_e708_q1_defconfig | 1 +
|
|
configs/ga10h_v1_1_defconfig | 1 +
|
|
configs/gt90h_v4_defconfig | 1 +
|
|
configs/iNet_D978_rev2_defconfig | 1 +
|
|
configs/inet86dz_defconfig | 1 +
|
|
configs/inet_q972_defconfig | 1 +
|
|
configs/polaroid_mid2407pxe03_defconfig | 1 +
|
|
configs/polaroid_mid2809pxe04_defconfig | 1 +
|
|
configs/q8_a23_tablet_800x480_defconfig | 1 +
|
|
configs/q8_a33_tablet_1024x600_defconfig | 1 +
|
|
configs/q8_a33_tablet_800x480_defconfig | 1 +
|
|
configs/tbs_a711_defconfig | 1 +
|
|
19 files changed, 19 insertions(+)
|
|
|
|
--- a/configs/A33-OLinuXino_defconfig
|
|
+++ b/configs/A33-OLinuXino_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
|
|
CONFIG_VIDEO_LCD_BL_EN="PB2"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DCDC1_VOLT=3300
|
|
CONFIG_USB_MUSB_HOST=y
|
|
--- a/configs/Cubieboard4_defconfig
|
|
+++ b/configs/Cubieboard4_defconfig
|
|
@@ -11,5 +11,6 @@ CONFIG_USB1_VBUS_PIN="PH14"
|
|
CONFIG_USB3_VBUS_PIN="PH15"
|
|
CONFIG_AXP_GPIO=y
|
|
CONFIG_SYS_I2C_SUN8I_RSB=y
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP809_POWER=y
|
|
--- a/configs/Cubietruck_plus_defconfig
|
|
+++ b/configs/Cubietruck_plus_defconfig
|
|
@@ -21,6 +21,7 @@ CONFIG_SYS_I2C_SLAVE=0x7f
|
|
CONFIG_SYS_I2C_SPEED=400000
|
|
CONFIG_PHY_REALTEK=y
|
|
CONFIG_SUN8I_EMAC=y
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO3_VOLT=2500
|
|
CONFIG_AXP_DLDO4_VOLT=3300
|
|
--- a/configs/MSI_Primo81_defconfig
|
|
+++ b/configs/MSI_Primo81_defconfig
|
|
@@ -12,6 +12,7 @@ CONFIG_VIDEO_LCD_BL_EN="PA25"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH13"
|
|
CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
--- a/configs/Merrii_A80_Optimus_defconfig
|
|
+++ b/configs/Merrii_A80_Optimus_defconfig
|
|
@@ -11,5 +11,6 @@ CONFIG_USB1_VBUS_PIN="PH4"
|
|
CONFIG_USB3_VBUS_PIN="PH5"
|
|
CONFIG_AXP_GPIO=y
|
|
CONFIG_SYS_I2C_SUN8I_RSB=y
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP809_POWER=y
|
|
--- a/configs/Sinovoip_BPI_M3_defconfig
|
|
+++ b/configs/Sinovoip_BPI_M3_defconfig
|
|
@@ -17,6 +17,7 @@ CONFIG_CONSOLE_MUX=y
|
|
CONFIG_PHY_REALTEK=y
|
|
CONFIG_SUN8I_EMAC=y
|
|
CONFIG_INITIAL_USB_SCAN_DELAY=500
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DCDC5_VOLT=1200
|
|
CONFIG_AXP_DLDO3_VOLT=3300
|
|
--- a/configs/Yones_Toptech_BS1078_V2_defconfig
|
|
+++ b/configs/Yones_Toptech_BS1078_V2_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PA25"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH13"
|
|
CONFIG_VIDEO_LCD_PANEL_LVDS=y
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_USB_MUSB_HOST=y
|
|
--- a/configs/colorfly_e708_q1_defconfig
|
|
+++ b/configs/colorfly_e708_q1_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PA25"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH13"
|
|
CONFIG_VIDEO_LCD_PANEL_LVDS=y
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_AXP_DLDO2_VOLT=1800
|
|
--- a/configs/ga10h_v1_1_defconfig
|
|
+++ b/configs/ga10h_v1_1_defconfig
|
|
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
CONFIG_VIDEO_LCD_PANEL_LVDS=y
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_CONS_INDEX=5
|
|
--- a/configs/gt90h_v4_defconfig
|
|
+++ b/configs/gt90h_v4_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
|
|
CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_CONS_INDEX=5
|
|
--- a/configs/iNet_D978_rev2_defconfig
|
|
+++ b/configs/iNet_D978_rev2_defconfig
|
|
@@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
CONFIG_VIDEO_LCD_PANEL_LVDS=y
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
--- a/configs/inet86dz_defconfig
|
|
+++ b/configs/inet86dz_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
|
|
CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_CONS_INDEX=5
|
|
--- a/configs/inet_q972_defconfig
|
|
+++ b/configs/inet_q972_defconfig
|
|
@@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
|
|
CONFIG_VIDEO_LCD_BL_EN="PA25"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH13"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_USB_EHCI_HCD=y
|
|
--- a/configs/polaroid_mid2407pxe03_defconfig
|
|
+++ b/configs/polaroid_mid2407pxe03_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
|
|
CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_CONS_INDEX=5
|
|
--- a/configs/polaroid_mid2809pxe04_defconfig
|
|
+++ b/configs/polaroid_mid2809pxe04_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
|
|
CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_CONS_INDEX=5
|
|
--- a/configs/q8_a23_tablet_800x480_defconfig
|
|
+++ b/configs/q8_a23_tablet_800x480_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
|
|
CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_CONS_INDEX=5
|
|
--- a/configs/q8_a33_tablet_1024x600_defconfig
|
|
+++ b/configs/q8_a33_tablet_1024x600_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
|
|
CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_CONS_INDEX=5
|
|
--- a/configs/q8_a33_tablet_800x480_defconfig
|
|
+++ b/configs/q8_a33_tablet_800x480_defconfig
|
|
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
|
|
CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DLDO1_VOLT=3300
|
|
CONFIG_CONS_INDEX=5
|
|
--- a/configs/tbs_a711_defconfig
|
|
+++ b/configs/tbs_a711_defconfig
|
|
@@ -13,6 +13,7 @@ CONFIG_USB0_ID_DET="PH11"
|
|
CONFIG_AXP_GPIO=y
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
|
|
+CONFIG_REGULATOR_AXP_DRIVEVBUS=y
|
|
CONFIG_REGULATOR_AXP_USB_POWER=y
|
|
CONFIG_AXP_DCDC5_VOLT=1200
|
|
CONFIG_USB_EHCI_HCD=y
|