Skip to contentSkip to conversation

fsl/85xx: add clkdvdr and pmuxcr2 to global utilities structure definition

PATCH New Timur Tabi 3 participants 3 messages May 20, 2010 – May 21, 2010 PowerPC

lore
Share & tools
lore

Timur Tabi

author
#0 lore raw

PATCH v2 1/1 fsl/85xx: add clkdvdr and pmuxcr2 to global utilities structure definition

Add the 'clkdvdr' and 'pmuxcr2' registers to the 85xx definition of struct ccsr_gur.

---

This patch replaces "fsl/85xx: add clkdvdr to global utilities structure definition". Thanks to Sergei Shtylyov.

 arch/powerpc/include/asm/immap_85xx.h |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/immap_85xx.h +6 -3
index e7954e6..5b205d1 100644
@@ -1912,7 +1912,8 @@ typedef struct ccsr_gur {
 #define MPC85xx_PMUXCR_SD_DATA		0x80000000
 #define MPC85xx_PMUXCR_SDHC_CD		0x40000000
 #define MPC85xx_PMUXCR_SDHC_WP		0x20000000
-	u8	res6[12];
+	u32	pmuxcr2;	/* Alt. function signal multiplex control 2 */
+	u8	res6[8];
 	u32	devdisr;	/* Device disable control */
 #define MPC85xx_DEVDISR_PCI1		0x80000000
 #define MPC85xx_DEVDISR_PCI2		0x40000000
@@ -1949,10 +1950,12 @@ typedef struct ccsr_gur {
 #if defined(CONFIG_MPC8568)||defined(CONFIG_MPC8569)
 	u8	res10b[76];
 	par_io_t qe_par_io[7];
-	u8	res10c[3136];
+	u8	res10c[1600];
 #else
-	u8	res10b[3404];
+	u8	res10b[1868];
 #endif
+	u32	clkdvdr;	/* Clock Divide register */
+	u8	res10d[1532];
 	u32	clkocr;		/* Clock out select */
 	u8	res11[12];
 	u32	ddrdllcr;	/* DDR DLL control */
Signature · 1 line
1.6.5
Applied
#1 lore raw

PATCH v2 1/1 fsl/85xx: add clkdvdr and pmuxcr2 to global utilities structure definition

Quoted 11 lines · Timur Tabi

Add the 'clkdvdr' and 'pmuxcr2' registers to the 85xx definition of struct ccsr_gur.

---

This patch replaces "fsl/85xx: add clkdvdr to global utilities structure definition". Thanks to Sergei Shtylyov.

arch/powerpc/include/asm/immap_85xx.h | 9 ++++++---

1 files changed, 6 insertions(+), 3 deletions(-)

applied to 85xx.

- k

#2 lore raw

PATCH v2 1/1 fsl/85xx: add clkdvdr and pmuxcr2 to global utilities structure definition

In reply to Timur Tabi

Dear Timur Tabi,

Quoted 2 lines · In message <[email protected]> you wrote:

Add the 'clkdvdr' and 'pmuxcr2' registers to the 85xx definition of struct ccsr_gur.

Please keep the subject line short enought to fit as title of the commit message. Also, it makes little sense to more or less duplicate the same text in the body of the commit message.

Thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Cogito cogito ergo cogito sum - "I think that I  think,  therefore  I
think that I am."          - Ambrose Bierce, "The Devil's Dictionary"