From 65d48cd98505800c6765ff94fc007797e00d466f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 29 Jan 2013 21:11:55 +0100 Subject: [PATCH 12/34] MTD: m25p80: allow loading mtd name from OF In accordance with the physmap flash we should honour the linux,mtd-name property when deciding what name the mtd device has. Signed-off-by: Thomas Langer Signed-off-by: John Crispin --- drivers/mtd/devices/m25p80.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -927,10 +927,13 @@ static int m25p_probe(struct spi_device unsigned i; struct mtd_part_parser_data ppdata; struct device_node __maybe_unused *np = spi->dev.of_node; + const char __maybe_unused *of_mtd_name = NULL; #ifdef CONFIG_MTD_OF_PARTS if (!of_device_is_available(np)) return -ENODEV; + of_property_read_string(spi->dev.of_node, + "linux,mtd-name", &of_mtd_name); #endif /* Platform data helps sort out which chip type we have, as @@ -1006,6 +1009,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; + else if (of_mtd_name) + flash->mtd.name = of_mtd_name; else flash->mtd.name = dev_name(&spi->dev); gi/iCE40/ghdl/tree/pyGHDL/dom/__init__.py?id=00270a7ae84a789406211476b04c7002853ab223'>treecommitdiffstats
blob: f5d38fa09a7642b9d048ef48782a917383a8188e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107