diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:11:19 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:11:19 +0200 |
commit | 6e68393fb17254850b9bfc8e268569a05111c29c (patch) | |
tree | e5a5b22a64f3772458f44c7110f5ec9653d56bcd /arch | |
parent | 45000aac11315d7ccbaeefa29cafc8303ac206cb (diff) | |
parent | 6ccb3eb306022f7334a086f46d03a189e0abd937 (diff) | |
download | barebox-6e68393fb17254850b9bfc8e268569a05111c29c.tar.gz barebox-6e68393fb17254850b9bfc8e268569a05111c29c.tar.xz |
Merge branch 'for-next/mxs'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/imx28_defconfig | 16 | ||||
-rw-r--r-- | arch/arm/mach-mxs/Kconfig | 8 | ||||
-rw-r--r-- | arch/arm/mach-mxs/power-init.c | 2 |
3 files changed, 23 insertions, 3 deletions
diff --git a/arch/arm/configs/imx28_defconfig b/arch/arm/configs/imx28_defconfig index 1acc8dd94f..4442c79cc4 100644 --- a/arch/arm/configs/imx28_defconfig +++ b/arch/arm/configs/imx28_defconfig @@ -20,7 +20,9 @@ CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y CONFIG_BLSPEC=y +CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CONSOLE_ALLOW_COLOR=y +CONFIG_PBL_CONSOLE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_RESET_SOURCE=y CONFIG_CMD_DMESG=y @@ -28,11 +30,13 @@ CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_IMD=y CONFIG_CMD_MEMINFO=y +CONFIG_CMD_REGULATOR=y # CONFIG_CMD_BOOTU is not set CONFIG_CMD_GO=y CONFIG_CMD_RESET=y CONFIG_CMD_UIMAGE=y CONFIG_CMD_PARTITION=y +CONFIG_CMD_UBIFORMAT=y CONFIG_CMD_EXPORT=y CONFIG_CMD_LOADENV=y CONFIG_CMD_PRINTENV=y @@ -72,16 +76,20 @@ CONFIG_CMD_NANDTEST=y CONFIG_CMD_SPI=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_USBGADGET=y +CONFIG_CMD_WD=y CONFIG_CMD_BAREBOX_UPDATE=y CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y CONFIG_NET=y -CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_AUART=y CONFIG_DRIVER_NET_FEC_IMX=y +CONFIG_NET_USB=y +CONFIG_NET_USB_ASIX=y +CONFIG_USB_NET_AX88179_178A=y +CONFIG_NET_USB_SMSC95XX=y CONFIG_DRIVER_SPI_MXS=y CONFIG_I2C=y CONFIG_MTD=y @@ -89,6 +97,10 @@ CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y +CONFIG_USB_HOST=y +CONFIG_USB_IMX_CHIPIDEA=y +CONFIG_USB_EHCI=y +CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DFU=y CONFIG_USB_GADGET_SERIAL=y @@ -97,7 +109,6 @@ CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_STM=y CONFIG_MCI=y -CONFIG_MCI_STARTUP=y CONFIG_MCI_MXS=y CONFIG_LED=y CONFIG_LED_GPIO=y @@ -108,6 +119,7 @@ CONFIG_WATCHDOG_MXS28=y CONFIG_MXS_APBH_DMA=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED=y +CONFIG_GENERIC_PHY=y CONFIG_FS_EXT4=y CONFIG_FS_TFTP=y CONFIG_FS_NFS=y diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index b3a7c6259c..f4a9d3d422 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -9,6 +9,12 @@ config ARCH_TEXT_BASE default 0x47000000 if MACH_MX28EVK default 0x47000000 if MACH_CFA10036 +config ARCH_MXS_OF_SUPPORT + bool + select COMMON_CLK_OF_PROVIDER + select OFTREE + select OFDEVICE + comment "Freescale i.MX System-on-Chip" choice @@ -57,12 +63,14 @@ config MACH_TX28 config MACH_MX28EVK bool "mx28-evk" select MXS_OCOTP + select ARCH_MXS_OF_SUPPORT help Say Y here if you are using the Freescale i.MX28-EVK board config MACH_DUCKBILL bool "Duckbill" select MXS_OCOTP + select ARCH_MXS_OF_SUPPORT help Say Y here if you are using the I2SE Duckbill board diff --git a/arch/arm/mach-mxs/power-init.c b/arch/arm/mach-mxs/power-init.c index ca7c349d7f..c89f1f5f5d 100644 --- a/arch/arm/mach-mxs/power-init.c +++ b/arch/arm/mach-mxs/power-init.c @@ -1172,7 +1172,7 @@ static void mx23_ungate_power(void) writel(MX23_POWER_CTRL_CLKGATE, &power_regs->hw_power_ctrl_clr); } -struct mxs_power_ctrl mxs_vddd_default = { .target = 1500, .brownout = 1325 }; +struct mxs_power_ctrl mxs_vddd_default = { .target = 1550, .brownout = 1400 }; struct mxs_power_ctrl mxs_vdda_default = { .target = 1800, .brownout = 1650 }; struct mxs_power_ctrl mxs_vddio_default = { .target = 3300, .brownout = 3150 }; struct mxs_power_ctrl mx23_vddmem_default = { .target = 2500, .brownout = 1700 }; |