random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 12:56:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch/phy-default' into allwinner

Browse Source 
# Conflicts:
#	drivers/phy/allwinner/Kconfig
This commit is contained in:
Samuel Holland 2022-10-31 22:44:24 -05:00
commit eb6d1b57c4
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-sunxi/Kconfig
View File

@ -147,7 +147,6 @@ endif
config MACH_SUNXI_H3_H5 config MACH_SUNXI_H3_H5
bool bool
select PHY_SUN4I_USB
select SUNXI_DE2 select SUNXI_DE2
select SUNXI_DRAM_DW select SUNXI_DRAM_DW
select SUNXI_DRAM_DW_32BIT select SUNXI_DRAM_DW_32BIT
@ -174,7 +173,6 @@ config MACH_SUNIV
config MACH_SUN4I config MACH_SUN4I
bool "sun4i (Allwinner A10)" bool "sun4i (Allwinner A10)"
select CPU_V7A select CPU_V7A
select PHY_SUN4I_USB
select DRAM_SUN4I select DRAM_SUN4I
select SUNXI_GEN_SUN4I select SUNXI_GEN_SUN4I
imply SPL_SYS_I2C_LEGACY imply SPL_SYS_I2C_LEGACY
@ -184,7 +182,6 @@ config MACH_SUN5I
bool "sun5i (Allwinner A13)" bool "sun5i (Allwinner A13)"
select CPU_V7A select CPU_V7A
select DRAM_SUN4I select DRAM_SUN4I
select PHY_SUN4I_USB
select SUNXI_GEN_SUN4I select SUNXI_GEN_SUN4I
imply SPL_SYS_I2C_LEGACY imply SPL_SYS_I2C_LEGACY
imply SYS_I2C_LEGACY imply SYS_I2C_LEGACY
@ -197,7 +194,6 @@ config MACH_SUN6I
select ARCH_SUPPORT_PSCI select ARCH_SUPPORT_PSCI
select SPL_ARMV7_SET_CORTEX_SMPEN select SPL_ARMV7_SET_CORTEX_SMPEN
select DRAM_SUN6I select DRAM_SUN6I
select PHY_SUN4I_USB
select SPL_I2C select SPL_I2C
select SUN6I_PRCM select SUN6I_PRCM
select SUNXI_GEN_SUN6I select SUNXI_GEN_SUN6I
@ -212,7 +208,6 @@ config MACH_SUN7I
select ARCH_SUPPORT_PSCI select ARCH_SUPPORT_PSCI
select SPL_ARMV7_SET_CORTEX_SMPEN select SPL_ARMV7_SET_CORTEX_SMPEN
select DRAM_SUN4I select DRAM_SUN4I
select PHY_SUN4I_USB
select SUNXI_GEN_SUN4I select SUNXI_GEN_SUN4I
select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
imply SPL_SYS_I2C_LEGACY imply SPL_SYS_I2C_LEGACY
@ -225,7 +220,6 @@ config MACH_SUN8I_A23
select CPU_V7_HAS_VIRT select CPU_V7_HAS_VIRT
select ARCH_SUPPORT_PSCI select ARCH_SUPPORT_PSCI
select DRAM_SUN8I_A23 select DRAM_SUN8I_A23
select PHY_SUN4I_USB
select SPL_I2C select SPL_I2C
select SUNXI_GEN_SUN6I select SUNXI_GEN_SUN6I
select SYS_I2C_SUN8I_RSB select SYS_I2C_SUN8I_RSB
@ -238,7 +232,6 @@ config MACH_SUN8I_A33
select CPU_V7_HAS_VIRT select CPU_V7_HAS_VIRT
select ARCH_SUPPORT_PSCI select ARCH_SUPPORT_PSCI
select DRAM_SUN8I_A33 select DRAM_SUN8I_A33
select PHY_SUN4I_USB
select SPL_I2C select SPL_I2C
select SUNXI_GEN_SUN6I select SUNXI_GEN_SUN6I
select SYS_I2C_SUN8I_RSB select SYS_I2C_SUN8I_RSB
@ -248,7 +241,6 @@ config MACH_SUN8I_A83T
bool "sun8i (Allwinner A83T)" bool "sun8i (Allwinner A83T)"
select CPU_V7A select CPU_V7A
select DRAM_SUN8I_A83T select DRAM_SUN8I_A83T
select PHY_SUN4I_USB
select SPL_I2C select SPL_I2C
select SUNXI_GEN_SUN6I select SUNXI_GEN_SUN6I
select MMC_SUNXI_HAS_NEW_MODE select MMC_SUNXI_HAS_NEW_MODE
@ -274,7 +266,6 @@ config MACH_SUN8I_R40
select MMC_SUNXI_HAS_NEW_MODE select MMC_SUNXI_HAS_NEW_MODE
select SUNXI_DRAM_DW select SUNXI_DRAM_DW
select SUNXI_DRAM_DW_32BIT select SUNXI_DRAM_DW_32BIT
select PHY_SUN4I_USB
imply SPL_SYS_I2C_LEGACY imply SPL_SYS_I2C_LEGACY
config MACH_SUN8I_V3S config MACH_SUN8I_V3S
@ -300,7 +291,6 @@ config MACH_SUN9I
config MACH_SUN50I config MACH_SUN50I
bool "sun50i (Allwinner A64)" bool "sun50i (Allwinner A64)"
select ARM64 select ARM64
select PHY_SUN4I_USB
select SUN6I_PRCM select SUN6I_PRCM
select SUNXI_DE2 select SUNXI_DE2
select SUNXI_GEN_SUN6I select SUNXI_GEN_SUN6I
@ -322,7 +312,6 @@ config MACH_SUN50I_H5
config MACH_SUN50I_H6 config MACH_SUN50I_H6
bool "sun50i (Allwinner H6)" bool "sun50i (Allwinner H6)"
select ARM64 select ARM64
select PHY_SUN4I_USB
select DRAM_SUN50I_H6 select DRAM_SUN50I_H6
select SUN50I_GEN_H6 select SUN50I_GEN_H6

3
drivers/phy/allwinner/Kconfig
View File

@ -3,7 +3,8 @@
# #
config PHY_SUN4I_USB config PHY_SUN4I_USB
bool "Allwinner Sun4I USB PHY driver" bool "Allwinner Sun4I USB PHY driver"
depends on BOARD_SUNXI depends on BOARD_SUNXI && !MACH_SUN9I
default y
select DM_REGULATOR select DM_REGULATOR
select PHY select PHY
help help