Skip to content

Commit 1f52fef

Browse files
pelwellpopcornmix
pelwell
authored and
popcornmix
committed
mfd: Add Raspberry Pi Sense HAT core driver
mfd: Add rpi_sense_core of compatible string rpisense-fb: Set pseudo_pallete to prevent crash on fbcon takeover Signed-off-by: Serge Schneider <[email protected]> rpisense-fb: Add explicit fb_deferred_io_mmap hook As of commit [1], introduced in 5.18, fbdev drivers that use deferred IO and need mmap support must include an explicit fb_mmap pointer to the fb_deferred_io_mmap. Signed-off-by: Phil Elwell <[email protected]> [1] 5905585 ("fbdev: Put mmap for deferred I/O into drivers")
1 parent 3ea183d commit 1f52fef

File tree

12 files changed

+759
-0
lines changed

12 files changed

+759
-0
lines changed

‎drivers/input/joystick/Kconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,4 +422,12 @@ config JOYSTICK_SEESAW
422422
To compile this driver as a module, choose M here: the module will be
423423
called adafruit-seesaw.
424424

425+
config JOYSTICK_RPISENSE
426+
tristate "Raspberry Pi Sense HAT joystick"
427+
depends on GPIOLIB && INPUT
428+
select MFD_RPISENSE_CORE
429+
430+
help
431+
This is the joystick driver for the Raspberry Pi Sense HAT
432+
425433
endif

‎drivers/input/joystick/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o
4141
obj-$(CONFIG_JOYSTICK_WALKERA0701) += walkera0701.o
4242
obj-$(CONFIG_JOYSTICK_XPAD) += xpad.o
4343
obj-$(CONFIG_JOYSTICK_ZHENHUA) += zhenhua.o
44+
obj-$(CONFIG_JOYSTICK_RPISENSE) += rpisense-js.o

