[PATCH v2 01/22] sunxi: remove CONFIG_SATAPWR

Samuel Holland samuel at sholland.org
Sun Oct 22 05:34:50 CEST 2023


On 10/21/23 18:27, Andre Przywara wrote:
> On Thu, 19 Oct 2023 18:51:30 -0500
> Samuel Holland <samuel at sholland.org> wrote:
> 
> Hi Samuel,
> 
> thanks for having a look!
> 
>> On 9/28/23 16:54, Andre Przywara wrote:
>>> The CONFIG_SATAPWR Kconfig symbol was used to point to a GPIO that
>>> enables the power for a SATA harddisk.
>>> In the DT this is described with the target-supply property in the AHCI
>>> DT node, pointing to a (GPIO controlled) regulator. Since we need SATA
>>> only in U-Boot proper, and use a DM driver for AHCI there, we should use
>>> the DT instead of hardcoding this.
>>>
>>> Add code to the sunxi AHCI driver to check the DT for that regulator and
>>> enable it, at probe time. Then drop the current code from board.c, which
>>> was doing that job before.
>>> This allows us to remove the SATAPWR Kconfig definition and the
>>> respective values from the defconfigs.
>>> We also select the generic fixed regulator driver, which handles those
>>> GPIO controlled regulators.
>>>
>>> Signed-off-by: Andre Przywara <andre.przywara at arm.com>
>>> Reviewed-by: Sam Edwards <CFSworks at gmail.com>
>>> ---
>>>  arch/arm/Kconfig                             |  2 ++
>>>  arch/arm/mach-sunxi/Kconfig                  |  8 --------
>>>  board/sunxi/board.c                          | 16 +---------------
>>>  configs/A10-OLinuXino-Lime_defconfig         |  1 -
>>>  configs/A20-OLinuXino-Lime2-eMMC_defconfig   |  1 -
>>>  configs/A20-OLinuXino-Lime2_defconfig        |  1 -
>>>  configs/A20-OLinuXino-Lime_defconfig         |  1 -
>>>  configs/A20-OLinuXino_MICRO-eMMC_defconfig   |  1 -
>>>  configs/A20-OLinuXino_MICRO_defconfig        |  1 -
>>>  configs/A20-Olimex-SOM-EVB_defconfig         |  1 -
>>>  configs/A20-Olimex-SOM204-EVB-eMMC_defconfig |  1 -
>>>  configs/A20-Olimex-SOM204-EVB_defconfig      |  1 -
>>>  configs/Cubieboard2_defconfig                |  1 -
>>>  configs/Cubieboard_defconfig                 |  1 -
>>>  configs/Cubietruck_defconfig                 |  1 -
>>>  configs/Itead_Ibox_A20_defconfig             |  1 -
>>>  configs/Lamobo_R1_defconfig                  |  1 -
>>>  configs/Linksprite_pcDuino3_Nano_defconfig   |  1 -
>>>  configs/Linksprite_pcDuino3_defconfig        |  1 -
>>>  configs/Sinovoip_BPI_M3_defconfig            |  1 -
>>>  configs/orangepi_plus_defconfig              |  2 +-
>>>  drivers/ata/ahci_sunxi.c                     |  9 +++++++++
>>>  22 files changed, 13 insertions(+), 41 deletions(-)
>>>
>>> [...]
>>> diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
>>> index 76de72aa228..ed585881d49 100644
>>> --- a/configs/orangepi_plus_defconfig
>>> +++ b/configs/orangepi_plus_defconfig
>>> @@ -7,7 +7,6 @@ CONFIG_DRAM_CLK=672
>>>  CONFIG_MACPWR="PD6"
>>>  CONFIG_MMC_SUNXI_SLOT_EXTRA=2
>>>  CONFIG_USB1_VBUS_PIN="PG13"
>>> -CONFIG_SATAPWR="PG11"
>>>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>>>  CONFIG_SPL_I2C=y
>>>  CONFIG_SPL_SYS_I2C_LEGACY=y
>>> @@ -16,3 +15,4 @@ CONFIG_SUN8I_EMAC=y
>>>  CONFIG_SY8106A_POWER=y
>>>  CONFIG_USB_EHCI_HCD=y
>>>  CONFIG_USB_OHCI_HCD=y
>>> +CONFIG_USB3_VBUS_PIN="PG11"  
>>
>> This change is unrelated to the purpose of this commit.
> 
> I added this line after your suggestion last December:
> https://lore.kernel.org/u-boot/bb2ef69f-23e1-9936-e824-6b86924b9c8a@sholland.org/
> 
> In short: this is an H3 board without native SATA, so having this
> symbol set here enables SATA operation for now, until we get full DT
> regulator support in phy-sun4i-usb.c.

Ah right, sorry for the confusion. Maybe this deserves mentioning in the
commit message. Either way:

Reviewed-by: Samuel Holland <samuel at sholland.org>



More information about the U-Boot mailing list