diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-11 11:02:30 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-20 08:50:49 +0100 |
| commit | e61b7432212ab5fcf61b7e1d33fcf6727ba84fdd (patch) | |
| tree | 76acc4671c018f65496c6428f41ef54148204a73 /arch/arm/mach-omap | |
| parent | 3d613cd7d1c468e8a9c3281ba3704eb2fec79360 (diff) | |
| download | barebox-e61b7432212ab5fcf61b7e1d33fcf6727ba84fdd.tar.gz barebox-e61b7432212ab5fcf61b7e1d33fcf6727ba84fdd.tar.xz | |
ARM: omap: enable am33xx_uart_soft_reset for AM35xx
am33xx_uart_soft_reset() can be used on AM35xx aswell, so move it
to a more generic place where it can be added to am35xx compilation.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-omap')
| -rw-r--r-- | arch/arm/mach-omap/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap/am33xx_generic.c | 27 | ||||
| -rw-r--r-- | arch/arm/mach-omap/am3xxx.c | 32 | ||||
| -rw-r--r-- | arch/arm/mach-omap/include/mach/am3xxx-silicon.h | 6 |
4 files changed, 40 insertions, 28 deletions
diff --git a/arch/arm/mach-omap/Makefile b/arch/arm/mach-omap/Makefile index e6132342e1..901cc90373 100644 --- a/arch/arm/mach-omap/Makefile +++ b/arch/arm/mach-omap/Makefile @@ -21,7 +21,8 @@ obj-$(CONFIG_ARCH_OMAP3) += omap3_generic.o auxcr.o pbl-$(CONFIG_ARCH_OMAP3) += omap3_generic.o auxcr.o obj-$(CONFIG_ARCH_OMAP4) += omap4_generic.o omap4_clock.o pbl-$(CONFIG_ARCH_OMAP4) += omap4_generic.o omap4_clock.o -obj-pbl-$(CONFIG_ARCH_AM33XX) += am33xx_generic.o am33xx_clock.o am33xx_mux.o +obj-pbl-$(CONFIG_ARCH_AM33XX) += am33xx_generic.o am33xx_clock.o am33xx_mux.o am3xxx.o +obj-pbl-$(CONFIG_ARCH_AM35XX) += am3xxx.o obj-$(CONFIG_ARCH_AM33XX) += am33xx_scrm.o obj-$(CONFIG_ARCH_OMAP3) += omap3_clock.o pbl-$(CONFIG_ARCH_OMAP3) += omap3_clock.o diff --git a/arch/arm/mach-omap/am33xx_generic.c b/arch/arm/mach-omap/am33xx_generic.c index c446431537..fe3c4a8b17 100644 --- a/arch/arm/mach-omap/am33xx_generic.c +++ b/arch/arm/mach-omap/am33xx_generic.c @@ -262,33 +262,6 @@ int am33xx_devices_init(void) return 0; } -/* UART Defines */ -#define UART_SYSCFG_OFFSET 0x54 -#define UART_SYSSTS_OFFSET 0x58 - -#define UART_CLK_RUNNING_MASK 0x1 -#define UART_RESET (0x1 << 1) -#define UART_SMART_IDLE_EN (0x1 << 0x3) - -void am33xx_uart_soft_reset(void __iomem *uart_base) -{ - int reg; - - reg = readl(uart_base + UART_SYSCFG_OFFSET); - reg |= UART_RESET; - writel(reg, (uart_base + UART_SYSCFG_OFFSET)); - - while ((readl(uart_base + UART_SYSSTS_OFFSET) & - UART_CLK_RUNNING_MASK) != UART_CLK_RUNNING_MASK) - ; - - /* Disable smart idle */ - reg = readl((uart_base + UART_SYSCFG_OFFSET)); - reg |= UART_SMART_IDLE_EN; - writel(reg, (uart_base + UART_SYSCFG_OFFSET)); -} - - #define VTP_CTRL_READY (0x1 << 5) #define VTP_CTRL_ENABLE (0x1 << 6) #define VTP_CTRL_START_EN (0x1) diff --git a/arch/arm/mach-omap/am3xxx.c b/arch/arm/mach-omap/am3xxx.c new file mode 100644 index 0000000000..75965a8e0e --- /dev/null +++ b/arch/arm/mach-omap/am3xxx.c @@ -0,0 +1,32 @@ +#include <common.h> +#include <io.h> +#include <mach/am3xxx-silicon.h> + +/* UART Defines */ +#define UART_SYSCFG_OFFSET 0x54 +#define UART_SYSSTS_OFFSET 0x58 + +#define UART_CLK_RUNNING_MASK 0x1 +#define UART_RESET (0x1 << 1) +#define UART_SMART_IDLE_EN (0x1 << 0x3) + +void am3xxx_uart_soft_reset(void __iomem *uart_base) +{ + int reg; + + reg = readl(uart_base + UART_SYSCFG_OFFSET); + reg |= UART_RESET; + writel(reg, (uart_base + UART_SYSCFG_OFFSET)); + + while ((readl(uart_base + UART_SYSSTS_OFFSET) & + UART_CLK_RUNNING_MASK) != UART_CLK_RUNNING_MASK) + ; + + /* Disable smart idle */ + reg = readl((uart_base + UART_SYSCFG_OFFSET)); + reg |= UART_SMART_IDLE_EN; + writel(reg, (uart_base + UART_SYSCFG_OFFSET)); +} + +void am33xx_uart_soft_reset(void __iomem *uart_base) + __alias(am3xxx_uart_soft_reset);
\ No newline at end of file diff --git a/arch/arm/mach-omap/include/mach/am3xxx-silicon.h b/arch/arm/mach-omap/include/mach/am3xxx-silicon.h new file mode 100644 index 0000000000..c5f73ad457 --- /dev/null +++ b/arch/arm/mach-omap/include/mach/am3xxx-silicon.h @@ -0,0 +1,6 @@ +#ifndef __ASM_ARCH_AM33XX_H +#define __ASM_ARCH_AM33XX_H + +void am3xxx_uart_soft_reset(void __iomem *uart_base); + +#endif /* __ASM_ARCH_AM33XX_H */
\ No newline at end of file |