‎drivers/input/joystick/rpisense-js.c‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
/*
2+
* Raspberry Pi Sense HAT joystick driver
3+
* http://raspberrypi.org
4+
*
5+
* Copyright (C) 2015 Raspberry Pi
6+
*
7+
* Author: Serge Schneider
8+
*
9+
* This program is free software; you can redistribute it and/or modify it
10+
* under the terms of the GNU General Public License as published by the
11+
* Free Software Foundation; either version 2 of the License, or (at your
12+
* option) any later version.
13+
*
14+
*/
15+
16+
#include <linux/module.h>
17+
18+
#include <linux/mfd/rpisense/joystick.h>
19+
#include <linux/mfd/rpisense/core.h>
20+
21+
static struct rpisense *rpisense;
22+
static unsigned char keymap[5] = {KEY_DOWN, KEY_RIGHT, KEY_UP, KEY_ENTER, KEY_LEFT,};
23+
24+
static void keys_work_fn(struct work_struct *work)
25+
{
26+
int i;
27+
static s32 prev_keys;
28+
struct rpisense_js *rpisense_js = &rpisense->joystick;
29+
s32 keys = rpisense_reg_read(rpisense, RPISENSE_KEYS);
30+
s32 changes = keys ^ prev_keys;
31+
32+
prev_keys = keys;
33+
for (i = 0; i < 5; i++) {
34+
if (changes & 1) {
35+
input_report_key(rpisense_js->keys_dev,
36+
keymap[i], keys & 1);
37+
}
38+
changes >>= 1;
39+
keys >>= 1;
40+
}
41+
input_sync(rpisense_js->keys_dev);
42+
}
43+
44+
static irqreturn_t keys_irq_handler(int irq, void *pdev)
45+
{
46+
struct rpisense_js *rpisense_js = &rpisense->joystick;
47+
48+
schedule_work(&rpisense_js->keys_work_s);
49+
return IRQ_HANDLED;
50+
}
51+
52+
static int rpisense_js_probe(struct platform_device *pdev)
53+
{
54+
int ret;
55+
int i;
56+
struct rpisense_js *rpisense_js;
57+
58+
rpisense = rpisense_get_dev();
59+
rpisense_js = &rpisense->joystick;
60+
61+
INIT_WORK(&rpisense_js->keys_work_s, keys_work_fn);
62+
63+
rpisense_js->keys_dev = input_allocate_device();
64+
if (!rpisense_js->keys_dev) {
65+
dev_err(&pdev->dev, "Could not allocate input device.\n");
66+
return -ENOMEM;
67+
}
68+
69+
rpisense_js->keys_dev->evbit[0] = BIT_MASK(EV_KEY);
70+
for (i = 0; i < ARRAY_SIZE(keymap); i++) {
71+
set_bit(keymap[i],
72+
rpisense_js->keys_dev->keybit);
73+
}
74+
75+
rpisense_js->keys_dev->name = "Raspberry Pi Sense HAT Joystick";
76+
rpisense_js->keys_dev->phys = "rpi-sense-joy/input0";
77+
rpisense_js->keys_dev->id.bustype = BUS_I2C;
78+
rpisense_js->keys_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
79+
rpisense_js->keys_dev->keycode = keymap;
80+
rpisense_js->keys_dev->keycodesize = sizeof(unsigned char);
81+
rpisense_js->keys_dev->keycodemax = ARRAY_SIZE(keymap);
82+
83+
ret = input_register_device(rpisense_js->keys_dev);
84+
if (ret) {
85+
dev_err(&pdev->dev, "Could not register input device.\n");
86+
goto err_keys_alloc;
87+
}
88+
89+
ret = gpiod_direction_input(rpisense_js->keys_desc);
90+
if (ret) {
91+
dev_err(&pdev->dev, "Could not set keys-int direction.\n");
92+
goto err_keys_reg;
93+
}
94+
95+
rpisense_js->keys_irq = gpiod_to_irq(rpisense_js->keys_desc);
96+
if (rpisense_js->keys_irq < 0) {
97+
dev_err(&pdev->dev, "Could not determine keys-int IRQ.\n");
98+
ret = rpisense_js->keys_irq;
99+
goto err_keys_reg;
100+
}
101+
102+
ret = devm_request_irq(&pdev->dev, rpisense_js->keys_irq,
103+
keys_irq_handler, IRQF_TRIGGER_RISING,
104+
"keys", &pdev->dev);
105+
if (ret) {
106+
dev_err(&pdev->dev, "IRQ request failed.\n");
107+
goto err_keys_reg;
108+
}
109+
return 0;
110+
err_keys_reg:
111+
input_unregister_device(rpisense_js->keys_dev);
112+
err_keys_alloc:
113+
input_free_device(rpisense_js->keys_dev);
114+
return ret;
115+
}
116+
117+
static int rpisense_js_remove(struct platform_device *pdev)
118+
{
119+
struct rpisense_js *rpisense_js = &rpisense->joystick;
120+
121+
input_unregister_device(rpisense_js->keys_dev);
122+
input_free_device(rpisense_js->keys_dev);
123+
return 0;
124+
}
125+
126+
#ifdef CONFIG_OF
127+
static const struct of_device_id rpisense_js_id[] = {
128+
{ .compatible = "rpi,rpi-sense-js" },
129+
{ },
130+
};
131+
MODULE_DEVICE_TABLE(of, rpisense_js_id);
132+
#endif
133+
134+
static struct platform_device_id rpisense_js_device_id[] = {
135+
{ .name = "rpi-sense-js" },
136+
{ },
137+
};
138+
MODULE_DEVICE_TABLE(platform, rpisense_js_device_id);
139+
140+
static struct platform_driver rpisense_js_driver = {
141+
.probe = rpisense_js_probe,
142+
.remove = rpisense_js_remove,
143+
.driver = {
144+
.name = "rpi-sense-js",
145+
.owner = THIS_MODULE,
146+
},
147+
};
148+
149+
module_platform_driver(rpisense_js_driver);
150+
151+
MODULE_DESCRIPTION("Raspberry Pi Sense HAT joystick driver");
152+
MODULE_AUTHOR("Serge Schneider <[email protected]>");
153+
MODULE_LICENSE("GPL");

‎drivers/mfd/Kconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ config MFD_CORE
1111
select IRQ_DOMAIN
1212
default n
1313

14+
config MFD_RPISENSE_CORE
15+
tristate "Raspberry Pi Sense HAT core functions"
16+
depends on I2C
17+
select MFD_CORE
18+
help
19+
This is the core driver for the Raspberry Pi Sense HAT. This provides
20+
the necessary functions to communicate with the hardware.
21+
1422
config MFD_CS5535
1523
tristate "AMD CS5535 and CS5536 southbridge core functions"
1624
select MFD_CORE

