Merge linux-2.6 with linux-acpi-2.6

1 files changed, 466 insertions, 311 deletions

diff --git a/drivers/video/w100fb.h b/drivers/video/w100fb.h
index 41624f961237..7a58a1e3e427 100644
--- a/drivers/video/w100fb.h
+++ b/drivers/video/w100fb.h
@@ -5,9 +5,12 @@
  *
  * Copyright (C) 2002, ATI Corp.
  * Copyright (C) 2004-2005 Richard Purdie
+ * Copyright (c) 2005 Ian Molton <spyro@f2s.com>
  *
  * Modified to work with 2.6 by Richard Purdie <rpurdie@rpsys.net>
  *
+ * w32xx support by Ian Molton
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -19,7 +22,7 @@
 
 /* Block CIF Start: */
 #define mmCHIP_ID           0x0000
-#define mmREVISION_ID           0x0004
+#define mmREVISION_ID       0x0004
 #define mmWRAP_BUF_A        0x0008
 #define mmWRAP_BUF_B        0x000C
 #define mmWRAP_TOP_DIR      0x0010
@@ -88,7 +91,7 @@
 #define mmDISP_DEBUG        0x04D4
 #define mmDISP_DB_BUF_CNTL  0x04D8
 #define mmDISP_CRC_SIG      0x04DC
-#define mmCRTC_DEFAULT_COUNT    0x04E0
+#define mmCRTC_DEFAULT_COUNT    0x04E0
 #define mmLCD_BACKGROUND_COLOR  0x04E4
 #define mmCRTC_PS2          0x04E8
 #define mmCRTC_PS2_VPOS     0x04EC
@@ -119,17 +122,17 @@
 /* Block DISPLAY End: */
 
 /* Block GFX Start: */
-#define mmBRUSH_OFFSET      0x108C
-#define mmBRUSH_Y_X         0x1074
-#define mmDEFAULT_PITCH_OFFSET          0x10A0
-#define mmDEFAULT_SC_BOTTOM_RIGHT       0x10A8
-#define mmDEFAULT2_SC_BOTTOM_RIGHT      0x10AC
-#define mmGLOBAL_ALPHA      0x1210
-#define mmFILTER_COEF       0x1214
-#define mmMVC_CNTL_START    0x11E0
-#define mmE2_ARITHMETIC_CNTL    0x1220
-#define mmENG_CNTL          0x13E8
-#define mmENG_PERF_CNT      0x13F0
+#define mmBRUSH_OFFSET        0x108C
+#define mmBRUSH_Y_X           0x1074
+#define mmDEFAULT_PITCH_OFFSET      0x10A0
+#define mmDEFAULT_SC_BOTTOM_RIGHT   0x10A8
+#define mmDEFAULT2_SC_BOTTOM_RIGHT  0x10AC
+#define mmGLOBAL_ALPHA        0x1210
+#define mmFILTER_COEF         0x1214
+#define mmMVC_CNTL_START      0x11E0
+#define mmE2_ARITHMETIC_CNTL  0x1220
+#define mmENG_CNTL            0x13E8
+#define mmENG_PERF_CNT        0x13F0
 /* Block GFX End: */
 
 /* Block IDCT Start: */
@@ -141,22 +144,38 @@
 /* Block IDCT End: */
 
 /* Block MC Start: */
-#define mmMEM_CNTL          0x0180
-#define mmMEM_ARB           0x0184
-#define mmMC_FB_LOCATION    0x0188
-#define mmMEM_EXT_CNTL      0x018C
-#define mmMC_EXT_MEM_LOCATION   0x0190
-#define mmMEM_EXT_TIMING_CNTL   0x0194
-#define mmMEM_SDRAM_MODE_REG    0x0198
-#define mmMEM_IO_CNTL       0x019C
-#define mmMC_DEBUG          0x01A0
-#define mmMC_BIST_CTRL      0x01A4
-#define mmMC_BIST_COLLAR_READ   0x01A8
-#define mmTC_MISMATCH       0x01AC
-#define mmMC_PERF_MON_CNTL  0x01B0
-#define mmMC_PERF_COUNTERS  0x01B4
+#define mmMEM_CNTL             0x0180
+#define mmMEM_ARB              0x0184
+#define mmMC_FB_LOCATION       0x0188
+#define mmMEM_EXT_CNTL         0x018C
+#define mmMC_EXT_MEM_LOCATION  0x0190
+#define mmMEM_EXT_TIMING_CNTL  0x0194
+#define mmMEM_SDRAM_MODE_REG   0x0198
+#define mmMEM_IO_CNTL          0x019C
+#define mmMC_DEBUG             0x01A0
+#define mmMC_BIST_CTRL         0x01A4
+#define mmMC_BIST_COLLAR_READ  0x01A8
+#define mmTC_MISMATCH          0x01AC
+#define mmMC_PERF_MON_CNTL     0x01B0
+#define mmMC_PERF_COUNTERS     0x01B4
 /* Block MC End: */
 
