Skip to content

Commit

Permalink
fix milkv duo platform on sophgo cv180x soc
Browse files Browse the repository at this point in the history
Signed-off-by: carbon <carbon@milkv.io>
  • Loading branch information
carbonfix committed Apr 23, 2024
1 parent c89cbae commit 64c581d
Show file tree
Hide file tree
Showing 9 changed files with 186 additions and 122 deletions.
21 changes: 14 additions & 7 deletions docs/source/platforms/milkv/duo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Milk-V Duo
+----------------+-----------------+
| System on Chip | Sophgo CV1800B |
+----------------+-----------------+
| Number GPIO | 22 |
| Number GPIO | 26 |
+----------------+-----------------+
| Status | Fully supported |
+----------------+-----------------+
Expand All @@ -29,10 +29,17 @@ GPIO Mapping

.. image:: duo.jpg

+----+----+-----+----+----+----+----+-----+----+----+----+----+-----+----+----+----+----+-----+----+----+-----+-----+
|3.3V|3.3V| GND |3.3V|3.3V|3.3V|3.3V| GND | 27 | 26 |3.3V| 22 | GND | 21 | 20 | 19 | 18 | GND | 17 | 16 | N/A | N/A |
+----+----+-----+----+----+----+----+-----+----+----+----+----+-----+----+----+----+----+-----+----+----+-----+-----+
| 0 | 1 | GND | 2 | 3 | 4 | 5 | GND | 6 | 7 | 8 | 9 | GND | 10 | 11 | 12 | 13 | GND | 14 | 15 | N/A | 25 |
+----+----+-----+----+----+----+----+-----+----+----+----+----+-----+----+----+----+----+-----+----+----+-----+-----+
+----+----+-----+------+------+-----+-----+-----+----+----+----+----+-----+----+----+----+----+-----+----+----+
| 5V | 5V | GND | 3.3V | 3.3V | N/A | N/A | GND | 27 | 26 |3.3V| 22 | GND | 21 | 20 | 19 | 18 | GND | 17 | 16 |
+----+----+-----+------+------+-----+-----+-----+----+----+----+----+-----+----+----+----+----+-----+----+----+
| 0 | 1 | GND | 2 | 3 | 4 | 5 | GND | 6 | 7 | 8 | 9 | GND | 10 | 11 | 12 | 13 | GND | 14 | 15 |
+----+----+-----+------+------+-----+-----+-----+----+----+----+----+-----+----+----+----+----+-----+----+----+

Note: GPIO 25 is also connected to the User LED.
Additional
----------

- Blue LED: 25

