*** ../linux/arch/arm/mach-pxa/sharpsl_apm.c	Sun Nov 23 21:23:29 2003
--- linux/arch/arm/mach-pxa/sharpsl_apm.c	Mon Nov 24 00:44:02 2003
***************
*** 121,126 ****
--- 121,127 ----
  
  #if defined(CONFIG_SL_CCCR_CHANGE)
  extern unsigned int cccr_clkparam;
+ unsigned int cccr_change_reg = 0x242;
  #endif
  
  #if defined(CONFIG_SABINAL_DISCOVERY)
***************
*** 1017,1022 ****
--- 1018,1024 ----
  	sscanf(buf,"%x",&param);
  	if (param) {
  		printk("Change CCCR = %x.\n",param);
+ 		cccr_change_reg = param;
  		cccr_clkparam = param;
  		sharpsl_chg_freq = param;
  		cpu_xscale_sl_change_speed_num();
***************
*** 1154,1166 ****
                  } else if ( cccr_reg == 0x242 ) {
                          cpu_xscale_sl_change_speed_242();
  #endif
  #if defined(CONFIG_SL_CCCR_CHANGE)
!                 } else if ( cccr_reg != 0 ) {
! 			cccr_clkparam = (unsigned int)cccr_reg;
                          cpu_xscale_sl_change_speed_num();
! #endif
! 		} else {
  			cpu_xscale_change_speed_241();
  		}
  #else
  		if ( cccr_reg == 0x145 ) {
--- 1156,1168 ----
                  } else if ( cccr_reg == 0x242 ) {
                          cpu_xscale_sl_change_speed_242();
  #endif
+ 		} else {
  #if defined(CONFIG_SL_CCCR_CHANGE)
! 			cccr_clkparam = cccr_change_reg;
                          cpu_xscale_sl_change_speed_num();
! #else
  			cpu_xscale_change_speed_241();
+ #endif
  		}
  #else
  		if ( cccr_reg == 0x145 ) {
***************
*** 1169,1181 ****
                  } else if ( cccr_reg == 0x242 ) {
                          cpu_xscale_sl_change_speed_242();
  #endif
  #if defined(CONFIG_SL_CCCR_CHANGE)
!                 } else if ( cccr_reg != 0 ) {
! 			cccr_clkparam = (unsigned int)cccr_reg;
                          cpu_xscale_sl_change_speed_num();
! #endif
! 		} else {
  			cpu_xscale_change_speed_241();
  		}
  #endif
  	} else {
--- 1171,1183 ----
                  } else if ( cccr_reg == 0x242 ) {
                          cpu_xscale_sl_change_speed_242();
  #endif
+ 		} else {
  #if defined(CONFIG_SL_CCCR_CHANGE)
! 			cccr_clkparam = cccr_change_reg;
                          cpu_xscale_sl_change_speed_num();
! #else
  			cpu_xscale_change_speed_241();
+ #endif
  		}
  #endif
  	} else {
***************
*** 2726,2732 ****
  #endif
  	cccr_reg = CCCR;
  #if defined(CONFIG_SL_CCCR_CHANGE)
!         cccr_clkparam=(unsigned int)cccr_reg;
  #endif
  	printk("FCS : CCCR = %x\n",cccr_reg);
  #endif
--- 2728,2734 ----
  #endif
  	cccr_reg = CCCR;
  #if defined(CONFIG_SL_CCCR_CHANGE)
!         cccr_change_reg = cccr_reg;
  #endif
  	printk("FCS : CCCR = %x\n",cccr_reg);
  #endif