‎drivers/mfd/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ obj-$(CONFIG_MFD_STMFX) += stmfx.o
268268
obj-$(CONFIG_MFD_KHADAS_MCU) += khadas-mcu.o
269269
obj-$(CONFIG_MFD_ACER_A500_EC) += acer-ec-a500.o
270270
obj-$(CONFIG_MFD_QCOM_PM8008) += qcom-pm8008.o
271+
obj-$(CONFIG_MFD_RPISENSE_CORE) += rpisense-core.o
271272

272273
obj-$(CONFIG_SGI_MFD_IOC3) += ioc3.o
273274
obj-$(CONFIG_MFD_SIMPLE_MFD_I2C) += simple-mfd-i2c.o

‎drivers/mfd/rpisense-core.c‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
/*
2+
* Raspberry Pi Sense HAT core driver
3+
* http://raspberrypi.org
4+
*
5+
* Copyright (C) 2015 Raspberry Pi
6+
*
7+
* Author: Serge Schneider
8+
*
9+
* This program is free software; you can redistribute it and/or modify it
10+
* under the terms of the GNU General Public License as published by the
11+
* Free Software Foundation; either version 2 of the License, or (at your
12+
* option) any later version.
13+
*
14+
* This driver is based on wm8350 implementation.
15+
*/
16+
17+
#include <linux/module.h>
18+
#include <linux/moduleparam.h>
19+
#include <linux/err.h>
20+
#include <linux/init.h>
21+
#include <linux/i2c.h>
22+
#include <linux/platform_device.h>
23+
#include <linux/mfd/rpisense/core.h>
24+
#include <linux/slab.h>
25+
26+
static struct rpisense *rpisense;
27+
28+
static void rpisense_client_dev_register(struct rpisense *rpisense,
29+
const char *name,
30+
struct platform_device **pdev)
31+
{
32+
int ret;
33+
34+
*pdev = platform_device_alloc(name, -1);
35+
if (*pdev == NULL) {
36+
dev_err(rpisense->dev, "Failed to allocate %s\n", name);
37+
return;
38+
}
39+
40+
(*pdev)->dev.parent = rpisense->dev;
41+
platform_set_drvdata(*pdev, rpisense);
42+
ret = platform_device_add(*pdev);
43+
if (ret != 0) {
44+
dev_err(rpisense->dev, "Failed to register %s: %d\n",
45+
name, ret);
46+
platform_device_put(*pdev);
47+
*pdev = NULL;
48+
}
49+
}
50+
51+
static int rpisense_probe(struct i2c_client *i2c)
52+
{
53+
int ret;
54+
struct rpisense_js *rpisense_js;
55+
56+
rpisense = devm_kzalloc(&i2c->dev, sizeof(struct rpisense), GFP_KERNEL);
57+
if (rpisense == NULL)
58+
return -ENOMEM;
59+
60+
i2c_set_clientdata(i2c, rpisense);
61+
rpisense->dev = &i2c->dev;
62+
rpisense->i2c_client = i2c;
63+
64+
ret = rpisense_reg_read(rpisense, RPISENSE_WAI);
65+
if (ret > 0) {
66+
if (ret != 's')
67+
return -EINVAL;
68+
} else {
69+
return ret;
70+
}
71+
ret = rpisense_reg_read(rpisense, RPISENSE_VER);
72+
if (ret < 0)
73+
return ret;
74+
75+
dev_info(rpisense->dev,
76+
"Raspberry Pi Sense HAT firmware version %i\n", ret);
77+
78+
rpisense_js = &rpisense->joystick;
79+
rpisense_js->keys_desc = devm_gpiod_get(&i2c->dev,
80+
"keys-int", GPIOD_IN);
81+
if (IS_ERR(rpisense_js->keys_desc)) {
82+
dev_warn(&i2c->dev, "Failed to get keys-int descriptor.\n");
83+
rpisense_js->keys_desc = gpio_to_desc(23);
84+
if (rpisense_js->keys_desc == NULL) {
85+
dev_err(&i2c->dev, "GPIO23 fallback failed.\n");
86+
return PTR_ERR(rpisense_js->keys_desc);
87+
}
88+
}
89+
rpisense_client_dev_register(rpisense, "rpi-sense-js",
90+
&(rpisense->joystick.pdev));
91+
rpisense_client_dev_register(rpisense, "rpi-sense-fb",
92+
&(rpisense->framebuffer.pdev));
93+
94+
return 0;
95+
}
96+
97+
static void rpisense_remove(struct i2c_client *i2c)
98+
{
99+
struct rpisense *rpisense = i2c_get_clientdata(i2c);
100+
101+
platform_device_unregister(rpisense->joystick.pdev);
102+
}
103+
104+
struct rpisense *rpisense_get_dev(void)
105+
{
106+
return rpisense;
107+
}
108+
EXPORT_SYMBOL_GPL(rpisense_get_dev);
109+
110+
s32 rpisense_reg_read(struct rpisense *rpisense, int reg)
111+
{
112+
int ret = i2c_smbus_read_byte_data(rpisense->i2c_client, reg);
113+
114+
if (ret < 0)
115+
dev_err(rpisense->dev, "Read from reg %d failed\n", reg);
116+
/* Due to the BCM270x I2C clock stretching bug, some values
117+
* may have MSB set. Clear it to avoid incorrect values.
118+
* */
119+
return ret & 0x7F;
120+
}
121+
EXPORT_SYMBOL_GPL(rpisense_reg_read);
122+
123+
int rpisense_block_write(struct rpisense *rpisense, const char *buf, int count)
124+
{
125+
int ret = i2c_master_send(rpisense->i2c_client, buf, count);
126+
127+
if (ret < 0)
128+
dev_err(rpisense->dev, "Block write failed\n");
129+
return ret;
130+
}
131+
EXPORT_SYMBOL_GPL(rpisense_block_write);
132+
133+
static const struct i2c_device_id rpisense_i2c_id[] = {
134+
{ "rpi-sense", 0 },
135+
{ }
136+
};
137+
MODULE_DEVICE_TABLE(i2c, rpisense_i2c_id);
138+
139+
#ifdef CONFIG_OF
140+
static const struct of_device_id rpisense_core_id[] = {
141+
{ .compatible = "rpi,rpi-sense" },
142+
{ },
143+
};
144+
MODULE_DEVICE_TABLE(of, rpisense_core_id);
145+
#endif
146+
147+
148+
static struct i2c_driver rpisense_driver = {
149+
.driver = {
150+
.name = "rpi-sense",
151+
.owner = THIS_MODULE,
152+
},
153+
.probe = rpisense_probe,
154+
.remove = rpisense_remove,
155+
.id_table = rpisense_i2c_id,
156+
};
157+
158+
module_i2c_driver(rpisense_driver);
159+
160+
MODULE_DESCRIPTION("Raspberry Pi Sense HAT core driver");
161+
MODULE_AUTHOR("Serge Schneider <[email protected]>");
162+
MODULE_LICENSE("GPL");
163+

