summaryrefslogtreecommitdiff
path: root/platform/kendryte
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-04-11 03:41:52 +0300
committerAnup Patel <anup@brainfault.org>2019-04-24 07:19:46 +0300
commit10baa64c02f6746fd506136e0693aa2d592574fb (patch)
treeda00e48f0cb5d1434cbc7c31bb6ca15efa7d4564 /platform/kendryte
parentfbf986ac2a0b926ae97e6796b87e366610d7589e (diff)
downloadopensbi-10baa64c02f6746fd506136e0693aa2d592574fb.tar.xz
all: run clang-format and update checked-in files
Noisy commit, no functional changes. Generated with an current upstream clang-format and: clang-format -i $(find . -name \*.[ch]) Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'platform/kendryte')
-rw-r--r--platform/kendryte/k210/platform.c35
-rw-r--r--platform/kendryte/k210/sysctl.c9
-rw-r--r--platform/kendryte/k210/sysctl.h2
-rw-r--r--platform/kendryte/k210/uarths.c20
-rw-r--r--platform/kendryte/k210/uarths.h5
5 files changed, 31 insertions, 40 deletions
diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c
index cba83da..136e58e 100644
--- a/platform/kendryte/k210/platform.c
+++ b/platform/kendryte/k210/platform.c
@@ -17,7 +17,7 @@
#include "platform.h"
#include "uarths.h"
-#define K210_UART_BAUDRATE 115200
+#define K210_UART_BAUDRATE 115200
static int k210_console_init(void)
{
@@ -42,16 +42,13 @@ static int k210_irqchip_init(bool cold_boot)
u32 hartid = sbi_current_hartid();
if (cold_boot) {
- rc = plic_cold_irqchip_init(PLIC_BASE_ADDR,
- PLIC_NUM_SOURCES,
+ rc = plic_cold_irqchip_init(PLIC_BASE_ADDR, PLIC_NUM_SOURCES,
K210_HART_COUNT);
if (rc)
return rc;
}
- return plic_warm_irqchip_init(hartid,
- (2 * hartid),
- (2 * hartid + 1));
+ return plic_warm_irqchip_init(hartid, (2 * hartid), (2 * hartid + 1));
}
static int k210_ipi_init(bool cold_boot)
@@ -59,8 +56,7 @@ static int k210_ipi_init(bool cold_boot)
int rc;
if (cold_boot) {
- rc = clint_cold_ipi_init(CLINT_BASE_ADDR,
- K210_HART_COUNT);
+ rc = clint_cold_ipi_init(CLINT_BASE_ADDR, K210_HART_COUNT);
if (rc)
return rc;
}
@@ -73,8 +69,7 @@ static int k210_timer_init(bool cold_boot)
int rc;
if (cold_boot) {
- rc = clint_cold_timer_init(CLINT_BASE_ADDR,
- K210_HART_COUNT);
+ rc = clint_cold_timer_init(CLINT_BASE_ADDR, K210_HART_COUNT);
if (rc)
return rc;
}
@@ -100,11 +95,11 @@ static int k210_system_shutdown(u32 type)
const struct sbi_platform platform = {
- .name = "Kendryte K210",
+ .name = "Kendryte K210",
.features = SBI_PLATFORM_HAS_TIMER_VALUE,
- .hart_count = K210_HART_COUNT,
- .hart_stack_size = K210_HART_STACK_SIZE,
+ .hart_count = K210_HART_COUNT,
+ .hart_stack_size = K210_HART_STACK_SIZE,
.disabled_hart_mask = 0,
.console_init = k210_console_init,
@@ -113,16 +108,16 @@ const struct sbi_platform platform = {
.irqchip_init = k210_irqchip_init,
- .ipi_init = k210_ipi_init,
- .ipi_send = clint_ipi_send,
- .ipi_sync = clint_ipi_sync,
+ .ipi_init = k210_ipi_init,
+ .ipi_send = clint_ipi_send,
+ .ipi_sync = clint_ipi_sync,
.ipi_clear = clint_ipi_clear,
- .timer_init = k210_timer_init,
- .timer_value = clint_timer_value,
- .timer_event_stop = clint_timer_event_stop,
+ .timer_init = k210_timer_init,
+ .timer_value = clint_timer_value,
+ .timer_event_stop = clint_timer_event_stop,
.timer_event_start = clint_timer_event_start,
- .system_reboot = k210_system_reboot,
+ .system_reboot = k210_system_reboot,
.system_shutdown = k210_system_shutdown
};
diff --git a/platform/kendryte/k210/sysctl.c b/platform/kendryte/k210/sysctl.c
index 8f8622d..3c07777 100644
--- a/platform/kendryte/k210/sysctl.c
+++ b/platform/kendryte/k210/sysctl.c
@@ -28,9 +28,9 @@ static u32 sysctl_pll0_get_freq(void)
u32 freq_in, nr, nf, od;
freq_in = SYSCTRL_CLOCK_FREQ_IN0;
- nr = sysctl->pll0.clkr0 + 1;
- nf = sysctl->pll0.clkf0 + 1;
- od = sysctl->pll0.clkod0 + 1;
+ nr = sysctl->pll0.clkr0 + 1;
+ nf = sysctl->pll0.clkf0 + 1;
+ od = sysctl->pll0.clkod0 + 1;
/*
* Get final PLL output freq
@@ -50,9 +50,8 @@ u32 sysctl_get_cpu_freq(void)
return SYSCTRL_CLOCK_FREQ_IN0;
case 1:
return sysctl_pll0_get_freq() /
- (2ULL << (int)sysctl->clk_sel0.aclk_divider_sel);
+ (2ULL << (int)sysctl->clk_sel0.aclk_divider_sel);
default:
return 0;
}
}
-
diff --git a/platform/kendryte/k210/sysctl.h b/platform/kendryte/k210/sysctl.h
index 357acc5..40d4e8f 100644
--- a/platform/kendryte/k210/sysctl.h
+++ b/platform/kendryte/k210/sysctl.h
@@ -588,7 +588,7 @@ typedef struct _sysctl_clk_th6 {
typedef struct _sysctl_misc {
u32 debug_sel : 6;
u32 reserved0 : 4;
- u32 spi_dvp_data_enable: 1;
+ u32 spi_dvp_data_enable : 1;
u32 reserved1 : 21;
} __attribute__((packed, aligned(4))) sysctl_misc_t;
diff --git a/platform/kendryte/k210/uarths.c b/platform/kendryte/k210/uarths.c
index 3b3cbb9..67d5d1c 100644
--- a/platform/kendryte/k210/uarths.c
+++ b/platform/kendryte/k210/uarths.c
@@ -26,19 +26,19 @@ static volatile struct uarths *const uarths =
void uarths_init(u32 baud_rate, enum uarths_stopbit stopbit)
{
u32 freq = sysctl_get_cpu_freq();
- u16 div = freq / baud_rate - 1;
+ u16 div = freq / baud_rate - 1;
/* Set UART registers */
- uarths->div.div = div;
+ uarths->div.div = div;
uarths->txctrl.nstop = stopbit;
- uarths->txctrl.txen = 1;
- uarths->rxctrl.rxen = 1;
+ uarths->txctrl.txen = 1;
+ uarths->rxctrl.rxen = 1;
uarths->txctrl.txcnt = 0;
uarths->rxctrl.rxcnt = 0;
- uarths->ip.txwm = 1;
- uarths->ip.rxwm = 0;
- uarths->ie.txwm = 1;
- uarths->ie.rxwm = 0;
+ uarths->ip.txwm = 1;
+ uarths->ip.rxwm = 0;
+ uarths->ie.txwm = 1;
+ uarths->ie.rxwm = 0;
/* Clear input */
if (!uarths->rxdata.empty)
@@ -47,7 +47,8 @@ void uarths_init(u32 baud_rate, enum uarths_stopbit stopbit)
void uarths_putc(char c)
{
- while (uarths->txdata.full);
+ while (uarths->txdata.full)
+ ;
uarths->txdata.data = (u8)c;
}
@@ -61,4 +62,3 @@ int uarths_getc(void)
return rx.data;
}
-
diff --git a/platform/kendryte/k210/uarths.h b/platform/kendryte/k210/uarths.h
index 3bfb8d5..18b7e95 100644
--- a/platform/kendryte/k210/uarths.h
+++ b/platform/kendryte/k210/uarths.h
@@ -162,10 +162,7 @@ struct uarths {
struct uarths_div div;
} __attribute__((packed, aligned(4)));
-enum uarths_stopbit {
- UARTHS_STOP_1,
- UARTHS_STOP_2
-};
+enum uarths_stopbit { UARTHS_STOP_1, UARTHS_STOP_2 };
void uarths_init(u32 baud_rate, enum uarths_stopbit stopbit);
void uarths_putc(char c);