Skip to content

Commit cdea987

Browse files
pelwellpopcornmix
authored andcommitted
Merge pull request #1043 from XECDesign/sense-4.0
mfd: Add Raspberry Pi Sense HAT core driver
1 parent 55cc759 commit cdea987

File tree

12 files changed

+750
-0
lines changed

12 files changed

+750
-0
lines changed

drivers/input/joystick/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,4 +330,12 @@ config JOYSTICK_MAPLE
330330
To compile this as a module choose M here: the module will be called
331331
maplecontrol.
332332

333+
config JOYSTICK_RPISENSE
334+
tristate "Raspberry Pi Sense HAT joystick"
335+
depends on GPIOLIB && INPUT
336+
select MFD_RPISENSE_CORE
337+
338+
help
339+
This is the joystick driver for the Raspberry Pi Sense HAT
340+
333341
endif

drivers/input/joystick/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o
3232
obj-$(CONFIG_JOYSTICK_XPAD) += xpad.o
3333
obj-$(CONFIG_JOYSTICK_ZHENHUA) += zhenhua.o
3434
obj-$(CONFIG_JOYSTICK_WALKERA0701) += walkera0701.o
35+
obj-$(CONFIG_JOYSTICK_RPISENSE) += rpisense-js.o
3536

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+
struct rpisense *rpisense;
22+
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
@@ -10,6 +10,14 @@ config MFD_CORE
1010
select IRQ_DOMAIN
1111
default n
1212

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

drivers/mfd/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,5 @@ obj-$(CONFIG_MFD_SKY81452) += sky81452.o
192192
intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
193193
obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
194194
obj-$(CONFIG_MFD_MT6397) += mt6397-core.o
195+
196+
obj-$(CONFIG_MFD_RPISENSE_CORE) += rpisense-core.o

drivers/mfd/rpisense-core.c

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
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+
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+
const struct i2c_device_id *id)
53+
{
54+
int ret;
55+
struct rpisense_js *rpisense_js;
56+
57+
rpisense = devm_kzalloc(&i2c->dev, sizeof(struct rpisense), GFP_KERNEL);
58+
if (rpisense == NULL)
59+
return -ENOMEM;
60+
61+
i2c_set_clientdata(i2c, rpisense);
62+
rpisense->dev = &i2c->dev;
63+
rpisense->i2c_client = i2c;
64+
65+
ret = rpisense_reg_read(rpisense, RPISENSE_WAI);
66+
if (ret > 0) {
67+
if (ret != 's')
68+
return -EINVAL;
69+
} else {
70+
return ret;
71+
}
72+
ret = rpisense_reg_read(rpisense, RPISENSE_VER);
73+
if (ret < 0)
74+
return ret;
75+
76+
dev_info(rpisense->dev,
77+
"Raspberry Pi Sense HAT firmware version %i\n", ret);
78+
79+
rpisense_js = &rpisense->joystick;
80+
rpisense_js->keys_desc = devm_gpiod_get(&i2c->dev,
81+
"keys-int", GPIOD_IN);
82+
if (IS_ERR(rpisense_js->keys_desc)) {
83+
dev_warn(&i2c->dev, "Failed to get keys-int descriptor.\n");
84+
rpisense_js->keys_desc = gpio_to_desc(23);
85+
if (rpisense_js->keys_desc == NULL) {
86+
dev_err(&i2c->dev, "GPIO23 fallback failed.\n");
87+
return PTR_ERR(rpisense_js->keys_desc);
88+
}
89+
}
90+
rpisense_client_dev_register(rpisense, "rpi-sense-js",
91+
&(rpisense->joystick.pdev));
92+
rpisense_client_dev_register(rpisense, "rpi-sense-fb",
93+
&(rpisense->framebuffer.pdev));
94+
95+
return 0;
96+
}
97+
98+
static int rpisense_remove(struct i2c_client *i2c)
99+
{
100+
struct rpisense *rpisense = i2c_get_clientdata(i2c);
101+
102+
platform_device_unregister(rpisense->joystick.pdev);
103+
return 0;
104+
}
105+
106+
struct rpisense *rpisense_get_dev(void)
107+
{
108+
return rpisense;
109+
}
110+
EXPORT_SYMBOL_GPL(rpisense_get_dev);
111+
112+
s32 rpisense_reg_read(struct rpisense *rpisense, int reg)
113+
{
114+
int ret = i2c_smbus_read_byte_data(rpisense->i2c_client, reg);
115+
116+
if (ret < 0)
117+
dev_err(rpisense->dev, "Read from reg %d failed\n", reg);
118+
/* Due to the BCM270x I2C clock stretching bug, some values
119+
* may have MSB set. Clear it to avoid incorrect values.
120+
* */
121+
return ret & 0x7F;
122+
}
123+
EXPORT_SYMBOL_GPL(rpisense_reg_read);
124+
125+
int rpisense_block_write(struct rpisense *rpisense, const char *buf, int count)
126+
{
127+
int ret = i2c_master_send(rpisense->i2c_client, buf, count);
128+
129+
if (ret < 0)
130+
dev_err(rpisense->dev, "Block write failed\n");
131+
return ret;
132+
}
133+
EXPORT_SYMBOL_GPL(rpisense_block_write);
134+
135+
static const struct i2c_device_id rpisense_i2c_id[] = {
136+
{ "rpi-sense", 0 },
137+
{ }
138+
};
139+
MODULE_DEVICE_TABLE(i2c, rpisense_i2c_id);
140+
141+
142+
static struct i2c_driver rpisense_driver = {
143+
.driver = {
144+
.name = "rpi-sense",
145+
.owner = THIS_MODULE,
146+
},
147+
.probe = rpisense_probe,
148+
.remove = rpisense_remove,
149+
.id_table = rpisense_i2c_id,
150+
};
151+
152+
module_i2c_driver(rpisense_driver);
153+
154+
MODULE_DESCRIPTION("Raspberry Pi Sense HAT core driver");
155+
MODULE_AUTHOR("Serge Schneider <[email protected]>");
156+
MODULE_LICENSE("GPL");
157+

drivers/video/fbdev/Kconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2503,3 +2503,16 @@ config FB_SM712
25032503
This driver is also available as a module. The module will be
25042504
called sm712fb. If you want to compile it as a module, say M
25052505
here and read <file:Documentation/kbuild/modules.txt>.
2506+
2507+
config FB_RPISENSE
2508+
tristate "Raspberry Pi Sense HAT framebuffer"
2509+
depends on FB
2510+
select MFD_RPISENSE_CORE
2511+
select FB_SYS_FOPS
2512+
select FB_SYS_FILLRECT
2513+
select FB_SYS_COPYAREA
2514+
select FB_SYS_IMAGEBLIT
2515+
select FB_DEFERRED_IO
2516+
2517+
help
2518+
This is the framebuffer driver for the Raspberry Pi Sense HAT

drivers/video/fbdev/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ obj-$(CONFIG_FB_DA8XX) += da8xx-fb.o
150150
obj-$(CONFIG_FB_MXS) += mxsfb.o
151151
obj-$(CONFIG_FB_SSD1307) += ssd1307fb.o
152152
obj-$(CONFIG_FB_SIMPLE) += simplefb.o
153+
obj-$(CONFIG_FB_RPISENSE) += rpisense-fb.o
153154

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

0 commit comments

Comments
 (0)