‎drivers/video/fbdev/Kconfig‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1873,6 +1873,19 @@ config FB_SM712
18731873
called sm712fb. If you want to compile it as a module, say M
18741874
here and read <file:Documentation/kbuild/modules.rst>.
18751875

1876+
config FB_RPISENSE
1877+
tristate "Raspberry Pi Sense HAT framebuffer"
1878+
depends on FB
1879+
select MFD_RPISENSE_CORE
1880+
select FB_SYS_FOPS
1881+
select FB_SYS_FILLRECT
1882+
select FB_SYS_COPYAREA
1883+
select FB_SYS_IMAGEBLIT
1884+
select FB_DEFERRED_IO
1885+
1886+
help
1887+
This is the framebuffer driver for the Raspberry Pi Sense HAT
1888+
18761889
source "drivers/video/fbdev/omap/Kconfig"
18771890
source "drivers/video/fbdev/omap2/Kconfig"
18781891
source "drivers/video/fbdev/mmp/Kconfig"

‎drivers/video/fbdev/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ obj-$(CONFIG_FB_OF) += offb.o
125125
obj-$(CONFIG_FB_DA8XX) += da8xx-fb.o
126126
obj-$(CONFIG_FB_SSD1307) += ssd1307fb.o
127127
obj-$(CONFIG_FB_SIMPLE) += simplefb.o
128+
obj-$(CONFIG_FB_RPISENSE) += rpisense-fb.o
128129

129130
# the test framebuffer is last
130131
obj-$(CONFIG_FB_VIRTUAL) += vfb.o

0 commit comments

Comments
 (0)