+/* Block BM Start: */
+#define mmBM_EXT_MEM_BANDWIDTH    0x0A00
+#define mmBM_OFFSET               0x0A04
+#define mmBM_MEM_EXT_TIMING_CNTL  0x0A08
+#define mmBM_MEM_EXT_CNTL         0x0A0C
+#define mmBM_MEM_MODE_REG         0x0A10
+#define mmBM_MEM_IO_CNTL          0x0A18
+#define mmBM_CONFIG               0x0A1C
+#define mmBM_STATUS               0x0A20
+#define mmBM_DEBUG                0x0A24
+#define mmBM_PERF_MON_CNTL        0x0A28
+#define mmBM_PERF_COUNTERS        0x0A2C
+#define mmBM_PERF2_MON_CNTL       0x0A30
+#define mmBM_PERF2_COUNTERS       0x0A34
+/* Block BM End: */
+
 /* Block RBBM Start: */
 #define mmWAIT_UNTIL        0x1400
 #define mmISYNC_CNTL        0x1404
@@ -176,439 +195,575 @@
 /* Block CG End: */
 
 /* default value definitions */
-#define defWRAP_TOP_DIR     0x00000000
-#define defWRAP_START_DIR       0x00000000
-#define defCFGREG_BASE      0x00000000
-#define defCIF_IO           0x000C0902
-#define defINTF_CNTL        0x00000011
-#define defCPU_DEFAULTS     0x00000006
-#define defHW_INT           0x00000000
-#define defMC_EXT_MEM_LOCATION            0x07ff0000
-#define defTC_MISMATCH      0x00000000
+#define defWRAP_TOP_DIR        0x00000000
+#define defWRAP_START_DIR      0x00000000
+#define defCFGREG_BASE         0x00000000
+#define defCIF_IO              0x000C0902
+#define defINTF_CNTL           0x00000011
+#define defCPU_DEFAULTS        0x00000006
+#define defHW_INT              0x00000000
+#define defMC_EXT_MEM_LOCATION 0x07ff0000
+#define defTC_MISMATCH         0x00000000
 
 #define W100_CFG_BASE          0x0
 #define W100_CFG_LEN           0x10
 #define W100_REG_BASE          0x10000
 #define W100_REG_LEN           0x2000
 #define MEM_INT_BASE_VALUE     0x100000
-#define MEM_INT_TOP_VALUE_W100 0x15ffff
 #define MEM_EXT_BASE_VALUE     0x800000
-#define MEM_EXT_TOP_VALUE      0x9fffff
+#define MEM_INT_SIZE           0x05ffff
+#define MEM_WINDOW_BASE        0x100000
+#define MEM_WINDOW_SIZE        0xf00000
+
 #define WRAP_BUF_BASE_VALUE    0x80000
 #define WRAP_BUF_TOP_VALUE     0xbffff
 
+#define CHIP_ID_W100           0x57411002
+#define CHIP_ID_W3200          0x56441002
+#define CHIP_ID_W3220          0x57441002
 
