[U-Boot] [PATCH 2/2] ARM: omap3: am3517-evm: Add device tree and DM support
Derald D. Woods
woods.technical at gmail.com
Thu Sep 21 02:45:34 UTC 2017
On Tue, Sep 19, 2017 at 08:32:11PM -0500, Adam Ford wrote:
> With the device tree ported from Linux 4.13, this enables
> Driver Model and Device Tree support for the am3517-evm
>
> Signed-off-by: Adam Ford <aford173 at gmail.com>
Tested-by: Derald D. Woods <woods.technical at gmail.com>
> ---
> arch/arm/mach-omap2/omap3/Kconfig | 5 +++
> board/logicpd/am3517evm/am3517evm.c | 71 ++++++++++++++++++++++++-------------
> configs/am3517_evm_defconfig | 6 ++--
> include/configs/am3517_evm.h | 14 +-------
> 4 files changed, 57 insertions(+), 39 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig
> index 11f5f05..4dbf9a2 100644
> --- a/arch/arm/mach-omap2/omap3/Kconfig
> +++ b/arch/arm/mach-omap2/omap3/Kconfig
> @@ -22,6 +22,11 @@ choice
>
> config TARGET_AM3517_EVM
> bool "AM3517 EVM"
> + select DM
> + select DM_SERIAL
> + select DM_GPIO
> + select DM_I2C
> + select DM_MMC
>
> config TARGET_MT_VENTOUX
> bool "TeeJet Mt.Ventoux"
> diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
> index c18a5a3..29f136a 100644
> --- a/board/logicpd/am3517evm/am3517evm.c
> +++ b/board/logicpd/am3517evm/am3517evm.c
> @@ -12,6 +12,8 @@
> */
>
> #include <common.h>
> +#include <dm.h>
> +#include <ns16550.h>
> #include <asm/io.h>
> #include <asm/omap_musb.h>
> #include <asm/arch/am35x_def.h>
> @@ -34,6 +36,22 @@ DECLARE_GLOBAL_DATA_PTR;
>
> #define AM3517_IP_SW_RESET 0x48002598
> #define CPGMACSS_SW_RST (1 << 1)
> +#define PHY_GPIO 30
> +
> +/* This is only needed until SPL gets OF support */
> +#ifdef CONFIG_SPL_BUILD
> +static const struct ns16550_platdata am3517_serial = {
> + .base = OMAP34XX_UART3,
> + .reg_shift = 2,
> + .clock = V_NS16550_CLK,
> + .fcr = UART_FCR_DEFVAL,
> +};
> +
> +U_BOOT_DEVICE(am3517_uart) = {
> + "ns16550_serial",
> + &am3517_serial
> +};
> +#endif
>
> /*
> * Routine: board_init
> @@ -113,30 +131,35 @@ int misc_init_r(void)
>
> am3517_evm_musb_init();
>
> - /* activate PHY reset */
> - gpio_direction_output(30, 0);
> - gpio_set_value(30, 0);
> -
> - ctr = 0;
> - do {
> - udelay(1000);
> - ctr++;
> - } while (ctr < 300);
> -
> - /* deactivate PHY reset */
> - gpio_set_value(30, 1);
> -
> - /* allow the PHY to stabilize and settle down */
> - ctr = 0;
> - do {
> - udelay(1000);
> - ctr++;
> - } while (ctr < 300);
> -
> - /* ensure that the module is out of reset */
> - reset = readl(AM3517_IP_SW_RESET);
> - reset &= (~CPGMACSS_SW_RST);
> - writel(reset,AM3517_IP_SW_RESET);
> + if (gpio_request(PHY_GPIO, "gpio_30") == 0) {
> + /* activate PHY reset */
> + gpio_direction_output(PHY_GPIO, 0);
> + gpio_set_value(PHY_GPIO, 0);
> +
> + ctr = 0;
> + do {
> + udelay(1000);
> + ctr++;
> + } while (ctr < 300);
> +
> + /* deactivate PHY reset */
> + gpio_set_value(PHY_GPIO, 1);
> +
> + /* allow the PHY to stabilize and settle down */
> + ctr = 0;
> + do {
> + udelay(1000);
> + ctr++;
> + } while (ctr < 300);
> +
> + /* ensure that the module is out of reset */
> + reset = readl(AM3517_IP_SW_RESET);
> + reset &= (~CPGMACSS_SW_RST);
> + writel(reset, AM3517_IP_SW_RESET);
> +
> + /* Free requested GPIO */
> + gpio_free(PHY_GPIO);
> + }
>
> return 0;
> }
> diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
> index 920c61c..8ab0186 100644
> --- a/configs/am3517_evm_defconfig
> +++ b/configs/am3517_evm_defconfig
> @@ -4,11 +4,14 @@ CONFIG_ARCH_OMAP2PLUS=y
> CONFIG_SYS_TEXT_BASE=0x80100000
> CONFIG_TI_COMMON_CMD_OPTIONS=y
> # CONFIG_SPL_GPIO_SUPPORT is not set
> +CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_TARGET_AM3517_EVM=y
> CONFIG_EMIF4=y
> +CONFIG_DEFAULT_DEVICE_TREE="am3517-evm"
> CONFIG_BOOTDELAY=10
> CONFIG_VERSION_VARIABLE=y
> CONFIG_SPL=y
> +CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> # CONFIG_SPL_EXT_SUPPORT is not set
> CONFIG_SPL_MTD_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> @@ -27,13 +30,12 @@ CONFIG_CMD_CACHE=y
> # CONFIG_CMD_TIME is not set
> CONFIG_CMD_UBI=y
> CONFIG_SPL_PARTITION_UUIDS=y
> +CONFIG_OF_CONTROL=y
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_MMC_OMAP_HS=y
> CONFIG_NAND=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> -CONFIG_USB_STORAGE=y
> # CONFIG_FAT_WRITE is not set
> CONFIG_BCH=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
> index 708a98f..adb33a9 100644
> --- a/include/configs/am3517_evm.h
> +++ b/include/configs/am3517_evm.h
> @@ -21,6 +21,7 @@
> * header. That is 0x800FFFC0--0x80100000 should not be used for any
> * other needs.
> */
> +
> #define CONFIG_SYS_TEXT_BASE 0x80100000
> #define CONFIG_SYS_SPL_MALLOC_START 0x80208000
> #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000
> @@ -33,16 +34,6 @@
>
> /* Hardware drivers */
>
> -/* NS16550 Configuration */
> -#define CONFIG_SYS_NS16550_SERIAL
> -#define CONFIG_SYS_NS16550_REG_SIZE (-4)
> -
> -/* select serial console configuration */
> -#define CONFIG_CONS_INDEX 3
> -#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
> -#define CONFIG_SERIAL3 3 /* UART3 on AM3517 EVM */
> -
> -
> /* allow to overwrite serial and ethaddr */
> #define CONFIG_ENV_OVERWRITE
>
> @@ -72,7 +63,6 @@
> #endif /* CONFIG_USB_MUSB_AM35X */
>
> /* I2C */
> -#define CONFIG_SYS_I2C
> #define CONFIG_SYS_OMAP24_I2C_SPEED 100000
> #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
>
> @@ -250,8 +240,6 @@
> #define CONFIG_SPL_FRAMEWORK
> #undef CONFIG_SPL_TEXT_BASE
> #define CONFIG_SPL_TEXT_BASE 0x40200000
> -#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \
> - CONFIG_SPL_TEXT_BASE)
>
> #undef CONFIG_SPL_BSS_START_ADDR
> #define CONFIG_SPL_BSS_START_ADDR 0x80000000
> --
> 2.7.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
More information about the U-Boot
mailing list