Re: [PATCH] hw/arm: ast2600: Wire up EHCI controllers

[Cédric Le Goater]

On 2/7/20 6:07 PM, Guenter Roeck wrote:
> On Fri, Feb 07, 2020 at 04:47:09PM +0100, Cédric Le Goater wrote:
>> On 2/7/20 3:49 PM, Guenter Roeck wrote:
>>> Initialize EHCI controllers on AST2600 using the existing
>>> TYPE_PLATFORM_EHCI. After this change, booting ast2600-evb
>>> into Linux successfully instantiates a USB interface after
>>> the necessary changes are made to its devicetree files.
>>>
>>> ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
>>> ehci-platform: EHCI generic platform driver
>>> ehci-platform 1e6a3000.usb: EHCI Host Controller
>>> ehci-platform 1e6a3000.usb: new USB bus registered, assigned bus number 1
>>> ehci-platform 1e6a3000.usb: irq 25, io mem 0x1e6a3000
>>> ehci-platform 1e6a3000.usb: USB 2.0 started, EHCI 1.00
>>> usb usb1: Manufacturer: Linux 5.5.0-09825-ga0802f2d0ef5-dirty ehci_hcd
>>> usb 1-1: new high-speed USB device number 2 using ehci-platform
>>>
>>> Signed-off-by: Guenter Roeck <address@hidden>
>>> ---
>>>  hw/arm/aspeed_ast2600.c | 23 +++++++++++++++++++++++
>>>  1 file changed, 23 insertions(+)
>>>
>>> diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
>>> index 931887ac68..a528251c8d 100644
>>> --- a/hw/arm/aspeed_ast2600.c
>>> +++ b/hw/arm/aspeed_ast2600.c
>>> @@ -31,6 +31,8 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = {
>>>      [ASPEED_FMC]       = 0x1E620000,
>>>      [ASPEED_SPI1]      = 0x1E630000,
>>>      [ASPEED_SPI2]      = 0x1E641000,
>>> +    [ASPEED_EHCI1]     = 0x1E6A1000,
>>> +    [ASPEED_EHCI2]     = 0x1E6A3000,
>>>      [ASPEED_MII1]      = 0x1E650000,
>>>      [ASPEED_MII2]      = 0x1E650008,
>>>      [ASPEED_MII3]      = 0x1E650010,
>>> @@ -77,6 +79,8 @@ static const int aspeed_soc_ast2600_irqmap[] = {
>>>      [ASPEED_ADC]       = 78,
>>>      [ASPEED_XDMA]      = 6,
>>>      [ASPEED_SDHCI]     = 43,
>>> +    [ASPEED_EHCI1]     = 5,
>>> +    [ASPEED_EHCI2]     = 9,
>>
>> There is a conflict here with commit a29e3e127077 ("hw/arm: ast2600: Wire 
>> up the eMMC controller") which is mainline already 
>>
> Ah, sorry, I had tested this on top of v4.2. Fortunately it is only
> a context conflict. Should I resend ?

yes. keep my S-o-b.

There are a few aspeed changes in 5.0 and some more on the list but all 
patches apply cleanly. It will Peter's life easier.  

Thanks,

C.