* Patches by Yuli Barcohen, 13 Jul 2003:

  - Correct flash and JFFS2 support for MPC8260ADS
  - fix PVR values and clock generation for PowerQUICC II family
    (8270/8275/8280)

* Patch by Bernhard Kuhn, 08 Jul 2003:
  - add support for M68K targets

* Patch by Ken Chou, 3 Jul:
  - Fix PCI config table for A3000
  - Fix iobase for natsemi.c
    (PCI_BASE_ADDRESS_0 is the IO base register for DP83815)

* Allow to enable "slow" POST routines by key press on power-on
* Fix temperature dependend switching of LCD backlight on LWMON
* Tweak output format for LWMON

1 files changed, 79 insertions, 78 deletions

diff --git a/include/video_ad7177.h b/include/video_ad7177.h
index 3f35f335d5..de3863d089 100644
--- a/include/video_ad7177.h
+++ b/include/video_ad7177.h
@@ -12,7 +12,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -24,25 +24,25 @@
 #ifndef _VIDEO_AD7177_H_
 #define _VIDEO_AD7177_H_
 
-/*#define VIDEO_DEBUG_DISABLE_COLORS	0 */
+/* #define VIDEO_DEBUG_DISABLE_COLORS	0 */
 
 #define VIDEO_ENCODER_NAME	"Analog Devices AD7177"
 
-#define VIDEO_ENCODER_I2C_RATE	100000	/* Max rate is 100Khz */
-#define VIDEO_ENCODER_CB_Y_CR_Y		/* Use CB Y CR Y format... */
+#define VIDEO_ENCODER_I2C_RATE	100000	/* Max rate is 100 kHz		*/
+#define VIDEO_ENCODER_CB_Y_CR_Y		/* Use CB Y CR Y format...	*/
 
 #define VIDEO_MODE_YUYV		/* The only mode supported by this encoder */
-#undef  VIDEO_MODE_RGB
+#undef	VIDEO_MODE_RGB
 #define VIDEO_MODE_BPP		16
 
-#ifdef  VIDEO_MODE_PAL
+#ifdef	VIDEO_MODE_PAL
 #define VIDEO_ACTIVE_COLS	720
 #define VIDEO_ACTIVE_ROWS	576
 #define VIDEO_VISIBLE_COLS	640
 #define VIDEO_VISIBLE_ROWS	480
 #endif
 
-#ifdef 	VIDEO_MODE_NTSC
+#ifdef	VIDEO_MODE_NTSC
 #define VIDEO_ACTIVE_COLS	720
 #define VIDEO_ACTIVE_ROWS	525
 #define VIDEO_VISIBLE_COLS	640
