mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6: IXP4xx: Fix LL debugging on little-endian CPU. IXP4xx: Fix sparse warnings in I/O primitives. IXP4xx: Make mdio_bus struct static in the Ethernet driver. IXP4xx: Fix ixp4xx_crypto little-endian operation. IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals. ixp4xx/vulcan: add PCI support ixp4xx: base support for Arcom Vulcan
This commit is contained in:
commit
946880fa27
9 changed files with 357 additions and 5 deletions
|
|
@ -241,7 +241,7 @@ static inline void memcpy_swab32(u32 *dest, u32 *src, int cnt)
|
|||
|
||||
static spinlock_t mdio_lock;
|
||||
static struct eth_regs __iomem *mdio_regs; /* mdio command and status only */
|
||||
struct mii_bus *mdio_bus;
|
||||
static struct mii_bus *mdio_bus;
|
||||
static int ports_open;
|
||||
static struct port *npe_port_tab[MAX_NPES];
|
||||
static struct dma_pool *dma_pool;
|
||||
|
|
|
|||
|
|
@ -396,7 +396,7 @@ static void hss_config(struct port *port)
|
|||
msg.cmd = PORT_CONFIG_WRITE;
|
||||
msg.hss_port = port->id;
|
||||
msg.index = HSS_CONFIG_TX_PCR;
|
||||
msg.data32 = PCR_FRM_SYNC_OUTPUT_RISING | PCR_MSB_ENDIAN |
|
||||
msg.data32 = PCR_FRM_PULSE_DISABLED | PCR_MSB_ENDIAN |
|
||||
PCR_TX_DATA_ENABLE | PCR_SOF_NO_FBIT;
|
||||
if (port->clock_type == CLOCK_INT)
|
||||
msg.data32 |= PCR_SYNC_CLK_DIR_OUTPUT;
|
||||
|
|
|
|||
Loading…
Reference in a new issue