• Anton Vorontsov's avatar
    powerpc/qe&cpm2: Avoid redefinitions in CPM2 and QE headers · 80952988
    Anton Vorontsov authored
    struct mcc defined in both immap_qe.h and immap_cpm2.h, so they will
    conflic when included in a single file. The mcc struct is easy to deal
    with, since it isn't used in any driver (yet), so let's just rename QE
    version to qe_mcc.
    
    The ucb_ctlr is a bit trickier, since it is used by fsl_qe_udc driver,
    and the driver supports both CPM and QE UDCs, plus the QE version is
    used to form a bigger immap struct.
    
    I don't want to touch too much of USB code in this series, so for now
    let's just copy most generic version into the common cpm.h header,
    later we'll create cpm_usb.h where we'll place common USB structs that
    are used by QE/CPM UDC and QE Host drivers (FHCI).
    
    And as for the structs in qe.h and cpm2.h, just prefix them with qe_
    and cpm_.
    Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
    Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
    80952988
immap_cpm2.h 10.5 KB