Skip to content

Commit 95776d9

Browse files
galakMaureenHelm
authored andcommitted
drivers/display: mb_display: Move gpio defines to driver
Since the mb_display driver is specific to the microbit we can move the GPIO pin defines from board.h into the driver. This lets us remove one of the few remaining drivers that is including board.h Signed-off-by: Kumar Gala <[email protected]>
1 parent a8f1431 commit 95776d9

File tree

2 files changed

+49
-49
lines changed

2 files changed

+49
-49
lines changed

boards/arm/bbc_microbit/board.h

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,54 +9,6 @@
99

1010
#include <soc.h>
1111

12-
/* Onboard LED Row 1 */
13-
#define LED_ROW1_GPIO_PIN 13
14-
#define LED_ROW1_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
15-
16-
/* Onboard LED Row 2 */
17-
#define LED_ROW2_GPIO_PIN 14
18-
#define LED_ROW2_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
19-
20-
/* Onboard LED Row 3 */
21-
#define LED_ROW3_GPIO_PIN 15
22-
#define LED_ROW3_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
23-
24-
/* Onboard LED Column 1 */
25-
#define LED_COL1_GPIO_PIN 4
26-
#define LED_COL1_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
27-
28-
/* Onboard LED Column 2 */
29-
#define LED_COL2_GPIO_PIN 5
30-
#define LED_COL2_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
31-
32-
/* Onboard LED Column 3 */
33-
#define LED_COL3_GPIO_PIN 6
34-
#define LED_COL3_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
35-
36-
/* Onboard LED Column 4 */
37-
#define LED_COL4_GPIO_PIN 7
38-
#define LED_COL4_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
39-
40-
/* Onboard LED Column 5 */
41-
#define LED_COL5_GPIO_PIN 8
42-
#define LED_COL5_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
43-
44-
/* Onboard LED Column 6 */
45-
#define LED_COL6_GPIO_PIN 9
46-
#define LED_COL6_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
47-
48-
/* Onboard LED Column 7 */
49-
#define LED_COL7_GPIO_PIN 10
50-
#define LED_COL7_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
51-
52-
/* Onboard LED Column 8 */
53-
#define LED_COL8_GPIO_PIN 11
54-
#define LED_COL8_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
55-
56-
/* Onboard LED Column 9 */
57-
#define LED_COL9_GPIO_PIN 12
58-
#define LED_COL9_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
59-
6012
/* External edge connector pin mappings to nRF51 GPIO pin numbers.
6113
* More information:
6214
* https://www.microbit.co.uk/device/pins

drivers/display/mb_display.c

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include <zephyr.h>
1515
#include <init.h>
16-
#include <board.h>
1716
#include <gpio.h>
1817
#include <device.h>
1918
#include <string.h>
@@ -25,6 +24,55 @@
2524

2625
#define MODE_MASK BIT_MASK(16)
2726

27+
/* Onboard LED Row 1 */
28+
#define LED_ROW1_GPIO_PIN 13
29+
#define LED_ROW1_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
30+
31+
/* Onboard LED Row 2 */
32+
#define LED_ROW2_GPIO_PIN 14
33+
#define LED_ROW2_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
34+
35+
/* Onboard LED Row 3 */
36+
#define LED_ROW3_GPIO_PIN 15
37+
#define LED_ROW3_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
38+
39+
/* Onboard LED Column 1 */
40+
#define LED_COL1_GPIO_PIN 4
41+
#define LED_COL1_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
42+
43+
/* Onboard LED Column 2 */
44+
#define LED_COL2_GPIO_PIN 5
45+
#define LED_COL2_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
46+
47+
/* Onboard LED Column 3 */
48+
#define LED_COL3_GPIO_PIN 6
49+
#define LED_COL3_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
50+
51+
/* Onboard LED Column 4 */
52+
#define LED_COL4_GPIO_PIN 7
53+
#define LED_COL4_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
54+
55+
/* Onboard LED Column 5 */
56+
#define LED_COL5_GPIO_PIN 8
57+
#define LED_COL5_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
58+
59+
/* Onboard LED Column 6 */
60+
#define LED_COL6_GPIO_PIN 9
61+
#define LED_COL6_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
62+
63+
/* Onboard LED Column 7 */
64+
#define LED_COL7_GPIO_PIN 10
65+
#define LED_COL7_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
66+
67+
/* Onboard LED Column 8 */
68+
#define LED_COL8_GPIO_PIN 11
69+
#define LED_COL8_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
70+
71+
/* Onboard LED Column 9 */
72+
#define LED_COL9_GPIO_PIN 12
73+
#define LED_COL9_GPIO_PORT CONFIG_GPIO_P0_DEV_NAME
74+
75+
2876
#define DISPLAY_ROWS 3
2977
#define DISPLAY_COLS 9
3078

0 commit comments

Comments
 (0)