Merge branch 'i2c'

[u-boot] / include / mpc8260.h

diff --git a/include/mpc8260.h b/include/mpc8260.h
index 8bddd6a60e9dd3eb3ed89193781012c36a41e8c7..ff52a7b38b3de59e15c60cba2aac5b0dc189a1d8 100644 (file)
--- a/include/mpc8260.h
+++ b/include/mpc8260.h
@@ -34,8 +34,12 @@
 #define CPU_ID_STR     "MPC8255"
 #endif
 #ifndef CPU_ID_STR
+#if defined(CONFIG_MPC8272_FAMILY)
+#define CPU_ID_STR     "MPC8272"
+#else
 #define CPU_ID_STR     "MPC8260"
 #endif
+#endif /* !CPU_ID_STR */
 
 /*-----------------------------------------------------------------------
  * Exception offsets (PowerPC standard)
@@ -288,6 +292,10 @@
 /*-----------------------------------------------------------------------
  * SCCR - System Clock Control Register                                         9-8
  */
+#define SCCR_PCI_MODE  0x00000100      /* PCI Mode     */
+#define SCCR_PCI_MODCK 0x00000080      /* Value of PCI_MODCK pin       */
+#define SCCR_PCIDF_MSK 0x00000078      /* PCI division factor  */
+#define SCCR_PCIDF_SHIFT 3
 #define SCCR_CLPD      0x00000004      /* CPM Low Power Disable        */
 #define SCCR_DFBRG_MSK 0x00000003      /* Division factor of BRGCLK Mask */
 #define SCCR_DFBRG_SHIFT 0