Note: GPIO 25 is the system status indicator LED of Duo.
Before using wiringX to control this LED, its blinking function needs to be disabled in the system.
Otherwise, the control will not take effect and no error message will be returned.
2 changes: 1 addition & 1 deletion python/wiringX/wiringx.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ PyMODINIT_FUNC initgpio(void) {
PyModule_AddObject(module, "HUMMINGBOARD_GATE_SDL", Py_BuildValue("s", "hummingboard_gate_sdl"));
PyModule_AddObject(module, "ROCK4", Py_BuildValue("s", "rock4"));
PyModule_AddObject(module, "ROCK5B", Py_BuildValue("s", "rock5b"));
PyModule_AddObject(module, "DUO", Py_BuildValue("s", "milkv_duo"));
PyModule_AddObject(module, "MILKV_DUO", Py_BuildValue("s", "milkv_duo"));

#if PY_MAJOR_VERSION >= 3
return module;
Expand Down
40 changes: 40 additions & 0 deletions src/platform/milkv/common.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
Copyright (c) 2024 Shenzhen Milk-V Technology Co., Ltd
Author: William James <willian@milkv.io>
Carbon <carbon@milkv.io>
Zhang Yuntian <zhangyuntian@milkv.io>
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

#include "common.h"

int milkvValidGPIO(int pin, int *map, int map_count) {
return (pin < 0 || pin >= map_count || map[pin] == -1) ? -1 : 0;
}

int milkvSetup(struct platform_t *platform, int *map, int map_count) {
int ret = 0;

ret = platform->soc->setup();
if(ret == 0) {
platform->soc->setMap(map, map_count);
platform->soc->setIRQ(map, map_count);
}

return ret;
}

void milkvInit(struct platform_t *platform) {
platform->digitalRead = platform->soc->digitalRead;
platform->digitalWrite = platform->soc->digitalWrite;
platform->pinMode = platform->soc->pinMode;

platform->isr = platform->soc->isr;
platform->waitForInterrupt = platform->soc->waitForInterrupt;

platform->selectableFd = platform->soc->selectableFd;
platform->gc = platform->soc->gc;
}
35 changes: 35 additions & 0 deletions src/platform/milkv/common.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
Copyright (c) 2024 Shenzhen Milk-V Technology Co., Ltd
Author: William James <willian@milkv.io>
Carbon <carbon@milkv.io>
Zhang Yuntian <zhangyuntian@milkv.io>
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

#ifndef __WIRINGX_MILKV_COMMON_H_
#define __WIRINGX_MILKV_COMMON_H_

#include <sys/mman.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <signal.h>

#include "../../soc/soc.h"
#include "../../wiringx.h"
#include "../platform.h"

#define _sizeof(arr) (sizeof(arr) / sizeof(arr[0]))

int milkvValidGPIO(int pin, int *map, int map_count);
int milkvSetup(struct platform_t *platform, int *map, int map_count);
void milkvInit(struct platform_t *platform);

#endif
59 changes: 13 additions & 46 deletions src/platform/milkv/duo.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,64 +9,39 @@
file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

#include <sys/mman.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <signal.h>

#include "../../soc/soc.h"
#include "../../wiringx.h"
#include "../platform.h"
#include "duo.h"

struct platform_t *milkv_duo = NULL;

static int map[] = {
/* XGPIOA[28] XGPIOA[29] PWR_GPIO[26] PWR_GPIO[25] */
28, 29, 122, 121,
28, 29, 122, 121,

/* PWR_GPIO[19] PWR_GPIO[20] PWR_GPIO[23] PWR_GPIO[22] */
115, 116, 119, 118,
115, 116, 119, 118,

/* PWR_GPIO[21] PWR_GPIO[18] XGPIOC[9] XGPIOC[10] */
117, 114, 73, 74,
117, 114, 73, 74,

/* XGPIOA[16] XGPIOA[17] XGPIOA[14] XGPIOA[15] */
16, 17, 14, 15,
16, 17, 14, 15,

/* XGPIOA[23] XGPIOA[24] XGPIOA[22] XGPIOA[25] */
23, 24, 22, 25,
23, 24, 22, 25,

/* XGPIOA[27] XGPIOA[26] PWR_GPIO[4] */
27, 26, 100, -1,
/* XGPIOA[27] XGPIOA[26] PWR_GPIO[4] N/A */
27, 26, 100, -1,

/* XGPIOC[24] XGPIOB[3] XGPIOB[6] */
-1, 88, 35, 38
/* N/A XGPIOC[24] XGPIOB[3] XGPIOB[6] */
-1, 88, 35, 38
};

#define _sizeof(arr) (sizeof(arr) / sizeof(arr[0]))

static int milkv_duoValidGPIO(int pin) {
if(pin >= 0 && pin < _sizeof(map)) {
if(map[pin] == -1) {
return -1;
}
return 0;
} else {
return -1;
}
return milkvValidGPIO(pin, map, _sizeof(map));
}

static int milkv_duoSetup(void) {
milkv_duo->soc->setup();
milkv_duo->soc->setMap(map, _sizeof(map));
milkv_duo->soc->setIRQ(map, _sizeof(map));
return 0;
return milkvSetup(milkv_duo, map, _sizeof(map));
}

void milkv_duoInit(void) {
Expand All @@ -75,16 +50,8 @@ void milkv_duoInit(void) {
milkv_duo->soc = soc_get("Sophgo", "CV180X");
milkv_duo->soc->setMap(map, _sizeof(map));

milkv_duo->digitalRead = milkv_duo->soc->digitalRead;
milkv_duo->digitalWrite = milkv_duo->soc->digitalWrite;
milkv_duo->pinMode = milkv_duo->soc->pinMode;
milkv_duo->setup = &milkv_duoSetup;

milkv_duo->isr = milkv_duo->soc->isr;
milkv_duo->waitForInterrupt = milkv_duo->soc->waitForInterrupt;

milkv_duo->selectableFd = milkv_duo->soc->selectableFd;
milkv_duo->gc = milkv_duo->soc->gc;
milkvInit(milkv_duo);

milkv_duo->setup = &milkv_duoSetup;
milkv_duo->validGPIO = &milkv_duoValidGPIO;
}
2 changes: 1 addition & 1 deletion src/platform/milkv/duo.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef __WIRINGX_MILKV_DUO_H_
#define __WIRINGX_MILKV_DUO_H_

#include "../platform.h"
#include "common.h"

extern struct platform_t *milkv_duo;

Expand Down
46 changes: 46 additions & 0 deletions src/soc/sophgo/common.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
Copyright (c) 2024 Shenzhen Milk-V Technology Co., Ltd
Author: William James <willian@milkv.io>
Carbon <carbon@milkv.io>
Zhang Yuntian <zhangyuntian@milkv.io>
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

#ifndef __WIRINGX_SOPHGO_COMMON_H
#define __WIRINGX_SOPHGO_COMMON_H

#include <sys/mman.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>

#include "../../wiringx.h"
#include "../soc.h"
#include "../../i2c-dev.h"

// register data currently unavailable.
// Assuming each bank contains 32 GPIO lines, we fill them with placeholder data, in case they become available in the future.
#define GPIO_UNAVAILABLE(x) {(x), 0, 0, {0, 0}, {0, 0}, {0, 0}, FUNCTION_UNKNOWN, 0, 0}

const static uintptr_t gpio_register_physical_address[MAX_REG_AREA] = {0x03020000, 0x03021000, 0x03022000, 0x05021000};
#define GPIO_SWPORTA_DR 0x000
#define GPIO_SWPORTA_DDR 0x004
#define GPIO_EXT_PORTA 0x050

static uintptr_t pinmux_register_virtual_address = NULL;

#define PINMUX_BASE 0x03001000 // pinmux group 1

#define CLEAR_BITS(addr, bit, size) \
(*addr = *addr & ~(~(-1 << size) << bit) | (~(-1 << size) << bit << REGISTER_WRITE_MASK))
#define GET_BITS(addr, bit, size) \
((*addr & ~(-1 << size) << bit) >> (bit - size))

#endif
Loading

0 comments on commit 64c581d

Please sign in to comment.