summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2017-08-04 18:42:37 -0700
committerBrian Norris <computersforpeace@gmail.com>2017-08-04 18:42:37 -0700
commit33983675fbd5b2447430c3dd4c205e879576b475 (patch)
tree2ec4301c1ebba4793f8c29a505a01f09630e7b3d /include
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff)
parentee02f73e04c0e690600f621a3a1d2245834af7fe (diff)
downloadlwn-33983675fbd5b2447430c3dd4c205e879576b475.tar.gz
lwn-33983675fbd5b2447430c3dd4c205e879576b475.zip
Merge tag 'nand/fixes-for-4.13-rc4' of git://git.infradead.org/l2-mtd into MTD
""" This PR contains both core and drivers fixes for 4.13. Core fixes: - Fix data interface setup for ONFI NANDs that do not support the SET FEATURES command - Fix a kernel doc header - Fix potential integer overflow when retrieving timing information from the parameter page - Fix wrong OOB layout for small page NANDs Driver fixes: - Fix potential division-by-zero bug - Fix backward compat with old atmel-nand DT bindings - Fix ->setup_data_interface() in the atmel NAND driver """
Diffstat (limited to 'include')
-rw-r--r--include/linux/mtd/nand.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 892148c448cc..5216d2eb2289 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -681,10 +681,10 @@ struct nand_buffers {
* @tWW_min: WP# transition to WE# low
*/
struct nand_sdr_timings {
- u32 tBERS_max;
+ u64 tBERS_max;
u32 tCCS_min;
- u32 tPROG_max;
- u32 tR_max;
+ u64 tPROG_max;
+ u64 tR_max;
u32 tALH_min;
u32 tADL_min;
u32 tALS_min;