Skip to content

Commit a758f50

Browse files
3x380VBoris Brezillon
3x380V
authored and
Boris Brezillon
committed
mtd: onenand: omap2: Configure driver from DT
Move away from platform data configuration and use pure DT approach. Use generic probe function to deal with OneNAND node and remove now useless gpmc_probe_onenand_child function. Import sync mode timing calculation function from mach-omap2/gpmc-onenand.c Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Tested-by: Tony Lindgren <tony@atomide.com> Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
1 parent bdaca93 commit a758f50

File tree

4 files changed

+301
-139
lines changed

4 files changed

+301
-139
lines changed

‎drivers/memory/omap-gpmc.c

Lines changed: 117 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include <linux/pm_runtime.h>
3333

3434
#include <linux/platform_data/mtd-nand-omap2.h>
35-
#include <linux/platform_data/mtd-onenand-omap2.h>
3635

3736
#include <asm/mach-types.h>
3837

@@ -1138,6 +1137,112 @@ struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs)
11381137
}
11391138
EXPORT_SYMBOL_GPL(gpmc_omap_get_nand_ops);
11401139

1140+
static void gpmc_omap_onenand_calc_sync_timings(struct gpmc_timings *t,
1141+
struct gpmc_settings *s,
1142+
int freq, int latency)
1143+
{
1144+
struct gpmc_device_timings dev_t;
1145+
const int t_cer = 15;
1146+
const int t_avdp = 12;
1147+
const int t_cez = 20; /* max of t_cez, t_oez */
1148+
const int t_wpl = 40;
1149+
const int t_wph = 30;
1150+
int min_gpmc_clk_period, t_ces, t_avds, t_avdh, t_ach, t_aavdh, t_rdyo;
1151+
1152+
switch (freq) {
1153+
case 104:
1154+
min_gpmc_clk_period = 9600; /* 104 MHz */
1155+
t_ces = 3;
1156+
t_avds = 4;
1157+
t_avdh = 2;
1158+
t_ach = 3;
1159+
t_aavdh = 6;
1160+
t_rdyo = 6;
1161+
break;
1162+
case 83:
1163+
min_gpmc_clk_period = 12000; /* 83 MHz */
1164+
t_ces = 5;
1165+
t_avds = 4;
1166+
t_avdh = 2;
1167+
t_ach = 6;
1168+
t_aavdh = 6;
1169+
t_rdyo = 9;
1170+
break;
1171+
case 66:
1172+
min_gpmc_clk_period = 15000; /* 66 MHz */
1173+
t_ces = 6;
1174+
t_avds = 5;
1175+
t_avdh = 2;
1176+
t_ach = 6;
1177+
t_aavdh = 6;
1178+
t_rdyo = 11;
1179+
break;
1180+
default:
1181+
min_gpmc_clk_period = 18500; /* 54 MHz */
1182+
t_ces = 7;
1183+
t_avds = 7;
1184+
t_avdh = 7;
1185+
t_ach = 9;
1186+
t_aavdh = 7;
1187+
t_rdyo = 15;
1188+
break;
1189+
}
1190+
1191+
/* Set synchronous read timings */
1192+
memset(&dev_t, 0, sizeof(dev_t));
1193+
1194+
if (!s->sync_write) {
1195+
dev_t.t_avdp_w = max(t_avdp, t_cer) * 1000;
1196+
dev_t.t_wpl = t_wpl * 1000;
1197+
dev_t.t_wph = t_wph * 1000;
1198+
dev_t.t_aavdh = t_aavdh * 1000;
1199+
}
1200+
dev_t.ce_xdelay = true;
1201+
dev_t.avd_xdelay = true;
1202+
dev_t.oe_xdelay = true;
1203+
dev_t.we_xdelay = true;
1204+
dev_t.clk = min_gpmc_clk_period;
1205+
dev_t.t_bacc = dev_t.clk;
1206+
dev_t.t_ces = t_ces * 1000;
1207+
dev_t.t_avds = t_avds * 1000;
1208+
dev_t.t_avdh = t_avdh * 1000;
1209+
dev_t.t_ach = t_ach * 1000;
1210+
dev_t.cyc_iaa = (latency + 1);
1211+
dev_t.t_cez_r = t_cez * 1000;
1212+
dev_t.t_cez_w = dev_t.t_cez_r;
1213+
dev_t.cyc_aavdh_oe = 1;
1214+
dev_t.t_rdyo = t_rdyo * 1000 + min_gpmc_clk_period;
1215+
1216+
gpmc_calc_timings(t, s, &dev_t);
1217+
}
1218+
1219+
int gpmc_omap_onenand_set_timings(struct device *dev, int cs, int freq,
1220+
int latency,
1221+
struct gpmc_onenand_info *info)
1222+
{
1223+
int ret;
1224+
struct gpmc_timings gpmc_t;
1225+
struct gpmc_settings gpmc_s;
1226+
1227+
gpmc_read_settings_dt(dev->of_node, &gpmc_s);
1228+
1229+
info->sync_read = gpmc_s.sync_read;
1230+
info->sync_write = gpmc_s.sync_write;
1231+
info->burst_len = gpmc_s.burst_len;
1232+
1233+
if (!gpmc_s.sync_read && !gpmc_s.sync_write)
1234+
return 0;
1235+
1236+
gpmc_omap_onenand_calc_sync_timings(&gpmc_t, &gpmc_s, freq, latency);
1237+
1238+
ret = gpmc_cs_program_settings(cs, &gpmc_s);
1239+
if (ret < 0)
1240+
return ret;
1241+
1242+
return gpmc_cs_set_timings(cs, &gpmc_t, &gpmc_s);
1243+
}
1244+
EXPORT_SYMBOL_GPL(gpmc_omap_onenand_set_timings);
1245+
11411246
int gpmc_get_client_irq(unsigned irq_config)
11421247
{
11431248
if (!gpmc_irq_domain) {
@@ -1916,41 +2021,6 @@ static void __maybe_unused gpmc_read_timings_dt(struct device_node *np,
19162021
of_property_read_bool(np, "gpmc,time-para-granularity");
19172022
}
19182023

1919-
#if IS_ENABLED(CONFIG_MTD_ONENAND)
1920-
static int gpmc_probe_onenand_child(struct platform_device *pdev,
1921-
struct device_node *child)
1922-
{
1923-
u32 val;
1924-
struct omap_onenand_platform_data *gpmc_onenand_data;
1925-
1926-
if (of_property_read_u32(child, "reg", &val) < 0) {
1927-
dev_err(&pdev->dev, "%pOF has no 'reg' property\n",
1928-
child);
1929-
return -ENODEV;
1930-
}
1931-
1932-
gpmc_onenand_data = devm_kzalloc(&pdev->dev, sizeof(*gpmc_onenand_data),
1933-
GFP_KERNEL);
1934-
if (!gpmc_onenand_data)
1935-
return -ENOMEM;
1936-
1937-
gpmc_onenand_data->cs = val;
1938-
gpmc_onenand_data->of_node = child;
1939-
gpmc_onenand_data->dma_channel = -1;
1940-
1941-
if (!of_property_read_u32(child, "dma-channel", &val))
1942-
gpmc_onenand_data->dma_channel = val;
1943-
1944-
return gpmc_onenand_init(gpmc_onenand_data);
1945-
}
1946-
#else
1947-
static int gpmc_probe_onenand_child(struct platform_device *pdev,
1948-
struct device_node *child)
1949-
{
1950-
return 0;
1951-
}
1952-
#endif
1953-
19542024
/**
19552025
* gpmc_probe_generic_child - configures the gpmc for a child device
19562026
* @pdev: pointer to gpmc platform device
@@ -2053,6 +2123,16 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
20532123
}
20542124
}
20552125

2126+
if (of_node_cmp(child->name, "onenand") == 0) {
2127+
/* Warn about older DT blobs with no compatible property */
2128+
if (!of_property_read_bool(child, "compatible")) {
2129+
dev_warn(&pdev->dev,
2130+
"Incompatible OneNAND node: missing compatible");
2131+
ret = -EINVAL;
2132+
goto err;
2133+
}
2134+
}
2135+
20562136
if (of_device_is_compatible(child, "ti,omap2-nand")) {
20572137
/* NAND specific setup */
20582138
val = 8;
@@ -2189,11 +2269,7 @@ static void gpmc_probe_dt_children(struct platform_device *pdev)
21892269
if (!child->name)
21902270
continue;
21912271

2192-
if (of_node_cmp(child->name, "onenand") == 0)
2193-
ret = gpmc_probe_onenand_child(pdev, child);
2194-
else
2195-
ret = gpmc_probe_generic_child(pdev, child);
2196-
2272+
ret = gpmc_probe_generic_child(pdev, child);
21972273
if (ret) {
21982274
dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n",
21992275
child->name, ret);

‎drivers/mtd/onenand/Kconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ config MTD_ONENAND_GENERIC
2525
config MTD_ONENAND_OMAP2
2626
tristate "OneNAND on OMAP2/OMAP3 support"
2727
depends on ARCH_OMAP2 || ARCH_OMAP3
28+
depends on OF || COMPILE_TEST
2829
help
29-
Support for a OneNAND flash device connected to an OMAP2/OMAP3 CPU
30+
Support for a OneNAND flash device connected to an OMAP2/OMAP3 SoC
3031
via the GPMC memory controller.
32+
Enable dmaengine and gpiolib for better performance.
3133

3234
config MTD_ONENAND_SAMSUNG
3335
tristate "OneNAND on Samsung SOC controller support"

0 commit comments

Comments
 (0)