mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20 from jerryr/master

Browse Source 
Add support for Raspberry Pi 3
This commit is contained in:
willfe
2016-09-26 14:05:00 -07:00
committed by GitHub
parent f9d5c1532d f9bad8faf4
commit 25b022aa72
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/hd44780-rpi.c
+11 -5
View File
@@ -71,6 +71,8 @@ void lcdrpi_HD44780_close(PrivateData *p);
*/ */
static volatile unsigned int *gpio_map = NULL; static volatile unsigned int *gpio_map = NULL;
static unsigned int gpio_base_address = 0;
/* /*
* Two different board revisions are currently in widespread use. The * Two different board revisions are currently in widespread use. The
* GPIO mappings differ slightly - Not enough to kill a system yet. * GPIO mappings differ slightly - Not enough to kill a system yet.
@@ -119,7 +121,7 @@ setup_io(Driver *drvthis)
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
MAP_SHARED, MAP_SHARED,
mem_fd, mem_fd,
GPIO_BASE); gpio_base_address);
if (gpio_map == MAP_FAILED) { if (gpio_map == MAP_FAILED) {
report(RPT_ERR, "setup_io: mmap failed: %s", strerror(errno)); report(RPT_ERR, "setup_io: mmap failed: %s", strerror(errno));
@@ -161,8 +163,7 @@ check_board_rev(Driver *drvthis)
/* On boards that have been overvolted, the MSB will be set */ /* On boards that have been overvolted, the MSB will be set */
rev &= 0x00ff; rev &= 0x00ff;
if ((strcmp(hw, "BCM2708") != 0 && strcmp(hw, "BCM2709") != 0) || rev == 0) {
if (strcmp(hw, "BCM2708") != 0 || rev == 0) {
report(RPT_ERR, "check_board_rev: This board is not recognized as a Raspberry Pi!"); report(RPT_ERR, "check_board_rev: This board is not recognized as a Raspberry Pi!");
return NULL; return NULL;
} }
@@ -171,17 +172,22 @@ check_board_rev(Driver *drvthis)
* in the wild). */ * in the wild). */
if (rev < 4) { if (rev < 4) {
report(RPT_INFO, "check_board_rev: Revision 1 board detected"); report(RPT_INFO, "check_board_rev: Revision 1 board detected");
gpio_base_address = BCM2835_PERI_BASE_PI12 + GPIO_BASE_OFFSET;
return gpio_pins_R1; return gpio_pins_R1;
} }
/* Currently, Rev 2 boards are 0x004, 0x005, or 0x006. This will need /* Currently, Rev 2 boards are 0x004, 0x005, or 0x006. This will need
* updating as new revisions are released, but it is unlikely that P1 * updating as new revisions are released, but it is unlikely that P1
* will change. */ * will change. */
if (rev > 3) { if (rev > 3 && rev <= 21) {
report(RPT_INFO, "check_board_rev: Revision 2 board detected"); report(RPT_INFO, "check_board_rev: Revision 2 board detected");
gpio_base_address = BCM2835_PERI_BASE_PI12 + GPIO_BASE_OFFSET;
return gpio_pins_R2; return gpio_pins_R2;
} }
return NULL; report(RPT_INFO, "check_board_rev: Raspberry Pi 3 board detected");
gpio_base_address = BCM2835_PERI_BASE_PI3 + GPIO_BASE_OFFSET;
return gpio_pins_R2;
} }
server/drivers/hd44780-rpi.h
+4 -3
View File
@@ -20,9 +20,10 @@ struct rpi_gpio_map {
}; };
/** Peripheral base address of the BCM2835 */ /** Peripheral base address of the BCM2835 */
#define BCM2835_PERI_BASE 0x20000000 #define BCM2835_PERI_BASE_PI12 0x20000000
/** GPIO register start address */ #define BCM2835_PERI_BASE_PI3 0x3F000000
#define GPIO_BASE BCM2835_PERI_BASE + 0x200000 /** GPIO register start address offset from PERI_BASE */
#define GPIO_BASE_OFFSET 0x200000
/** Length of register space */ /** Length of register space */
#define GPIO_BLOCK_SIZE 180 #define GPIO_BLOCK_SIZE 180
/** The Pi has 32 GPIO pins */ /** The Pi has 32 GPIO pins */