diff --git a/[refs] b/[refs] index 945da339222b..16d71f88a9d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11d579ee0a19052a5a90ebfe0c39e7ed8ce8a9dc +refs/heads/master: 6a4a636fad018500c5db7a2b56a00caeb21cbb2c diff --git a/trunk/include/asm-powerpc/mpc52xx_psc.h b/trunk/include/asm-powerpc/mpc52xx_psc.h index 710c5d36efaa..5467c2c0faa7 100644 --- a/trunk/include/asm-powerpc/mpc52xx_psc.h +++ b/trunk/include/asm-powerpc/mpc52xx_psc.h @@ -132,8 +132,12 @@ struct mpc52xx_psc { u8 reserved5[3]; u8 ctlr; /* PSC + 0x1c */ u8 reserved6[3]; - u16 ccr; /* PSC + 0x20 */ - u8 reserved7[14]; + /* BitClkDiv field of CCR is byte swapped in + * the hardware for mpc5200/b compatibility */ + u32 ccr; /* PSC + 0x20 */ + u32 ac97_slots; /* PSC + 0x24 */ + u32 ac97_cmd; /* PSC + 0x28 */ + u32 ac97_data; /* PSC + 0x2c */ u8 ivr; /* PSC + 0x30 */ u8 reserved8[3]; u8 ip; /* PSC + 0x34 */