tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/solomon: Move device info from ssd130x-i2c to the core driver
These are declared in the ssd130x-i2c transport driver but the information
is not I2C specific, and could be used by other SSD130x transport drivers.
Move them to the ssd130x core driver and just set the OF device entries to
an ID that could be used to lookup the correct device info from an array.
While being there, also move the SSD130X_DATA and SSD130X_COMMAND control
bytes. Since even though they are used by the I2C interface, they could
also be useful for other transport protocols such as SPI.
Suggested-by: Chen-Yu Tsai <wens@kernel.org>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Acked-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patchwork.freedesktop.org/patch/msgid/20220419214824.335075-5-javierm@redhat.com
+56
-45
+10
-42
drivers/gpu/drm/solomon/ssd130x-i2c.c
+10
-42
drivers/gpu/drm/solomon/ssd130x-i2c.c
···
53
53
ssd130x_shutdown(ssd130x);
54
54
}
55
55
56
-
static struct ssd130x_deviceinfo ssd130x_sh1106_deviceinfo = {
57
-
.default_vcomh = 0x40,
58
-
.default_dclk_div = 1,
59
-
.default_dclk_frq = 5,
60
-
.page_mode_only = 1,
61
-
};
62
-
63
-
static struct ssd130x_deviceinfo ssd130x_ssd1305_deviceinfo = {
64
-
.default_vcomh = 0x34,
65
-
.default_dclk_div = 1,
66
-
.default_dclk_frq = 7,
67
-
};
68
-
69
-
static struct ssd130x_deviceinfo ssd130x_ssd1306_deviceinfo = {
70
-
.default_vcomh = 0x20,
71
-
.default_dclk_div = 1,
72
-
.default_dclk_frq = 8,
73
-
.need_chargepump = 1,
74
-
};
75
-
76
-
static struct ssd130x_deviceinfo ssd130x_ssd1307_deviceinfo = {
77
-
.default_vcomh = 0x20,
78
-
.default_dclk_div = 2,
79
-
.default_dclk_frq = 12,
80
-
.need_pwm = 1,
81
-
};
82
-
83
-
static struct ssd130x_deviceinfo ssd130x_ssd1309_deviceinfo = {
84
-
.default_vcomh = 0x34,
85
-
.default_dclk_div = 1,
86
-
.default_dclk_frq = 10,
87
-
};
88
-
89
56
static const struct of_device_id ssd130x_of_match[] = {
90
57
{
91
58
.compatible = "sinowealth,sh1106",
92
-
.data = &ssd130x_sh1106_deviceinfo,
59
+
.data = &ssd130x_variants[SH1106_ID],
93
60
},
94
61
{
95
62
.compatible = "solomon,ssd1305",
96
-
.data = &ssd130x_ssd1305_deviceinfo,
63
+
.data = &ssd130x_variants[SSD1305_ID],
97
64
},
98
65
{
99
66
.compatible = "solomon,ssd1306",
100
-
.data = &ssd130x_ssd1306_deviceinfo,
67
+
.data = &ssd130x_variants[SSD1306_ID],
101
68
},
102
69
{
103
70
.compatible = "solomon,ssd1307",
104
-
.data = &ssd130x_ssd1307_deviceinfo,
71
+
.data = &ssd130x_variants[SSD1307_ID],
105
72
},
106
73
{
107
74
.compatible = "solomon,ssd1309",
108
-
.data = &ssd130x_ssd1309_deviceinfo,
75
+
.data = &ssd130x_variants[SSD1309_ID],
109
76
},
110
77
/* Deprecated but kept for backward compatibility */
111
78
{
112
79
.compatible = "solomon,ssd1305fb-i2c",
113
-
.data = &ssd130x_ssd1305_deviceinfo,
80
+
.data = &ssd130x_variants[SSD1305_ID],
114
81
},
115
82
{
116
83
.compatible = "solomon,ssd1306fb-i2c",
117
-
.data = &ssd130x_ssd1306_deviceinfo,
84
+
.data = &ssd130x_variants[SSD1306_ID],
118
85
},
119
86
{
120
87
.compatible = "solomon,ssd1307fb-i2c",
121
-
.data = &ssd130x_ssd1307_deviceinfo,
88
+
.data = &ssd130x_variants[SSD1307_ID],
122
89
},
123
90
{
124
91
.compatible = "solomon,ssd1309fb-i2c",
125
-
.data = &ssd130x_ssd1309_deviceinfo,
92
+
.data = &ssd130x_variants[SSD1309_ID],
126
93
},
127
94
{ /* sentinel */ }
128
95
};
···
109
142
MODULE_DESCRIPTION(DRIVER_DESC);
110
143
MODULE_AUTHOR("Javier Martinez Canillas <javierm@redhat.com>");
111
144
MODULE_LICENSE("GPL v2");
145
+
MODULE_IMPORT_NS(DRM_SSD130X);
+32
-3
drivers/gpu/drm/solomon/ssd130x.c
+32
-3
drivers/gpu/drm/solomon/ssd130x.c
···
39
39
#define DRIVER_MAJOR 1
40
40
#define DRIVER_MINOR 0
41
41
42
-
#define SSD130X_DATA 0x40
43
-
#define SSD130X_COMMAND 0x80
44
-
45
42
#define SSD130X_PAGE_COL_START_LOW 0x00
46
43
#define SSD130X_PAGE_COL_START_HIGH 0x10
47
44
#define SSD130X_SET_ADDRESS_MODE 0x20
···
90
93
#define SSD130X_SET_AREA_COLOR_MODE_LOW_POWER 0x05
91
94
92
95
#define MAX_CONTRAST 255
96
+
97
+
const struct ssd130x_deviceinfo ssd130x_variants[] = {
98
+
[SH1106_ID] = {
99
+
.default_vcomh = 0x40,
100
+
.default_dclk_div = 1,
101
+
.default_dclk_frq = 5,
102
+
.page_mode_only = 1,
103
+
},
104
+
[SSD1305_ID] = {
105
+
.default_vcomh = 0x34,
106
+
.default_dclk_div = 1,
107
+
.default_dclk_frq = 7,
108
+
},
109
+
[SSD1306_ID] = {
110
+
.default_vcomh = 0x20,
111
+
.default_dclk_div = 1,
112
+
.default_dclk_frq = 8,
113
+
.need_chargepump = 1,
114
+
},
115
+
[SSD1307_ID] = {
116
+
.default_vcomh = 0x20,
117
+
.default_dclk_div = 2,
118
+
.default_dclk_frq = 12,
119
+
.need_pwm = 1,
120
+
},
121
+
[SSD1309_ID] = {
122
+
.default_vcomh = 0x34,
123
+
.default_dclk_div = 1,
124
+
.default_dclk_frq = 10,
125
+
}
126
+
};
127
+
EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X);
93
128
94
129
static inline struct ssd130x_device *drm_to_ssd130x(struct drm_device *drm)
95
130
{
+14
drivers/gpu/drm/solomon/ssd130x.h
+14
drivers/gpu/drm/solomon/ssd130x.h
···
18
18
19
19
#include <linux/regmap.h>
20
20
21
+
#define SSD130X_DATA 0x40
22
+
#define SSD130X_COMMAND 0x80
23
+
24
+
enum ssd130x_variants {
25
+
SH1106_ID,
26
+
SSD1305_ID,
27
+
SSD1306_ID,
28
+
SSD1307_ID,
29
+
SSD1309_ID,
30
+
NR_SSD130X_VARIANTS
31
+
};
32
+
21
33
struct ssd130x_deviceinfo {
22
34
u32 default_vcomh;
23
35
u32 default_dclk_div;
···
82
70
u8 page_start;
83
71
u8 page_end;
84
72
};
73
+
74
+
extern const struct ssd130x_deviceinfo ssd130x_variants[];
85
75
86
76
struct ssd130x_device *ssd130x_probe(struct device *dev, struct regmap *regmap);
87
77
int ssd130x_remove(struct ssd130x_device *ssd130x);