Embedded_Projects/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-samsung

Browse Source
This commit is contained in:
Tom Rini 2023-11-28 10:05:25 -05:00
commit b2bf18d5e5
9 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-exynos/include/mach/gpio.h
View File

@ -8,6 +8,9 @@
#define __ASM_ARCH_GPIO_H #define __ASM_ARCH_GPIO_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/arch/cpu.h>
struct s5p_gpio_bank { struct s5p_gpio_bank {
unsigned int con; unsigned int con;
unsigned int dat; unsigned int dat;

3
arch/arm/mach-exynos/soc.c
View File

@ -9,6 +9,7 @@
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/arch/cpu.h>
#ifdef CONFIG_TARGET_ESPRESSO7420 #ifdef CONFIG_TARGET_ESPRESSO7420
/* /*
@ -20,12 +21,14 @@ extern void _main(void);
void *secondary_boot_addr = (void *)_main; void *secondary_boot_addr = (void *)_main;
#endif /* CONFIG_TARGET_ESPRESSO7420 */ #endif /* CONFIG_TARGET_ESPRESSO7420 */
#if !CONFIG_IS_ENABLED(SYSRESET)
void reset_cpu(void) void reset_cpu(void)
{ {
#ifdef CONFIG_CPU_V7A #ifdef CONFIG_CPU_V7A
writel(0x1, samsung_get_base_swreset()); writel(0x1, samsung_get_base_swreset());
#endif #endif
} }
#endif
#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
void enable_caches(void) void enable_caches(void)

14
board/samsung/axy17lte/Kconfig
View File

@ -1,11 +1,3 @@
config SYS_CONFIG_NAME
string "Board configuration name"
default "exynos78x0-common.h"
help
This option contains information about board configuration name.
Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
will be used for board configuration.
if TARGET_A5Y17LTE if TARGET_A5Y17LTE
config SYS_BOARD config SYS_BOARD
default "axy17lte" default "axy17lte"
@ -16,7 +8,7 @@ config SYS_VENDOR
default "samsung" default "samsung"
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "a5y17lte" default "exynos78x0-common"
config EXYNOS7880 config EXYNOS7880
bool "Exynos 7880 SOC support" bool "Exynos 7880 SOC support"
@ -33,7 +25,7 @@ config SYS_VENDOR
default "samsung" default "samsung"
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "a5y17lte" default "exynos78x0-common"
config EXYNOS7880 config EXYNOS7880
bool "Exynos 7880 SOC support" bool "Exynos 7880 SOC support"
@ -50,7 +42,7 @@ config SYS_VENDOR
default "samsung" default "samsung"
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "a3y17lte" default "exynos78x0-common"
config EXYNOS7870 config EXYNOS7870
bool "Exynos 7870 SOC support" bool "Exynos 7870 SOC support"

1
configs/a3y17lte_defconfig
View File

@ -1,5 +1,4 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="exynos78x0-common"
CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=26000000 CONFIG_COUNTER_FREQUENCY=26000000
CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS=y

1
configs/a5y17lte_defconfig
View File

@ -1,5 +1,4 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="exynos78x0-common"
CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=26000000 CONFIG_COUNTER_FREQUENCY=26000000
CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS=y

1
configs/a7y17lte_defconfig
View File

@ -1,5 +1,4 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="exynos78x0-common"
CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=26000000 CONFIG_COUNTER_FREQUENCY=26000000
CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS=y

5
drivers/clk/exynos/clk-pll.h
View File

@ -5,4 +5,9 @@
* Thomas Abraham <thomas.ab@samsung.com> * Thomas Abraham <thomas.ab@samsung.com>
*/ */
#ifndef __EXYNOS_CLK_PLL_H
#define __EXYNOS_CLK_PLL_H
unsigned long pll145x_get_rate(unsigned int *con1, unsigned long fin_freq); unsigned long pll145x_get_rate(unsigned int *con1, unsigned long fin_freq);
#endif /* __EXYNOS_CLK_PLL_H */

79
drivers/serial/serial_s5p.c
View File

@ -7,7 +7,6 @@
* based on drivers/serial/s3c64xx.c * based on drivers/serial/s3c64xx.c
*/ */
#include <common.h>
#include <dm.h> #include <dm.h>
#include <errno.h> #include <errno.h>
#include <fdtdec.h> #include <fdtdec.h>
@ -21,32 +20,39 @@
#include <serial.h> #include <serial.h>
#include <clk.h> #include <clk.h>
DECLARE_GLOBAL_DATA_PTR;
enum { enum {
PORT_S5P = 0, PORT_S5P = 0,
PORT_S5L PORT_S5L
}; };
#define UFCON_FIFO_EN BIT(0)
#define UFCON_RX_FIFO_RESET BIT(1)
#define UMCON_RESET_VAL 0x0
#define ULCON_WORD_8_BIT 0x3
#define UCON_RX_IRQ_OR_POLLING BIT(0)
#define UCON_TX_IRQ_OR_POLLING BIT(2)
#define UCON_RX_ERR_IRQ_EN BIT(6)
#define UCON_TX_IRQ_LEVEL BIT(9)
#define S5L_RX_FIFO_COUNT_SHIFT 0 #define S5L_RX_FIFO_COUNT_SHIFT 0
#define S5L_RX_FIFO_COUNT_MASK (0xf << S5L_RX_FIFO_COUNT_SHIFT) #define S5L_RX_FIFO_COUNT_MASK (0xf << S5L_RX_FIFO_COUNT_SHIFT)
#define S5L_RX_FIFO_FULL (1 << 8) #define S5L_RX_FIFO_FULL BIT(8)
#define S5L_TX_FIFO_COUNT_SHIFT 4 #define S5L_TX_FIFO_COUNT_SHIFT 4
#define S5L_TX_FIFO_COUNT_MASK (0xf << S5L_TX_FIFO_COUNT_SHIFT) #define S5L_TX_FIFO_COUNT_MASK (0xf << S5L_TX_FIFO_COUNT_SHIFT)
#define S5L_TX_FIFO_FULL (1 << 9) #define S5L_TX_FIFO_FULL BIT(9)
#define S5P_RX_FIFO_COUNT_SHIFT 0 #define S5P_RX_FIFO_COUNT_SHIFT 0
#define S5P_RX_FIFO_COUNT_MASK (0xff << S5P_RX_FIFO_COUNT_SHIFT) #define S5P_RX_FIFO_COUNT_MASK (0xff << S5P_RX_FIFO_COUNT_SHIFT)
#define S5P_RX_FIFO_FULL (1 << 8) #define S5P_RX_FIFO_FULL BIT(8)
#define S5P_TX_FIFO_COUNT_SHIFT 16 #define S5P_TX_FIFO_COUNT_SHIFT 16
#define S5P_TX_FIFO_COUNT_MASK (0xff << S5P_TX_FIFO_COUNT_SHIFT) #define S5P_TX_FIFO_COUNT_MASK (0xff << S5P_TX_FIFO_COUNT_SHIFT)
#define S5P_TX_FIFO_FULL (1 << 24) #define S5P_TX_FIFO_FULL BIT(24)
/* Information about a serial port */ /* Information about a serial port */
struct s5p_serial_plat { struct s5p_serial_plat {
struct s5p_uart *reg; /* address of registers in physical memory */ struct s5p_uart *reg; /* address of registers in physical memory */
u8 reg_width; /* register width */ u8 reg_width; /* register width */
u8 port_id; /* uart port number */ u8 port_id; /* uart port number */
u8 rx_fifo_count_shift; u8 rx_fifo_count_shift;
u8 tx_fifo_count_shift; u8 tx_fifo_count_shift;
u32 rx_fifo_count_mask; u32 rx_fifo_count_mask;
@ -59,7 +65,7 @@ struct s5p_serial_plat {
* The coefficient, used to calculate the baudrate on S5P UARTs is * The coefficient, used to calculate the baudrate on S5P UARTs is
* calculated as * calculated as
* C = UBRDIV * 16 + number_of_set_bits_in_UDIVSLOT * C = UBRDIV * 16 + number_of_set_bits_in_UDIVSLOT
* however, section 31.6.11 of the datasheet doesn't recomment using 1 for 1, * however, section 31.6.11 of the datasheet doesn't recommend using 1 for 1,
* 3 for 2, ... (2^n - 1) for n, instead, they suggest using these constants: * 3 for 2, ... (2^n - 1) for n, instead, they suggest using these constants:
*/ */
static const int udivslot[] = { static const int udivslot[] = {
@ -83,13 +89,15 @@ static const int udivslot[] = {
static void __maybe_unused s5p_serial_init(struct s5p_uart *uart) static void __maybe_unused s5p_serial_init(struct s5p_uart *uart)
{ {
/* enable FIFOs, auto clear Rx FIFO */ /* Enable FIFOs, auto clear Rx FIFO */
writel(0x3, &uart->ufcon); writel(UFCON_FIFO_EN | UFCON_RX_FIFO_RESET, &uart->ufcon);
writel(0, &uart->umcon); /* No auto flow control, disable nRTS signal */
/* 8N1 */ writel(UMCON_RESET_VAL, &uart->umcon);
writel(0x3, &uart->ulcon); /* 8N1, no parity bit */
writel(ULCON_WORD_8_BIT, &uart->ulcon);
/* No interrupts, no DMA, pure polling */ /* No interrupts, no DMA, pure polling */
writel(0x245, &uart->ucon); writel(UCON_RX_IRQ_OR_POLLING | UCON_TX_IRQ_OR_POLLING |
UCON_RX_ERR_IRQ_EN | UCON_TX_IRQ_LEVEL, &uart->ucon);
} }
static void __maybe_unused s5p_serial_baud(struct s5p_uart *uart, u8 reg_width, static void __maybe_unused s5p_serial_baud(struct s5p_uart *uart, u8 reg_width,
@ -118,7 +126,7 @@ int s5p_serial_setbrg(struct udevice *dev, int baudrate)
#if IS_ENABLED(CONFIG_CLK_EXYNOS) || IS_ENABLED(CONFIG_ARCH_APPLE) #if IS_ENABLED(CONFIG_CLK_EXYNOS) || IS_ENABLED(CONFIG_ARCH_APPLE)
struct clk clk; struct clk clk;
u32 ret; int ret;
ret = clk_get_by_index(dev, 1, &clk); ret = clk_get_by_index(dev, 1, &clk);
if (ret < 0) if (ret < 0)
@ -213,16 +221,13 @@ static int s5p_serial_of_to_plat(struct udevice *dev)
{ {
struct s5p_serial_plat *plat = dev_get_plat(dev); struct s5p_serial_plat *plat = dev_get_plat(dev);
const ulong port_type = dev_get_driver_data(dev); const ulong port_type = dev_get_driver_data(dev);
fdt_addr_t addr;
addr = dev_read_addr(dev); plat->reg = dev_read_addr_ptr(dev);
if (addr == FDT_ADDR_T_NONE) if (!plat->reg)
return -EINVAL; return -EINVAL;
plat->reg = (struct s5p_uart *)addr;
plat->reg_width = dev_read_u32_default(dev, "reg-io-width", 1); plat->reg_width = dev_read_u32_default(dev, "reg-io-width", 1);
plat->port_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), plat->port_id = dev_read_u8_default(dev, "id", dev_seq(dev));
"id", dev_seq(dev));
if (port_type == PORT_S5L) { if (port_type == PORT_S5L) {
plat->rx_fifo_count_shift = S5L_RX_FIFO_COUNT_SHIFT; plat->rx_fifo_count_shift = S5L_RX_FIFO_COUNT_SHIFT;
@ -244,10 +249,10 @@ static int s5p_serial_of_to_plat(struct udevice *dev)
} }
static const struct dm_serial_ops s5p_serial_ops = { static const struct dm_serial_ops s5p_serial_ops = {
.putc = s5p_serial_putc, .putc = s5p_serial_putc,
.pending = s5p_serial_pending, .pending = s5p_serial_pending,
.getc = s5p_serial_getc, .getc = s5p_serial_getc,
.setbrg = s5p_serial_setbrg, .setbrg = s5p_serial_setbrg,
}; };
static const struct udevice_id s5p_serial_ids[] = { static const struct udevice_id s5p_serial_ids[] = {
@ -257,13 +262,13 @@ static const struct udevice_id s5p_serial_ids[] = {
}; };
U_BOOT_DRIVER(serial_s5p) = { U_BOOT_DRIVER(serial_s5p) = {
.name = "serial_s5p", .name = "serial_s5p",
.id = UCLASS_SERIAL, .id = UCLASS_SERIAL,
.of_match = s5p_serial_ids, .of_match = s5p_serial_ids,
.of_to_plat = s5p_serial_of_to_plat, .of_to_plat = s5p_serial_of_to_plat,
.plat_auto = sizeof(struct s5p_serial_plat), .plat_auto = sizeof(struct s5p_serial_plat),
.probe = s5p_serial_probe, .probe = s5p_serial_probe,
.ops = &s5p_serial_ops, .ops = &s5p_serial_ops,
}; };
#endif #endif
@ -291,10 +296,12 @@ static inline void _debug_uart_putc(int ch)
struct s5p_uart *uart = (struct s5p_uart *)CONFIG_VAL(DEBUG_UART_BASE); struct s5p_uart *uart = (struct s5p_uart *)CONFIG_VAL(DEBUG_UART_BASE);
#if IS_ENABLED(CONFIG_ARCH_APPLE) #if IS_ENABLED(CONFIG_ARCH_APPLE)
while (readl(&uart->ufstat) & S5L_TX_FIFO_FULL); while (readl(&uart->ufstat) & S5L_TX_FIFO_FULL)
;
writel(ch, &uart->utxh); writel(ch, &uart->utxh);
#else #else
while (readl(&uart->ufstat) & S5P_TX_FIFO_FULL); while (readl(&uart->ufstat) & S5P_TX_FIFO_FULL)
;
writeb(ch, &uart->utxh); writeb(ch, &uart->utxh);
#endif #endif
} }

1
drivers/watchdog/s5p_wdt.c
View File

@ -6,6 +6,7 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/watchdog.h> #include <asm/arch/watchdog.h>
#define PRESCALER_VAL 255 #define PRESCALER_VAL 255