@@ -52,97 +52,98 @@
 static unsigned char
     video_encoder_data[] = {
 #ifdef VIDEO_MODE_NTSC
-					0x04, /* Mode Register 0 */
+					0x04, /* Mode Register 0	*/
 #ifdef VIDEO_DEBUG_COLORBARS
 					0xc2,
 #else
-					0x42, /* Mode Register 1 */
-#endif
-					0x16, /* Subcarrier Freq 0 */
-					0x7c, /* Subcarrier Freq 1 */
-					0xf0, /* Subcarrier Freq 2 */
-					0x21, /* Subcarrier Freq 3 */
-					0x00, /* Subcarrier phase */
-					0x02, /* Timing Register 0 */
-					0x00, /* Extended Captioning 0 */
-					0x00, /* Extended Captioning 1 */
-					0x00, /* Closed Captioning 0 */
-					0x00, /* Closed Captioning 1 */
-					0x00, /* Timing Register 1 */
-					0x08, /* Mode Register 2 */
-					0x00, /* Pedestal Register 0 */
-					0x00, /* Pedestal Register 1 */
-					0x00, /* Pedestal Register 2 */
-					0x00, /* Pedestal Register 3 */
-					0x08 /* Mode Register 3 */
+					0x42, /* Mode Register 1	*/
+#endif	/* VIDEO_DEBUG_COLORBARS */
+					0x16, /* Subcarrier Freq 0	*/
+					0x7c, /* Subcarrier Freq 1	*/
+					0xf0, /* Subcarrier Freq 2	*/
+					0x21, /* Subcarrier Freq 3	*/
+					0x00, /* Subcarrier phase	*/
+					0x02, /* Timing Register 0	*/
+					0x00, /* Extended Captioning 0	*/
+					0x00, /* Extended Captioning 1	*/
+					0x00, /* Closed Captioning 0	*/
+					0x00, /* Closed Captioning 1	*/
+					0x00, /* Timing Register 1	*/
+					0x08, /* Mode Register 2	*/
+					0x00, /* Pedestal Register 0	*/
+					0x00, /* Pedestal Register 1	*/
+					0x00, /* Pedestal Register 2	*/
+					0x00, /* Pedestal Register 3	*/
+					0x08, /* Mode Register 3	*/
+
+#endif	/* VIDEO_MODE_NTSC */
 
-#endif
 #ifdef VIDEO_MODE_PAL
 #ifdef VIDEO_MODE_RGB_OUT
 
-					0x69, /* Mode Register 0 */
+					0x69, /* Mode Register 0	*/
 #ifdef VIDEO_DEBUG_COLORBARS
-					0xc0, /* Mode Register 1 (c0) */
+					0xc0, /* Mode Register 1 (c0)	*/
 #else
-					0x40, /* Mode Register 1 (c0) */
-#endif
-					0xcb, /* Subcarrier Freq 0 */
-					0x8a, /* Subcarrier Freq 1 */
-					0x09, /* Subcarrier Freq 2 */
-					0x2a, /* Subcarrier Freq 3 */
-					0x00, /* Subcarrier phase */
-					0x02, /* Timing Register 0 */
-					0x00, /* Extended Captioning 0 */
-					0x00, /* Extended Captioning 1 */
-					0x00, /* Closed Captioning 0 */
-					0x00, /* Closed Captioning 1 */
-					0x00, /* Timing Register 1 */
-					0x28, /* Mode Register 2 */
-					0x00, /* Pedestal Register 0 */
-					0x00, /* Pedestal Register 1 */
-					0x00, /* Pedestal Register 2 */
-					0x00, /* Pedestal Register 3 */
-					0x08  /* Mode Register 3 */
+					0x40, /* Mode Register 1 (c0)	*/
+#endif	/* VIDEO_DEBUG_COLORBARS */
+					0xcb, /* Subcarrier Freq 0	*/
+					0x8a, /* Subcarrier Freq 1	*/
+					0x09, /* Subcarrier Freq 2	*/
+					0x2a, /* Subcarrier Freq 3	*/
+					0x00, /* Subcarrier phase	*/
+					0x02, /* Timing Register 0	*/
+					0x00, /* Extended Captioning 0	*/
+					0x00, /* Extended Captioning 1	*/
+					0x00, /* Closed Captioning 0	*/
+					0x00, /* Closed Captioning 1	*/
+					0x00, /* Timing Register 1	*/
+					0x28, /* Mode Register 2	*/
+					0x00, /* Pedestal Register 0	*/
+					0x00, /* Pedestal Register 1	*/
+					0x00, /* Pedestal Register 2	*/
+					0x00, /* Pedestal Register 3	*/
+					0x08, /* Mode Register 3	*/
 
-#else
+#else	/* ! VIDEO_MODE_RGB_OUT */
 
 					0x09, /* Mode Register 0 (was 01) */
 #ifdef VIDEO_DEBUG_COLORBARS
-					0xd8,	/* */
+					0xd8, /*			*/
 #else
 					0x59, /* Mode Register 1 (was 58) */
-#endif
-					0xcb, /* Subcarrier Freq 0 */
-					0x8a, /* Subcarrier Freq 1 */
-					0x09, /* Subcarrier Freq 2 */
-					0x2a, /* Subcarrier Freq 3 */
-					0x00, /* Subcarrier phase */
+#endif	/* VIDEO_DEBUG_COLORBARS */
+					0xcb, /* Subcarrier Freq 0	*/
+					0x8a, /* Subcarrier Freq 1	*/
+					0x09, /* Subcarrier Freq 2	*/
+					0x2a, /* Subcarrier Freq 3	*/
+					0x00, /* Subcarrier phase	*/
 					0x02, /* Timing Register 0 (was a) */
-					0x00, /* Extended Captioning 0 */
-					0x00, /* Extended Captioning 1 */
-					0x00, /* Closed Captioning 0 */
-					0x00, /* Closed Captioning 1 */
-					0x00, /* Timing Register 1 */
+					0x00, /* Extended Captioning 0	*/
+					0x00, /* Extended Captioning 1	*/
+					0x00, /* Closed Captioning 0	*/
+					0x00, /* Closed Captioning 1	*/
+					0x00, /* Timing Register 1	*/
 #ifdef VIDEO_DEBUG_LOWPOWER
 #ifdef VIDEO_DEBUG_DISABLE_COLORS
-					0x98, /* Mode Register 2 */
-#else
-					0x88, /* Mode Register 2 */
-#endif
+					0x98, /* Mode Register 2	*/
 #else
+					0x88, /* Mode Register 2	*/
+#endif	/* VIDEO_DEBUG_DISABLE_COLORS */
+#else	/* ! VIDEO_DEBUG_LOWPOWER */
 #ifdef VIDEO_DEBUG_DISABLE_COLORS
-					0x18, /* Mode Register 2 */
+					0x18, /* Mode Register 2	*/
 #else
-					0x08, /* Mode Register 2 */
-#endif
-#endif
-					0x00, /* Pedestal Register 0 */
-					0x00, /* Pedestal Register 1 */
-					0x00, /* Pedestal Register 2 */
-					0x00, /* Pedestal Register 3 */
-					0x08  /* Mode Register 3 */
-#endif
-#endif
+					0x08, /* Mode Register 2	*/
+#endif	/* VIDEO_DEBUG_DISABLE_COLORS */
+#endif	/* VIDEO_DEBUG_LOWPOWER */
+					0x00, /* Pedestal Register 0	*/
+					0x00, /* Pedestal Register 1	*/
+					0x00, /* Pedestal Register 2	*/
+					0x00, /* Pedestal Register 3	*/
+					0x08  /* Mode Register 3	*/
+#endif	/* VIDEO_MODE_RGB_OUT */
+#endif	/* VIDEO_MODE_PAL */
     } ;
 
-#endif
+#endif	/* _VIDEO_AD7177_H_ */