evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mtd: gpmi: add a new field for HW_GPMI_CTRL1

Browse source 
add the WRN_DLY_SEL field for HW_GPMI_CTRL1.
This field is used as delay for gpmi write strobe.

Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Huang Shijie 2012-09-13 14:57:56 +08:00 • committed by David Woodhouse
parent ae70ba2d60
commit d37e02d8f3
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/mtd/nand/gpmi-nand/gpmi-lib.c
View file

@ -731,6 +731,7 @@ return_results:
hw->use_half_periods = dll_use_half_periods; hw->use_half_periods = dll_use_half_periods;
hw->sample_delay_factor = sample_delay_factor; hw->sample_delay_factor = sample_delay_factor;
hw->device_busy_timeout = GPMI_DEFAULT_BUSY_TIMEOUT; hw->device_busy_timeout = GPMI_DEFAULT_BUSY_TIMEOUT;
hw->wrn_dly_sel = BV_GPMI_CTRL1_WRN_DLY_SEL_4_TO_8NS;
/* Return success. */ /* Return success. */
return 0; return 0;
@ -769,6 +770,11 @@ void gpmi_begin(struct gpmi_nand_data *this)
/* [3] The following code is to set the HW_GPMI_CTRL1. */ /* [3] The following code is to set the HW_GPMI_CTRL1. */
/* Set the WRN_DLY_SEL */
writel(BM_GPMI_CTRL1_WRN_DLY_SEL, gpmi_regs + HW_GPMI_CTRL1_CLR);
writel(BF_GPMI_CTRL1_WRN_DLY_SEL(hw.wrn_dly_sel),
gpmi_regs + HW_GPMI_CTRL1_SET);
/* DLL_ENABLE must be set to 0 when setting RDN_DELAY or HALF_PERIOD. */ /* DLL_ENABLE must be set to 0 when setting RDN_DELAY or HALF_PERIOD. */
writel(BM_GPMI_CTRL1_DLL_ENABLE, gpmi_regs + HW_GPMI_CTRL1_CLR); writel(BM_GPMI_CTRL1_DLL_ENABLE, gpmi_regs + HW_GPMI_CTRL1_CLR);

2
drivers/mtd/nand/gpmi-nand/gpmi-nand.h
View file

@ -195,6 +195,7 @@ struct gpmi_nand_data {
* @use_half_periods: Indicates the clock is running slowly, so the * @use_half_periods: Indicates the clock is running slowly, so the
* NFC DLL should use half-periods. * NFC DLL should use half-periods.
* @sample_delay_factor: The sample delay factor. * @sample_delay_factor: The sample delay factor.
* @wrn_dly_sel: The delay on the GPMI write strobe.
*/ */
struct gpmi_nfc_hardware_timing { struct gpmi_nfc_hardware_timing {
/* for HW_GPMI_TIMING0 */ /* for HW_GPMI_TIMING0 */
@ -209,6 +210,7 @@ struct gpmi_nfc_hardware_timing {
/* for HW_GPMI_CTRL1 */ /* for HW_GPMI_CTRL1 */
bool use_half_periods; bool use_half_periods;
uint8_t sample_delay_factor; uint8_t sample_delay_factor;
uint8_t wrn_dly_sel;
}; };
/** /**

9
drivers/mtd/nand/gpmi-nand/gpmi-regs.h
View file

@ -108,6 +108,15 @@
#define HW_GPMI_CTRL1_CLR 0x00000068 #define HW_GPMI_CTRL1_CLR 0x00000068
#define HW_GPMI_CTRL1_TOG 0x0000006c #define HW_GPMI_CTRL1_TOG 0x0000006c
#define BP_GPMI_CTRL1_WRN_DLY_SEL 22
#define BM_GPMI_CTRL1_WRN_DLY_SEL (0x3 << BP_GPMI_CTRL1_WRN_DLY_SEL)
#define BF_GPMI_CTRL1_WRN_DLY_SEL(v) \
(((v) << BP_GPMI_CTRL1_WRN_DLY_SEL) & BM_GPMI_CTRL1_WRN_DLY_SEL)
#define BV_GPMI_CTRL1_WRN_DLY_SEL_4_TO_8NS 0x0
#define BV_GPMI_CTRL1_WRN_DLY_SEL_6_TO_10NS 0x1
#define BV_GPMI_CTRL1_WRN_DLY_SEL_7_TO_12NS 0x2
#define BV_GPMI_CTRL1_WRN_DLY_SEL_NO_DELAY 0x3
#define BM_GPMI_CTRL1_BCH_MODE (1 << 18) #define BM_GPMI_CTRL1_BCH_MODE (1 << 18)
#define BP_GPMI_CTRL1_DLL_ENABLE 17 #define BP_GPMI_CTRL1_DLL_ENABLE 17