-/* data structure definitions */
+/* Register structure definitions */
 
 struct wrap_top_dir_t {
-     unsigned long top_addr         : 23;
-     unsigned long                              : 9;
+        unsigned long top_addr  : 23;
+        unsigned long           : 9;
 } __attribute__((packed));
 
 union wrap_top_dir_u {
-     unsigned long val : 32;
-     struct wrap_top_dir_t f;
+        unsigned long val : 32;
+        struct wrap_top_dir_t f;
 } __attribute__((packed));
 
 struct wrap_start_dir_t {
-     unsigned long start_addr       : 23;
-     unsigned long                              : 9;
+        unsigned long start_addr : 23;
+        unsigned long            : 9;
 } __attribute__((packed));
 
 union wrap_start_dir_u {
-     unsigned long val : 32;
-     struct wrap_start_dir_t f;
+        unsigned long val : 32;
+        struct wrap_start_dir_t f;
 } __attribute__((packed));
 
 struct cif_cntl_t {
-     unsigned long swap_reg                     : 2;
-     unsigned long swap_fbuf_1                  : 2;
-     unsigned long swap_fbuf_2                  : 2;
-     unsigned long swap_fbuf_3                  : 2;
-     unsigned long pmi_int_disable              : 1;
-     unsigned long pmi_schmen_disable       : 1;
-     unsigned long intb_oe                      : 1;
-     unsigned long en_wait_to_compensate_dq_prop_dly : 1;
-     unsigned long compensate_wait_rd_size  : 2;
-     unsigned long wait_asserted_timeout_val      : 2;
-     unsigned long wait_masked_val              : 2;
-     unsigned long en_wait_timeout              : 1;
-     unsigned long en_one_clk_setup_before_wait   : 1;
-     unsigned long interrupt_active_high    : 1;
-     unsigned long en_overwrite_straps      : 1;
-     unsigned long strap_wait_active_hi     : 1;
-     unsigned long lat_busy_count               : 2;
-     unsigned long lat_rd_pm4_sclk_busy     : 1;
-     unsigned long dis_system_bits              : 1;
-     unsigned long dis_mr                       : 1;
-     unsigned long cif_spare_1                  : 4;
+        unsigned long swap_reg                 : 2;
+        unsigned long swap_fbuf_1              : 2;
+        unsigned long swap_fbuf_2              : 2;
+        unsigned long swap_fbuf_3              : 2;
+        unsigned long pmi_int_disable          : 1;
+        unsigned long pmi_schmen_disable       : 1;
+        unsigned long intb_oe                  : 1;
+        unsigned long en_wait_to_compensate_dq_prop_dly  : 1;
+        unsigned long compensate_wait_rd_size  : 2;
+        unsigned long wait_asserted_timeout_val  : 2;
+        unsigned long wait_masked_val          : 2;
+        unsigned long en_wait_timeout          : 1;
+        unsigned long en_one_clk_setup_before_wait  : 1;
+        unsigned long interrupt_active_high    : 1;
+        unsigned long en_overwrite_straps      : 1;
+        unsigned long strap_wait_active_hi     : 1;
+        unsigned long lat_busy_count           : 2;
+        unsigned long lat_rd_pm4_sclk_busy     : 1;
+        unsigned long dis_system_bits          : 1;
+        unsigned long dis_mr                   : 1;
+        unsigned long cif_spare_1              : 4;
 } __attribute__((packed));
 
 union cif_cntl_u {
-     unsigned long val : 32;
-     struct cif_cntl_t f;
+        unsigned long val : 32;
+        struct cif_cntl_t f;
 } __attribute__((packed));
 
 struct cfgreg_base_t {
-     unsigned long cfgreg_base      : 24;
-     unsigned long                              : 8;
+        unsigned long cfgreg_base  : 24;
+        unsigned long              : 8;
 } __attribute__((packed));
 
 union cfgreg_base_u {
-     unsigned long val : 32;
-     struct cfgreg_base_t f;
+        unsigned long val : 32;
+        struct cfgreg_base_t f;
 } __attribute__((packed));
 
 struct cif_io_t {
-     unsigned long dq_srp           : 1;
-     unsigned long dq_srn           : 1;
-     unsigned long dq_sp            : 4;
-     unsigned long dq_sn            : 4;
-     unsigned long waitb_srp        : 1;
-     unsigned long waitb_srn        : 1;
-     unsigned long waitb_sp         : 4;
-     unsigned long waitb_sn         : 4;
-     unsigned long intb_srp         : 1;
-     unsigned long intb_srn         : 1;
-     unsigned long intb_sp          : 4;
-     unsigned long intb_sn          : 4;
-     unsigned long                              : 2;
+        unsigned long dq_srp     : 1;
+        unsigned long dq_srn     : 1;
+        unsigned long dq_sp      : 4;
+        unsigned long dq_sn      : 4;
+        unsigned long waitb_srp  : 1;
+        unsigned long waitb_srn  : 1;
+        unsigned long waitb_sp   : 4;
+        unsigned long waitb_sn   : 4;
+        unsigned long intb_srp   : 1;
+        unsigned long intb_srn   : 1;
+        unsigned long intb_sp    : 4;
+        unsigned long intb_sn    : 4;
+        unsigned long            : 2;
 } __attribute__((packed));
 
 union cif_io_u {
-     unsigned long val : 32;
-     struct cif_io_t f;
+        unsigned long val : 32;
+        struct cif_io_t f;
 } __attribute__((packed));
 
 struct cif_read_dbg_t {
-     unsigned long unpacker_pre_fetch_trig_gen  : 2;
-     unsigned long dly_second_rd_fetch_trig     : 1;
-     unsigned long rst_rd_burst_id                      : 1;
-     unsigned long dis_rd_burst_id                      : 1;
-     unsigned long en_block_rd_when_packer_is_not_emp : 1;
-     unsigned long dis_pre_fetch_cntl_sm        : 1;
-     unsigned long rbbm_chrncy_dis                      : 1;
-     unsigned long rbbm_rd_after_wr_lat         : 2;
-     unsigned long dis_be_during_rd                     : 1;
-     unsigned long one_clk_invalidate_pulse     : 1;
-     unsigned long dis_chnl_priority                    : 1;
-     unsigned long rst_read_path_a_pls          : 1;
-     unsigned long rst_read_path_b_pls          : 1;
-     unsigned long dis_reg_rd_fetch_trig        : 1;
-     unsigned long dis_rd_fetch_trig_from_ind_addr : 1;
-     unsigned long dis_rd_same_byte_to_trig_fetch : 1;
-     unsigned long dis_dir_wrap                         : 1;
-     unsigned long dis_ring_buf_to_force_dec    : 1;
-     unsigned long dis_addr_comp_in_16bit       : 1;
-     unsigned long clr_w                                : 1;
-     unsigned long err_rd_tag_is_3                      : 1;
-     unsigned long err_load_when_ful_a          : 1;
-     unsigned long err_load_when_ful_b          : 1;
-     unsigned long                                                      : 7;
+        unsigned long unpacker_pre_fetch_trig_gen  : 2;
+        unsigned long dly_second_rd_fetch_trig     : 1;
+        unsigned long rst_rd_burst_id              : 1;
+        unsigned long dis_rd_burst_id              : 1;
+        unsigned long en_block_rd_when_packer_is_not_emp : 1;
+        unsigned long dis_pre_fetch_cntl_sm        : 1;
+        unsigned long rbbm_chrncy_dis              : 1;
+        unsigned long rbbm_rd_after_wr_lat         : 2;
+        unsigned long dis_be_during_rd             : 1;
+        unsigned long one_clk_invalidate_pulse     : 1;
+        unsigned long dis_chnl_priority            : 1;
+        unsigned long rst_read_path_a_pls          : 1;
+        unsigned long rst_read_path_b_pls          : 1;
+        unsigned long dis_reg_rd_fetch_trig        : 1;
+        unsigned long dis_rd_fetch_trig_from_ind_addr : 1;
+        unsigned long dis_rd_same_byte_to_trig_fetch : 1;
+        unsigned long dis_dir_wrap                 : 1;
+        unsigned long dis_ring_buf_to_force_dec    : 1;
+        unsigned long dis_addr_comp_in_16bit       : 1;
+        unsigned long clr_w                        : 1;
+        unsigned long err_rd_tag_is_3              : 1;
+        unsigned long err_load_when_ful_a          : 1;
+        unsigned long err_load_when_ful_b          : 1;
+        unsigned long                              : 7;
 } __attribute__((packed));
 
 union cif_read_dbg_u {
-     unsigned long val : 32;
-     struct cif_read_dbg_t f;
+        unsigned long val : 32;
+        struct cif_read_dbg_t f;
 } __attribute__((packed));
 
 struct cif_write_dbg_t {
-     unsigned long packer_timeout_count           : 2;
-     unsigned long en_upper_load_cond             : 1;
-     unsigned long en_chnl_change_cond            : 1;
-     unsigned long dis_addr_comp_cond             : 1;
-     unsigned long dis_load_same_byte_addr_cond   : 1;
-     unsigned long dis_timeout_cond                       : 1;
-     unsigned long dis_timeout_during_rbbm        : 1;
-     unsigned long dis_packer_ful_during_rbbm_timeout : 1;
-     unsigned long en_dword_split_to_rbbm         : 1;
-     unsigned long en_dummy_val                           : 1;
-     unsigned long dummy_val_sel                          : 1;
-     unsigned long mask_pm4_wrptr_dec             : 1;
-     unsigned long dis_mc_clean_cond                      : 1;
-     unsigned long err_two_reqi_during_ful        : 1;
-     unsigned long err_reqi_during_idle_clk       : 1;
-     unsigned long err_global                             : 1;
-     unsigned long en_wr_buf_dbg_load             : 1;
-     unsigned long en_wr_buf_dbg_path             : 1;
-     unsigned long sel_wr_buf_byte                        : 3;
-     unsigned long dis_rd_flush_wr                        : 1;
-     unsigned long dis_packer_ful_cond            : 1;
-     unsigned long dis_invalidate_by_ops_chnl     : 1;
-     unsigned long en_halt_when_reqi_err          : 1;
-     unsigned long cif_spare_2                            : 5;
-     unsigned long                                                        : 1;
+        unsigned long packer_timeout_count          : 2;
+        unsigned long en_upper_load_cond            : 1;
+        unsigned long en_chnl_change_cond           : 1;
+        unsigned long dis_addr_comp_cond            : 1;
+        unsigned long dis_load_same_byte_addr_cond  : 1;
+        unsigned long dis_timeout_cond              : 1;
+        unsigned long dis_timeout_during_rbbm       : 1;
+        unsigned long dis_packer_ful_during_rbbm_timeout : 1;
+        unsigned long en_dword_split_to_rbbm        : 1;
+        unsigned long en_dummy_val                  : 1;
+        unsigned long dummy_val_sel                 : 1;
+        unsigned long mask_pm4_wrptr_dec            : 1;
+        unsigned long dis_mc_clean_cond             : 1;
+        unsigned long err_two_reqi_during_ful       : 1;
+        unsigned long err_reqi_during_idle_clk      : 1;
+        unsigned long err_global                    : 1;
+        unsigned long en_wr_buf_dbg_load            : 1;
+        unsigned long en_wr_buf_dbg_path            : 1;
+        unsigned long sel_wr_buf_byte               : 3;
+        unsigned long dis_rd_flush_wr               : 1;
+        unsigned long dis_packer_ful_cond           : 1;
+        unsigned long dis_invalidate_by_ops_chnl    : 1;
+        unsigned long en_halt_when_reqi_err         : 1;
+        unsigned long cif_spare_2                   : 5;
+        unsigned long                               : 1;
 } __attribute__((packed));
 
 union cif_write_dbg_u {
-     unsigned long val : 32;
-     struct cif_write_dbg_t f;
+        unsigned long val : 32;
+        struct cif_write_dbg_t f;
 } __attribute__((packed));
 
 
 struct intf_cntl_t {
-     unsigned char ad_inc_a            : 1;
-     unsigned char ring_buf_a          : 1;
-     unsigned char rd_fetch_trigger_a  : 1;
-     unsigned char rd_data_rdy_a       : 1;
-     unsigned char ad_inc_b            : 1;
-     unsigned char ring_buf_b          : 1;
-     unsigned char rd_fetch_trigger_b  : 1;
-     unsigned char rd_data_rdy_b       : 1;
+        unsigned char ad_inc_a            : 1;
+        unsigned char ring_buf_a          : 1;
+        unsigned char rd_fetch_trigger_a  : 1;
+        unsigned char rd_data_rdy_a       : 1;
+        unsigned char ad_inc_b            : 1;
+        unsigned char ring_buf_b          : 1;
+        unsigned char rd_fetch_trigger_b  : 1;
+        unsigned char rd_data_rdy_b       : 1;
 } __attribute__((packed));
 
 union intf_cntl_u {
-     unsigned char val : 8;
-     struct intf_cntl_t f;
+        unsigned char val : 8;
+        struct intf_cntl_t f;
 } __attribute__((packed));
 
 struct cpu_defaults_t {
-     unsigned char unpack_rd_data   : 1;
-     unsigned char access_ind_addr_a: 1;
-     unsigned char access_ind_addr_b: 1;
-     unsigned char access_scratch_reg             : 1;
-     unsigned char pack_wr_data     : 1;
-     unsigned char transition_size  : 1;
-     unsigned char en_read_buf_mode : 1;
-     unsigned char rd_fetch_scratch : 1;
+        unsigned char unpack_rd_data     : 1;
+        unsigned char access_ind_addr_a  : 1;
+        unsigned char access_ind_addr_b  : 1;
+        unsigned char access_scratch_reg : 1;
+        unsigned char pack_wr_data       : 1;
+        unsigned char transition_size    : 1;
+        unsigned char en_read_buf_mode   : 1;
+        unsigned char rd_fetch_scratch   : 1;
 } __attribute__((packed));
 
 union cpu_defaults_u {
-     unsigned char val : 8;
-     struct cpu_defaults_t f;
+        unsigned char val : 8;
+        struct cpu_defaults_t f;
+} __attribute__((packed));
+
+struct crtc_total_t {
+        unsigned long crtc_h_total : 10;
+        unsigned long              : 6;
+        unsigned long crtc_v_total : 10;
+        unsigned long              : 6;
+} __attribute__((packed));
+
+union crtc_total_u {
+        unsigned long val : 32;
+        struct crtc_total_t f;
+} __attribute__((packed));
+
+struct crtc_ss_t {
+        unsigned long ss_start    : 10;
+        unsigned long             : 6;
+        unsigned long ss_end      : 10;
+        unsigned long             : 2;
+        unsigned long ss_align    : 1;
+        unsigned long ss_pol      : 1;
+        unsigned long ss_run_mode : 1;
+        unsigned long ss_en       : 1;
+} __attribute__((packed));
+
+union crtc_ss_u {
+        unsigned long val : 32;
+        struct crtc_ss_t f;
+} __attribute__((packed));
+
+struct active_h_disp_t {
+        unsigned long active_h_start  : 10;
+        unsigned long                 : 6;
+        unsigned long active_h_end    : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union active_h_disp_u {
+        unsigned long val : 32;
+        struct active_h_disp_t f;
+} __attribute__((packed));
+
+struct active_v_disp_t {
+        unsigned long active_v_start  : 10;
+        unsigned long                 : 6;
+        unsigned long active_v_end    : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union active_v_disp_u {
+        unsigned long val : 32;
+        struct active_v_disp_t f;
+} __attribute__((packed));
+
+struct graphic_h_disp_t {
+        unsigned long graphic_h_start : 10;
+        unsigned long                 : 6;
+        unsigned long graphic_h_end   : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union graphic_h_disp_u {
+        unsigned long val : 32;
+        struct graphic_h_disp_t f;
+} __attribute__((packed));
+
+struct graphic_v_disp_t {
+        unsigned long graphic_v_start : 10;
+        unsigned long                 : 6;
+        unsigned long graphic_v_end   : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union graphic_v_disp_u{
+        unsigned long val : 32;
+        struct graphic_v_disp_t f;
+} __attribute__((packed));
+
+struct graphic_ctrl_t_w100 {
+        unsigned long color_depth       : 3;
+        unsigned long portrait_mode     : 2;
+        unsigned long low_power_on      : 1;
+        unsigned long req_freq          : 4;
+        unsigned long en_crtc           : 1;
+        unsigned long en_graphic_req    : 1;
+        unsigned long en_graphic_crtc   : 1;
+        unsigned long total_req_graphic : 9;
+        unsigned long lcd_pclk_on       : 1;
+        unsigned long lcd_sclk_on       : 1;
+        unsigned long pclk_running      : 1;
+        unsigned long sclk_running      : 1;
+        unsigned long                   : 6;
+} __attribute__((packed));
+
+struct graphic_ctrl_t_w32xx {
+        unsigned long color_depth       : 3;
+        unsigned long portrait_mode     : 2;
+        unsigned long low_power_on      : 1;
+        unsigned long req_freq          : 4;
+        unsigned long en_crtc           : 1;
+        unsigned long en_graphic_req    : 1;
+        unsigned long en_graphic_crtc   : 1;
+        unsigned long total_req_graphic : 10;
+        unsigned long lcd_pclk_on       : 1;
+        unsigned long lcd_sclk_on       : 1;
+        unsigned long pclk_running      : 1;
+        unsigned long sclk_running      : 1;
+        unsigned long                   : 5;
+} __attribute__((packed));
+
+union graphic_ctrl_u {
+        unsigned long val : 32;
+        struct graphic_ctrl_t_w100 f_w100;
+        struct graphic_ctrl_t_w32xx f_w32xx;
 } __attribute__((packed));
 
 struct video_ctrl_t {
-     unsigned long video_mode       : 1;
-     unsigned long keyer_en         : 1;
-     unsigned long en_video_req     : 1;
-     unsigned long en_graphic_req_video           : 1;
-     unsigned long en_video_crtc    : 1;
-     unsigned long video_hor_exp    : 2;
-     unsigned long video_ver_exp    : 2;
-     unsigned long uv_combine       : 1;
-     unsigned long total_req_video  : 9;
-     unsigned long video_ch_sel     : 1;
-     unsigned long video_portrait   : 2;
-     unsigned long yuv2rgb_en       : 1;
-     unsigned long yuv2rgb_option   : 1;
-     unsigned long video_inv_hor    : 1;
-     unsigned long video_inv_ver    : 1;
-     unsigned long gamma_sel        : 2;
-     unsigned long dis_limit        : 1;
-     unsigned long en_uv_hblend     : 1;
-     unsigned long rgb_gamma_sel    : 2;
+        unsigned long video_mode       : 1;
+        unsigned long keyer_en         : 1;
+        unsigned long en_video_req     : 1;
+        unsigned long en_graphic_req_video  : 1;
+        unsigned long en_video_crtc    : 1;
+        unsigned long video_hor_exp    : 2;
+        unsigned long video_ver_exp    : 2;
+        unsigned long uv_combine       : 1;
+        unsigned long total_req_video  : 9;
+        unsigned long video_ch_sel     : 1;
+        unsigned long video_portrait   : 2;
+        unsigned long yuv2rgb_en       : 1;
+        unsigned long yuv2rgb_option   : 1;
+        unsigned long video_inv_hor    : 1;
+        unsigned long video_inv_ver    : 1;
+        unsigned long gamma_sel        : 2;
+        unsigned long dis_limit        : 1;
+        unsigned long en_uv_hblend     : 1;
+        unsigned long rgb_gamma_sel    : 2;
 } __attribute__((packed));
 
 union video_ctrl_u {
-     unsigned long val : 32;
-     struct video_ctrl_t f;
+        unsigned long val : 32;
+        struct video_ctrl_t f;
 } __attribute__((packed));
 
 struct disp_db_buf_cntl_rd_t {
-     unsigned long en_db_buf            : 1;
-     unsigned long update_db_buf_done   : 1;
-     unsigned long db_buf_cntl          : 6;
-     unsigned long                                      : 24;
+        unsigned long en_db_buf           : 1;
+        unsigned long update_db_buf_done  : 1;
+        unsigned long db_buf_cntl         : 6;
+        unsigned long                     : 24;
 } __attribute__((packed));
 
 union disp_db_buf_cntl_rd_u {
-     unsigned long val : 32;
-     struct disp_db_buf_cntl_rd_t f;
+        unsigned long val : 32;
+        struct disp_db_buf_cntl_rd_t f;
 } __attribute__((packed));
 
 struct disp_db_buf_cntl_wr_t {
-     unsigned long en_db_buf        : 1;
-     unsigned long update_db_buf    : 1;
-     unsigned long db_buf_cntl      : 6;
-     unsigned long    : 24;
+        unsigned long en_db_buf      : 1;
+        unsigned long update_db_buf  : 1;
+        unsigned long db_buf_cntl    : 6;
+        unsigned long                : 24;
 } __attribute__((packed));
 
 union disp_db_buf_cntl_wr_u {
-     unsigned long val : 32;
-     struct disp_db_buf_cntl_wr_t f;
+        unsigned long val : 32;
+        struct disp_db_buf_cntl_wr_t f;
 } __attribute__((packed));
 
 struct gamma_value1_t {
-     unsigned long gamma1           : 8;
-     unsigned long gamma2           : 8;
-     unsigned long gamma3           : 8;
-     unsigned long gamma4           : 8;
+        unsigned long gamma1   : 8;
+        unsigned long gamma2   : 8;
+        unsigned long gamma3   : 8;
+        unsigned long gamma4   : 8;
 } __attribute__((packed));
 
 union gamma_value1_u {
-     unsigned long val : 32;
-     struct gamma_value1_t f;
+        unsigned long val : 32;
+        struct gamma_value1_t f;
 } __attribute__((packed));
 
 struct gamma_value2_t {
-     unsigned long gamma5           : 8;
-     unsigned long gamma6           : 8;
-     unsigned long gamma7           : 8;
-     unsigned long gamma8           : 8;
+        unsigned long gamma5   : 8;
+        unsigned long gamma6   : 8;
+        unsigned long gamma7   : 8;
+        unsigned long gamma8   : 8;
 } __attribute__((packed));
 
 union gamma_value2_u {
-     unsigned long val : 32;
-     struct gamma_value2_t f;
+        unsigned long val : 32;
+        struct gamma_value2_t f;
 } __attribute__((packed));
 
 struct gamma_slope_t {
-     unsigned long slope1           : 3;
-     unsigned long slope2           : 3;
-     unsigned long slope3           : 3;
-     unsigned long slope4           : 3;
-     unsigned long slope5           : 3;
-     unsigned long slope6           : 3;
-     unsigned long slope7           : 3;
-     unsigned long slope8           : 3;
-     unsigned long                              : 8;
+        unsigned long slope1   : 3;
+        unsigned long slope2   : 3;
+        unsigned long slope3   : 3;
+        unsigned long slope4   : 3;
+        unsigned long slope5   : 3;
+        unsigned long slope6   : 3;
+        unsigned long slope7   : 3;
+        unsigned long slope8   : 3;
+        unsigned long          : 8;
 } __attribute__((packed));
 
 union gamma_slope_u {
-     unsigned long val : 32;
-     struct gamma_slope_t f;
+        unsigned long val : 32;
+        struct gamma_slope_t f;
 } __attribute__((packed));
 
 struct mc_ext_mem_location_t {
-     unsigned long mc_ext_mem_start : 16;
-     unsigned long mc_ext_mem_top   : 16;
+        unsigned long mc_ext_mem_start : 16;
+        unsigned long mc_ext_mem_top   : 16;
 } __attribute__((packed));
 
 union mc_ext_mem_location_u {
-     unsigned long val : 32;
-     struct mc_ext_mem_location_t f;
+        unsigned long val : 32;
+        struct mc_ext_mem_location_t f;
+} __attribute__((packed));
+
+struct mc_fb_location_t {
+        unsigned long mc_fb_start      : 16;
+        unsigned long mc_fb_top        : 16;
+} __attribute__((packed));
+
+union mc_fb_location_u {
+        unsigned long val : 32;
+        struct mc_fb_location_t f;
 } __attribute__((packed));
 
 struct clk_pin_cntl_t {
-     unsigned long osc_en           : 1;
-     unsigned long osc_gain         : 5;
-     unsigned long dont_use_xtalin  : 1;
-     unsigned long xtalin_pm_en     : 1;
-     unsigned long xtalin_dbl_en    : 1;
-     unsigned long                              : 7;
-     unsigned long cg_debug         : 16;
+        unsigned long osc_en           : 1;
+        unsigned long osc_gain         : 5;
+        unsigned long dont_use_xtalin  : 1;
+        unsigned long xtalin_pm_en     : 1;
+        unsigned long xtalin_dbl_en    : 1;
+        unsigned long                  : 7;
+        unsigned long cg_debug         : 16;
 } __attribute__((packed));
 
 union clk_pin_cntl_u {
-     unsigned long val : 32;
-     struct clk_pin_cntl_t f;
+        unsigned long val : 32;
+        struct clk_pin_cntl_t f;
 } __attribute__((packed));
 
 struct pll_ref_fb_div_t {
-     unsigned long pll_ref_div      : 4;
-     unsigned long                              : 4;
-     unsigned long pll_fb_div_int   : 6;
-     unsigned long                              : 2;
-     unsigned long pll_fb_div_frac  : 3;
-     unsigned long                              : 1;
-     unsigned long pll_reset_time   : 4;
-     unsigned long pll_lock_time    : 8;
+        unsigned long pll_ref_div      : 4;
+        unsigned long                  : 4;
+        unsigned long pll_fb_div_int   : 6;
+        unsigned long                  : 2;
+        unsigned long pll_fb_div_frac  : 3;
+        unsigned long                  : 1;
+        unsigned long pll_reset_time   : 4;
+        unsigned long pll_lock_time    : 8;
 } __attribute__((packed));
 
 union pll_ref_fb_div_u {
-     unsigned long val : 32;
-     struct pll_ref_fb_div_t f;
+        unsigned long val : 32;
+        struct pll_ref_fb_div_t f;
 } __attribute__((packed));
 
 struct pll_cntl_t {
-     unsigned long pll_pwdn         : 1;
-     unsigned long pll_reset        : 1;
-     unsigned long pll_pm_en        : 1;
-     unsigned long pll_mode         : 1;
-     unsigned long pll_refclk_sel   : 1;
-     unsigned long pll_fbclk_sel    : 1;
-     unsigned long pll_tcpoff       : 1;
-     unsigned long pll_pcp          : 3;
-     unsigned long pll_pvg          : 3;
-     unsigned long pll_vcofr        : 1;
-     unsigned long pll_ioffset      : 2;
-     unsigned long pll_pecc_mode    : 2;
-     unsigned long pll_pecc_scon    : 2;
-     unsigned long pll_dactal       : 4;
-     unsigned long pll_cp_clip      : 2;
-     unsigned long pll_conf         : 3;
-     unsigned long pll_mbctrl       : 2;
-     unsigned long pll_ring_off     : 1;
+        unsigned long pll_pwdn        : 1;
+        unsigned long pll_reset       : 1;
+        unsigned long pll_pm_en       : 1;
+        unsigned long pll_mode        : 1;
+        unsigned long pll_refclk_sel  : 1;
+        unsigned long pll_fbclk_sel   : 1;
+        unsigned long pll_tcpoff      : 1;
+        unsigned long pll_pcp         : 3;
+        unsigned long pll_pvg         : 3;
+        unsigned long pll_vcofr       : 1;
+        unsigned long pll_ioffset     : 2;
+        unsigned long pll_pecc_mode   : 2;
+        unsigned long pll_pecc_scon   : 2;
+        unsigned long pll_dactal      : 4;
+        unsigned long pll_cp_clip     : 2;
+        unsigned long pll_conf        : 3;
+        unsigned long pll_mbctrl      : 2;
+        unsigned long pll_ring_off    : 1;
 } __attribute__((packed));
 
 union pll_cntl_u {
-     unsigned long val : 32;
-     struct pll_cntl_t f;
+        unsigned long val : 32;
+        struct pll_cntl_t f;
 } __attribute__((packed));
 
 struct sclk_cntl_t {
-     unsigned long sclk_src_sel         : 2;
-     unsigned long                                      : 2;
-     unsigned long sclk_post_div_fast   : 4;
-     unsigned long sclk_clkon_hys       : 3;
-     unsigned long sclk_post_div_slow   : 4;
-     unsigned long disp_cg_ok2switch_en : 1;
-     unsigned long sclk_force_reg       : 1;
-     unsigned long sclk_force_disp      : 1;
-     unsigned long sclk_force_mc        : 1;
-     unsigned long sclk_force_extmc     : 1;
-     unsigned long sclk_force_cp        : 1;
-     unsigned long sclk_force_e2        : 1;
-     unsigned long sclk_force_e3        : 1;
-     unsigned long sclk_force_idct      : 1;
-     unsigned long sclk_force_bist      : 1;
-     unsigned long busy_extend_cp       : 1;
-     unsigned long busy_extend_e2       : 1;
-     unsigned long busy_extend_e3       : 1;
-     unsigned long busy_extend_idct     : 1;
-     unsigned long                                      : 3;
+        unsigned long sclk_src_sel         : 2;
+        unsigned long                      : 2;
+        unsigned long sclk_post_div_fast   : 4;
+        unsigned long sclk_clkon_hys       : 3;
+        unsigned long sclk_post_div_slow   : 4;
+        unsigned long disp_cg_ok2switch_en : 1;
+        unsigned long sclk_force_reg       : 1;
+        unsigned long sclk_force_disp      : 1;
+        unsigned long sclk_force_mc        : 1;
+        unsigned long sclk_force_extmc     : 1;
+        unsigned long sclk_force_cp        : 1;
+        unsigned long sclk_force_e2        : 1;
+        unsigned long sclk_force_e3        : 1;
+        unsigned long sclk_force_idct      : 1;
+        unsigned long sclk_force_bist      : 1;
+        unsigned long busy_extend_cp       : 1;
+        unsigned long busy_extend_e2       : 1;
+        unsigned long busy_extend_e3       : 1;
+        unsigned long busy_extend_idct     : 1;
+        unsigned long                      : 3;
 } __attribute__((packed));
 
 union sclk_cntl_u {
-     unsigned long val : 32;
-     struct sclk_cntl_t f;
+        unsigned long val : 32;
+        struct sclk_cntl_t f;
 } __attribute__((packed));
 
 struct pclk_cntl_t {
-     unsigned long pclk_src_sel     : 2;
-     unsigned long                              : 2;
-     unsigned long pclk_post_div    : 4;
-     unsigned long                              : 8;
-     unsigned long pclk_force_disp  : 1;
-     unsigned long                              : 15;
+        unsigned long pclk_src_sel     : 2;
+        unsigned long                  : 2;
+        unsigned long pclk_post_div    : 4;
+        unsigned long                  : 8;
+        unsigned long pclk_force_disp  : 1;
+        unsigned long                  : 15;
 } __attribute__((packed));
 
 union pclk_cntl_u {
-     unsigned long val : 32;
-     struct pclk_cntl_t f;
+        unsigned long val : 32;
+        struct pclk_cntl_t f;
 } __attribute__((packed));
 
+
+#define TESTCLK_SRC_PLL   0x01
+#define TESTCLK_SRC_SCLK  0x02
+#define TESTCLK_SRC_PCLK  0x03
+/* 4 and 5 seem to by XTAL/M */
+#define TESTCLK_SRC_XTAL  0x06
+
 struct clk_test_cntl_t {
-     unsigned long testclk_sel      : 4;
-     unsigned long                              : 3;
-     unsigned long start_check_freq : 1;
-     unsigned long tstcount_rst     : 1;
-     unsigned long                              : 15;
-     unsigned long test_count       : 8;
+        unsigned long testclk_sel      : 4;
+        unsigned long                  : 3;
+        unsigned long start_check_freq : 1;
+        unsigned long tstcount_rst     : 1;
+        unsigned long                  : 15;
+        unsigned long test_count       : 8;
 } __attribute__((packed));
 
 union clk_test_cntl_u {
-     unsigned long val : 32;
-     struct clk_test_cntl_t f;
+        unsigned long val : 32;
+        struct clk_test_cntl_t f;
 } __attribute__((packed));
 
 struct pwrmgt_cntl_t {
-     unsigned long pwm_enable           : 1;
-     unsigned long                                      : 1;
-     unsigned long pwm_mode_req         : 2;
-     unsigned long pwm_wakeup_cond      : 2;
-     unsigned long pwm_fast_noml_hw_en  : 1;
-     unsigned long pwm_noml_fast_hw_en  : 1;
-     unsigned long pwm_fast_noml_cond   : 4;
-     unsigned long pwm_noml_fast_cond   : 4;
-     unsigned long pwm_idle_timer       : 8;
-     unsigned long pwm_busy_timer       : 8;
+        unsigned long pwm_enable           : 1;
+        unsigned long                      : 1;
+        unsigned long pwm_mode_req         : 2;
+        unsigned long pwm_wakeup_cond      : 2;
+        unsigned long pwm_fast_noml_hw_en  : 1;
+        unsigned long pwm_noml_fast_hw_en  : 1;
+        unsigned long pwm_fast_noml_cond   : 4;
+        unsigned long pwm_noml_fast_cond   : 4;
+        unsigned long pwm_idle_timer       : 8;
+        unsigned long pwm_busy_timer       : 8;
 } __attribute__((packed));
 
 union pwrmgt_cntl_u {
-     unsigned long val : 32;
-     struct pwrmgt_cntl_t f;
+        unsigned long val : 32;
+        struct pwrmgt_cntl_t f;
 } __attribute__((packed));
 
 #endif