diff options
author | Ladislav Michl <ladis@linux-mips.org> | 2017-10-25 14:42:57 -0400 |
---|---|---|
committer | Roger Quadros <rogerq@ti.com> | 2017-11-03 09:06:11 -0400 |
commit | a622c641665c32a879348efb2abc389527479ee4 (patch) | |
tree | 0bed96b4efb9a82e19bb52c0b984f7493daf5aca | |
parent | 0d96a4f6a03797b73bee465cada39133b7972e8d (diff) |
memory: omap-gpmc: Remove deprecated gpmc_update_nand_reg()
Deprecated gpmc_update_nand_reg() is no longer used, remove.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Roger Quadros <rogerq@ti.com>
-rw-r--r-- | drivers/memory/omap-gpmc.c | 53 | ||||
-rw-r--r-- | include/linux/omap-gpmc.h | 12 |
2 files changed, 24 insertions, 41 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index f2aef0b87bc6..a385a35c7de9 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c | |||
@@ -1075,10 +1075,33 @@ int gpmc_configure(int cmd, int wval) | |||
1075 | } | 1075 | } |
1076 | EXPORT_SYMBOL(gpmc_configure); | 1076 | EXPORT_SYMBOL(gpmc_configure); |
1077 | 1077 | ||
1078 | void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) | 1078 | static bool gpmc_nand_writebuffer_empty(void) |
1079 | { | ||
1080 | if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS) | ||
1081 | return true; | ||
1082 | |||
1083 | return false; | ||
1084 | } | ||
1085 | |||
1086 | static struct gpmc_nand_ops nand_ops = { | ||
1087 | .nand_writebuffer_empty = gpmc_nand_writebuffer_empty, | ||
1088 | }; | ||
1089 | |||
1090 | /** | ||
1091 | * gpmc_omap_get_nand_ops - Get the GPMC NAND interface | ||
1092 | * @regs: the GPMC NAND register map exclusive for NAND use. | ||
1093 | * @cs: GPMC chip select number on which the NAND sits. The | ||
1094 | * register map returned will be specific to this chip select. | ||
1095 | * | ||
1096 | * Returns NULL on error e.g. invalid cs. | ||
1097 | */ | ||
1098 | struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) | ||
1079 | { | 1099 | { |
1080 | int i; | 1100 | int i; |
1081 | 1101 | ||
1102 | if (cs >= gpmc_cs_num) | ||
1103 | return NULL; | ||
1104 | |||
1082 | reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET + | 1105 | reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET + |
1083 | GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs; | 1106 | GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs; |
1084 | reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET + | 1107 | reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET + |
@@ -1110,34 +1133,6 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) | |||
1110 | reg->gpmc_bch_result6[i] = gpmc_base + GPMC_ECC_BCH_RESULT_6 + | 1133 | reg->gpmc_bch_result6[i] = gpmc_base + GPMC_ECC_BCH_RESULT_6 + |
1111 | i * GPMC_BCH_SIZE; | 1134 | i * GPMC_BCH_SIZE; |
1112 | } | 1135 | } |
1113 | } | ||
1114 | |||
1115 | static bool gpmc_nand_writebuffer_empty(void) | ||
1116 | { | ||
1117 | if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS) | ||
1118 | return true; | ||
1119 | |||
1120 | return false; | ||
1121 | } | ||
1122 | |||
1123 | static struct gpmc_nand_ops nand_ops = { | ||
1124 | .nand_writebuffer_empty = gpmc_nand_writebuffer_empty, | ||
1125 | }; | ||
1126 | |||
1127 | /** | ||
1128 | * gpmc_omap_get_nand_ops - Get the GPMC NAND interface | ||
1129 | * @regs: the GPMC NAND register map exclusive for NAND use. | ||
1130 | * @cs: GPMC chip select number on which the NAND sits. The | ||
1131 | * register map returned will be specific to this chip select. | ||
1132 | * | ||
1133 | * Returns NULL on error e.g. invalid cs. | ||
1134 | */ | ||
1135 | struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) | ||
1136 | { | ||
1137 | if (cs >= gpmc_cs_num) | ||
1138 | return NULL; | ||
1139 | |||
1140 | gpmc_update_nand_reg(reg, cs); | ||
1141 | 1136 | ||
1142 | return &nand_ops; | 1137 | return &nand_ops; |
1143 | } | 1138 | } |
diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h index fd0de00c0d77..edfa280c3d56 100644 --- a/include/linux/omap-gpmc.h +++ b/include/linux/omap-gpmc.h | |||
@@ -36,18 +36,6 @@ static inline struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs | |||
36 | } | 36 | } |
37 | #endif /* CONFIG_OMAP_GPMC */ | 37 | #endif /* CONFIG_OMAP_GPMC */ |
38 | 38 | ||
39 | /*--------------------------------*/ | ||
40 | |||
41 | /* deprecated APIs */ | ||
42 | #if IS_ENABLED(CONFIG_OMAP_GPMC) | ||
43 | void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs); | ||
44 | #else | ||
45 | static inline void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) | ||
46 | { | ||
47 | } | ||
48 | #endif /* CONFIG_OMAP_GPMC */ | ||
49 | /*--------------------------------*/ | ||
50 | |||
51 | extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t, | 39 | extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t, |
52 | struct gpmc_settings *gpmc_s, | 40 | struct gpmc_settings *gpmc_s, |
53 | struct gpmc_device_timings *dev_t); | 41 | struct gpmc_device_timings *dev_t); |