| Message ID | 20190418150114.24148-1-lusus@denx.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] phycore-pcl060: U-boot support for Phytec phyCORE PCL060 | expand |
On 4/18/19 5:01 PM, Niel Fourie wrote: > Support for Phytech phyCORE AM335x R2 SOM (PCL060) on the Phytec > phyBOARD-Wega AM335x. > > CPU : AM335X-GP rev 2.1 > Model: Phytec AM335x phyBOARD-WEGA > DRAM: 256 MiB > NAND: 256 MiB > MMC: OMAP SD/MMC: 0 > eth0: ethernet@4a100000 > > Working: > - Eth0 > - i2C > - MMC/SD > - NAND > - UART > - USB (host) > > Signed-off-by: Niel Fourie <lusus@denx.de> > --- > arch/arm/dts/Makefile | 3 +- > arch/arm/dts/am335x-phycore-som.dtsi | 327 ++++++++++++++++++++++ > arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 35 +++ > arch/arm/dts/am335x-wega-rdk.dts | 23 ++ > arch/arm/dts/am335x-wega.dtsi | 231 +++++++++++++++ The DTs come from Linux kernel, but which version of Linux ? Which exact commit ? Did you modify them in any way ? [...] > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig > index d29f1ca0b5..9336439340 100644 > --- a/arch/arm/mach-omap2/Kconfig > +++ b/arch/arm/mach-omap2/Kconfig > @@ -186,6 +186,7 @@ source "board/ti/am43xx/Kconfig" > source "board/ti/am335x/Kconfig" > source "board/compulab/cm_t335/Kconfig" > source "board/compulab/cm_t43/Kconfig" > +source "board/phytec/phycore_pcl060/Kconfig" Here [1] it says the name of the SoM is PCM-060 , what is PCL-060 ? [1] https://www.phytec.eu/product-eu/system-on-modules/phycore-am335x-download/ [...] > diff --git a/board/phytec/phycore_pcl060/Kconfig b/board/phytec/phycore_pcl060/Kconfig > new file mode 100644 > index 0000000000..bdd1a9b6e0 > --- /dev/null > +++ b/board/phytec/phycore_pcl060/Kconfig > @@ -0,0 +1,19 @@ > +if TARGET_PCL060 > + > +config SYS_BOARD > + default "phycore_pcl060" > + > +config SYS_VENDOR > + default "phytec" > + > +config SYS_SOC > + default "am33xx" > + > +config SYS_CONFIG_NAME > + default "phycore_pcl060" > + > +config PCL060_DDR_SIZE > + int "DDR size (in MiB) of Phycore PCL060 module" > + default 256 DRAM size should come from DT, we don't need another custom config option. Look at fdtdec_setup_mem_size_base() and fdtdec_setup_memory_banksize(). [...] > diff --git a/board/phytec/phycore_pcl060/board.c b/board/phytec/phycore_pcl060/board.c > new file mode 100644 > index 0000000000..01fe13e959 > --- /dev/null > +++ b/board/phytec/phycore_pcl060/board.c > @@ -0,0 +1,340 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * board.c > + * > + * Board functions for Phytec phyCORE-AM335x R2 (pcl060) based boards > + * > + * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ > + * Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH > + * Copyright (C) 2015 Wadim Egorov, PHYTEC Messtechnik GmbH > + * Copyright (C) 2019 DENX Software Engineering GmbH > + */ > + > +#include <common.h> > +#include <environment.h> > +#include <errno.h> > +#include <spl.h> > +#include <asm/arch/cpu.h> > +#include <asm/arch/hardware.h> > +#include <asm/arch/omap.h> > +#include <asm/arch/ddr_defs.h> > +#include <asm/arch/clock.h> > +#include <asm/arch/gpio.h> > +#include <asm/arch/mmc_host_def.h> > +#include <asm/arch/sys_proto.h> > +#include <asm/io.h> > +#include <asm/emif.h> > +#include <asm/gpio.h> > +#include <i2c.h> > +#include <miiphy.h> > +#include <cpsw.h> > +#include <power/tps65910.h> > +#include <jffs2/load_kernel.h> > +#include <mtd_node.h> > +#include <fdt_support.h> > +#include "board.h" > + > +DECLARE_GLOBAL_DATA_PTR; > + > +static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; > + > +#ifdef CONFIG_SPL_BUILD > + > +#ifdef CONFIG_SPL_OS_BOOT #if CONFIG_IS_ENABLED(OS_BOOT) > +int spl_start_uboot(void) > +{ > + return 1; > +} > +#endif > +/* DDR RAM defines */ > +#define DDR_CLK_MHZ 400 /* DDR_DPLL_MULT value */ > + > +#define OSC (V_OSCK / 1000000) > +const struct dpll_params dpll_ddr = { > + DDR_CLK_MHZ, OSC - 1, 1, -1, -1, -1, -1}; > + > +const struct dpll_params *get_dpll_ddr_params(void) > +{ > + return &dpll_ddr; > +} > + > +const struct ctrl_ioregs ioregs = { > + .cm0ioctl = 0x18B, > + .cm1ioctl = 0x18B, > + .cm2ioctl = 0x18B, > + .dt0ioctl = 0x18B, > + .dt1ioctl = 0x18B, > +}; > + > +static const struct cmd_control ddr3_cmd_ctrl_data = { > + .cmd0csratio = 0x80, > + .cmd0iclkout = 0x0, > + > + .cmd1csratio = 0x80, > + .cmd1iclkout = 0x0, > + > + .cmd2csratio = 0x80, > + .cmd2iclkout = 0x0, > +}; > + > +#if CONFIG_PCL060_DDR_SIZE == 256 Get the DRAM layout from DT and apply EMIF settings accordingly. [...] > diff --git a/include/configs/phycore_pcl060.h b/include/configs/phycore_pcl060.h > new file mode 100644 > index 0000000000..982c96b267 > --- /dev/null > +++ b/include/configs/phycore_pcl060.h > @@ -0,0 +1,141 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * phycore_pcl060.h > + * > + * Phytec phyCORE-AM335x (pcl060) boards information header > + * > + * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ > + * Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH > + * Copyright (C) 2019 DENX Software Engineering GmbH > + */ > + > +#ifndef __CONFIG_PCL060_H > +#define __CONFIG_PCL060_H > + > +#include <configs/ti_am335x_common.h> > + > +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ > +#define CONFIG_MACH_TYPE MACH_TYPE_PCL060 > +#define CONFIG_SYS_MMC_ENV_DEV 0 > +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 > + > +#ifdef CONFIG_NAND > +#define NANDARGS \ > + "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ > + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ > + "nandargs=setenv bootargs console=${console} " \ > + "${optargs} " \ > + "root=${nandroot} " \ > + "rootfstype=${nandrootfstype}\0" \ > + "nandroot=ubi0:root ubi.mtd=NAND.UBI\0" \ > + "nandrootfstype=ubifs rootwait rw fsck.repair=yes\0" \ > + "nandboot=echo Booting from nand ...; " \ > + "run nandargs; " \ > + "ubi part NAND.UBI; " \ > + "ubi readvol ${fdtaddr} oftree; " \ > + "ubi readvol ${loadaddr} kernel; " \ > + "bootz ${loadaddr} - ${fdtaddr}\0" > + > +#else > +#define NANDARGS "" > +#endif > + > +/* set to negative value for no autoboot */ > +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ > + "bootcmd_" #devtypel #instance "=" \ > + "setenv mmcdev " #instance "; "\ > + "setenv bootpart " #instance ":1 ; "\ > + "setenv rootpart " #instance ":2 ; "\ > + "run mmcboot\0" > + > +#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ > + #devtypel #instance " " > + > +#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ > + "bootcmd_" #devtypel #instance "=" \ > + "run nandboot\0" > + > +#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ > + #devtypel #instance " " > + > +#define BOOT_TARGET_DEVICES(func) \ > + func(MMC, mmc, 0) \ > + func(LEGACY_MMC, legacy_mmc, 0) \ > + func(MMC, mmc, 1) \ > + func(LEGACY_MMC, legacy_mmc, 1) \ > + func(NAND, nand, 0) > + > +#include <config_distro_bootcmd.h> > +#include <environment/ti/dfu.h> > +#include <environment/ti/mmc.h> > + > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + DEFAULT_MMC_TI_ARGS \ > + DEFAULT_LINUX_BOOT_ENV \ > + "bootfile=zImage\0" \ > + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > + "console=ttyO0,115200n8\0" \ > + "optargs=\0" \ > + "mmcrootfstype=ext2 rootwait\0" \ > + "finduuid=part uuid mmc ${rootpart} uuid\0" \ > + "boot_fit=0\0" \ > + NANDARGS \ > + BOOTENV > + > +/* Clock Defines */ > +#define V_OSCK 25000000 /* Clock output from T2 */ > +#define V_SCLK (V_OSCK) > + > +#define CONFIG_POWER_TPS65910 > + > +#ifdef CONFIG_NAND > +/* NAND: device related configs */ > +#define CONFIG_SYS_NAND_5_ADDR_CYCLE > +#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ > + CONFIG_SYS_NAND_PAGE_SIZE) > +#define CONFIG_SYS_NAND_PAGE_SIZE 2048 > +#define CONFIG_SYS_NAND_OOBSIZE 64 > +#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) > +/* NAND: driver related configs */ > +#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS > +#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ > + 10, 11, 12, 13, 14, 15, 16, 17, \ > + 18, 19, 20, 21, 22, 23, 24, 25, \ > + 26, 27, 28, 29, 30, 31, 32, 33, \ > + 34, 35, 36, 37, 38, 39, 40, 41, \ > + 42, 43, 44, 45, 46, 47, 48, 49, \ > + 50, 51, 52, 53, 54, 55, 56, 57, } > + > +#define CONFIG_SYS_NAND_ECCSIZE 512 > +#define CONFIG_SYS_NAND_ECCBYTES 14 > +#define CONFIG_SYS_NAND_ONFI_DETECTION > +#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW > + > +/* NAND: SPL related configs */ > +#ifdef CONFIG_SPL_OS_BOOT > +#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ > +#endif > +#endif /* !CONFIG_NAND */ > + > +#define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \ > +4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } I think there's a default value for that in include/config_fallbacks.h , why do you override it here ? > +/* CPU */ > + > +#ifdef CONFIG_SPI_BOOT > +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 > +#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 > +#elif defined(CONFIG_ENV_IS_IN_NAND) > +#define CONFIG_ENV_OFFSET 0x000a0000 > +#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE > +#endif > + > +/* > + * USB configuration > + */ > +#define CONFIG_AM335X_USB0 > +#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL > +#define CONFIG_AM335X_USB1 > +#define CONFIG_AM335X_USB1_MODE MUSB_HOST Can't the USB settings be extracted from DT ?
Hello Marek, On 4/19/19 11:47 AM, Marek Vasut wrote: > On 4/18/19 5:01 PM, Niel Fourie wrote: >> Support for Phytech phyCORE AM335x R2 SOM (PCL060) on the Phytec >> phyBOARD-Wega AM335x. >> >> CPU : AM335X-GP rev 2.1 >> Model: Phytec AM335x phyBOARD-WEGA >> DRAM: 256 MiB >> NAND: 256 MiB >> MMC: OMAP SD/MMC: 0 >> eth0: ethernet@4a100000 >> >> Working: >> - Eth0 >> - i2C >> - MMC/SD >> - NAND >> - UART >> - USB (host) >> >> Signed-off-by: Niel Fourie <lusus@denx.de> >> --- >> arch/arm/dts/Makefile | 3 +- >> arch/arm/dts/am335x-phycore-som.dtsi | 327 ++++++++++++++++++++++ >> arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 35 +++ >> arch/arm/dts/am335x-wega-rdk.dts | 23 ++ >> arch/arm/dts/am335x-wega.dtsi | 231 +++++++++++++++ > > The DTs come from Linux kernel, but which version of Linux ? > Which exact commit ? Did you modify them in any way ? > > [...] > >> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig >> index d29f1ca0b5..9336439340 100644 >> --- a/arch/arm/mach-omap2/Kconfig >> +++ b/arch/arm/mach-omap2/Kconfig >> @@ -186,6 +186,7 @@ source "board/ti/am43xx/Kconfig" >> source "board/ti/am335x/Kconfig" >> source "board/compulab/cm_t335/Kconfig" >> source "board/compulab/cm_t43/Kconfig" >> +source "board/phytec/phycore_pcl060/Kconfig" > > Here [1] it says the name of the SoM is PCM-060 , what is PCL-060 ? > > [1] > https://www.phytec.eu/product-eu/system-on-modules/phycore-am335x-download/ > [...] This differs only by the connector. PCM variants are pluggable and PCL variants are direct soliderable to the carrier board. Copied from [1]: The PCL-060 System On Module is a connector-less, BGA style variant of the PCM-060/phyCORE-AM335x R2 SOM. Unlike traditional Phytec SOM products that support high density connectors, the PCL-060 SOM is directly soldered down to the phyBOARD-Wega AM335x using Phytec's Direct Solder Connect technology (DSC). This solution offers an ultra-low cost Single Board Computer for the AM335x processor, while maintaining most of the advantages of the SOM concept. [1] https://www.phytec.de/fileadmin/user_upload/downloads/Manuals/L-845e_1.pdf Thanks, Parthiban N > >> diff --git a/board/phytec/phycore_pcl060/Kconfig b/board/phytec/phycore_pcl060/Kconfig >> new file mode 100644 >> index 0000000000..bdd1a9b6e0 >> --- /dev/null >> +++ b/board/phytec/phycore_pcl060/Kconfig >> @@ -0,0 +1,19 @@ >> +if TARGET_PCL060 >> + >> +config SYS_BOARD >> + default "phycore_pcl060" >> + >> +config SYS_VENDOR >> + default "phytec" >> + >> +config SYS_SOC >> + default "am33xx" >> + >> +config SYS_CONFIG_NAME >> + default "phycore_pcl060" >> + >> +config PCL060_DDR_SIZE >> + int "DDR size (in MiB) of Phycore PCL060 module" >> + default 256 > > DRAM size should come from DT, we don't need another custom config > option. Look at fdtdec_setup_mem_size_base() and > fdtdec_setup_memory_banksize(). > > [...] > >> diff --git a/board/phytec/phycore_pcl060/board.c b/board/phytec/phycore_pcl060/board.c >> new file mode 100644 >> index 0000000000..01fe13e959 >> --- /dev/null >> +++ b/board/phytec/phycore_pcl060/board.c >> @@ -0,0 +1,340 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> +/* >> + * board.c >> + * >> + * Board functions for Phytec phyCORE-AM335x R2 (pcl060) based boards >> + * >> + * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ >> + * Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH >> + * Copyright (C) 2015 Wadim Egorov, PHYTEC Messtechnik GmbH >> + * Copyright (C) 2019 DENX Software Engineering GmbH >> + */ >> + >> +#include <common.h> >> +#include <environment.h> >> +#include <errno.h> >> +#include <spl.h> >> +#include <asm/arch/cpu.h> >> +#include <asm/arch/hardware.h> >> +#include <asm/arch/omap.h> >> +#include <asm/arch/ddr_defs.h> >> +#include <asm/arch/clock.h> >> +#include <asm/arch/gpio.h> >> +#include <asm/arch/mmc_host_def.h> >> +#include <asm/arch/sys_proto.h> >> +#include <asm/io.h> >> +#include <asm/emif.h> >> +#include <asm/gpio.h> >> +#include <i2c.h> >> +#include <miiphy.h> >> +#include <cpsw.h> >> +#include <power/tps65910.h> >> +#include <jffs2/load_kernel.h> >> +#include <mtd_node.h> >> +#include <fdt_support.h> >> +#include "board.h" >> + >> +DECLARE_GLOBAL_DATA_PTR; >> + >> +static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; >> + >> +#ifdef CONFIG_SPL_BUILD >> + >> +#ifdef CONFIG_SPL_OS_BOOT > > #if CONFIG_IS_ENABLED(OS_BOOT) > >> +int spl_start_uboot(void) >> +{ >> + return 1; >> +} >> +#endif >> +/* DDR RAM defines */ >> +#define DDR_CLK_MHZ 400 /* DDR_DPLL_MULT value */ >> + >> +#define OSC (V_OSCK / 1000000) >> +const struct dpll_params dpll_ddr = { >> + DDR_CLK_MHZ, OSC - 1, 1, -1, -1, -1, -1}; >> + >> +const struct dpll_params *get_dpll_ddr_params(void) >> +{ >> + return &dpll_ddr; >> +} >> + >> +const struct ctrl_ioregs ioregs = { >> + .cm0ioctl = 0x18B, >> + .cm1ioctl = 0x18B, >> + .cm2ioctl = 0x18B, >> + .dt0ioctl = 0x18B, >> + .dt1ioctl = 0x18B, >> +}; >> + >> +static const struct cmd_control ddr3_cmd_ctrl_data = { >> + .cmd0csratio = 0x80, >> + .cmd0iclkout = 0x0, >> + >> + .cmd1csratio = 0x80, >> + .cmd1iclkout = 0x0, >> + >> + .cmd2csratio = 0x80, >> + .cmd2iclkout = 0x0, >> +}; >> + >> +#if CONFIG_PCL060_DDR_SIZE == 256 > > Get the DRAM layout from DT and apply EMIF settings accordingly. > > [...] > >> diff --git a/include/configs/phycore_pcl060.h b/include/configs/phycore_pcl060.h >> new file mode 100644 >> index 0000000000..982c96b267 >> --- /dev/null >> +++ b/include/configs/phycore_pcl060.h >> @@ -0,0 +1,141 @@ >> +/* SPDX-License-Identifier: GPL-2.0+ */ >> +/* >> + * phycore_pcl060.h >> + * >> + * Phytec phyCORE-AM335x (pcl060) boards information header >> + * >> + * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ >> + * Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH >> + * Copyright (C) 2019 DENX Software Engineering GmbH >> + */ >> + >> +#ifndef __CONFIG_PCL060_H >> +#define __CONFIG_PCL060_H >> + >> +#include <configs/ti_am335x_common.h> >> + >> +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ >> +#define CONFIG_MACH_TYPE MACH_TYPE_PCL060 >> +#define CONFIG_SYS_MMC_ENV_DEV 0 >> +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 >> + >> +#ifdef CONFIG_NAND >> +#define NANDARGS \ >> + "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ >> + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ >> + "nandargs=setenv bootargs console=${console} " \ >> + "${optargs} " \ >> + "root=${nandroot} " \ >> + "rootfstype=${nandrootfstype}\0" \ >> + "nandroot=ubi0:root ubi.mtd=NAND.UBI\0" \ >> + "nandrootfstype=ubifs rootwait rw fsck.repair=yes\0" \ >> + "nandboot=echo Booting from nand ...; " \ >> + "run nandargs; " \ >> + "ubi part NAND.UBI; " \ >> + "ubi readvol ${fdtaddr} oftree; " \ >> + "ubi readvol ${loadaddr} kernel; " \ >> + "bootz ${loadaddr} - ${fdtaddr}\0" >> + >> +#else >> +#define NANDARGS "" >> +#endif >> + >> +/* set to negative value for no autoboot */ >> +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ >> + "bootcmd_" #devtypel #instance "=" \ >> + "setenv mmcdev " #instance "; "\ >> + "setenv bootpart " #instance ":1 ; "\ >> + "setenv rootpart " #instance ":2 ; "\ >> + "run mmcboot\0" >> + >> +#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ >> + #devtypel #instance " " >> + >> +#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ >> + "bootcmd_" #devtypel #instance "=" \ >> + "run nandboot\0" >> + >> +#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ >> + #devtypel #instance " " >> + >> +#define BOOT_TARGET_DEVICES(func) \ >> + func(MMC, mmc, 0) \ >> + func(LEGACY_MMC, legacy_mmc, 0) \ >> + func(MMC, mmc, 1) \ >> + func(LEGACY_MMC, legacy_mmc, 1) \ >> + func(NAND, nand, 0) >> + >> +#include <config_distro_bootcmd.h> >> +#include <environment/ti/dfu.h> >> +#include <environment/ti/mmc.h> >> + >> +#define CONFIG_EXTRA_ENV_SETTINGS \ >> + DEFAULT_MMC_TI_ARGS \ >> + DEFAULT_LINUX_BOOT_ENV \ >> + "bootfile=zImage\0" \ >> + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> + "console=ttyO0,115200n8\0" \ >> + "optargs=\0" \ >> + "mmcrootfstype=ext2 rootwait\0" \ >> + "finduuid=part uuid mmc ${rootpart} uuid\0" \ >> + "boot_fit=0\0" \ >> + NANDARGS \ >> + BOOTENV >> + >> +/* Clock Defines */ >> +#define V_OSCK 25000000 /* Clock output from T2 */ >> +#define V_SCLK (V_OSCK) >> + >> +#define CONFIG_POWER_TPS65910 >> + >> +#ifdef CONFIG_NAND >> +/* NAND: device related configs */ >> +#define CONFIG_SYS_NAND_5_ADDR_CYCLE >> +#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ >> + CONFIG_SYS_NAND_PAGE_SIZE) >> +#define CONFIG_SYS_NAND_PAGE_SIZE 2048 >> +#define CONFIG_SYS_NAND_OOBSIZE 64 >> +#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) >> +/* NAND: driver related configs */ >> +#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS >> +#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ >> + 10, 11, 12, 13, 14, 15, 16, 17, \ >> + 18, 19, 20, 21, 22, 23, 24, 25, \ >> + 26, 27, 28, 29, 30, 31, 32, 33, \ >> + 34, 35, 36, 37, 38, 39, 40, 41, \ >> + 42, 43, 44, 45, 46, 47, 48, 49, \ >> + 50, 51, 52, 53, 54, 55, 56, 57, } >> + >> +#define CONFIG_SYS_NAND_ECCSIZE 512 >> +#define CONFIG_SYS_NAND_ECCBYTES 14 >> +#define CONFIG_SYS_NAND_ONFI_DETECTION >> +#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW >> + >> +/* NAND: SPL related configs */ >> +#ifdef CONFIG_SPL_OS_BOOT >> +#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ >> +#endif >> +#endif /* !CONFIG_NAND */ >> + >> +#define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \ >> +4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } > > I think there's a default value for that in include/config_fallbacks.h , > why do you override it here ? > >> +/* CPU */ >> + >> +#ifdef CONFIG_SPI_BOOT >> +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 >> +#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 >> +#elif defined(CONFIG_ENV_IS_IN_NAND) >> +#define CONFIG_ENV_OFFSET 0x000a0000 >> +#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE >> +#endif >> + >> +/* >> + * USB configuration >> + */ >> +#define CONFIG_AM335X_USB0 >> +#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL >> +#define CONFIG_AM335X_USB1 >> +#define CONFIG_AM335X_USB1_MODE MUSB_HOST > > Can't the USB settings be extracted from DT ? >
On 4/19/19 3:18 PM, Parthiban Nallathambi wrote: Hi, [...] >>> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig >>> index d29f1ca0b5..9336439340 100644 >>> --- a/arch/arm/mach-omap2/Kconfig >>> +++ b/arch/arm/mach-omap2/Kconfig >>> @@ -186,6 +186,7 @@ source "board/ti/am43xx/Kconfig" >>> source "board/ti/am335x/Kconfig" >>> source "board/compulab/cm_t335/Kconfig" >>> source "board/compulab/cm_t43/Kconfig" >>> +source "board/phytec/phycore_pcl060/Kconfig" >> >> Here [1] it says the name of the SoM is PCM-060 , what is PCL-060 ? >> >> [1] >> https://www.phytec.eu/product-eu/system-on-modules/phycore-am335x-download/ >> [...] > > This differs only by the connector. PCM variants are pluggable and PCL variants > are direct soliderable to the carrier board. > > Copied from [1]: > The PCL-060 System On Module is a connector-less, BGA style variant of the > PCM-060/phyCORE-AM335x R2 SOM. Unlike traditional Phytec SOM products that support > high density connectors, the PCL-060 SOM is directly soldered down to the > phyBOARD-Wega AM335x using Phytec's Direct Solder Connect technology (DSC). This > solution offers an ultra-low cost Single Board Computer for the AM335x processor, while > maintaining most of the advantages of the SOM concept. > > [1] https://www.phytec.de/fileadmin/user_upload/downloads/Manuals/L-845e_1.pdf Ah damn, this looks like a consistency problem is coming up. We have multiple PCM* SoMs in U-Boot, one PCL* SoM and now another PCL/PCM SoM. But the PCL063 isn't even manufactured in variant with connectors, so I guess we can ignore that one. I wonder whether we should stick to PCM* for all of the Phytec SoMs for consistency sake and document that PCL060 is also supported or maybe there's a better way ? [...]
Hello Marek, On 4/19/19 3:35 PM, Marek Vasut wrote: > On 4/19/19 3:18 PM, Parthiban Nallathambi wrote: > > Hi, > > [...] > >>>> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig >>>> index d29f1ca0b5..9336439340 100644 >>>> --- a/arch/arm/mach-omap2/Kconfig >>>> +++ b/arch/arm/mach-omap2/Kconfig >>>> @@ -186,6 +186,7 @@ source "board/ti/am43xx/Kconfig" >>>> source "board/ti/am335x/Kconfig" >>>> source "board/compulab/cm_t335/Kconfig" >>>> source "board/compulab/cm_t43/Kconfig" >>>> +source "board/phytec/phycore_pcl060/Kconfig" >>> >>> Here [1] it says the name of the SoM is PCM-060 , what is PCL-060 ? >>> >>> [1] >>> https://www.phytec.eu/product-eu/system-on-modules/phycore-am335x-download/ >>> [...] >> >> This differs only by the connector. PCM variants are pluggable and PCL variants >> are direct soliderable to the carrier board. >> >> Copied from [1]: >> The PCL-060 System On Module is a connector-less, BGA style variant of the >> PCM-060/phyCORE-AM335x R2 SOM. Unlike traditional Phytec SOM products that support >> high density connectors, the PCL-060 SOM is directly soldered down to the >> phyBOARD-Wega AM335x using Phytec's Direct Solder Connect technology (DSC). This >> solution offers an ultra-low cost Single Board Computer for the AM335x processor, while >> maintaining most of the advantages of the SOM concept. >> >> [1] https://www.phytec.de/fileadmin/user_upload/downloads/Manuals/L-845e_1.pdf > > Ah damn, this looks like a consistency problem is coming up. We have > multiple PCM* SoMs in U-Boot, one PCL* SoM and now another PCL/PCM SoM. > But the PCL063 isn't even manufactured in variant with connectors, so I > guess we can ignore that one. > > I wonder whether we should stick to PCM* for all of the Phytec SoMs for > consistency sake and document that PCL060 is also supported or maybe > there's a better way ? Does PCX/PCx makes sense? But we have the same problem with variscite [1] SoM's (either SODIMM or solderable). [1] https://lists.denx.de/pipermail/u-boot/2019-April/365667.html > > [...] >
On 4/19/19 5:06 PM, Parthiban Nallathambi wrote: > Hello Marek, > > On 4/19/19 3:35 PM, Marek Vasut wrote: >> On 4/19/19 3:18 PM, Parthiban Nallathambi wrote: >> >> Hi, >> >> [...] >> >>>>> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig >>>>> index d29f1ca0b5..9336439340 100644 >>>>> --- a/arch/arm/mach-omap2/Kconfig >>>>> +++ b/arch/arm/mach-omap2/Kconfig >>>>> @@ -186,6 +186,7 @@ source "board/ti/am43xx/Kconfig" >>>>> source "board/ti/am335x/Kconfig" >>>>> source "board/compulab/cm_t335/Kconfig" >>>>> source "board/compulab/cm_t43/Kconfig" >>>>> +source "board/phytec/phycore_pcl060/Kconfig" >>>> >>>> Here [1] it says the name of the SoM is PCM-060 , what is PCL-060 ? >>>> >>>> [1] >>>> https://www.phytec.eu/product-eu/system-on-modules/phycore-am335x-download/ >>>> [...] >>> >>> This differs only by the connector. PCM variants are pluggable and PCL variants >>> are direct soliderable to the carrier board. >>> >>> Copied from [1]: >>> The PCL-060 System On Module is a connector-less, BGA style variant of the >>> PCM-060/phyCORE-AM335x R2 SOM. Unlike traditional Phytec SOM products that support >>> high density connectors, the PCL-060 SOM is directly soldered down to the >>> phyBOARD-Wega AM335x using Phytec's Direct Solder Connect technology (DSC). This >>> solution offers an ultra-low cost Single Board Computer for the AM335x processor, while >>> maintaining most of the advantages of the SOM concept. >>> >>> [1] https://www.phytec.de/fileadmin/user_upload/downloads/Manuals/L-845e_1.pdf >> >> Ah damn, this looks like a consistency problem is coming up. We have >> multiple PCM* SoMs in U-Boot, one PCL* SoM and now another PCL/PCM SoM. >> But the PCL063 isn't even manufactured in variant with connectors, so I >> guess we can ignore that one. >> >> I wonder whether we should stick to PCM* for all of the Phytec SoMs for >> consistency sake and document that PCL060 is also supported or maybe >> there's a better way ? > > Does PCX/PCx makes sense? But we have the same problem with variscite [1] SoM's > (either SODIMM or solderable). > > [1] https://lists.denx.de/pipermail/u-boot/2019-April/365667.html PCX would introduce another option, in addition to PCM/PCL, one which cannot be easily found on the internet, so I'd like to avoid that. I am banking toward the sticking with PCM where possible (simply because that's what $searchengine spits out first when you look for that SoM, and because we already have plenty of PCM-nnn SoMs), but maybe someone has a better idea .
Hi, On 19.04.19 17:20, Marek Vasut wrote: > On 4/19/19 5:06 PM, Parthiban Nallathambi wrote: >> Hello Marek, >> >> On 4/19/19 3:35 PM, Marek Vasut wrote: >>> On 4/19/19 3:18 PM, Parthiban Nallathambi wrote: >>> >>> Hi, >>> >>> [...] >>> >>>>>> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig >>>>>> index d29f1ca0b5..9336439340 100644 >>>>>> --- a/arch/arm/mach-omap2/Kconfig >>>>>> +++ b/arch/arm/mach-omap2/Kconfig >>>>>> @@ -186,6 +186,7 @@ source "board/ti/am43xx/Kconfig" >>>>>> source "board/ti/am335x/Kconfig" >>>>>> source "board/compulab/cm_t335/Kconfig" >>>>>> source "board/compulab/cm_t43/Kconfig" >>>>>> +source "board/phytec/phycore_pcl060/Kconfig" >>>>> Here [1] it says the name of the SoM is PCM-060 , what is PCL-060 ? >>>>> >>>>> [1] >>>>> https://www.phytec.eu/product-eu/system-on-modules/phycore-am335x-download/ >>>>> [...] >>>> This differs only by the connector. PCM variants are pluggable and PCL variants >>>> are direct soliderable to the carrier board. >>>> >>>> Copied from [1]: >>>> The PCL-060 System On Module is a connector-less, BGA style variant of the >>>> PCM-060/phyCORE-AM335x R2 SOM. Unlike traditional Phytec SOM products that support >>>> high density connectors, the PCL-060 SOM is directly soldered down to the >>>> phyBOARD-Wega AM335x using Phytec's Direct Solder Connect technology (DSC). This >>>> solution offers an ultra-low cost Single Board Computer for the AM335x processor, while >>>> maintaining most of the advantages of the SOM concept. >>>> >>>> [1] https://www.phytec.de/fileadmin/user_upload/downloads/Manuals/L-845e_1.pdf >>> Ah damn, this looks like a consistency problem is coming up. We have >>> multiple PCM* SoMs in U-Boot, one PCL* SoM and now another PCL/PCM SoM. >>> But the PCL063 isn't even manufactured in variant with connectors, so I >>> guess we can ignore that one. >>> >>> I wonder whether we should stick to PCM* for all of the Phytec SoMs for >>> consistency sake and document that PCL060 is also supported or maybe >>> there's a better way ? >> Does PCX/PCx makes sense? But we have the same problem with variscite [1] SoM's >> (either SODIMM or solderable). >> >> [1] https://lists.denx.de/pipermail/u-boot/2019-April/365667.html > PCX would introduce another option, in addition to PCM/PCL, one which > cannot be easily found on the internet, so I'd like to avoid that. I > am banking toward the sticking with PCM where possible (simply because > that's what $searchengine spits out first when you look for that SoM, > and because we already have plenty of PCM-nnn SoMs), but maybe someone > has a better idea . why not simply use the full name of the module instead? - phyCORE-AM335x - phyCORE-AM335x R2 I did the same for the phyCORE-RK3288. There is no real difference between a PCM and PCL SOM. You can take look at the barebox code for this modules to get some inspiration on how to handle the different SOM variants. Â https://git.pengutronix.de/cgit/barebox/tree/arch/arm/boards/phytec-som-am335x Regards, Wadim >
On 4/23/19 11:33 AM, Wadim Egorov wrote: > Hi, > > On 19.04.19 17:20, Marek Vasut wrote: >> On 4/19/19 5:06 PM, Parthiban Nallathambi wrote: >>> Hello Marek, >>> >>> On 4/19/19 3:35 PM, Marek Vasut wrote: >>>> On 4/19/19 3:18 PM, Parthiban Nallathambi wrote: >>>> >>>> Hi, >>>> >>>> [...] >>>> >>>>>>> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig >>>>>>> index d29f1ca0b5..9336439340 100644 >>>>>>> --- a/arch/arm/mach-omap2/Kconfig >>>>>>> +++ b/arch/arm/mach-omap2/Kconfig >>>>>>> @@ -186,6 +186,7 @@ source "board/ti/am43xx/Kconfig" >>>>>>> source "board/ti/am335x/Kconfig" >>>>>>> source "board/compulab/cm_t335/Kconfig" >>>>>>> source "board/compulab/cm_t43/Kconfig" >>>>>>> +source "board/phytec/phycore_pcl060/Kconfig" >>>>>> Here [1] it says the name of the SoM is PCM-060 , what is PCL-060 ? >>>>>> >>>>>> [1] >>>>>> https://www.phytec.eu/product-eu/system-on-modules/phycore-am335x-download/ >>>>>> [...] >>>>> This differs only by the connector. PCM variants are pluggable and PCL variants >>>>> are direct soliderable to the carrier board. >>>>> >>>>> Copied from [1]: >>>>> The PCL-060 System On Module is a connector-less, BGA style variant of the >>>>> PCM-060/phyCORE-AM335x R2 SOM. Unlike traditional Phytec SOM products that support >>>>> high density connectors, the PCL-060 SOM is directly soldered down to the >>>>> phyBOARD-Wega AM335x using Phytec's Direct Solder Connect technology (DSC). This >>>>> solution offers an ultra-low cost Single Board Computer for the AM335x processor, while >>>>> maintaining most of the advantages of the SOM concept. >>>>> >>>>> [1] https://www.phytec.de/fileadmin/user_upload/downloads/Manuals/L-845e_1.pdf >>>> Ah damn, this looks like a consistency problem is coming up. We have >>>> multiple PCM* SoMs in U-Boot, one PCL* SoM and now another PCL/PCM SoM. >>>> But the PCL063 isn't even manufactured in variant with connectors, so I >>>> guess we can ignore that one. >>>> >>>> I wonder whether we should stick to PCM* for all of the Phytec SoMs for >>>> consistency sake and document that PCL060 is also supported or maybe >>>> there's a better way ? >>> Does PCX/PCx makes sense? But we have the same problem with variscite [1] SoM's >>> (either SODIMM or solderable). >>> >>> [1] https://lists.denx.de/pipermail/u-boot/2019-April/365667.html >> PCX would introduce another option, in addition to PCM/PCL, one which >> cannot be easily found on the internet, so I'd like to avoid that. I >> am banking toward the sticking with PCM where possible (simply because >> that's what $searchengine spits out first when you look for that SoM, >> and because we already have plenty of PCM-nnn SoMs), but maybe someone >> has a better idea . > > why not simply use the full name of the module instead? > > - phyCORE-AM335x > - phyCORE-AM335x R2 > > I did the same for the phyCORE-RK3288. Well, that's fine by me, and I think it's better than the pcm060 or pcl060 too. Let's go with this, unless there are objections.
Hi All, On 4/19/19 11:47 AM, Marek Vasut wrote: >> --- >> arch/arm/dts/Makefile | 3 +- >> arch/arm/dts/am335x-phycore-som.dtsi | 327 ++++++++++++++++++++++ >> arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 35 +++ >> arch/arm/dts/am335x-wega-rdk.dts | 23 ++ >> arch/arm/dts/am335x-wega.dtsi | 231 +++++++++++++++ > > The DTs come from Linux kernel, but which version of Linux ? > Which exact commit ? Did you modify them in any way ? I pulled these in from current Linux Mainline. I added SPDX headers and reformatted some lines to for line length (but I have reverted the line lengths in my follow-up patch). > [...] > > > Here [1] it says the name of the SoM is PCM-060 , what is PCL-060 ? > > [1] > https://www.phytec.eu/product-eu/system-on-modules/phycore-am335x-download/ > [...] > I renamed everything to variants of phycore_am335x_r2 as previously discussed. > DRAM size should come from DT, we don't need another custom config > option. Look at fdtdec_setup_mem_size_base() and > fdtdec_setup_memory_banksize(). > Done, thank you for the suggestion. I also took inspiration for the data structure as suggested by Wadim Egorov. > >> diff --git a/include/configs/phycore_pcl060.h b/include/configs/phycore_pcl060.h >> new file mode 100644 >> index 0000000000..982c96b267 >> --- /dev/null >> +++ b/include/configs/phycore_pcl060.h >> @@ -0,0 +1,141 @@ [...] >> +/* >> + * USB configuration >> + */ >> +#define CONFIG_AM335X_USB0 >> +#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL >> +#define CONFIG_AM335X_USB1 >> +#define CONFIG_AM335X_USB1_MODE MUSB_HOST > > Can't the USB settings be extracted from DT ? Unfortunately, these defines are referenced within arch/arm/mach-omap2/am335x/board.c, which I would rather not want to break at this time. Other than that, I implemented all points, along with some further refinement/clean-up. Best regards, Niel Fourie
On 4/25/19 10:31 AM, Niel Fourie wrote: > Hi All, Hi, > On 4/19/19 11:47 AM, Marek Vasut wrote: >>> --- >>>  arch/arm/dts/Makefile                   |  3 +- >>>  arch/arm/dts/am335x-phycore-som.dtsi    | 327 ++++++++++++++++++++++ >>>  arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 35 +++ >>>  arch/arm/dts/am335x-wega-rdk.dts        | 23 ++ >>>  arch/arm/dts/am335x-wega.dtsi           | 231 +++++++++++++++ >> >> The DTs come from Linux kernel, but which version of Linux ? >> Which exact commit ? Did you modify them in any way ? > > I pulled these in from current Linux Mainline. I added SPDX headers and > reformatted some lines to for line length (but I have reverted the line > lengths in my follow-up patch). The commit message should contain the commit ID in Linux from which the files came , since when someone decides to upgrade those files in the future, they will be able to generate a diff from that commit to Linux version that's current at that point. Please add it. >> [...] >> >> >> Here [1] it says the name of the SoM is PCM-060 , what is PCL-060 ? >> >> [1] >> https://www.phytec.eu/product-eu/system-on-modules/phycore-am335x-download/ >> >>  [...] >> > > I renamed everything to variants of phycore_am335x_r2 as previously > discussed. > >> DRAM size should come from DT, we don't need another custom config >> option. Look at fdtdec_setup_mem_size_base() and >> fdtdec_setup_memory_banksize(). >> > > Done, thank you for the suggestion. I also took inspiration for the data > structure as suggested by Wadim Egorov. > >> >>> diff --git a/include/configs/phycore_pcl060.h >>> b/include/configs/phycore_pcl060.h >>> new file mode 100644 >>> index 0000000000..982c96b267 >>> --- /dev/null >>> +++ b/include/configs/phycore_pcl060.h >>> @@ -0,0 +1,141 @@ > > [...] > >>> +/* >>> + * USB configuration >>> + */ >>> +#define CONFIG_AM335X_USB0 >>> +#define CONFIG_AM335X_USB0_MODE   MUSB_PERIPHERAL >>> +#define CONFIG_AM335X_USB1 >>> +#define CONFIG_AM335X_USB1_MODE MUSB_HOST >> >> Can't the USB settings be extracted from DT ? > > Unfortunately, these defines are referenced within > arch/arm/mach-omap2/am335x/board.c, which I would rather not want to > break at this time. Take a look at configs/am335x_evm_defconfig:CONFIG_DM_USB_GADGET=y Maybe we can at least get rid of some of the hard-coded USB non-DM stuff.
On Thu, Apr 25, 2019 at 1:33 PM Marek Vasut <marex@denx.de> wrote: [..] > The commit message should contain the commit ID in Linux from which the > files came , since when someone decides to upgrade those files in the > future, they will be able to generate a diff from that commit to Linux > version that's current at that point. Please add it. +1 -- Best regards, Eugeniu.
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0aee8dfde0..a44a95d0a2 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -253,7 +253,8 @@ dtb-$(CONFIG_AM33XX) += \ am335x-chiliboard.dtb \ am335x-sl50.dtb \ am335x-base0033.dtb \ - am335x-guardian.dtb + am335x-guardian.dtb \ + am335x-wega-rdk.dtb dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \ am43x-epos-evm.dtb \ am437x-idk-evm.dtb \ diff --git a/arch/arm/dts/am335x-phycore-som.dtsi b/arch/arm/dts/am335x-phycore-som.dtsi new file mode 100644 index 0000000000..a2478cc628 --- /dev/null +++ b/arch/arm/dts/am335x-phycore-som.dtsi @@ -0,0 +1,327 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2015 Phytec Messtechnik GmbH + * Author: Teresa Remmet <t.remmet@phytec.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "am33xx.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> + +/ { + model = "Phytec AM335x phyCORE"; + compatible = "phytec,am335x-phycore-som", "ti,am33xx"; + + aliases { + rtc0 = &i2c_rtc; + rtc1 = &rtc; + }; + + cpus { + cpu@0 { + cpu0-supply = <&vdd1_reg>; + }; + }; + + memory@80000000 { + device_type = "memory"; + reg = <0x80000000 0x10000000>; /* 256 MB */ + }; + + regulators { + compatible = "simple-bus"; + + vcc5v: fixedregulator0 { + compatible = "regulator-fixed"; + regulator-name = "vcc5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; + }; +}; + +/* Crypto Module */ +&aes { + status = "okay"; +}; + +&sham { + status = "okay"; +}; + +/* Ethernet */ +&am33xx_pinmux { + ethernet0_pins: pinmux_ethernet0 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_crs.rmii1_crs_dv */ + AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_rxerr.rmii1_rxerr */ + AM33XX_IOPAD(0x914, PIN_OUTPUT | MUX_MODE1) /* mii1_txen.rmii1_txen */ + AM33XX_IOPAD(0x924, PIN_OUTPUT | MUX_MODE1) /* mii1_txd1.rmii1_txd1 */ + AM33XX_IOPAD(0x928, PIN_OUTPUT | MUX_MODE1) /* mii1_txd0.rmii1_txd0 */ + AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_rxd1.rmii1_rxd1 */ + AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_rxd0.rmii1_rxd0 */ + AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii1_refclk.rmii1_refclk */ + >; + }; + + mdio_pins: pinmux_mdio { + pinctrl-single,pins = < + /* MDIO */ + AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | + MUX_MODE0) /* mdio_data.mdio_data */ + AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ + >; + }; +}; + +&cpsw_emac0 { + phy-handle = <&phy0>; + phy-mode = "rmii"; + dual_emac_res_vlan = <1>; +}; + +&davinci_mdio { + pinctrl-names = "default"; + pinctrl-0 = <&mdio_pins>; + status = "okay"; + + phy0: ethernet-phy@0 { + reg = <0>; + }; +}; + +&mac { + slaves = <1>; + pinctrl-names = "default"; + pinctrl-0 = <ðernet0_pins>; + status = "okay"; +}; + +/* I2C Busses */ +&am33xx_pinmux { + i2c0_pins: pinmux_i2c0 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x988, PIN_INPUT | MUX_MODE0) /* i2c0_sda.i2c0_sda */ + AM33XX_IOPAD(0x98c, PIN_INPUT | MUX_MODE0) /* i2c0_scl.i2c0_scl */ + >; + }; +}; + +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + clock-frequency = <400000>; + status = "okay"; + + tps: pmic@2d { + reg = <0x2d>; + }; + + i2c_tmp102: temp@4b { + compatible = "ti,tmp102"; + reg = <0x4b>; + status = "disabled"; + }; + + i2c_eeprom: eeprom@52 { + compatible = "atmel,24c32"; + pagesize = <32>; + reg = <0x52>; + status = "disabled"; + }; + + i2c_rtc: rtc@68 { + compatible = "microcrystal,rv4162"; + reg = <0x68>; + status = "disabled"; + }; +}; + +/* NAND memory */ +&am33xx_pinmux { + nandflash_pins: pinmux_nandflash { + pinctrl-single,pins = < + AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad0.gpmc_ad0 */ + AM33XX_IOPAD(0x804, PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad1.gpmc_ad1 */ + AM33XX_IOPAD(0x808, PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad2.gpmc_ad2 */ + AM33XX_IOPAD(0x80c, PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad3.gpmc_ad3 */ + AM33XX_IOPAD(0x810, PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad4.gpmc_ad4 */ + AM33XX_IOPAD(0x814, PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad5.gpmc_ad5 */ + AM33XX_IOPAD(0x818, PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad6.gpmc_ad6 */ + AM33XX_IOPAD(0x81c, PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad7.gpmc_ad7 */ + AM33XX_IOPAD(0x870, PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_wait0.gpmc_wait0 */ + AM33XX_IOPAD(0x87c, PIN_OUTPUT | MUX_MODE0) /* gpmc_csn0.gpmc_csn0 */ + AM33XX_IOPAD(0x890, PIN_OUTPUT | MUX_MODE0) /* gpmc_advn_ale.gpmc_advn_ale */ + AM33XX_IOPAD(0x894, PIN_OUTPUT | MUX_MODE0) /* gpmc_oen_ren.gpmc_oen_ren */ + AM33XX_IOPAD(0x898, PIN_OUTPUT | MUX_MODE0) /* gpmc_wen.gpmc_wen */ + AM33XX_IOPAD(0x89c, PIN_OUTPUT | MUX_MODE0) /* gpmc_be0n_cle.gpmc_be0n_cle */ + >; + }; +}; + +&elm { + status = "okay"; +}; + +&gpmc { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&nandflash_pins>; + ranges = <0 0 0x08000000 0x1000000>; /* CS0: NAND */ + nandflash: nand@0,0 { + compatible = "ti,omap2-nand"; + reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ + interrupt-parent = <&gpmc>; + interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */ + <1 IRQ_TYPE_NONE>; /* termcount */ + rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */ + nand-bus-width = <8>; + ti,nand-ecc-opt = "bch8"; + gpmc,device-nand = "true"; + gpmc,device-width = <1>; + gpmc,sync-clk-ps = <0>; + gpmc,cs-on-ns = <0>; + gpmc,cs-rd-off-ns = <30>; + gpmc,cs-wr-off-ns = <30>; + gpmc,adv-on-ns = <0>; + gpmc,adv-rd-off-ns = <30>; + gpmc,adv-wr-off-ns = <30>; + gpmc,we-on-ns = <0>; + gpmc,we-off-ns = <20>; + gpmc,oe-on-ns = <10>; + gpmc,oe-off-ns = <30>; + gpmc,access-ns = <30>; + gpmc,rd-cycle-ns = <30>; + gpmc,wr-cycle-ns = <30>; + gpmc,bus-turnaround-ns = <0>; + gpmc,cycle2cycle-delay-ns = <50>; + gpmc,cycle2cycle-diffcsen; + gpmc,clk-activation-ns = <0>; + gpmc,wr-access-ns = <30>; + gpmc,wr-data-mux-bus-ns = <0>; + + ti,elm-id = <&elm>; + + #address-cells = <1>; + #size-cells = <1>; + }; +}; + +/* Power */ +#include "tps65910.dtsi" + +&tps { + vcc1-supply = <&vcc5v>; + vcc2-supply = <&vcc5v>; + vcc3-supply = <&vcc5v>; + vcc4-supply = <&vcc5v>; + vcc5-supply = <&vcc5v>; + vcc6-supply = <&vcc5v>; + vcc7-supply = <&vcc5v>; + vccio-supply = <&vcc5v>; + + regulators { + vrtc_reg: regulator@0 { + regulator-always-on; + }; + + vio_reg: regulator@1 { + regulator-always-on; + }; + + vdd1_reg: regulator@2 { + /* VDD_MPU voltage limits 0.95V - 1.325V with + * +/-4% tolerance + */ + regulator-name = "vdd_mpu"; + regulator-min-microvolt = <912500>; + regulator-max-microvolt = <1378000>; + regulator-boot-on; + regulator-always-on; + }; + + vdd2_reg: regulator@3 { + /* VDD_CORE voltage limits 0.95V - 1.1V with + * +/-4% tolerance + */ + regulator-name = "vdd_core"; + regulator-min-microvolt = <912500>; + regulator-max-microvolt = <1150000>; + regulator-boot-on; + regulator-always-on; + }; + + vdd3_reg: regulator@4 { + regulator-always-on; + }; + + vdig1_reg: regulator@5 { + regulator-name = "vdig1_1p8v"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vdig2_reg: regulator@6 { + regulator-always-on; + }; + + vpll_reg: regulator@7 { + regulator-always-on; + }; + + vdac_reg: regulator@8 { + regulator-always-on; + }; + + vaux1_reg: regulator@9 { + regulator-always-on; + }; + + vaux2_reg: regulator@10 { + regulator-always-on; + }; + + vaux33_reg: regulator@11 { + regulator-always-on; + }; + + vmmc_reg: regulator@12 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; +}; + +/* SPI Busses */ +&am33xx_pinmux { + spi0_pins: pinmux_spi0 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x950, PIN_INPUT_PULLDOWN | MUX_MODE0) /* spi0_clk.spi0_clk */ + AM33XX_IOPAD(0x954, PIN_INPUT_PULLDOWN | MUX_MODE0) /* spi0_d0.spi0_d0 */ + AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_d1.spi0_d1 */ + AM33XX_IOPAD(0x95c, PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_cs0.spi0_cs0 */ + >; + }; +}; + +&spi0 { + pinctrl-names = "default"; + pinctrl-0 = <&spi0_pins>; + status = "okay"; + + serial_flash: m25p80@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <48000000>; + reg = <0x0>; + m25p,fast-read; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + }; +}; diff --git a/arch/arm/dts/am335x-wega-rdk-u-boot.dtsi b/arch/arm/dts/am335x-wega-rdk-u-boot.dtsi new file mode 100644 index 0000000000..bafef3c76d --- /dev/null +++ b/arch/arm/dts/am335x-wega-rdk-u-boot.dtsi @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 DENX Software Engineering GmbH + */ + +/ { + chosen { + #address-cells = <1>; + #size-cells = <1>; + + bootargs = "console=ttyO0,115200 earlyprintk"; + stdout-path = &uart0; + }; + + ocp { + u-boot,dm-spl; + u-boot,dm-pre-reloc; + }; +}; + +&scm { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&uart0 { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&mmc1 { + u-boot,dm-spl; + u-boot,dm-pre-reloc; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; +}; diff --git a/arch/arm/dts/am335x-wega-rdk.dts b/arch/arm/dts/am335x-wega-rdk.dts new file mode 100644 index 0000000000..fe50f3041a --- /dev/null +++ b/arch/arm/dts/am335x-wega-rdk.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2015 Phytec Messtechnik GmbH + * Author: Teresa Remmet <t.remmet@phytec.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/dts-v1/; + +#include "am335x-phycore-som.dtsi" +#include "am335x-wega.dtsi" + +/* SoM */ +&i2c_eeprom { + status = "okay"; +}; + +&i2c_rtc { + status = "okay"; +}; diff --git a/arch/arm/dts/am335x-wega.dtsi b/arch/arm/dts/am335x-wega.dtsi new file mode 100644 index 0000000000..b5821592e5 --- /dev/null +++ b/arch/arm/dts/am335x-wega.dtsi @@ -0,0 +1,231 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2015 Phytec Messtechnik GmbH + * Author: Teresa Remmet <t.remmet@phytec.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/ { + model = "Phytec AM335x phyBOARD-WEGA"; + compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", + "ti,am33xx"; + + sound: sound_iface { + compatible = "ti,da830-evm-audio"; + }; + + regulators { + compatible = "simple-bus"; + + vcc3v3: fixedregulator1 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + }; + }; +}; + +/* Audio */ +&am33xx_pinmux { + mcasp0_pins: pinmux_mcasp0 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9AC, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_ahclkx.mcasp0_ahclkx */ + AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ + AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ + AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr0.mcasp0_axr0 */ + AM33XX_IOPAD(0x9A8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr1.mcasp0_axr1 */ + >; + }; +}; + +&i2c0 { + tlv320aic3007: tlv320aic3007@18 { + compatible = "ti,tlv320aic3007"; + reg = <0x18>; + AVDD-supply = <&vcc3v3>; + IOVDD-supply = <&vcc3v3>; + DRVDD-supply = <&vcc3v3>; + DVDD-supply = <&vdig1_reg>; + status = "okay"; + }; +}; + +&mcasp0 { + pinctrl-names = "default"; + pinctrl-0 = <&mcasp0_pins>; + op-mode = <0>; /* DAVINCI_MCASP_IIS_MODE */ + tdm-slots = <2>; + serial-dir = < + 2 1 0 0 /* # 0: INACTIVE, 1: TX, 2: RX */ + >; + tx-num-evt = <16>; + rt-num-evt = <16>; + status = "okay"; +}; + +&sound { + ti,model = "AM335x-Wega"; + ti,audio-codec = <&tlv320aic3007>; + ti,mcasp-controller = <&mcasp0>; + ti,audio-routing = + "Line Out", "LLOUT", + "Line Out", "RLOUT", + "LINE1L", "Line In", + "LINE1R", "Line In"; + clocks = <&mcasp0_fck>; + clock-names = "mclk"; + status = "okay"; +}; + +/* CAN Busses */ +&am33xx_pinmux { + dcan1_pins: pinmux_dcan1 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x968, PIN_OUTPUT_PULLUP | MUX_MODE2) /* uart0_ctsn.d_can1_tx */ + AM33XX_IOPAD(0x96c, PIN_INPUT_PULLUP | MUX_MODE2) /* uart0_rtsn.d_can1_rx */ + >; + }; +}; + +&dcan1 { + pinctrl-names = "default"; + pinctrl-0 = <&dcan1_pins>; + status = "okay"; +}; + +/* Ethernet */ +&am33xx_pinmux { + ethernet1_pins: pinmux_ethernet1 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x840, PIN_OUTPUT | MUX_MODE1) /* gpmc_a0.mii2_txen */ + AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE1) /* gpmc_a1.mii2_rxdv */ + AM33XX_IOPAD(0x848, PIN_OUTPUT | MUX_MODE1) /* gpmc_a2.mii2_txd3 */ + AM33XX_IOPAD(0x84c, PIN_OUTPUT | MUX_MODE1) /* gpmc_a3.mii2_txd2 */ + AM33XX_IOPAD(0x850, PIN_OUTPUT | MUX_MODE1) /* gpmc_a4.mii2_txd1 */ + AM33XX_IOPAD(0x854, PIN_OUTPUT | MUX_MODE1) /* gpmc_a5.mii2_txd0 */ + AM33XX_IOPAD(0x858, PIN_INPUT_PULLDOWN | MUX_MODE1) /* gpmc_a6.mii2_txclk */ + AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE1) /* gpmc_a7.mii2_rxclk */ + AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE1) /* gpmc_a8.mii2_rxd3 */ + AM33XX_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE1) /* gpmc_a9.mii2_rxd2 */ + AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE1) /* gpmc_a10.mii2_rxd1 */ + AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE1) /* gpmc_a11.mii2_rxd0 */ + AM33XX_IOPAD(0x874, PIN_INPUT_PULLDOWN | MUX_MODE1) /* gpmc_wpn.mii2_rxerr */ + AM33XX_IOPAD(0x878, PIN_INPUT_PULLDOWN | MUX_MODE1) /* gpmc_ben1.mii2_col */ + >; + }; +}; + +&cpsw_emac1 { + phy-handle = <&phy1>; + phy-mode = "mii"; + dual_emac_res_vlan = <2>; +}; + +&davinci_mdio { + phy1: ethernet-phy@1 { + reg = <1>; + }; +}; + +&mac { + slaves = <2>; + pinctrl-names = "default"; + pinctrl-0 = <ðernet0_pins ðernet1_pins>; + dual_emac = <1>; +}; + +/* MMC */ +&am33xx_pinmux { + mmc1_pins: pinmux_mmc1 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat3.mmc0_dat3 */ + AM33XX_IOPAD(0x8f4, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat2.mmc0_dat2 */ + AM33XX_IOPAD(0x8f8, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat1.mmc0_dat1 */ + AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat0.mmc0_dat0 */ + AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_clk.mmc0_clk */ + AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_cmd.mmc0_cmd */ + AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE7) /* spi0_cs1.mmc0_sdcd */ + >; + }; +}; + +&mmc1 { + vmmc-supply = <&vcc3v3>; + bus-width = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +/* Power */ +&vdig1_reg { + regulator-boot-on; + regulator-always-on; +}; + +/* UARTs */ +&am33xx_pinmux { + uart0_pins: pinmux_uart0 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */ + AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */ + >; + }; + + uart1_pins: pinmux_uart1_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x980, PIN_INPUT_PULLUP | MUX_MODE0) /* uart1_rxd.uart1_rxd */ + AM33XX_IOPAD(0x984, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart1_txd.uart1_txd */ + AM33XX_IOPAD(0x978, PIN_INPUT | MUX_MODE0) /* uart1_ctsn.uart1_ctsn */ + AM33XX_IOPAD(0x97c, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart1_rtsn.uart1_rtsn */ + >; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + status = "okay"; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins>; + status = "okay"; +}; + +/* USB */ +&cppi41dma { + status = "okay"; +}; + +&usb_ctrl_mod { + status = "okay"; +}; + +&usb { + status = "okay"; +}; + +&usb0 { + status = "okay"; +}; + +&usb0_phy { + status = "okay"; +}; + +&usb1 { + dr_mode = "host"; + status = "okay"; +}; + +&usb1_phy { + status = "okay"; +}; diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 9f82efe007..79c522ecdc 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -5057,4 +5057,5 @@ #define MACH_TYPE_NASM25 5112 #define MACH_TYPE_TOMATO 5113 #define MACH_TYPE_OMAP3_MRC3D 5114 +#define MACH_TYPE_PCL060 5115 #endif diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index d29f1ca0b5..9336439340 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -186,6 +186,7 @@ source "board/ti/am43xx/Kconfig" source "board/ti/am335x/Kconfig" source "board/compulab/cm_t335/Kconfig" source "board/compulab/cm_t43/Kconfig" +source "board/phytec/phycore_pcl060/Kconfig" config SPL_LDSCRIPT default "arch/arm/mach-omap2/u-boot-spl.lds" diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig index 500df1aa11..4e84cfbeff 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig +++ b/arch/arm/mach-omap2/am33xx/Kconfig @@ -156,6 +156,13 @@ config TARGET_ETAMIN select DM_SERIAL imply CMD_DM +config TARGET_PCL060 + bool "Support pcl060" + select DM + select DM_GPIO + select DM_SERIAL + imply CMD_DM + config TARGET_PCM051 bool "Support pcm051" select DM diff --git a/board/phytec/phycore_pcl060/Kconfig b/board/phytec/phycore_pcl060/Kconfig new file mode 100644 index 0000000000..bdd1a9b6e0 --- /dev/null +++ b/board/phytec/phycore_pcl060/Kconfig @@ -0,0 +1,19 @@ +if TARGET_PCL060 + +config SYS_BOARD + default "phycore_pcl060" + +config SYS_VENDOR + default "phytec" + +config SYS_SOC + default "am33xx" + +config SYS_CONFIG_NAME + default "phycore_pcl060" + +config PCL060_DDR_SIZE + int "DDR size (in MiB) of Phycore PCL060 module" + default 256 + +endif diff --git a/board/phytec/phycore_pcl060/MAINTAINERS b/board/phytec/phycore_pcl060/MAINTAINERS new file mode 100644 index 0000000000..cddcc308c4 --- /dev/null +++ b/board/phytec/phycore_pcl060/MAINTAINERS @@ -0,0 +1,7 @@ +phyCORE PCL060 BOARD +M: Niel Fourie <lusus@denx.de> +M: Parthiban Nallathambi <pn@denx.de> +S: Maintained +F: board/phytec/phycore_pcl060 +F: include/configs/phycore_pcl060.h +F: configs/phycore-pcl060-wega_defconfig diff --git a/board/phytec/phycore_pcl060/Makefile b/board/phytec/phycore_pcl060/Makefile new file mode 100644 index 0000000000..ff6f8b4221 --- /dev/null +++ b/board/phytec/phycore_pcl060/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Makefile +# +# Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + +ifdef CONFIG_SPL_BUILD +obj-y += mux.o +endif + +obj-y += board.o diff --git a/board/phytec/phycore_pcl060/board.c b/board/phytec/phycore_pcl060/board.c new file mode 100644 index 0000000000..01fe13e959 --- /dev/null +++ b/board/phytec/phycore_pcl060/board.c @@ -0,0 +1,340 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * board.c + * + * Board functions for Phytec phyCORE-AM335x R2 (pcl060) based boards + * + * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ + * Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH + * Copyright (C) 2015 Wadim Egorov, PHYTEC Messtechnik GmbH + * Copyright (C) 2019 DENX Software Engineering GmbH + */ + +#include <common.h> +#include <environment.h> +#include <errno.h> +#include <spl.h> +#include <asm/arch/cpu.h> +#include <asm/arch/hardware.h> +#include <asm/arch/omap.h> +#include <asm/arch/ddr_defs.h> +#include <asm/arch/clock.h> +#include <asm/arch/gpio.h> +#include <asm/arch/mmc_host_def.h> +#include <asm/arch/sys_proto.h> +#include <asm/io.h> +#include <asm/emif.h> +#include <asm/gpio.h> +#include <i2c.h> +#include <miiphy.h> +#include <cpsw.h> +#include <power/tps65910.h> +#include <jffs2/load_kernel.h> +#include <mtd_node.h> +#include <fdt_support.h> +#include "board.h" + +DECLARE_GLOBAL_DATA_PTR; + +static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; + +#ifdef CONFIG_SPL_BUILD + +#ifdef CONFIG_SPL_OS_BOOT +int spl_start_uboot(void) +{ + return 1; +} +#endif +/* DDR RAM defines */ +#define DDR_CLK_MHZ 400 /* DDR_DPLL_MULT value */ + +#define OSC (V_OSCK / 1000000) +const struct dpll_params dpll_ddr = { + DDR_CLK_MHZ, OSC - 1, 1, -1, -1, -1, -1}; + +const struct dpll_params *get_dpll_ddr_params(void) +{ + return &dpll_ddr; +} + +const struct ctrl_ioregs ioregs = { + .cm0ioctl = 0x18B, + .cm1ioctl = 0x18B, + .cm2ioctl = 0x18B, + .dt0ioctl = 0x18B, + .dt1ioctl = 0x18B, +}; + +static const struct cmd_control ddr3_cmd_ctrl_data = { + .cmd0csratio = 0x80, + .cmd0iclkout = 0x0, + + .cmd1csratio = 0x80, + .cmd1iclkout = 0x0, + + .cmd2csratio = 0x80, + .cmd2iclkout = 0x0, +}; + +#if CONFIG_PCL060_DDR_SIZE == 256 +/* 256MiB MT41K128M16JT */ +static struct emif_regs ddr3_emif_reg_data = { + .sdram_config = 0x61C052B2, + .ref_ctrl = 0x00000C30, + .sdram_tim1 = 0x0AAAD4DB, + .sdram_tim2 = 0x26437FDA, + .sdram_tim3 = 0x501F83FF, + .zq_config = 0x50074BE4, + .emif_ddr_phy_ctlr_1 = 0x7, + .ocp_config = 0x003d3d3d, +}; + +static const struct ddr_data ddr3_data = { + .datardsratio0 = 0x36, + .datawdsratio0 = 0x38, + .datafwsratio0 = 0x99, + .datawrsratio0 = 0x73, +}; + +#elif CONFIG_PCL060_DDR_SIZE == 512 +/* 512MiB MT41K256M16TW107IT */ +static struct emif_regs ddr3_emif_reg_data = { + .sdram_config = 0x61C05332, + .ref_ctrl = 0x00000C30, + .sdram_tim1 = 0x0AAAD4DB, + .sdram_tim2 = 0x266B7FDA, + .sdram_tim3 = 0x501F867F, + .zq_config = 0x50074BE4, + .emif_ddr_phy_ctlr_1 = 0x7, + .ocp_config = 0x003d3d3d, +}; + +static const struct ddr_data ddr3_data = { + .datardsratio0 = 0x37, + .datawdsratio0 = 0x38, + .datafwsratio0 = 0x92, + .datawrsratio0 = 0x72, +}; + +#elif CONFIG_PCL060_DDR_SIZE == 1024 +/* 1 GiB MT41K512M16HA125IT */ + +static struct emif_regs ddr3_emif_reg_data = { + .sdram_config = 0x61C053B2, + .ref_ctrl = 0x00000C30, + .sdram_tim1 = 0x0AAAD4DB, + .sdram_tim2 = 0x268F7FDA, + .sdram_tim3 = 0x501F88BF, + .zq_config = 0x50074BE4, + .emif_ddr_phy_ctlr_1 = 0x7, + .ocp_config = 0x003d3d3d, +}; + +static const struct ddr_data ddr3_data = { + .datardsratio0 = 0x38, + .datawdsratio0 = 0x4d, + .datafwsratio0 = 0x9d, + .datawrsratio0 = 0x82, +}; + +#else +#error "Invalid CONFIG_SYS_DDR_SIZE configuration for Phycore pcl060" +#endif + +const struct dpll_params *get_dpll_mpu_params(void) +{ + int ind = get_sys_clk_index(); + int freq = am335x_get_efuse_mpu_max_freq(cdev); + + switch (freq) { + case MPUPLL_M_1000: + return &dpll_mpu_opp[ind][5]; + case MPUPLL_M_800: + return &dpll_mpu_opp[ind][4]; + case MPUPLL_M_720: + return &dpll_mpu_opp[ind][3]; + case MPUPLL_M_600: + return &dpll_mpu_opp[ind][2]; + case MPUPLL_M_500: + return &dpll_mpu_opp100; + case MPUPLL_M_300: + return &dpll_mpu_opp[ind][0]; + } + + return &dpll_mpu_opp[ind][0]; +} + +void scale_vcores_generic(int freq) +{ + int sil_rev, mpu_vdd; + + /* + * We use a TPS65910 PMIC. For all MPU frequencies we support we use a + * CORE voltage of 1.10V. For MPU voltage we need to switch based on + * the frequency we are running at. + */ +#ifndef CONFIG_DM_I2C + if (i2c_probe(TPS65910_CTRL_I2C_ADDR)) + return; +#else + if (power_tps65910_init(0)) + return; +#endif + /* + * Depending on MPU clock and PG we will need a different + * VDD to drive at that speed. + */ + sil_rev = readl(&cdev->deviceid) >> 28; + mpu_vdd = am335x_get_tps65910_mpu_vdd(sil_rev, freq); + + /* Tell the TPS65910 to use i2c */ + tps65910_set_i2c_control(); + + /* First update MPU voltage. */ + if (tps65910_voltage_update(MPU, mpu_vdd)) + return; + + /* Second, update the CORE voltage. */ + if (tps65910_voltage_update(CORE, TPS65910_OP_REG_SEL_1_1_0)) + return; +} + +void scale_vcores(void) +{ + int freq; + + freq = am335x_get_efuse_mpu_max_freq(cdev); + scale_vcores_generic(freq); +} + +void sdram_init(void) +{ + config_ddr(DDR_CLK_MHZ, &ioregs, &ddr3_data, + &ddr3_cmd_ctrl_data, &ddr3_emif_reg_data, 0); +} + +void set_uart_mux_conf(void) +{ + enable_uart0_pin_mux(); +} + +void set_mux_conf_regs(void) +{ + enable_i2c0_pin_mux(); + enable_board_pin_mux(); +} +#endif + +/* + * Basic board specific setup. Pinmux has been handled already. + */ +int board_init(void) +{ + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + return 0; +} + +#ifdef CONFIG_DRIVER_TI_CPSW +static void cpsw_control(int enabled) +{ + /* VTP can be added here */ +} + +static struct cpsw_slave_data cpsw_slaves[] = { + { + .slave_reg_ofs = 0x208, + .sliver_reg_ofs = 0xd80, + .phy_addr = 0, + .phy_if = PHY_INTERFACE_MODE_RGMII, + }, + { + .slave_reg_ofs = 0x308, + .sliver_reg_ofs = 0xdc0, + .phy_addr = 1, + .phy_if = PHY_INTERFACE_MODE_RGMII, + }, +}; + +static struct cpsw_platform_data cpsw_data = { + .mdio_base = CPSW_MDIO_BASE, + .cpsw_base = CPSW_BASE, + .mdio_div = 0xff, + .channels = 8, + .cpdma_reg_ofs = 0x800, + .slaves = 1, + .slave_data = cpsw_slaves, + .ale_reg_ofs = 0xd00, + .ale_entries = 1024, + .host_port_reg_ofs = 0x108, + .hw_stats_reg_ofs = 0x900, + .bd_ram_ofs = 0x2000, + .mac_control = (1 << 5), + .control = cpsw_control, + .host_port_num = 0, + .version = CPSW_CTRL_VERSION_2, +}; +#endif + +#if defined(CONFIG_DRIVER_TI_CPSW) || \ + (defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) +int board_eth_init(bd_t *bis) +{ + int rv, n = 0; +#ifdef CONFIG_DRIVER_TI_CPSW + u8 mac_addr[6]; + u32 mac_hi, mac_lo; + + if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { + printf("<ethaddr> not set. Reading from E-fuse\n"); + /* try reading mac address from efuse */ + mac_lo = readl(&cdev->macid0l); + mac_hi = readl(&cdev->macid0h); + mac_addr[0] = mac_hi & 0xFF; + mac_addr[1] = (mac_hi & 0xFF00) >> 8; + mac_addr[2] = (mac_hi & 0xFF0000) >> 16; + mac_addr[3] = (mac_hi & 0xFF000000) >> 24; + mac_addr[4] = mac_lo & 0xFF; + mac_addr[5] = (mac_lo & 0xFF00) >> 8; + + if (is_valid_ethaddr(mac_addr)) + eth_env_set_enetaddr("ethaddr", mac_addr); + else + goto try_usbether; + } + + writel(GMII1_SEL_RMII | GMII2_SEL_RGMII | RGMII_INT_DELAY | + RMII1_IO_CLK_EN, &cdev->miisel); + + rv = cpsw_register(&cpsw_data); + if (rv < 0) + printf("Error %d registering CPSW switch\n", rv); + else + n += rv; +try_usbether: +#endif + +#if defined(CONFIG_USB_ETHER) && !defined(CONFIG_SPL_BUILD) + rv = usb_eth_initialize(bis); + if (rv < 0) + printf("Error %d registering USB_ETHER\n", rv); + else + n += rv; +#endif + return n; +} +#endif + +#ifdef CONFIG_OF_BOARD_SETUP +int ft_board_setup(void *blob, bd_t *bd) +{ +#ifdef CONFIG_FDT_FIXUP_PARTITIONS + static const struct node_info nodes[] = { + { "ti,omap2-nand", MTD_DEV_TYPE_NAND, }, + }; + + fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); +#endif + return 0; +} +#endif diff --git a/board/phytec/phycore_pcl060/board.h b/board/phytec/phycore_pcl060/board.h new file mode 100644 index 0000000000..68c3d56aa5 --- /dev/null +++ b/board/phytec/phycore_pcl060/board.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * board.h + * + * Phytec phyCORE-AM335x (pcl060) boards information header + * + * Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH + * Copyright (C) 2019 DENX Software Engineering GmbH + */ + +#ifndef _BOARD_H_ +#define _BOARD_H_ + +/* + * We have three pin mux functions that must exist. We must be able to enable + * uart0, for initial output and i2c0 to access the PMIC. We then have a main + * pinmux function that can be overridden to enable all other pinmux that + * is required on the board. + */ +void enable_uart0_pin_mux(void); +void enable_i2c0_pin_mux(void); +void enable_board_pin_mux(void); +void enable_cbmux_pin_mux(void); +#endif diff --git a/board/phytec/phycore_pcl060/mux.c b/board/phytec/phycore_pcl060/mux.c new file mode 100644 index 0000000000..5fd452e66d --- /dev/null +++ b/board/phytec/phycore_pcl060/mux.c @@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * mux.c + * + * Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH + * Copyright (C) 2019 DENX Software Engineering GmbH + */ + +#include <common.h> +#include <asm/arch/sys_proto.h> +#include <asm/arch/hardware.h> +#include <asm/arch/mux.h> +#include <asm/io.h> +#include "board.h" + +static struct module_pin_mux uart0_pin_mux[] = { + {OFFSET(uart0_rxd), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* UART0_RXD */ + {OFFSET(uart0_txd), (MODE(0) | PULLUDEN)}, /* UART0_TXD */ + {-1}, +}; + +#ifdef CONFIG_MMC +static struct module_pin_mux mmc0_pin_mux[] = { + {OFFSET(mmc0_dat3), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT3 */ + {OFFSET(mmc0_dat2), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT2 */ + {OFFSET(mmc0_dat1), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT1 */ + {OFFSET(mmc0_dat0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT0 */ + {OFFSET(mmc0_clk), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_CLK */ + {OFFSET(mmc0_cmd), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_CMD */ + {OFFSET(spi0_cs1), (MODE(5) | RXACTIVE | PULLUP_EN)}, /* MMC0_CD */ + {-1}, +}; +#endif + +static struct module_pin_mux i2c0_pin_mux[] = { + {OFFSET(i2c0_sda), (MODE(0) | RXACTIVE | + PULLUDEN | SLEWCTRL)}, /* I2C_DATA */ + {OFFSET(i2c0_scl), (MODE(0) | RXACTIVE | + PULLUDEN | SLEWCTRL)}, /* I2C_SCLK */ + {-1}, +}; + +#ifdef CONFIG_SPI +static struct module_pin_mux spi0_pin_mux[] = { + {OFFSET(spi0_sclk), (MODE(0) | RXACTIVE | PULLUDEN)}, /* SPI0_SCLK */ + {OFFSET(spi0_d0), (MODE(0) | RXACTIVE | + PULLUDEN | PULLUP_EN)}, /* SPI0_D0 */ + {OFFSET(spi0_d1), (MODE(0) | RXACTIVE | PULLUDEN)}, /* SPI0_D1 */ + {OFFSET(spi0_cs0), (MODE(0) | RXACTIVE | + PULLUDEN | PULLUP_EN)}, /* SPI0_CS0 */ + {-1}, +}; +#endif + +static struct module_pin_mux rmii1_pin_mux[] = { + {OFFSET(mii1_crs), MODE(1) | RXACTIVE}, /* RMII1_CRS */ + {OFFSET(mii1_rxerr), MODE(1) | RXACTIVE}, /* RMII1_RXERR */ + {OFFSET(mii1_txen), MODE(1)}, /* RMII1_TXEN */ + {OFFSET(mii1_txd1), MODE(1)}, /* RMII1_TXD1 */ + {OFFSET(mii1_txd0), MODE(1)}, /* RMII1_TXD0 */ + {OFFSET(mii1_rxd1), MODE(1) | RXACTIVE}, /* RMII1_RXD1 */ + {OFFSET(mii1_rxd0), MODE(1) | RXACTIVE}, /* RMII1_RXD0 */ + {OFFSET(mdio_data), MODE(0) | RXACTIVE | PULLUP_EN}, /* MDIO_DATA */ + {OFFSET(mdio_clk), MODE(0) | PULLUP_EN}, /* MDIO_CLK */ + {OFFSET(rmii1_refclk), MODE(0) | RXACTIVE}, /* RMII1_REFCLK */ + {-1}, +}; + +static struct module_pin_mux cbmux_pin_mux[] = { + {OFFSET(uart0_ctsn), MODE(7) | RXACTIVE | PULLDOWN_EN}, /* JP3 */ + {OFFSET(uart0_rtsn), MODE(7) | RXACTIVE | PULLUP_EN}, /* JP4 */ + {-1}, +}; + +#ifdef CONFIG_NAND +static struct module_pin_mux nand_pin_mux[] = { + {OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD0 */ + {OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD1 */ + {OFFSET(gpmc_ad2), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD2 */ + {OFFSET(gpmc_ad3), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD3 */ + {OFFSET(gpmc_ad4), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD4 */ + {OFFSET(gpmc_ad5), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD5 */ + {OFFSET(gpmc_ad6), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD6 */ + {OFFSET(gpmc_ad7), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD7 */ + {OFFSET(gpmc_wait0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* NAND WAIT */ + {OFFSET(gpmc_wpn), (MODE(7) | PULLUP_EN | RXACTIVE)}, /* NAND_WPN */ + {OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN)}, /* NAND_CS0 */ + {OFFSET(gpmc_advn_ale), (MODE(0) | PULLUDEN)}, /* NAND_ADV_ALE */ + {OFFSET(gpmc_oen_ren), (MODE(0) | PULLUDEN)}, /* NAND_OE */ + {OFFSET(gpmc_wen), (MODE(0) | PULLUDEN)}, /* NAND_WEN */ + {OFFSET(gpmc_be0n_cle), (MODE(0) | PULLUDEN)}, /* NAND_BE_CLE */ + {-1}, +}; +#endif + +void enable_uart0_pin_mux(void) +{ + configure_module_pin_mux(uart0_pin_mux); +} + +void enable_i2c0_pin_mux(void) +{ + configure_module_pin_mux(i2c0_pin_mux); +} + +void enable_board_pin_mux(void) +{ + configure_module_pin_mux(rmii1_pin_mux); + configure_module_pin_mux(mmc0_pin_mux); + configure_module_pin_mux(cbmux_pin_mux); +#ifdef CONFIG_NAND + configure_module_pin_mux(nand_pin_mux); +#endif +#ifdef CONFIG_SPI + configure_module_pin_mux(spi0_pin_mux); +#endif +} diff --git a/configs/phycore-pcl060-wega_defconfig b/configs/phycore-pcl060-wega_defconfig new file mode 100644 index 0000000000..2266bdde0c --- /dev/null +++ b/configs/phycore-pcl060-wega_defconfig @@ -0,0 +1,80 @@ +CONFIG_ARM=y +CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_AM33XX=y +CONFIG_TARGET_PCL060=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL=y +CONFIG_SPL_FS_FAT=y +CONFIG_SPL_LIBDISK_SUPPORT=y +# CONFIG_FIT is not set +CONFIG_OF_BOARD_SETUP=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_DEFAULT_FDT_FILE="am335x-wega-rdk.dtb" +CONFIG_VERSION_VARIABLE=y +CONFIG_ARCH_MISC_INIT=y +CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_PAYLOAD="u-boot.img" +CONFIG_SPL_POWER_SUPPORT=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_SPL=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PART=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=nand.0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),512k(NAND.u-boot),512k(NAND.u-boot.backup1),256k(NAND.u-boot-env),-(NAND.UBI)" +CONFIG_CMD_UBI=y +CONFIG_DOS_PARTITION=y +CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-wega-rdk" +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_SPL_DM=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_DM_I2C=y +CONFIG_MISC=y +CONFIG_DM_MMC=y +CONFIG_MMC_OMAP_HS=y +CONFIG_MTD=y +CONFIG_NAND=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 +CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND=0x100000 +CONFIG_DM_SPI_FLASH=y +CONFIG_DM_ETH=y +CONFIG_MII=y +CONFIG_DRIVER_TI_CPSW=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_TI=y +CONFIG_USB_MUSB_DSPS=y +CONFIG_USB_GADGET=y +CONFIG_USB_ETHER=y +# CONFIG_OMAP_WATCHDOG is not set +CONFIG_FDT_FIXUP_PARTITIONS=y +# CONFIG_EFI_LOADER is not set diff --git a/include/configs/phycore_pcl060.h b/include/configs/phycore_pcl060.h new file mode 100644 index 0000000000..982c96b267 --- /dev/null +++ b/include/configs/phycore_pcl060.h @@ -0,0 +1,141 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * phycore_pcl060.h + * + * Phytec phyCORE-AM335x (pcl060) boards information header + * + * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ + * Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH + * Copyright (C) 2019 DENX Software Engineering GmbH + */ + +#ifndef __CONFIG_PCL060_H +#define __CONFIG_PCL060_H + +#include <configs/ti_am335x_common.h> + +#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ +#define CONFIG_MACH_TYPE MACH_TYPE_PCL060 +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 + +#ifdef CONFIG_NAND +#define NANDARGS \ + "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ + "nandargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:root ubi.mtd=NAND.UBI\0" \ + "nandrootfstype=ubifs rootwait rw fsck.repair=yes\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "ubi part NAND.UBI; " \ + "ubi readvol ${fdtaddr} oftree; " \ + "ubi readvol ${loadaddr} kernel; " \ + "bootz ${loadaddr} - ${fdtaddr}\0" + +#else +#define NANDARGS "" +#endif + +/* set to negative value for no autoboot */ +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "setenv mmcdev " #instance "; "\ + "setenv bootpart " #instance ":1 ; "\ + "setenv rootpart " #instance ":2 ; "\ + "run mmcboot\0" + +#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ + #devtypel #instance " " + +#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "run nandboot\0" + +#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ + #devtypel #instance " " + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(LEGACY_MMC, legacy_mmc, 0) \ + func(MMC, mmc, 1) \ + func(LEGACY_MMC, legacy_mmc, 1) \ + func(NAND, nand, 0) + +#include <config_distro_bootcmd.h> +#include <environment/ti/dfu.h> +#include <environment/ti/mmc.h> + +#define CONFIG_EXTRA_ENV_SETTINGS \ + DEFAULT_MMC_TI_ARGS \ + DEFAULT_LINUX_BOOT_ENV \ + "bootfile=zImage\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "console=ttyO0,115200n8\0" \ + "optargs=\0" \ + "mmcrootfstype=ext2 rootwait\0" \ + "finduuid=part uuid mmc ${rootpart} uuid\0" \ + "boot_fit=0\0" \ + NANDARGS \ + BOOTENV + +/* Clock Defines */ +#define V_OSCK 25000000 /* Clock output from T2 */ +#define V_SCLK (V_OSCK) + +#define CONFIG_POWER_TPS65910 + +#ifdef CONFIG_NAND +/* NAND: device related configs */ +#define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ + CONFIG_SYS_NAND_PAGE_SIZE) +#define CONFIG_SYS_NAND_PAGE_SIZE 2048 +#define CONFIG_SYS_NAND_OOBSIZE 64 +#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) +/* NAND: driver related configs */ +#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS +#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ + 10, 11, 12, 13, 14, 15, 16, 17, \ + 18, 19, 20, 21, 22, 23, 24, 25, \ + 26, 27, 28, 29, 30, 31, 32, 33, \ + 34, 35, 36, 37, 38, 39, 40, 41, \ + 42, 43, 44, 45, 46, 47, 48, 49, \ + 50, 51, 52, 53, 54, 55, 56, 57, } + +#define CONFIG_SYS_NAND_ECCSIZE 512 +#define CONFIG_SYS_NAND_ECCBYTES 14 +#define CONFIG_SYS_NAND_ONFI_DETECTION +#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW + +/* NAND: SPL related configs */ +#ifdef CONFIG_SPL_OS_BOOT +#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ +#endif +#endif /* !CONFIG_NAND */ + +#define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \ +4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } + +/* CPU */ + +#ifdef CONFIG_SPI_BOOT +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 +#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 +#elif defined(CONFIG_ENV_IS_IN_NAND) +#define CONFIG_ENV_OFFSET 0x000a0000 +#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE +#endif + +/* + * USB configuration + */ +#define CONFIG_AM335X_USB0 +#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL +#define CONFIG_AM335X_USB1 +#define CONFIG_AM335X_USB1_MODE MUSB_HOST + +#endif /* ! __CONFIG_PCL060_H */
Support for Phytech phyCORE AM335x R2 SOM (PCL060) on the Phytec phyBOARD-Wega AM335x. CPU : AM335X-GP rev 2.1 Model: Phytec AM335x phyBOARD-WEGA DRAM: 256 MiB NAND: 256 MiB MMC: OMAP SD/MMC: 0 eth0: ethernet@4a100000 Working: - Eth0 - i2C - MMC/SD - NAND - UART - USB (host) Signed-off-by: Niel Fourie <lusus@denx.de> --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/am335x-phycore-som.dtsi | 327 ++++++++++++++++++++++ arch/arm/dts/am335x-wega-rdk-u-boot.dtsi | 35 +++ arch/arm/dts/am335x-wega-rdk.dts | 23 ++ arch/arm/dts/am335x-wega.dtsi | 231 +++++++++++++++ arch/arm/include/asm/mach-types.h | 1 + arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/am33xx/Kconfig | 7 + board/phytec/phycore_pcl060/Kconfig | 19 ++ board/phytec/phycore_pcl060/MAINTAINERS | 7 + board/phytec/phycore_pcl060/Makefile | 11 + board/phytec/phycore_pcl060/board.c | 340 +++++++++++++++++++++++ board/phytec/phycore_pcl060/board.h | 24 ++ board/phytec/phycore_pcl060/mux.c | 117 ++++++++ configs/phycore-pcl060-wega_defconfig | 80 ++++++ include/configs/phycore_pcl060.h | 141 ++++++++++ 16 files changed, 1366 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/am335x-phycore-som.dtsi create mode 100644 arch/arm/dts/am335x-wega-rdk-u-boot.dtsi create mode 100644 arch/arm/dts/am335x-wega-rdk.dts create mode 100644 arch/arm/dts/am335x-wega.dtsi create mode 100644 board/phytec/phycore_pcl060/Kconfig create mode 100644 board/phytec/phycore_pcl060/MAINTAINERS create mode 100644 board/phytec/phycore_pcl060/Makefile create mode 100644 board/phytec/phycore_pcl060/board.c create mode 100644 board/phytec/phycore_pcl060/board.h create mode 100644 board/phytec/phycore_pcl060/mux.c create mode 100644 configs/phycore-pcl060-wega_defconfig create mode 100644 include/configs/phycore_pcl060.h