Fix model name of RPI3

As model name in dtb of RPI3 has been changed, there is a issue that
peripheral-bus failed to recognize the RPI3 board. This patch removes
"Rev 1.2" from lookup string for RPI3 to solve the issue.

Change-Id: If7e2c9b5f83a6bf29c743d19ae7eae3095761934
Signed-off-by: Hyeongsik Min <hyeongsik.min@samsung.com>

diff --git a/data/pio_board_rp3_b.ini b/data/pio_board_rp3_b.ini
new file mode 100644 (file)
index 0000000..1344001
--- /dev/null
+++ b/data/pio_board_rp3_b.ini
@@ -0,0 +1,31 @@
+[gpio]
+gpio4  = 7
+gpio5  = 29
+gpio6  = 31
+gpio12 = 15
+gpio13 = 33
+gpio16 = 36
+gpio17 = 11
+gpio18 = 12
+gpio19 = 35
+gpio20 = 38
+gpio21 = 40
+gpio22 = 15
+gpio24 = 18
+gpio25 = 22
+gpio26 = 37
+gpio27 = 12
+
+[i2c]
+i2c-1  = 5, 3
+
+[pwm]
+
+[adc]
+
+[uart]
+ttyS0  = 8, 10
+
+[spi]
+spidev0.0      = 24, 23, 21, 19
+spidev0.1      = 26, 23, 21, 19

diff --git a/data/pio_board_rp3_b_12.ini b/data/pio_board_rp3_b_12.ini
deleted file mode 100644 (file)
index 1344001..0000000
--- a/data/pio_board_rp3_b_12.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[gpio]
-gpio4  = 7
-gpio5  = 29
-gpio6  = 31
-gpio12 = 15
-gpio13 = 33
-gpio16 = 36
-gpio17 = 11
-gpio18 = 12
-gpio19 = 35
-gpio20 = 38
-gpio21 = 40
-gpio22 = 15
-gpio24 = 18
-gpio25 = 22
-gpio26 = 37
-gpio27 = 12
-
-[i2c]
-i2c-1  = 5, 3
-
-[pwm]
-
-[adc]
-
-[uart]
-ttyS0  = 8, 10
-
-[spi]
-spidev0.0      = 24, 23, 21, 19
-spidev0.1      = 26, 23, 21, 19

diff --git a/src/daemon/include/peripheral_bus_board.h b/src/daemon/include/peripheral_bus_board.h
index 85ae2b4589d4c5d176bf7ec5e266590228a63ca5..fc517cd610b3ee52a366f3a53590f49f8484400b 100644 (file)
--- a/src/daemon/include/peripheral_bus_board.h
+++ b/src/daemon/include/peripheral_bus_board.h
@@ -24,7 +24,7 @@
 typedef enum {
        PB_BOARD_ARTIK710 = 0,
        PB_BOARD_ARTIK530,
-       PB_BOARD_RP3_B_12,
+       PB_BOARD_RP3_B,
        PB_BOARD_UNKOWN,
 } pb_board_type_e;
 

diff --git a/src/daemon/peripheral_bus_board.c b/src/daemon/peripheral_bus_board.c
index 652020488e01338824fa4400bc95aa4458a257cb..291ac2e754d576286033756c83ada8098e18e724 100644 (file)
--- a/src/daemon/peripheral_bus_board.c
+++ b/src/daemon/peripheral_bus_board.c
@@ -29,13 +29,13 @@
 #define STR_BUF_MAX                    255
 
 #define BOARD_INI_ARTIK710_PATH        SYSCONFDIR"/peripheral-bus/pio_board_artik710.ini"
-#define BOARD_INI_RP3_B_12_PATH        SYSCONFDIR"/peripheral-bus/pio_board_rp3_b_12.ini"
+#define BOARD_INI_RP3_B_PATH   SYSCONFDIR"/peripheral-bus/pio_board_rp3_b.ini"
 #define BOARD_INI_UNKNOWN_PATH SYSCONFDIR"/peripheral-bus/pio_board_unknown.ini"
 
 static const pb_board_type_s pb_board_type[] = {
        {PB_BOARD_ARTIK710, "artik710 raptor", BOARD_INI_ARTIK710_PATH},
        {PB_BOARD_ARTIK530, "artik530 raptor", BOARD_INI_ARTIK710_PATH},
-       {PB_BOARD_RP3_B_12, "Raspberry Pi 3 Model B Rev 1.2", BOARD_INI_RP3_B_12_PATH},
+       {PB_BOARD_RP3_B, "Raspberry Pi 3 Model B", BOARD_INI_RP3_B_PATH},
        {PB_BOARD_UNKOWN, "unkown board", BOARD_INI_UNKNOWN_PATH},
 };