Changeset 45716


Ignore:
Timestamp:
2015-05-23T16:54:44+02:00 (3 years ago)
Author:
hauke
Message:

bcm53xx: add OHCI (USB 1.1) support

There is also a OHCI controller, activate it for USB 1.1 support.

This should close #19601.

Signed-off-by: Hauke Mehrtens <hauke@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/bcm53xx/patches-3.18/190-bcma_hcd_add_bcm5301x_support.patch

    r45450 r45716  
    7777  
    7878        /* TODO: Probably need checks here; is the core connected? */ 
    79 @@ -234,18 +281,23 @@ static int bcma_hcd_probe(struct bcma_de 
     79@@ -234,7 +281,12 @@ static int bcma_hcd_probe(struct bcma_de 
    8080        if (!usb_dev) 
    8181                return -ENOMEM; 
    8282  
    8383-       bcma_hcd_init_chip(dev); 
    84 - 
    85 -       /* In AI chips EHCI is addrspace 0, OHCI is 1 */ 
    86 -       ohci_addr = dev->addr_s[0]; 
    87 -       if ((chipinfo->id == 0x5357 || chipinfo->id == 0x4749) 
    88 -           && chipinfo->rev == 0) 
    89 -               ohci_addr = 0x18009000; 
    90 - 
    91 -       usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, true, ohci_addr); 
    92 -       if (IS_ERR(usb_dev->ohci_dev)) { 
    93 -               err = PTR_ERR(usb_dev->ohci_dev); 
    94 -               goto err_free_usb_dev; 
    9584+       if (IS_BUILTIN(CONFIG_ARCH_BCM_5301X) && 
    9685+           chipinfo->id == BCMA_CHIP_ID_BCM4707) { 
     
    9887+       } else if(IS_BUILTIN(CONFIG_BCM47XX)) { 
    9988+               bcma_hcd_init_chip_mips(dev); 
    100 + 
    101 +               /* In AI chips EHCI is addrspace 0, OHCI is 1 */ 
    102 +               ohci_addr = dev->addr_s[0]; 
    103 +               if ((chipinfo->id == 0x5357 || chipinfo->id == 0x4749) 
    104 +                       && chipinfo->rev == 0) 
    105 +                       ohci_addr = 0x18009000; 
    106 + 
    107 +               usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, true, ohci_addr); 
    108 +               if (IS_ERR(usb_dev->ohci_dev)) { 
    109 +                       err = PTR_ERR(usb_dev->ohci_dev); 
    110 +                       goto err_free_usb_dev; 
    111 +               } 
    112         } 
     89+       } 
    11390  
    114         usb_dev->ehci_dev = bcma_hcd_create_pdev(dev, false, dev->addr); 
     91        /* In AI chips EHCI is addrspace 0, OHCI is 1 */ 
     92        ohci_addr = dev->addr_s[0]; 
    11593@@ -306,6 +358,7 @@ static int bcma_hcd_resume(struct bcma_d 
    11694  
Note: See TracChangeset for help on using the changeset viewer.