Add support for Wandboard-Dual
v2 cover Add support for Wandboard-Dual
This patchset adds support for Wandboard-dual.
Changes since v1:
Kernel patch no longer contains wandboard_defconfig as it is not used. Upstream-status field added to all generated patches Shortlogs changed to reflect convention suggested by Otavio
John Weber (3):
linux (3.0.35): Add support for Wandboard-Dual u-boot (2009.08): Add support for Wandboard-Dual
wandboard-dual: Add machine definition
conf/machine/wandboard-dual.conf | 20 + ...u-boot-2009.08-Add-Wandboard-Dual-support.patch | 1768 +++++++++++++ recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend | 8 + ...1-Linux-3.0.35-Add-wandboard-dual-support.patch | 1216 +++++++++ .../linux-imx-3.0.35/wandboard-dual/defconfig | 2762 ++++++++++++++++++++ recipes-kernel/linux/linux-imx_3.0.35.bbappend | 8 + 6 files changed, 5782 insertions(+) create mode 100644 conf/machine/wandboard-dual.conf create mode 100644 recipes-bsp/u-boot/u-boot-imx/wandboard-dual/0001-u-boot-2009.08-Add-Wandboard-Dual-support.patch create mode 100644 recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0001-Linux-3.0.35-Add-wandboard-dual-support.patch create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/defconfig create mode 100644 recipes-kernel/linux/linux-imx_3.0.35.bbappend
Signature · 1 line
1.7.9.5
PATCH v2 1/3 Linux (3.0.35): Add support for Wandboard-Dual
linux (3.0.35): Add support for Wandboard-Dual
--- ...1-Linux-3.0.35-Add-wandboard-dual-support.patch | 1216 +++++++++ .../linux-imx-3.0.35/wandboard-dual/defconfig | 2762 ++++++++++++++++++++ recipes-kernel/linux/linux-imx_3.0.35.bbappend | 8 + 3 files changed, 3986 insertions(+) create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0001-Linux-3.0.35-Add-wandboard-dual-support.patch create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/defconfig create mode 100644 recipes-kernel/linux/linux-imx_3.0.35.bbappend
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0001-Linux-3.0.35-Add-wandboard-dual-support.patch new file +1216 -0
@@ -0,0 +1,1216 @@ +From 73031b2da070693a3a75a3ec3e0f45c0e610bee4 Mon Sep 17 00:00:00 2001 +From: John Weber <[email protected]> +Date: Tue, 26 Feb 2013 15:00:48 -0600 +Subject: [PATCH] Linux (3.0.35): Add wandboard-dual support + +Upstream-Status: Pending +Signed-off-by: John Weber <[email protected]> +--- + arch/arm/mach-mx6/Kconfig | 41 ++ + arch/arm/mach-mx6/Makefile | 2 + + arch/arm/mach-mx6/baseboard-wand.c | 137 +++++ + arch/arm/mach-mx6/board-wand.c | 972 ++++++++++++++++++++++++++++++++++++ + arch/arm/tools/mach-types | 1 + + 5 files changed, 1153 insertions(+) + create mode 100644 arch/arm/mach-mx6/baseboard-wand.c + create mode 100644 arch/arm/mach-mx6/board-wand.c + +diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig +index 2ffd90d..e49c56f 100644 +--- a/arch/arm/mach-mx6/Kconfig ++++ b/arch/arm/mach-mx6/Kconfig +@@ -251,6 +251,47 @@ config MACH_MX6Q_SABREAUTO + Include support for i.MX 6Quad SABRE Auto platform. This includes specific + configurations for the board and its peripherals. + ++config MACH_WANDBOARD ++ bool "Support for the WandBoard" ++ select ARCH_MX6Q ++ select SOC_IMX6Q ++ select IMX_HAVE_PLATFORM_DMA if IMX_SDMA ++ select IMX_HAVE_PLATFORM_IMX_UART if SERIAL_IMX ++ select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX if MMC_SDHCI_ESDHC_IMX ++ select IMX_HAVE_PLATFORM_IMX_I2C if I2C_IMX ++ select IMX_HAVE_PLATFORM_IMX_ASRC if SND_IMX_SOC ++ select ARCH_MXC_AUDMUX_V2 if SND_IMX_SOC ++ select IMX_HAVE_PLATFORM_IMX_SSI if MXC_SSI ++ select IMX_HAVE_PLATFORM_IMX_ESAI if MXC_SSI ++ select IMX_HAVE_PLATFORM_IMX_SPDIF if SND_SOC_IMX_SPDIF ++ select IMX_HAVE_PLATFORM_FEC if NETDEVICES ++ select IMX_HAVE_PLATFORM_FSL_USB2_UDC if USB ++ select IMX_HAVE_PLATFORM_MXC_EHCI if USB ++ select IMX_HAVE_PLATFORM_FSL_USB_WAKEUP if USB ++ select IMX_HAVE_PLATFORM_FSL_OTG if USB_OTG ++ select IMX_HAVE_PLATFORM_MXC_HDMI if FB_MXC_HDMI ++ select IMX_HAVE_PLATFORM_IMX_IPUV3 if MXC_IPU_V3 ++ select IMX_HAVE_PLATFORM_IMX_ANATOP_THERMAL if ANATOP_THERMAL ++ select IMX_HAVE_PLATFORM_IMX_PM if PM ++ select IMX_HAVE_PLATFORM_IMX_DVFS if CPU_FREQ_IMX ++ select IMX_HAVE_PLATFORM_SPI_IMX if SPI ++ select IMX_HAVE_PLATFORM_VIV_GPU if MXC_GPU_VIV ++ select IMX_HAVE_PLATFORM_IMX_VPU if MXC_VPU ++ select IMX_HAVE_PLATFORM_IMX_MIPI_DSI if VIDEO_MXC_IPU_OUTPUT ++ help ++ Include support for the WandBoard SoM. ++ ++ ++config WANDBOARD_BASE ++ tristate "Support for Wand baseboard" ++ depends on MACH_WANDBOARD ++ default y ++ help ++ Include support for the devices on the default wand baseboard. ++ ++ If you have a standard Wandboard, say Y. ++ ++ + comment "MX6 Options:" + + config IMX_PCIE +diff --git a/arch/arm/mach-mx6/Makefile b/arch/arm/mach-mx6/Makefile +index 5cac9bc..3f43098 100644 +--- a/arch/arm/mach-mx6/Makefile ++++ b/arch/arm/mach-mx6/Makefile +@@ -14,6 +14,8 @@ obj-$(CONFIG_MACH_MX6SL_EVK) += board-mx6sl_evk.o mx6sl_evk_pmic_pfuze100.o + obj-$(CONFIG_MACH_MX6Q_SABRELITE) += board-mx6q_sabrelite.o + obj-$(CONFIG_MACH_MX6Q_SABRESD) += board-mx6q_sabresd.o mx6q_sabresd_pmic_pfuze100.o + obj-$(CONFIG_MACH_MX6Q_SABREAUTO) += board-mx6q_sabreauto.o mx6q_sabreauto_pmic_pfuze100.o ++obj-$(CONFIG_MACH_WANDBOARD) += board-wand.o ++obj-$(CONFIG_WANDBOARD_BASE) += baseboard-wand.o + obj-$(CONFIG_SMP) += plat_hotplug.o platsmp.o headsmp.o + obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o + obj-$(CONFIG_IMX_PCIE) += pcie.o +diff --git a/arch/arm/mach-mx6/baseboard-wand.c b/arch/arm/mach-mx6/baseboard-wand.c +new file mode 100644 +index 0000000..e9e9378 +--- /dev/null ++++ b/arch/arm/mach-mx6/baseboard-wand.c +@@ -0,0 +1,137 @@ ++ ++#include <asm/mach/arch.h> ++ ++#include <linux/clk.h> ++#include <linux/i2c.h> ++#include <linux/platform_device.h> ++#include <linux/regulator/fixed.h> ++#include <linux/regulator/machine.h> ++ ++#include <mach/common.h> ++#include <mach/devices-common.h> ++ ++ ++/**************************************************************************** ++ * ++ * SGTL5000 Audio Codec ++ * ++ ****************************************************************************/ ++ ++static struct regulator_consumer_supply wandbase_sgtl5000_consumer_vdda = { ++ .supply = "VDDA", ++ .dev_name = "0-000a", /* Modified load time */ ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct regulator_consumer_supply wandbase_sgtl5000_consumer_vddio = { ++ .supply = "VDDIO", ++ .dev_name = "0-000a", /* Modified load time */ ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct regulator_init_data wandbase_sgtl5000_vdda_reg_initdata = { ++ .num_consumer_supplies = 1, ++ .consumer_supplies = &wandbase_sgtl5000_consumer_vdda, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct regulator_init_data wandbase_sgtl5000_vddio_reg_initdata = { ++ .num_consumer_supplies = 1, ++ .consumer_supplies = &wandbase_sgtl5000_consumer_vddio, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct fixed_voltage_config wandbase_sgtl5000_vdda_reg_config = { ++ .supply_name = "VDDA", ++ .microvolts = 2500000, ++ .gpio = -1, ++ .init_data = &wandbase_sgtl5000_vdda_reg_initdata, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct fixed_voltage_config wandbase_sgtl5000_vddio_reg_config = { ++ .supply_name = "VDDIO", ++ .microvolts = 3300000, ++ .gpio = -1, ++ .init_data = &wandbase_sgtl5000_vddio_reg_initdata, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct platform_device wandbase_sgtl5000_vdda_reg_devices = { ++ .name = "reg-fixed-voltage", ++ .id = 0, ++ .dev = { ++ .platform_data = &wandbase_sgtl5000_vdda_reg_config, ++ }, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct platform_device wandbase_sgtl5000_vddio_reg_devices = { ++ .name = "reg-fixed-voltage", ++ .id = 1, ++ .dev = { ++ .platform_data = &wandbase_sgtl5000_vddio_reg_config, ++ }, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct platform_device wandbase_audio_device = { ++ .name = "imx-sgtl5000", ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static const struct i2c_board_info wandbase_sgtl5000_i2c_data __initdata = { ++ I2C_BOARD_INFO("sgtl5000", 0x0a) ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static char wandbase_sgtl5000_dev_name[8] = "0-000a"; ++ ++extern struct mxc_audio_platform_data wand_audio_channel_data; ++ ++static __init int wandbase_init_sgtl5000(void) { ++ int i2c_bus = 1; /* TODO: get this from the module. */ ++ ++ wandbase_sgtl5000_dev_name[0] = '0' + i2c_bus; ++ wandbase_sgtl5000_consumer_vdda.dev_name = wandbase_sgtl5000_dev_name; ++ wandbase_sgtl5000_consumer_vddio.dev_name = wandbase_sgtl5000_dev_name; ++ ++ wandbase_audio_device.dev.platform_data = &wand_audio_channel_data; ++ platform_device_register(&wandbase_audio_device); ++ ++ i2c_register_board_info(i2c_bus, &wandbase_sgtl5000_i2c_data, 1); ++ platform_device_register(&wandbase_sgtl5000_vdda_reg_devices); ++ platform_device_register(&wandbase_sgtl5000_vddio_reg_devices); ++ return 0; ++} ++ ++ ++/**************************************************************************** ++ * ++ * main-function for wand baseboard ++ * ++ ****************************************************************************/ ++ ++static __init int wandbase_init(void) { ++ return wandbase_init_sgtl5000(); ++} ++subsys_initcall(wandbase_init); ++ ++static __exit void wandbase_exit(void) { ++ /* Actually, this cannot be unloaded. Or loaded as a module..? */ ++} ++module_exit(wandbase_exit); ++ ++MODULE_DESCRIPTION("Wand baseboard driver"); ++MODULE_AUTHOR("Tapani <[email protected]>"); ++MODULE_LICENSE("GPL"); +diff --git a/arch/arm/mach-mx6/board-wand.c b/arch/arm/mach-mx6/board-wand.c +new file mode 100644 +index 0000000..7f972eb +--- /dev/null ++++ b/arch/arm/mach-mx6/board-wand.c +@@ -0,0 +1,972 @@ ++ ++#include <asm/mach-types.h> ++#include <asm/mach/arch.h> ++#include <asm/mach/time.h> ++ ++#include <linux/clk.h> ++#include <linux/delay.h> ++#include <linux/err.h> ++#include <linux/fec.h> ++#include <linux/i2c.h> ++#include <linux/kernel.h> ++#include <linux/memblock.h> ++#include <linux/phy.h> ++ ++#include <mach/common.h> ++//#include <mach/devices-common.h> ++#include <mach/gpio.h> ++#include <mach/iomux-mx6dl.h> ++#include <mach/iomux-v3.h> ++#include <mach/mx6.h> ++ ++#include "crm_regs.h" ++#include "devices-imx6q.h" ++#include "usb.h" ++//#include "cpu_op-mx6.h" ++ ++#define WAND_BT_ON IMX_GPIO_NR(3, 13) ++#define WAND_BT_WAKE IMX_GPIO_NR(3, 14) ++#define WAND_BT_HOST_WAKE IMX_GPIO_NR(3, 15) ++ ++#define WAND_RGMII_INT IMX_GPIO_NR(1, 28) ++#define WAND_RGMII_RST IMX_GPIO_NR(3, 29) ++ ++#define WAND_SD1_CD IMX_GPIO_NR(1, 2) ++#define WAND_SD3_CD IMX_GPIO_NR(3, 9) ++#define WAND_SD3_WP IMX_GPIO_NR(1, 10) ++ ++#define WAND_USB_OTG_OC IMX_GPIO_NR(1, 9) ++#define WAND_USB_OTG_PWR IMX_GPIO_NR(3, 22) ++#define WAND_USB_H1_OC IMX_GPIO_NR(3, 30) ++ ++#define WAND_WL_REF_ON IMX_GPIO_NR(2, 29) ++#define WAND_WL_RST_N IMX_GPIO_NR(5, 2) ++#define WAND_WL_REG_ON IMX_GPIO_NR(1, 26) ++#define WAND_WL_HOST_WAKE IMX_GPIO_NR(1, 29) ++#define WAND_WL_WAKE IMX_GPIO_NR(1, 30) ++ ++/* Syntactic sugar for pad configuration */ ++#define WAND_SETUP_PADS(p) \ ++ mxc_iomux_v3_setup_multiple_pads((p), ARRAY_SIZE(p)) ++ ++/* See arch/arm/plat-mxc/include/mach/iomux-mx6dl.h for definitions */ ++ ++/**************************************************************************** ++ * ++ * DMA controller init ++ * ++ ****************************************************************************/ ++ ++static __init void wand_init_dma(void) { ++ imx6q_add_dma(); ++} ++ ++ ++/**************************************************************************** ++ * ++ * SD init ++ * ++ * SD1 is routed to EDM connector (external SD on wand baseboard) ++ * SD2 is WiFi ++ * SD3 is boot SD on the module ++ * ++ ****************************************************************************/ ++ ++/* For some reason, iomux_mx6dl.h does not define multiple speeds for ++ SD1 and SD2, so these don't have any speed switching. */ ++static iomux_v3_cfg_t mx6dl_sd1_pads[] = { ++ MX6DL_PAD_SD1_CLK__USDHC1_CLK_50MHZ_40OHM, ++ MX6DL_PAD_SD1_CMD__USDHC1_CMD_50MHZ_40OHM, ++ MX6DL_PAD_SD1_DAT0__USDHC1_DAT0_50MHZ_40OHM, ++ MX6DL_PAD_SD1_DAT1__USDHC1_DAT1_50MHZ_40OHM, ++ MX6DL_PAD_SD1_DAT2__USDHC1_DAT2_50MHZ_40OHM, ++ MX6DL_PAD_SD1_DAT3__USDHC1_DAT3_50MHZ_40OHM, ++}; ++ ++static iomux_v3_cfg_t mx6dl_sd2_pads[] = { ++ MX6DL_PAD_SD2_CLK__USDHC2_CLK, ++ MX6DL_PAD_SD2_CMD__USDHC2_CMD, ++ MX6DL_PAD_SD2_DAT0__USDHC2_DAT0, ++ MX6DL_PAD_SD2_DAT1__USDHC2_DAT1, ++ MX6DL_PAD_SD2_DAT2__USDHC2_DAT2, ++ MX6DL_PAD_SD2_DAT3__USDHC2_DAT3, ++}; ++ ++ ++#define MX6DL_USDHC_PAD_SETTING(id, speed) \ ++mx6dl_sd##id##_##speed##mhz[] = { \ ++ MX6DL_PAD_SD##id##_CLK__USDHC##id##_CLK_##speed##MHZ, \ ++ MX6DL_PAD_SD##id##_CMD__USDHC##id##_CMD_##speed##MHZ, \ ++ MX6DL_PAD_SD##id##_DAT0__USDHC##id##_DAT0_##speed##MHZ, \ ++ MX6DL_PAD_SD##id##_DAT1__USDHC##id##_DAT1_##speed##MHZ, \ ++ MX6DL_PAD_SD##id##_DAT2__USDHC##id##_DAT2_##speed##MHZ, \ ++ MX6DL_PAD_SD##id##_DAT3__USDHC##id##_DAT3_##speed##MHZ, \ ++} ++ ++/* 50,100, and 200 MHz are supported for SD3 in iomux_mx6dl.h */ ++static iomux_v3_cfg_t MX6DL_USDHC_PAD_SETTING(3, 50); ++static iomux_v3_cfg_t MX6DL_USDHC_PAD_SETTING(3, 100); ++static iomux_v3_cfg_t MX6DL_USDHC_PAD_SETTING(3, 200); ++ ++enum sd_pad_mode { ++ SD_PAD_MODE_LOW_SPEED, ++ SD_PAD_MODE_MED_SPEED, ++ SD_PAD_MODE_HIGH_SPEED, ++}; ++ ++static int plt_sd_pad_change(unsigned int index, int clock) ++{ ++ /* LOW speed is the default state of SD pads */ ++ static enum sd_pad_mode pad_mode = SD_PAD_MODE_LOW_SPEED; ++ ++ iomux_v3_cfg_t *sd_pads_200mhz = NULL; ++ iomux_v3_cfg_t *sd_pads_100mhz = NULL; ++ iomux_v3_cfg_t *sd_pads_50mhz = NULL; ++ ++ u32 sd_pads_200mhz_cnt; ++ u32 sd_pads_100mhz_cnt; ++ u32 sd_pads_50mhz_cnt; ++ ++ switch (index) { ++ case 0: ++ sd_pads_50mhz = mx6dl_sd1_pads; ++ sd_pads_50mhz_cnt = ARRAY_SIZE(mx6dl_sd1_pads); ++ return mxc_iomux_v3_setup_multiple_pads(sd_pads_50mhz, sd_pads_50mhz_cnt); ++ break; ++ case 1: ++ sd_pads_50mhz = mx6dl_sd2_pads; ++ sd_pads_50mhz_cnt = ARRAY_SIZE(mx6dl_sd2_pads); ++ return mxc_iomux_v3_setup_multiple_pads(sd_pads_50mhz, sd_pads_50mhz_cnt); ++ break; ++ case 2: ++ sd_pads_200mhz = mx6dl_sd3_200mhz; ++ sd_pads_100mhz = mx6dl_sd3_100mhz; ++ sd_pads_50mhz = mx6dl_sd3_50mhz; ++ ++ sd_pads_200mhz_cnt = ARRAY_SIZE(mx6dl_sd3_200mhz); ++ sd_pads_100mhz_cnt = ARRAY_SIZE(mx6dl_sd3_100mhz); ++ sd_pads_50mhz_cnt = ARRAY_SIZE(mx6dl_sd3_50mhz); ++ break; ++ default: ++ printk(KERN_ERR "no such SD host controller index %d\n", index); ++ return -EINVAL; ++ } ++ ++ if (clock > 100000000) { ++ if (pad_mode == SD_PAD_MODE_HIGH_SPEED) ++ return 0; ++ BUG_ON(!sd_pads_200mhz); ++ pad_mode = SD_PAD_MODE_HIGH_SPEED; ++ return mxc_iomux_v3_setup_multiple_pads(sd_pads_200mhz, ++ sd_pads_200mhz_cnt); ++ } else if (clock > 52000000) { ++ if (pad_mode == SD_PAD_MODE_MED_SPEED) ++ return 0; ++ BUG_ON(!sd_pads_100mhz); ++ pad_mode = SD_PAD_MODE_MED_SPEED; ++ return mxc_iomux_v3_setup_multiple_pads(sd_pads_100mhz, ++ sd_pads_100mhz_cnt); ++ } else { ++ if (pad_mode == SD_PAD_MODE_LOW_SPEED) ++ return 0; ++ BUG_ON(!sd_pads_50mhz); ++ pad_mode = SD_PAD_MODE_LOW_SPEED; ++ return mxc_iomux_v3_setup_multiple_pads(sd_pads_50mhz, ++ sd_pads_50mhz_cnt); ++ } ++} ++ ++ ++/* ------------------------------------------------------------------------ */ ++ ++static const struct esdhc_platform_data wand_sd_data[3] = { ++ { ++ .cd_gpio = WAND_SD1_CD, ++ .wp_gpio =-EINVAL, ++ .keep_power_at_suspend = 1, ++ .support_8bit = 0, ++ .platform_pad_change = plt_sd_pad_change, ++ }, { ++ .cd_gpio =-EINVAL, ++ .wp_gpio =-EINVAL, ++ .keep_power_at_suspend = 1, ++ .platform_pad_change = plt_sd_pad_change, ++ }, { ++ .cd_gpio = WAND_SD3_CD, ++ .wp_gpio = WAND_SD3_WP, ++ .keep_power_at_suspend = 1, ++ .support_8bit = 0, ++ .delay_line = 0, ++ .platform_pad_change = plt_sd_pad_change, ++ } ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static void wand_init_sd(void) { ++ //int i; ++ /* Card Detect for SD1 & SD3, respectively */ ++ mxc_iomux_v3_setup_pad(MX6DL_PAD_GPIO_2__GPIO_1_2); ++ mxc_iomux_v3_setup_pad(MX6DL_PAD_EIM_DA9__GPIO_3_9); ++ ++ /* Add mmc devices in reverse order, so mmc0 always is boot sd (SD3) */ ++/* for (i=2; i>=0; i--) { ++ WAND_SETUP_PADS(wand_sd_pads[i][0]); ++ imx6q_add_sdhci_usdhc_imx(i, &wand_sd_data[i]); ++ } */ ++ ++ /* SD3 is first, speed is set to lowest to start */ ++ WAND_SETUP_PADS(mx6dl_sd3_50mhz); ++ imx6q_add_sdhci_usdhc_imx(2, &wand_sd_data[2]); ++ ++ WAND_SETUP_PADS(mx6dl_sd2_pads); ++ imx6q_add_sdhci_usdhc_imx(1, &wand_sd_data[1]); ++ ++ WAND_SETUP_PADS(mx6dl_sd1_pads); ++ imx6q_add_sdhci_usdhc_imx(0, &wand_sd_data[0]); ++} ++ ++ ++/**************************************************************************** ++ * ++ * I2C ++ * ++ ****************************************************************************/ ++ ++static iomux_v3_cfg_t wand_i2c_pads[3][2] __initdata = { ++ { ++ MX6DL_PAD_EIM_D21__I2C1_SCL, ++ MX6DL_PAD_EIM_D28__I2C1_SDA, ++ }, { ++ MX6DL_PAD_KEY_COL3__I2C2_SCL, ++ MX6DL_PAD_KEY_ROW3__I2C2_SDA, ++ }, { ++ MX6DL_PAD_GPIO_5__I2C3_SCL, ++ MX6DL_PAD_GPIO_16__I2C3_SDA ++ } ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct imxi2c_platform_data wand_i2c_data[] = { ++ { .bitrate = 100000, }, ++ { .bitrate = 400000, }, ++ { .bitrate = 400000, }, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static void __init wand_init_i2c(void) { ++ int i; ++ for (i=0; i<3; i++) { ++ WAND_SETUP_PADS(wand_i2c_pads[i]); ++ imx6q_add_imx_i2c(i, &wand_i2c_data[i]); ++ } ++} ++ ++ ++/**************************************************************************** ++ * ++ * Initialize debug console (UART1) ++ * ++ ****************************************************************************/ ++ ++static __initdata iomux_v3_cfg_t wand_uart_pads[] = { ++ /* UART1 (debug console) */ ++ MX6DL_PAD_CSI0_DAT10__UART1_TXD, ++ MX6DL_PAD_CSI0_DAT11__UART1_RXD, ++ MX6DL_PAD_EIM_D19__UART1_CTS, ++ MX6DL_PAD_EIM_D20__UART1_RTS, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static __init void wand_init_uart(void) { ++ WAND_SETUP_PADS(wand_uart_pads); ++ ++ imx6q_add_imx_uart(0, NULL); ++} ++ ++ ++/**************************************************************************** ++ * ++ * Initialize sound (SSI, ASRC, AUD3 channel and S/PDIF) ++ * ++ ****************************************************************************/ ++ ++static iomux_v3_cfg_t wand_audio_pads[] = { ++ MX6DL_PAD_CSI0_DAT4__AUDMUX_AUD3_TXC, ++ MX6DL_PAD_CSI0_DAT5__AUDMUX_AUD3_TXD, ++ MX6DL_PAD_CSI0_DAT6__AUDMUX_AUD3_TXFS, ++ MX6DL_PAD_CSI0_DAT7__AUDMUX_AUD3_RXD, ++ MX6DL_PAD_GPIO_0__CCM_CLKO, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++extern struct mxc_audio_platform_data wand_audio_channel_data; ++ ++/* This function is called as a callback from the audio channel data struct */ ++static int wand_audio_clock_enable(void) { ++ struct clk *clko; ++ struct clk *new_parent; ++ int rate; ++ ++ clko = clk_get(NULL, "clko_clk"); ++ if (IS_ERR(clko)) return PTR_ERR(clko); ++ ++ new_parent = clk_get(NULL, "ahb"); ++ if (!IS_ERR(new_parent)) { ++ clk_set_parent(clko, new_parent); ++ clk_put(new_parent); ++ } ++ ++ rate = clk_round_rate(clko, 16000000); ++ if (rate < 8000000 || rate > 27000000) { ++ pr_err("SGTL5000: mclk freq %d out of range!\n", rate); ++ clk_put(clko); ++ return -1; ++ } ++ ++ wand_audio_channel_data.sysclk = rate; ++ clk_set_rate(clko, rate); ++ clk_enable(clko); ++ ++ return 0; ++} ++ ++/* ------------------------------------------------------------------------ */ ++ ++/* This struct is added by the baseboard when initializing the codec */ ++struct mxc_audio_platform_data wand_audio_channel_data = { ++ .ssi_num = 1, ++ .src_port = 2, ++ .ext_port = 3, /* audio channel: 3=AUD3. TODO: EDM */ ++ .init = wand_audio_clock_enable, ++ .hp_gpio = -1, ++}; ++EXPORT_SYMBOL_GPL(wand_audio_channel_data); /* TODO: edm naming? */ ++ ++/* ------------------------------------------------------------------------ */ ++ ++static int wand_set_spdif_clk_rate(struct clk *clk, unsigned long rate) { ++ unsigned long rate_actual; ++ rate_actual = clk_round_rate(clk, rate); ++ clk_set_rate(clk, rate_actual); ++ return 0; ++} ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct mxc_spdif_platform_data wand_spdif = { ++ .spdif_tx = 1, /* enable tx */ ++ .spdif_rx = 1, /* enable rx */ ++ .spdif_clk_44100 = 1, /* tx clk from spdif0_clk_root */ ++ .spdif_clk_48000 = 1, /* tx clk from spdif0_clk_root */ ++ .spdif_div_44100 = 23, ++ .spdif_div_48000 = 37, ++ .spdif_div_32000 = 37, ++ .spdif_rx_clk = 0, /* rx clk from spdif stream */ ++ .spdif_clk_set_rate = wand_set_spdif_clk_rate, ++ .spdif_clk = NULL, /* spdif bus clk */ ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct imx_ssi_platform_data wand_ssi_pdata = { ++ .flags = IMX_SSI_DMA | IMX_SSI_SYN, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct imx_asrc_platform_data wand_asrc_data = { ++ .channel_bits = 4, ++ .clk_map_ver = 2, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++void __init wand_init_audio(void) { ++ WAND_SETUP_PADS(wand_audio_pads); ++ ++ /* Sample rate converter is added together with audio */ ++ wand_asrc_data.asrc_core_clk = clk_get(NULL, "asrc_clk"); ++ wand_asrc_data.asrc_audio_clk = clk_get(NULL, "asrc_serial_clk"); ++ imx6q_add_asrc(&wand_asrc_data); ++ ++ imx6q_add_imx_ssi(1, &wand_ssi_pdata); ++ /* Enable SPDIF */ ++ ++ mxc_iomux_v3_setup_pad(MX6DL_PAD_ENET_RXD0__SPDIF_OUT1); ++ ++ wand_spdif.spdif_core_clk = clk_get_sys("mxc_spdif.0", NULL); ++ clk_put(wand_spdif.spdif_core_clk); ++ imx6q_add_spdif(&wand_spdif); ++ imx6q_add_spdif_dai(); ++ imx6q_add_spdif_audio_device(); ++} ++ ++ ++/***************************************************************************** ++ * ++ * Init FEC and AR8031 PHY ++ * ++ *****************************************************************************/ ++ ++static iomux_v3_cfg_t wand_fec_pads[] = { ++ MX6DL_PAD_ENET_MDIO__ENET_MDIO, ++ MX6DL_PAD_ENET_MDC__ENET_MDC, ++ MX6DL_PAD_ENET_REF_CLK__ENET_TX_CLK, ++ MX6DL_PAD_RGMII_TXC__ENET_RGMII_TXC, ++ MX6DL_PAD_RGMII_TD0__ENET_RGMII_TD0, ++ MX6DL_PAD_RGMII_TD1__ENET_RGMII_TD1, ++ MX6DL_PAD_RGMII_TD2__ENET_RGMII_TD2, ++ MX6DL_PAD_RGMII_TD3__ENET_RGMII_TD3, ++ MX6DL_PAD_RGMII_TX_CTL__ENET_RGMII_TX_CTL, ++ MX6DL_PAD_RGMII_RXC__ENET_RGMII_RXC, ++ MX6DL_PAD_RGMII_RD0__ENET_RGMII_RD0, ++ MX6DL_PAD_RGMII_RD1__ENET_RGMII_RD1, ++ MX6DL_PAD_RGMII_RD2__ENET_RGMII_RD2, ++ MX6DL_PAD_RGMII_RD3__ENET_RGMII_RD3, ++ MX6DL_PAD_RGMII_RX_CTL__ENET_RGMII_RX_CTL, ++ MX6DL_PAD_ENET_TX_EN__GPIO_1_28, ++ MX6DL_PAD_EIM_D29__GPIO_3_29, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static int wand_fec_phy_init(struct phy_device *phydev) { ++ unsigned short val; ++ ++ /* Enable AR8031 125MHz clk */ ++ phy_write(phydev, 0x0d, 0x0007); /* Set device address to 7*/ ++ phy_write(phydev, 0x00, 0x8000); /* Apply by soft reset */ ++ udelay(500); ++ ++ phy_write(phydev, 0x0e, 0x8016); /* set mmd reg */ ++ phy_write(phydev, 0x0d, 0x4007); /* apply */ ++ ++ val = phy_read(phydev, 0xe); ++ val &= 0xffe3; ++ val |= 0x18; ++ phy_write(phydev, 0xe, val); ++ phy_write(phydev, 0x0d, 0x4007); /* Post data */ ++ ++ /* Introduce random tx clock delay. Why is this needed? */ ++ phy_write(phydev, 0x1d, 0x5); ++ val = phy_read(phydev, 0x1e); ++ val |= 0x0100; ++ phy_write(phydev, 0x1e, val); ++ ++ return 0; ++} ++ ++/* ------------------------------------------------------------------------ */ ++ ++static int wand_fec_power_hibernate(struct phy_device *phydev) { return 0; } ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct fec_platform_data wand_fec_data __initdata = { ++ .init = wand_fec_phy_init, ++ .power_hibernate = wand_fec_power_hibernate, ++ .phy = PHY_INTERFACE_MODE_RGMII, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static __init void wand_init_ethernet(void) { ++ WAND_SETUP_PADS(wand_fec_pads); ++ ++ gpio_request(WAND_RGMII_RST, "rgmii reset"); ++ gpio_direction_output(WAND_RGMII_RST, 0); ++#ifdef CONFIG_FEC_1588 ++ mxc_iomux_set_gpr_register(1, 21, 1, 1); ++#endif ++ msleep(10); ++ gpio_set_value(WAND_RGMII_RST, 1); ++ imx6_init_fec(wand_fec_data); ++} ++ ++ ++/**************************************************************************** ++ * ++ * USB ++ * ++ ****************************************************************************/ ++ ++static __initdata iomux_v3_cfg_t wand_usb_pads[] = { ++ MX6DL_PAD_GPIO_9__GPIO_1_9, ++ MX6DL_PAD_GPIO_1__USBOTG_ID, ++ MX6DL_PAD_EIM_D22__GPIO_3_22, ++ MX6DL_PAD_EIM_D30__GPIO_3_30 ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static void wand_usbotg_vbus(bool on) { ++ gpio_set_value_cansleep(WAND_USB_OTG_PWR, !on); ++} ++ ++/* ------------------------------------------------------------------------ */ ++ ++static __init void wand_init_usb(void) { ++ WAND_SETUP_PADS(wand_usb_pads); ++ ++ gpio_request(WAND_USB_OTG_OC, "otg oc"); ++ gpio_direction_input(WAND_USB_OTG_OC); ++ ++ gpio_request(WAND_USB_OTG_PWR, "otg pwr"); ++ gpio_direction_output(WAND_USB_OTG_PWR, 0); ++ ++ imx_otg_base = MX6_IO_ADDRESS(MX6Q_USB_OTG_BASE_ADDR); ++ mxc_iomux_set_gpr_register(1, 13, 1, 1); ++ ++ mx6_set_otghost_vbus_func(wand_usbotg_vbus); ++ ++ gpio_request(WAND_USB_H1_OC, "usbh1 oc"); ++ gpio_direction_input(WAND_USB_H1_OC); ++} ++ ++ ++/**************************************************************************** ++ * ++ * IPU ++ * ++ ****************************************************************************/ ++ ++static struct imx_ipuv3_platform_data wand_ipu_data[] = { ++ { ++ .rev = 4, ++ .csi_clk[0] = "ccm_clk0", ++ }, { ++ .rev = 4, ++ .csi_clk[0] = "ccm_clk0", ++ }, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static __init void wand_init_ipu(void) { ++ imx6q_add_ipuv3(0, &wand_ipu_data[0]); ++} ++ ++ ++/**************************************************************************** ++ * ++ * HDMI ++ * ++ ****************************************************************************/ ++ ++static struct ipuv3_fb_platform_data wand_hdmi_fb[] = { ++ { /* hdmi framebuffer */ ++ .disp_dev = "hdmi", ++ .interface_pix_fmt = IPU_PIX_FMT_RGB32, ++ .mode_str = "1920x1080@60", ++ .default_bpp = 32, ++ .int_clk = false, ++ } ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static void wand_hdmi_init(int ipu_id, int disp_id) { ++ if ((unsigned)ipu_id > 1) ipu_id = 0; ++ if ((unsigned)disp_id > 1) disp_id = 0; ++ ++ mxc_iomux_set_gpr_register(3, 2, 2, 2*ipu_id + disp_id); ++} ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct fsl_mxc_hdmi_platform_data wand_hdmi_data = { ++ .init = wand_hdmi_init, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct fsl_mxc_hdmi_core_platform_data wand_hdmi_core_data = { ++ .ipu_id = 0, ++ .disp_id = 1, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static const struct i2c_board_info wand_hdmi_i2c_info = { ++ I2C_BOARD_INFO("mxc_hdmi_i2c", 0x50), ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static void wand_init_hdmi(void) { ++ i2c_register_board_info(0, &wand_hdmi_i2c_info, 1); ++ imx6q_add_mxc_hdmi_core(&wand_hdmi_core_data); ++ imx6q_add_mxc_hdmi(&wand_hdmi_data); ++ imx6q_add_ipuv3fb(0, wand_hdmi_fb); ++ ++ /* Enable HDMI audio */ ++ imx6q_add_hdmi_soc(); ++ imx6q_add_hdmi_soc_dai(); ++ mxc_iomux_set_gpr_register(0, 0, 1, 1); ++} ++ ++ ++/**************************************************************************** ++ * ++ * WiFi ++ * ++ ****************************************************************************/ ++ ++static __initdata iomux_v3_cfg_t wand_wifi_pads[] = { ++ /* ref_on, enable 32k clock */ ++ MX6DL_PAD_EIM_EB1__GPIO_2_29, ++ /* Wifi reset (resets when low!) */ ++ MX6DL_PAD_EIM_A25__GPIO_5_2, ++ /* reg on, signal to FDC6331L */ ++ MX6DL_PAD_ENET_RXD1__GPIO_1_26, ++ /* host wake */ ++ MX6DL_PAD_ENET_TXD1__GPIO_1_29, ++ /* wl wake - nc */ ++ MX6DL_PAD_ENET_TXD0__GPIO_1_30, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++/* assumes SD/MMC pins are set; call after wand_init_sd() */ ++static __init void wand_init_wifi(void) { ++ WAND_SETUP_PADS(wand_wifi_pads); ++ ++ gpio_request(WAND_WL_RST_N, "wl_rst_n"); ++ gpio_direction_output(WAND_WL_RST_N, 0); ++ msleep(11); ++ gpio_set_value(WAND_WL_RST_N, 1); ++ ++ gpio_request(WAND_WL_REF_ON, "wl_ref_on"); ++ gpio_direction_output(WAND_WL_REF_ON, 1); ++ ++ gpio_request(WAND_WL_REG_ON, "wl_reg_on"); ++ gpio_direction_output(WAND_WL_REG_ON, 1); ++ ++ gpio_request(WAND_WL_WAKE, "wl_wake"); ++ gpio_direction_output(WAND_WL_WAKE, 1); ++ ++ gpio_request(WAND_WL_HOST_WAKE, "wl_host_wake"); ++ gpio_direction_input(WAND_WL_HOST_WAKE); ++} ++ ++ ++/**************************************************************************** ++ * ++ * Bluetooth ++ * ++ ****************************************************************************/ ++ ++static __initdata iomux_v3_cfg_t wand_bt_pads[] = { ++ /* BT_ON, BT_WAKE and BT_HOST_WAKE */ ++ MX6DL_PAD_EIM_DA13__GPIO_3_13, ++ MX6DL_PAD_EIM_DA14__GPIO_3_14, ++ MX6DL_PAD_EIM_DA15__GPIO_3_15, ++ ++ /* AUD5 channel goes to BT */ ++ MX6DL_PAD_KEY_COL0__AUDMUX_AUD5_TXC, ++ MX6DL_PAD_KEY_ROW0__AUDMUX_AUD5_TXD, ++ MX6DL_PAD_KEY_COL1__AUDMUX_AUD5_TXFS, ++ MX6DL_PAD_KEY_ROW1__AUDMUX_AUD5_RXD, ++ ++ /* Bluetooth is on UART3*/ ++ MX6DL_PAD_EIM_D23__UART3_CTS, ++ MX6DL_PAD_EIM_D24__UART3_TXD, ++ MX6DL_PAD_EIM_D25__UART3_RXD, ++ MX6DL_PAD_EIM_EB3__UART3_RTS, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static const struct imxuart_platform_data wand_bt_uart_data = { ++ .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, ++ .dma_req_tx = MX6Q_DMA_REQ_UART3_TX, ++ .dma_req_rx = MX6Q_DMA_REQ_UART3_RX, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++/* This assumes wifi is initialized (chip has power) */ ++static __init void wand_init_bluetooth(void) { ++ WAND_SETUP_PADS(wand_bt_pads); ++ ++ imx6q_add_imx_uart(2, &wand_bt_uart_data); ++ ++ gpio_request(WAND_BT_ON, "bt_on"); ++ gpio_direction_output(WAND_BT_ON, 0); ++ msleep(11); ++ gpio_set_value(WAND_BT_ON, 1); ++ ++ gpio_request(WAND_BT_WAKE, "bt_wake"); ++ gpio_direction_output(WAND_BT_WAKE, 1); ++ ++ gpio_request(WAND_BT_HOST_WAKE, "bt_host_wake"); ++ gpio_direction_input(WAND_BT_WAKE); ++} ++ ++ ++/**************************************************************************** ++ * ++ * Power and thermal management ++ * ++ ****************************************************************************/ ++ ++extern bool enable_wait_mode; ++ ++static const struct anatop_thermal_platform_data wand_thermal = { ++ .name = "anatop_thermal", ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static void wand_suspend_enter(void) { ++ gpio_set_value(WAND_WL_WAKE, 0); ++ gpio_set_value(WAND_BT_WAKE, 0); ++} ++ ++/* ------------------------------------------------------------------------ */ ++ ++static void wand_suspend_exit(void) { ++ gpio_set_value(WAND_WL_WAKE, 1); ++ gpio_set_value(WAND_BT_WAKE, 1); ++} ++ ++/* ------------------------------------------------------------------------ */ ++ ++static const struct pm_platform_data wand_pm_data = { ++ .name = "imx_pm", ++ .suspend_enter = wand_suspend_enter, ++ .suspend_exit = wand_suspend_exit, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static const struct mxc_dvfs_platform_data wand_dvfscore_data = { ++ .reg_id = "cpu_vddgp", ++ .clk1_id = "cpu_clk", ++ .clk2_id = "gpc_dvfs_clk", ++ .gpc_cntr_offset = MXC_GPC_CNTR_OFFSET, ++ .ccm_cdcr_offset = MXC_CCM_CDCR_OFFSET, ++ .ccm_cacrr_offset = MXC_CCM_CACRR_OFFSET, ++ .ccm_cdhipr_offset = MXC_CCM_CDHIPR_OFFSET, ++ .prediv_mask = 0x1F800, ++ .prediv_offset = 11, ++ .prediv_val = 3, ++ .div3ck_mask = 0xE0000000, ++ .div3ck_offset = 29, ++ .div3ck_val = 2, ++ .emac_val = 0x08, ++ .upthr_val = 25, ++ .dnthr_val = 9, ++ .pncthr_val = 33, ++ .upcnt_val = 10, ++ .dncnt_val = 10, ++ .delay_time = 80, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static __init void wand_init_pm(void) { ++ enable_wait_mode = false; ++ imx6q_add_anatop_thermal_imx(1, &wand_thermal); ++ imx6q_add_pm_imx(0, &wand_pm_data); ++ imx6q_add_dvfs_core(&wand_dvfscore_data); ++ imx6q_add_busfreq(); ++} ++ ++ ++/**************************************************************************** ++ * ++ * Expansion pin header GPIOs ++ * ++ ****************************************************************************/ ++ ++static __initdata iomux_v3_cfg_t wand_external_gpio_pads[] = { ++ MX6DL_PAD_EIM_DA11__GPIO_3_11, ++ MX6DL_PAD_EIM_D27__GPIO_3_27, ++ MX6DL_PAD_EIM_BCLK__GPIO_6_31, ++ MX6DL_PAD_ENET_RX_ER__GPIO_1_24, ++ MX6DL_PAD_SD3_RST__GPIO_7_8, ++ MX6DL_PAD_EIM_D26__GPIO_3_26, ++ MX6DL_PAD_EIM_DA8__GPIO_3_8, ++ MX6DL_PAD_GPIO_19__GPIO_4_5, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static __init void wand_init_external_gpios(void) { ++ WAND_SETUP_PADS(wand_external_gpio_pads); ++ ++ gpio_request(IMX_GPIO_NR(3, 11), "external_gpio_0"); ++ gpio_export(IMX_GPIO_NR(3, 11), true); ++ gpio_request(IMX_GPIO_NR(3, 27), "external_gpio_1"); ++ gpio_export(IMX_GPIO_NR(3, 27), true); ++ gpio_request(IMX_GPIO_NR(6, 31), "external_gpio_2"); ++ gpio_export(IMX_GPIO_NR(6, 31), true); ++ gpio_request(IMX_GPIO_NR(1, 24), "external_gpio_3"); ++ gpio_export(IMX_GPIO_NR(1, 24), true); ++ gpio_request(IMX_GPIO_NR(7, 8), "external_gpio_4"); ++ gpio_export(IMX_GPIO_NR(7, 8), true); ++ gpio_request(IMX_GPIO_NR(3, 26), "external_gpio_5"); ++ gpio_export(IMX_GPIO_NR(3, 26), true); ++ gpio_request(IMX_GPIO_NR(3, 8), "external_gpio_6"); ++ gpio_export(IMX_GPIO_NR(3, 8), true); ++ gpio_request(IMX_GPIO_NR(4, 5), "external_gpio_7"); ++ gpio_export(IMX_GPIO_NR(4, 5), true); ++} ++ ++ ++/**************************************************************************** ++ * ++ * SPI - while not used on the Wandboard, the pins are routed out ++ * ++ ****************************************************************************/ ++ ++static __initdata iomux_v3_cfg_t wand_spi_pads[] = { ++ MX6DL_PAD_EIM_D16__ECSPI1_SCLK, ++ MX6DL_PAD_EIM_D17__ECSPI1_MISO, ++ MX6DL_PAD_EIM_D18__ECSPI1_MOSI, ++ MX6DL_PAD_EIM_EB2__GPIO_2_30, ++ ++ MX6DL_PAD_EIM_CS0__ECSPI2_SCLK, ++ MX6DL_PAD_EIM_CS1__ECSPI2_MOSI, ++ MX6DL_PAD_EIM_OE__ECSPI2_MISO, ++ MX6DL_PAD_EIM_RW__GPIO_2_26, ++ MX6DL_PAD_EIM_LBA__GPIO_2_27, ++}; ++/* The choice of using gpios for chipselect is deliberate, ++ there can be issues using the dedicated mux modes for cs. ++*/ ++ ++/* ------------------------------------------------------------------------ */ ++ ++static const int wand_spi1_chipselect[] = { IMX_GPIO_NR(2, 30) }; ++ ++/* platform device */ ++static const struct spi_imx_master wand_spi1_data = { ++ .chipselect = wand_spi1_chipselect, ++ .num_chipselect = ARRAY_SIZE(wand_spi1_chipselect), ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static const int wand_spi2_chipselect[] = { IMX_GPIO_NR(2, 26), IMX_GPIO_NR(2, 27) }; ++ ++static const struct spi_imx_master wand_spi2_data = { ++ .chipselect = wand_spi2_chipselect, ++ .num_chipselect = ARRAY_SIZE(wand_spi2_chipselect), ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static void __init wand_init_spi(void) { ++ WAND_SETUP_PADS(wand_spi_pads); ++ ++ imx6q_add_ecspi(0, &wand_spi1_data); ++ imx6q_add_ecspi(1, &wand_spi2_data); ++} ++ ++ ++/**************************************************************************** ++ * ++ * Vivante GPU/VPU ++ * ++ ****************************************************************************/ ++ ++static const __initconst struct imx_viv_gpu_data wand_gpu_data = { ++ .phys_baseaddr = 0, ++ .iobase_3d = GPU_3D_ARB_BASE_ADDR, ++ .irq_3d = MXC_INT_GPU3D_IRQ, ++ .iobase_2d = GPU_2D_ARB_BASE_ADDR, ++ .irq_2d = MXC_INT_GPU2D_IRQ, ++ .iobase_vg = OPENVG_ARB_BASE_ADDR, ++ .irq_vg = MXC_INT_OPENVG_XAQ2, ++}; ++ ++static struct viv_gpu_platform_data wand_gpu_pdata = { ++ .reserved_mem_size = SZ_128M + SZ_64M - SZ_16M, ++}; ++ ++static __init void wand_init_gpu(void) { ++ imx_add_viv_gpu(&wand_gpu_data, &wand_gpu_pdata); ++ imx6q_add_vpu(); ++ imx6q_add_v4l2_output(0); ++} ++ ++/***************************************************************************** ++ * ++ * Init clocks and early boot console ++ * ++ *****************************************************************************/ ++ ++extern void __iomem *twd_base; ++ ++static void __init wand_init_timer(void) { ++ struct clk *uart_clk; ++#ifdef CONFIG_LOCAL_TIMERS ++ twd_base = ioremap(LOCAL_TWD_ADDR, SZ_256); ++#endif ++ mx6_clocks_init(32768, 24000000, 0, 0); ++ ++ uart_clk = clk_get_sys("imx-uart.0", NULL); ++ early_console_setup(UART1_BASE_ADDR, uart_clk); ++} ++ ++/* ------------------------------------------------------------------------ */ ++ ++static struct sys_timer wand_timer = { ++ .init = wand_init_timer, ++}; ++ ++/* ------------------------------------------------------------------------ */ ++ ++static void __init wand_reserve(void) { ++ phys_addr_t phys; ++ ++ if (wand_gpu_pdata.reserved_mem_size) { ++ phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_512M); ++ memblock_remove(phys, wand_gpu_pdata.reserved_mem_size); ++ wand_gpu_pdata.reserved_mem_base = phys; ++ } ++} ++ ++/***************************************************************************** ++ * ++ * BOARD INIT ++ * ++ *****************************************************************************/ ++ ++static void __init wand_board_init(void) { ++ wand_init_dma(); ++ wand_init_uart(); ++ wand_init_sd(); ++ wand_init_i2c(); ++ wand_init_audio(); ++ wand_init_ethernet(); ++ wand_init_usb(); ++ wand_init_ipu(); ++ imx6q_add_imx_snvs_rtc(); ++ wand_init_hdmi(); ++ wand_init_wifi(); ++ wand_init_bluetooth(); ++ wand_init_pm(); ++ wand_init_external_gpios(); ++ wand_init_spi(); ++ wand_init_gpu(); ++} ++ ++/* ------------------------------------------------------------------------ */ ++ ++MACHINE_START(WANDBOARD, "Wandboard") ++ .boot_params = MX6_PHYS_OFFSET + 0x100, ++ .map_io = mx6_map_io, ++ .init_irq = mx6_init_irq, ++ .init_machine = wand_board_init, ++ .timer = &wand_timer, ++ .reserve = wand_reserve, ++MACHINE_END ++ +diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types +index 88210d9..5b4c1be 100644 +--- a/arch/arm/tools/mach-types ++++ b/arch/arm/tools/mach-types +@@ -1119,4 +1119,5 @@ mx6q_sabresd MACH_MX6Q_SABRESD MX6Q_SABRESD 3980 + mx6q_arm2 MACH_MX6Q_ARM2 MX6Q_ARM2 3837 + mx6sl_arm2 MACH_MX6SL_ARM2 MX6SL_ARM2 4091 + mx6sl_evk MACH_MX6SL_EVK MX6SL_EVK 4307 ++wandboard MACH_WANDBOARD WANDBOARD 4412 + +-- +1.7.9.5 +
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/defconfig new file +2762 -0
1,784 lines not on this page · raw message
recipes-kernel/linux/linux-imx_3.0.35.bbappend new file +8 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.9.5
Part of the diff is not shown here. View the raw message.
PATCH v2 2/3 u-boot (2009.08): Add support for Wandboard-Dual
In reply to John Weberu-boot (2009.08): Add support for Wandboard-Dual
--- ...u-boot-2009.08-Add-Wandboard-Dual-support.patch | 1768 ++++++++++++++++++++ recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend | 8 + 2 files changed, 1776 insertions(+) create mode 100644 recipes-bsp/u-boot/u-boot-imx/wandboard-dual/0001-u-boot-2009.08-Add-Wandboard-Dual-support.patch create mode 100644 recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend
recipes-bsp/u-boot/u-boot-imx/wandboard-dual/0001-u-boot-2009.08-Add-Wandboard-Dual-support.patch new file +1768 -0
@@ -0,0 +1,1768 @@ +From 45c8263617642957efcb51c47b320c85b0ec7322 Mon Sep 17 00:00:00 2001 +From: John Weber <[email protected]> +Date: Tue, 26 Feb 2013 15:10:46 -0600 +Subject: [PATCH] u-boot (2009.08): Add Wandboard Dual support + +Upstream-status: Pending +Signed-off-by: John Weber <[email protected]> +--- + Makefile | 3 + + board/freescale/wandboard/Makefile | 47 +++ + board/freescale/wandboard/config.mk | 7 + + board/freescale/wandboard/flash_header.S | 572 +++++++++++++++++++++++++++++ + board/freescale/wandboard/lowlevel_init.S | 171 +++++++++ + board/freescale/wandboard/u-boot.lds | 74 ++++ + board/freescale/wandboard/wandboard.c | 494 +++++++++++++++++++++++++ + include/asm-arm/mach-types.h | 27 ++ + include/configs/wandboard.h | 273 ++++++++++++++ + 9 files changed, 1668 insertions(+) + create mode 100644 board/freescale/wandboard/Makefile + create mode 100644 board/freescale/wandboard/config.mk + create mode 100644 board/freescale/wandboard/flash_header.S + create mode 100644 board/freescale/wandboard/lowlevel_init.S + create mode 100644 board/freescale/wandboard/u-boot.lds + create mode 100644 board/freescale/wandboard/wandboard.c + create mode 100644 include/configs/wandboard.h + +diff --git a/Makefile b/Makefile +index 1088794..41cca34 100644 +--- a/Makefile ++++ b/Makefile +@@ -3387,6 +3387,9 @@ mx6sl_evk_iram_config : unconfig + } + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 mx6sl_evk freescale mx6 + ++wandboard_config : unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 wandboard freescale mx6 ++ + omap2420h4_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx + +diff --git a/board/freescale/wandboard/Makefile b/board/freescale/wandboard/Makefile +new file mode 100644 +index 0000000..c0b30e4 +--- /dev/null ++++ b/board/freescale/wandboard/Makefile +@@ -0,0 +1,47 @@ ++# ++# (C) Copyright 2010-2011 Freescale Semiconductor, Inc. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++ ++include $(TOPDIR)/config.mk ++ ++LIB = $(obj)lib$(BOARD).a ++ ++COBJS := $(BOARD).o ++SOBJS := lowlevel_init.o flash_header.o ++ ++SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) ++OBJS := $(addprefix $(obj),$(COBJS)) ++SOBJS := $(addprefix $(obj),$(SOBJS)) ++ ++$(LIB): $(obj).depend $(OBJS) $(SOBJS) ++ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) ++ ++clean: ++ rm -f $(SOBJS) $(OBJS) ++ ++distclean: clean ++ rm -f $(LIB) core *.bak .depend ++ ++######################################################################### ++ ++# defines $(obj).depend target ++include $(SRCTREE)/rules.mk ++ ++sinclude $(obj).depend ++ ++######################################################################### +diff --git a/board/freescale/wandboard/config.mk b/board/freescale/wandboard/config.mk +new file mode 100644 +index 0000000..a0ce2a1 +--- /dev/null ++++ b/board/freescale/wandboard/config.mk +@@ -0,0 +1,7 @@ ++LDSCRIPT := $(SRCTREE)/board/$(VENDOR)/$(BOARD)/u-boot.lds ++ ++sinclude $(OBJTREE)/board/$(VENDOR)/$(BOARD)/config.tmp ++ ++ifndef TEXT_BASE ++ TEXT_BASE = 0x27800000 ++endif +diff --git a/board/freescale/wandboard/flash_header.S b/board/freescale/wandboard/flash_header.S +new file mode 100644 +index 0000000..f97d970 +--- /dev/null ++++ b/board/freescale/wandboard/flash_header.S +@@ -0,0 +1,572 @@ ++/* ++ * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include <config.h> ++#include <asm/arch/mx6.h> ++ ++#ifdef CONFIG_FLASH_HEADER ++#ifndef CONFIG_FLASH_HEADER_OFFSET ++# error "Must define the offset of flash header" ++#endif ++ ++#define CPU_2_BE_32(l) \ ++ ((((l) & 0x000000FF) << 24) | \ ++ (((l) & 0x0000FF00) << 8) | \ ++ (((l) & 0x00FF0000) >> 8) | \ ++ (((l) & 0xFF000000) >> 24)) ++ ++#define MXC_DCD_ITEM(i, addr, val) \ ++dcd_node_##i: \ ++ .word CPU_2_BE_32(addr) ; \ ++ .word CPU_2_BE_32(val) ; \ ++ ++.section ".text.flasheader", "x" ++ b _start ++ .org CONFIG_FLASH_HEADER_OFFSET ++ ++ivt_header: .word 0x402000D1 /* Tag=0xD1, Len=0x0020, Ver=0x40 */ ++app_code_jump_v: .word _start ++reserv1: .word 0x0 ++dcd_ptr: .word dcd_hdr ++boot_data_ptr: .word boot_data ++self_ptr: .word ivt_header ++app_code_csf: .word 0x0 ++reserv2: .word 0x0 ++ ++boot_data: .word TEXT_BASE ++image_len: .word _end_of_copy - TEXT_BASE + CONFIG_FLASH_HEADER_OFFSET ++plugin: .word 0x0 ++ ++#ifdef CONFIG_MX6SOLO_DDR3 ++dcd_hdr: .word 0x408802D2 /* Tag=0xD2, Len=80*8 + 4 + 4, Ver=0x40 */ ++write_dcd_cmd: .word 0x048402CC /* Tag=0xCC, Len=80*8 + 4, Param=0x04 */ ++ ++/* DCD */ ++/* DDR3 initialization based on the MX6Solo Auto Reference Design (ARD) */ ++/* DDR IO TYPE */ ++MXC_DCD_ITEM(1, IOMUXC_BASE_ADDR + 0x774, 0x000c0000) ++MXC_DCD_ITEM(2, IOMUXC_BASE_ADDR + 0x754, 0x00000000) ++/* CLOCK */ ++MXC_DCD_ITEM(3, IOMUXC_BASE_ADDR + 0x4ac, 0x00000030) ++MXC_DCD_ITEM(4, IOMUXC_BASE_ADDR + 0x4b0, 0x00000030) ++/* ADDRESS */ ++MXC_DCD_ITEM(5, IOMUXC_BASE_ADDR + 0x464, 0x00000030) ++MXC_DCD_ITEM(6, IOMUXC_BASE_ADDR + 0x490, 0x00000030) ++MXC_DCD_ITEM(7, IOMUXC_BASE_ADDR + 0x74c, 0x00000030) ++/* CONTROLE */ ++MXC_DCD_ITEM(8, IOMUXC_BASE_ADDR + 0x494, 0x000c0030) ++MXC_DCD_ITEM(9, IOMUXC_BASE_ADDR + 0x4a4, 0x00003000) ++MXC_DCD_ITEM(10, IOMUXC_BASE_ADDR + 0x4a8, 0x00003000) ++MXC_DCD_ITEM(11, IOMUXC_BASE_ADDR + 0x4a0, 0x00000000) ++MXC_DCD_ITEM(12, IOMUXC_BASE_ADDR + 0x4b4, 0x00003030) ++MXC_DCD_ITEM(13, IOMUXC_BASE_ADDR + 0x4b8, 0x00003030) ++MXC_DCD_ITEM(14, IOMUXC_BASE_ADDR + 0x76c, 0x00000030) ++/* DATA STROBE */ ++MXC_DCD_ITEM(15, IOMUXC_BASE_ADDR + 0x750, 0x00020000) ++MXC_DCD_ITEM(16, IOMUXC_BASE_ADDR + 0x4bc, 0x00000038) ++MXC_DCD_ITEM(17, IOMUXC_BASE_ADDR + 0x4c0, 0x00000038) ++MXC_DCD_ITEM(18, IOMUXC_BASE_ADDR + 0x4c4, 0x00000038) ++MXC_DCD_ITEM(19, IOMUXC_BASE_ADDR + 0x4c8, 0x00000038) ++MXC_DCD_ITEM(20, IOMUXC_BASE_ADDR + 0x4cc, 0x00000038) ++MXC_DCD_ITEM(21, IOMUXC_BASE_ADDR + 0x4d0, 0x00000038) ++MXC_DCD_ITEM(22, IOMUXC_BASE_ADDR + 0x4d4, 0x00000038) ++MXC_DCD_ITEM(23, IOMUXC_BASE_ADDR + 0x4d8, 0x00000038) ++/* DATA */ ++MXC_DCD_ITEM(24, IOMUXC_BASE_ADDR + 0x760, 0x00020000) ++MXC_DCD_ITEM(25, IOMUXC_BASE_ADDR + 0x764, 0x00000030) ++MXC_DCD_ITEM(26, IOMUXC_BASE_ADDR + 0x770, 0x00000030) ++MXC_DCD_ITEM(27, IOMUXC_BASE_ADDR + 0x778, 0x00000030) ++MXC_DCD_ITEM(28, IOMUXC_BASE_ADDR + 0x77c, 0x00000030) ++MXC_DCD_ITEM(29, IOMUXC_BASE_ADDR + 0x780, 0x00000030) ++MXC_DCD_ITEM(30, IOMUXC_BASE_ADDR + 0x784, 0x00000030) ++MXC_DCD_ITEM(31, IOMUXC_BASE_ADDR + 0x78c, 0x00000030) ++MXC_DCD_ITEM(32, IOMUXC_BASE_ADDR + 0x748, 0x00000030) ++ ++MXC_DCD_ITEM(33, IOMUXC_BASE_ADDR + 0x470, 0x00000030) ++MXC_DCD_ITEM(34, IOMUXC_BASE_ADDR + 0x474, 0x00000030) ++MXC_DCD_ITEM(35, IOMUXC_BASE_ADDR + 0x478, 0x00000030) ++MXC_DCD_ITEM(36, IOMUXC_BASE_ADDR + 0x47c, 0x00000030) ++MXC_DCD_ITEM(37, IOMUXC_BASE_ADDR + 0x480, 0x00000030) ++MXC_DCD_ITEM(38, IOMUXC_BASE_ADDR + 0x484, 0x00000030) ++MXC_DCD_ITEM(39, IOMUXC_BASE_ADDR + 0x488, 0x00000030) ++MXC_DCD_ITEM(40, IOMUXC_BASE_ADDR + 0x48c, 0x000C0030) ++/* ZQ */ ++MXC_DCD_ITEM(41, MMDC_P0_BASE_ADDR + 0x800, 0xa1390003) ++MXC_DCD_ITEM(42, MMDC_P1_BASE_ADDR + 0x800, 0xa1390003) ++/* Write leveling */ ++MXC_DCD_ITEM(43, MMDC_P0_BASE_ADDR + 0x80c, 0x0040003c) ++MXC_DCD_ITEM(44, MMDC_P0_BASE_ADDR + 0x810, 0x0032003e) ++ ++MXC_DCD_ITEM(45, MMDC_P0_BASE_ADDR + 0x83c, 0x42350231) ++MXC_DCD_ITEM(46, MMDC_P0_BASE_ADDR + 0x840, 0x021a0218) ++MXC_DCD_ITEM(47, MMDC_P0_BASE_ADDR + 0x848, 0x4b4b4e49) ++MXC_DCD_ITEM(48, MMDC_P0_BASE_ADDR + 0x850, 0x3f3f3035) ++/* Read data bit delay */ ++MXC_DCD_ITEM(49, MMDC_P0_BASE_ADDR + 0x81c, 0x33333333) ++MXC_DCD_ITEM(50, MMDC_P0_BASE_ADDR + 0x820, 0x33333333) ++MXC_DCD_ITEM(51, MMDC_P0_BASE_ADDR + 0x824, 0x33333333) ++MXC_DCD_ITEM(52, MMDC_P0_BASE_ADDR + 0x828, 0x33333333) ++MXC_DCD_ITEM(53, MMDC_P1_BASE_ADDR + 0x81c, 0x33333333) ++MXC_DCD_ITEM(54, MMDC_P1_BASE_ADDR + 0x820, 0x33333333) ++MXC_DCD_ITEM(55, MMDC_P1_BASE_ADDR + 0x824, 0x33333333) ++MXC_DCD_ITEM(56, MMDC_P1_BASE_ADDR + 0x828, 0x33333333) ++ ++/* Complete calibration by forced measurement */ ++MXC_DCD_ITEM(57, MMDC_P0_BASE_ADDR + 0x8b8, 0x00000800) ++MXC_DCD_ITEM(58, MMDC_P1_BASE_ADDR + 0x8b8, 0x00000800) ++ ++MXC_DCD_ITEM(59, MMDC_P0_BASE_ADDR + 0x004, 0x0002002d) ++MXC_DCD_ITEM(60, MMDC_P0_BASE_ADDR + 0x008, 0x00333030) ++MXC_DCD_ITEM(61, MMDC_P0_BASE_ADDR + 0x00c, 0x696d5323) ++MXC_DCD_ITEM(62, MMDC_P0_BASE_ADDR + 0x010, 0xb66e8c63) ++MXC_DCD_ITEM(63, MMDC_P0_BASE_ADDR + 0x014, 0x01ff00db) ++MXC_DCD_ITEM(64, MMDC_P0_BASE_ADDR + 0x018, 0x00001740) ++MXC_DCD_ITEM(65, MMDC_P0_BASE_ADDR + 0x01c, 0x00008000) ++MXC_DCD_ITEM(66, MMDC_P0_BASE_ADDR + 0x02c, 0x000026d2) ++MXC_DCD_ITEM(67, MMDC_P0_BASE_ADDR + 0x030, 0x006d0e21) ++MXC_DCD_ITEM(68, MMDC_P0_BASE_ADDR + 0x040, 0x00000027) ++MXC_DCD_ITEM(69, MMDC_P0_BASE_ADDR + 0x000, 0x84190000) ++MXC_DCD_ITEM(70, MMDC_P0_BASE_ADDR + 0x01c, 0x04008032) ++MXC_DCD_ITEM(71, MMDC_P0_BASE_ADDR + 0x01c, 0x00008033) ++MXC_DCD_ITEM(72, MMDC_P0_BASE_ADDR + 0x01c, 0x00048031) ++MXC_DCD_ITEM(73, MMDC_P0_BASE_ADDR + 0x01c, 0x07208030) ++MXC_DCD_ITEM(74, MMDC_P0_BASE_ADDR + 0x01c, 0x04008040) ++MXC_DCD_ITEM(75, MMDC_P0_BASE_ADDR + 0x020, 0x00005800) ++MXC_DCD_ITEM(76, MMDC_P0_BASE_ADDR + 0x818, 0x00011117) ++MXC_DCD_ITEM(77, MMDC_P1_BASE_ADDR + 0x818, 0x00011117) ++MXC_DCD_ITEM(78, MMDC_P0_BASE_ADDR + 0x004, 0x0002556d) ++MXC_DCD_ITEM(79, MMDC_P1_BASE_ADDR + 0x004, 0x00011006) ++MXC_DCD_ITEM(80, MMDC_P0_BASE_ADDR + 0x01c, 0x00000000) ++ ++#elif defined CONFIG_MX6DL_DDR3 ++ ++dcd_hdr: .word 0x40E002D2 /* Tag=0xD2, Len=91*8 + 4 + 4, Ver=0x40 */ ++write_dcd_cmd: .word 0x04DC02CC /* Tag=0xCC, Len=91*8 + 4, Param=0x04 */ ++ ++# IOMUXC_BASE_ADDR = 0x20e0000 ++# DDR IO TYPE ++MXC_DCD_ITEM(1, IOMUXC_BASE_ADDR + 0x774, 0x000c0000) ++MXC_DCD_ITEM(2, IOMUXC_BASE_ADDR + 0x754, 0x00000000) ++# Clock ++MXC_DCD_ITEM(3, IOMUXC_BASE_ADDR + 0x4ac, 0x00000030) ++MXC_DCD_ITEM(4, IOMUXC_BASE_ADDR + 0x4b0, 0x00000030) ++# Address ++MXC_DCD_ITEM(5, IOMUXC_BASE_ADDR + 0x464, 0x00000030) ++MXC_DCD_ITEM(6, IOMUXC_BASE_ADDR + 0x490, 0x00000030) ++MXC_DCD_ITEM(7, IOMUXC_BASE_ADDR + 0x74c, 0x00000030) ++# Control ++MXC_DCD_ITEM(8, IOMUXC_BASE_ADDR + 0x494, 0x00000030) ++MXC_DCD_ITEM(9, IOMUXC_BASE_ADDR + 0x4a4, 0x00003000) ++MXC_DCD_ITEM(10, IOMUXC_BASE_ADDR + 0x4a8, 0x00003000) ++MXC_DCD_ITEM(11, IOMUXC_BASE_ADDR + 0x4a0, 0x00000000) ++MXC_DCD_ITEM(12, IOMUXC_BASE_ADDR + 0x4b4, 0x00003030) ++MXC_DCD_ITEM(13, IOMUXC_BASE_ADDR + 0x4b8, 0x00003030) ++MXC_DCD_ITEM(14, IOMUXC_BASE_ADDR + 0x76c, 0x00000030) ++# Data Strobe ++MXC_DCD_ITEM(15, IOMUXC_BASE_ADDR + 0x750, 0x00020000) ++ ++MXC_DCD_ITEM(16, IOMUXC_BASE_ADDR + 0x4bc, 0x00000030) ++MXC_DCD_ITEM(17, IOMUXC_BASE_ADDR + 0x4c0, 0x00000030) ++MXC_DCD_ITEM(18, IOMUXC_BASE_ADDR + 0x4c4, 0x00000030) ++MXC_DCD_ITEM(19, IOMUXC_BASE_ADDR + 0x4c8, 0x00000030) ++MXC_DCD_ITEM(20, IOMUXC_BASE_ADDR + 0x4cc, 0x00000030) ++MXC_DCD_ITEM(21, IOMUXC_BASE_ADDR + 0x4d0, 0x00000030) ++MXC_DCD_ITEM(22, IOMUXC_BASE_ADDR + 0x4d4, 0x00000030) ++MXC_DCD_ITEM(23, IOMUXC_BASE_ADDR + 0x4d8, 0x00000030) ++# DATA ++MXC_DCD_ITEM(24, IOMUXC_BASE_ADDR + 0x760, 0x00020000) ++ ++MXC_DCD_ITEM(25, IOMUXC_BASE_ADDR + 0x764, 0x00000030) ++MXC_DCD_ITEM(26, IOMUXC_BASE_ADDR + 0x770, 0x00000030) ++MXC_DCD_ITEM(27, IOMUXC_BASE_ADDR + 0x778, 0x00000030) ++MXC_DCD_ITEM(28, IOMUXC_BASE_ADDR + 0x77c, 0x00000030) ++MXC_DCD_ITEM(29, IOMUXC_BASE_ADDR + 0x780, 0x00000030) ++MXC_DCD_ITEM(30, IOMUXC_BASE_ADDR + 0x784, 0x00000030) ++MXC_DCD_ITEM(31, IOMUXC_BASE_ADDR + 0x78c, 0x00000030) ++MXC_DCD_ITEM(32, IOMUXC_BASE_ADDR + 0x748, 0x00000030) ++ ++MXC_DCD_ITEM(33, IOMUXC_BASE_ADDR + 0x470, 0x00000030) ++MXC_DCD_ITEM(34, IOMUXC_BASE_ADDR + 0x474, 0x00000030) ++MXC_DCD_ITEM(35, IOMUXC_BASE_ADDR + 0x478, 0x00000030) ++MXC_DCD_ITEM(36, IOMUXC_BASE_ADDR + 0x47c, 0x00000030) ++MXC_DCD_ITEM(37, IOMUXC_BASE_ADDR + 0x480, 0x00000030) ++MXC_DCD_ITEM(38, IOMUXC_BASE_ADDR + 0x484, 0x00000030) ++MXC_DCD_ITEM(39, IOMUXC_BASE_ADDR + 0x488, 0x00000030) ++MXC_DCD_ITEM(40, IOMUXC_BASE_ADDR + 0x48c, 0x00000030) ++ ++# MMDC_P0_BASE_ADDR = 0x021b0000 ++# MMDC_P1_BASE_ADDR = 0x021b4000 ++# Calibrations ++# ZQ ++MXC_DCD_ITEM(41, MMDC_P0_BASE_ADDR + 0x800, 0xa1390003) ++MXC_DCD_ITEM(42, MMDC_P1_BASE_ADDR + 0x800, 0xa1390003) ++# write leveling ++MXC_DCD_ITEM(43, MMDC_P0_BASE_ADDR + 0x80c, 0x001F001F) ++MXC_DCD_ITEM(44, MMDC_P0_BASE_ADDR + 0x810, 0x001F001F) ++MXC_DCD_ITEM(45, MMDC_P1_BASE_ADDR + 0x80c, 0x001F001F) ++MXC_DCD_ITEM(46, MMDC_P1_BASE_ADDR + 0x810, 0x001F001F) ++# DQS gating, read delay, write delay calibration values ++# based on calibration compare of 0x00ffff00 ++MXC_DCD_ITEM(47, MMDC_P0_BASE_ADDR + 0x83c, 0x420E020E) ++MXC_DCD_ITEM(48, MMDC_P0_BASE_ADDR + 0x840, 0x02000200) ++MXC_DCD_ITEM(49, MMDC_P1_BASE_ADDR + 0x83C, 0x42020202) ++MXC_DCD_ITEM(50, MMDC_P1_BASE_ADDR + 0x840, 0x01720172) ++MXC_DCD_ITEM(51, MMDC_P0_BASE_ADDR + 0x848, 0x494C4F4C) ++MXC_DCD_ITEM(52, MMDC_P1_BASE_ADDR + 0x848, 0x4A4C4C49) ++MXC_DCD_ITEM(53, MMDC_P0_BASE_ADDR + 0x850, 0x3F3F3133) ++MXC_DCD_ITEM(54, MMDC_P1_BASE_ADDR + 0x850, 0x39373F2E) ++# read data bit delay ++MXC_DCD_ITEM(55, MMDC_P0_BASE_ADDR + 0x81c, 0x33333333) ++MXC_DCD_ITEM(56, MMDC_P0_BASE_ADDR + 0x820, 0x33333333) ++MXC_DCD_ITEM(57, MMDC_P0_BASE_ADDR + 0x824, 0x33333333) ++MXC_DCD_ITEM(58, MMDC_P0_BASE_ADDR + 0x828, 0x33333333) ++MXC_DCD_ITEM(59, MMDC_P1_BASE_ADDR + 0x81c, 0x33333333) ++MXC_DCD_ITEM(60, MMDC_P1_BASE_ADDR + 0x820, 0x33333333) ++MXC_DCD_ITEM(61, MMDC_P1_BASE_ADDR + 0x824, 0x33333333) ++MXC_DCD_ITEM(62, MMDC_P1_BASE_ADDR + 0x828, 0x33333333) ++# Complete calibration by forced measurment ++MXC_DCD_ITEM(63, MMDC_P0_BASE_ADDR + 0x8b8, 0x00000800) ++MXC_DCD_ITEM(64, MMDC_P1_BASE_ADDR + 0x8b8, 0x00000800) ++# MMDC init: ++# in DDR3, 64-bit mode, only MMDC0 is initiated: ++MXC_DCD_ITEM(65, MMDC_P0_BASE_ADDR + 0x004, 0x0002002d) ++MXC_DCD_ITEM(66, MMDC_P0_BASE_ADDR + 0x008, 0x00333030) ++ ++MXC_DCD_ITEM(67, MMDC_P0_BASE_ADDR + 0x00c, 0x40445323) ++MXC_DCD_ITEM(68, MMDC_P0_BASE_ADDR + 0x010, 0xb66e8c63) ++ ++MXC_DCD_ITEM(69, MMDC_P0_BASE_ADDR + 0x014, 0x01ff00db) ++MXC_DCD_ITEM(70, MMDC_P0_BASE_ADDR + 0x018, 0x00081740) ++MXC_DCD_ITEM(71, MMDC_P0_BASE_ADDR + 0x01c, 0x00008000) ++MXC_DCD_ITEM(72, MMDC_P0_BASE_ADDR + 0x02c, 0x000026d2) ++MXC_DCD_ITEM(73, MMDC_P0_BASE_ADDR + 0x030, 0x00440e21) ++MXC_DCD_ITEM(74, MMDC_P0_BASE_ADDR + 0x040, 0x00000027) ++MXC_DCD_ITEM(75, MMDC_P0_BASE_ADDR + 0x000, 0xc31a0000) ++ ++# Initialize 2GB DDR3 - Micron MT41J128M ++# MR2 ++MXC_DCD_ITEM(76, MMDC_P0_BASE_ADDR + 0x01c, 0x04008032) ++MXC_DCD_ITEM(77, MMDC_P0_BASE_ADDR + 0x01c, 0x0400803a) ++# MR3 ++MXC_DCD_ITEM(78, MMDC_P0_BASE_ADDR + 0x01c, 0x00008033) ++MXC_DCD_ITEM(79, MMDC_P0_BASE_ADDR + 0x01c, 0x0000803b) ++# MR1 ++MXC_DCD_ITEM(80, MMDC_P0_BASE_ADDR + 0x01c, 0x00428031) ++MXC_DCD_ITEM(81, MMDC_P0_BASE_ADDR + 0x01c, 0x00428039) ++# MR0 ++MXC_DCD_ITEM(82, MMDC_P0_BASE_ADDR + 0x01c, 0x07208030) ++MXC_DCD_ITEM(83, MMDC_P0_BASE_ADDR + 0x01c, 0x07208038) ++# ZQ calibration ++MXC_DCD_ITEM(84, MMDC_P0_BASE_ADDR + 0x01c, 0x04008040) ++MXC_DCD_ITEM(85, MMDC_P0_BASE_ADDR + 0x01c, 0x04008048) ++# final DDR setup ++MXC_DCD_ITEM(86, MMDC_P0_BASE_ADDR + 0x020, 0x00005800) ++MXC_DCD_ITEM(87, MMDC_P0_BASE_ADDR + 0x818, 0x00000007) ++MXC_DCD_ITEM(88, MMDC_P1_BASE_ADDR + 0x818, 0x00000007) ++MXC_DCD_ITEM(89, MMDC_P0_BASE_ADDR + 0x004, 0x0002556d) ++MXC_DCD_ITEM(90, MMDC_P1_BASE_ADDR + 0x404, 0x00011006) ++MXC_DCD_ITEM(91, MMDC_P0_BASE_ADDR + 0x01c, 0x00000000) ++ ++#elif defined CONFIG_LPDDR2 ++dcd_hdr: .word 0x40F003D2 /* Tag=0xD2, Len=125*8 + 4 + 4, Ver=0x40 */ ++write_dcd_cmd: .word 0x04EC03CC /* Tag=0xCC, Len=125*8 + 4, Param=0x04 */ ++ ++/* DCD */ ++MXC_DCD_ITEM(1, CCM_BASE_ADDR + 0x18, 0x60324) ++ ++MXC_DCD_ITEM(2, IOMUXC_BASE_ADDR + 0x5a8, 0x00003038) ++MXC_DCD_ITEM(3, IOMUXC_BASE_ADDR + 0x5b0, 0x00003038) ++MXC_DCD_ITEM(4, IOMUXC_BASE_ADDR + 0x524, 0x00003038) ++MXC_DCD_ITEM(5, IOMUXC_BASE_ADDR + 0x51c, 0x00003038) ++ ++MXC_DCD_ITEM(6, IOMUXC_BASE_ADDR + 0x518, 0x00003038) ++MXC_DCD_ITEM(7, IOMUXC_BASE_ADDR + 0x50c, 0x00003038) ++MXC_DCD_ITEM(8, IOMUXC_BASE_ADDR + 0x5b8, 0x00003038) ++MXC_DCD_ITEM(9, IOMUXC_BASE_ADDR + 0x5c0, 0x00003038) ++ ++MXC_DCD_ITEM(10, IOMUXC_BASE_ADDR + 0x5ac, 0x00000038) ++MXC_DCD_ITEM(11, IOMUXC_BASE_ADDR + 0x5b4, 0x00000038) ++MXC_DCD_ITEM(12, IOMUXC_BASE_ADDR + 0x528, 0x00000038) ++MXC_DCD_ITEM(13, IOMUXC_BASE_ADDR + 0x520, 0x00000038) ++ ++MXC_DCD_ITEM(14, IOMUXC_BASE_ADDR + 0x514, 0x00000038) ++MXC_DCD_ITEM(15, IOMUXC_BASE_ADDR + 0x510, 0x00000038) ++MXC_DCD_ITEM(16, IOMUXC_BASE_ADDR + 0x5bc, 0x00000038) ++MXC_DCD_ITEM(17, IOMUXC_BASE_ADDR + 0x5c4, 0x00000038) ++ ++MXC_DCD_ITEM(18, IOMUXC_BASE_ADDR + 0x56c, 0x00000038) ++MXC_DCD_ITEM(19, IOMUXC_BASE_ADDR + 0x578, 0x00000038) ++MXC_DCD_ITEM(20, IOMUXC_BASE_ADDR + 0x588, 0x00000038) ++MXC_DCD_ITEM(21, IOMUXC_BASE_ADDR + 0x594, 0x00000038) ++ ++MXC_DCD_ITEM(22, IOMUXC_BASE_ADDR + 0x57c, 0x00000038) ++MXC_DCD_ITEM(23, IOMUXC_BASE_ADDR + 0x590, 0x00000038) ++MXC_DCD_ITEM(24, IOMUXC_BASE_ADDR + 0x598, 0x00000038) ++MXC_DCD_ITEM(25, IOMUXC_BASE_ADDR + 0x58c, 0x00000000) ++ ++MXC_DCD_ITEM(26, IOMUXC_BASE_ADDR + 0x59c, 0x00000038) ++MXC_DCD_ITEM(27, IOMUXC_BASE_ADDR + 0x5a0, 0x00000038) ++MXC_DCD_ITEM(28, IOMUXC_BASE_ADDR + 0x784, 0x00000038) ++MXC_DCD_ITEM(29, IOMUXC_BASE_ADDR + 0x788, 0x00000038) ++ ++MXC_DCD_ITEM(30, IOMUXC_BASE_ADDR + 0x794, 0x00000038) ++MXC_DCD_ITEM(31, IOMUXC_BASE_ADDR + 0x79c, 0x00000038) ++MXC_DCD_ITEM(32, IOMUXC_BASE_ADDR + 0x7a0, 0x00000038) ++MXC_DCD_ITEM(33, IOMUXC_BASE_ADDR + 0x7a4, 0x00000038) ++ ++MXC_DCD_ITEM(34, IOMUXC_BASE_ADDR + 0x7a8, 0x00000038) ++MXC_DCD_ITEM(35, IOMUXC_BASE_ADDR + 0x748, 0x00000038) ++MXC_DCD_ITEM(36, IOMUXC_BASE_ADDR + 0x74c, 0x00000038) ++MXC_DCD_ITEM(37, IOMUXC_BASE_ADDR + 0x750, 0x00020000) ++ ++MXC_DCD_ITEM(38, IOMUXC_BASE_ADDR + 0x758, 0x00000000) ++MXC_DCD_ITEM(39, IOMUXC_BASE_ADDR + 0x774, 0x00020000) ++MXC_DCD_ITEM(40, IOMUXC_BASE_ADDR + 0x78c, 0x00000038) ++MXC_DCD_ITEM(41, IOMUXC_BASE_ADDR + 0x798, 0x00080000) ++ ++MXC_DCD_ITEM(42, MMDC_P0_BASE_ADDR + 0x01c, 0x00008000) ++MXC_DCD_ITEM(43, MMDC_P1_BASE_ADDR + 0x01c, 0x00008000) ++ ++MXC_DCD_ITEM(44, MMDC_P0_BASE_ADDR + 0x85c, 0x1b5f01ff) ++MXC_DCD_ITEM(45, MMDC_P1_BASE_ADDR + 0x85c, 0x1b5f01ff) ++ ++MXC_DCD_ITEM(46, MMDC_P0_BASE_ADDR + 0x800, 0xa1390000) ++MXC_DCD_ITEM(47, MMDC_P1_BASE_ADDR + 0x800, 0xa1390000) ++ ++MXC_DCD_ITEM(48, MMDC_P0_BASE_ADDR + 0x890, 0x00400000) ++MXC_DCD_ITEM(49, MMDC_P1_BASE_ADDR + 0x890, 0x00400000) ++ ++MXC_DCD_ITEM(50, MMDC_P1_BASE_ADDR + 0x8bc, 0x00055555) ++ ++MXC_DCD_ITEM(51, MMDC_P0_BASE_ADDR + 0x8b8, 0x00000800) ++MXC_DCD_ITEM(52, MMDC_P1_BASE_ADDR + 0x8b8, 0x00000800) ++ ++MXC_DCD_ITEM(53, MMDC_P0_BASE_ADDR + 0x81c, 0x33333333) ++MXC_DCD_ITEM(54, MMDC_P0_BASE_ADDR + 0x820, 0x33333333) ++MXC_DCD_ITEM(55, MMDC_P0_BASE_ADDR + 0x824, 0x33333333) ++MXC_DCD_ITEM(56, MMDC_P0_BASE_ADDR + 0x828, 0x33333333) ++MXC_DCD_ITEM(57, MMDC_P1_BASE_ADDR + 0x81c, 0x33333333) ++MXC_DCD_ITEM(58, MMDC_P1_BASE_ADDR + 0x820, 0x33333333) ++MXC_DCD_ITEM(59, MMDC_P1_BASE_ADDR + 0x824, 0x33333333) ++MXC_DCD_ITEM(60, MMDC_P1_BASE_ADDR + 0x828, 0x33333333) ++ ++MXC_DCD_ITEM(61, MMDC_P0_BASE_ADDR + 0x82c, 0xf3333333) ++MXC_DCD_ITEM(62, MMDC_P0_BASE_ADDR + 0x830, 0xf3333333) ++MXC_DCD_ITEM(63, MMDC_P0_BASE_ADDR + 0x834, 0xf3333333) ++MXC_DCD_ITEM(64, MMDC_P0_BASE_ADDR + 0x838, 0xf3333333) ++MXC_DCD_ITEM(65, MMDC_P1_BASE_ADDR + 0x82c, 0xf3333333) ++MXC_DCD_ITEM(66, MMDC_P1_BASE_ADDR + 0x830, 0xf3333333) ++MXC_DCD_ITEM(67, MMDC_P1_BASE_ADDR + 0x834, 0xf3333333) ++MXC_DCD_ITEM(68, MMDC_P1_BASE_ADDR + 0x838, 0xf3333333) ++ ++MXC_DCD_ITEM(69, MMDC_P0_BASE_ADDR + 0x848, 0x49383b39) ++MXC_DCD_ITEM(70, MMDC_P0_BASE_ADDR + 0x850, 0x30364738) ++MXC_DCD_ITEM(71, MMDC_P1_BASE_ADDR + 0x848, 0x3e3c3846) ++MXC_DCD_ITEM(72, MMDC_P1_BASE_ADDR + 0x850, 0x4c294b35) ++ ++MXC_DCD_ITEM(73, MMDC_P0_BASE_ADDR + 0x83c, 0x20000000) ++MXC_DCD_ITEM(74, MMDC_P0_BASE_ADDR + 0x840, 0x0) ++MXC_DCD_ITEM(75, MMDC_P1_BASE_ADDR + 0x83c, 0x20000000) ++MXC_DCD_ITEM(76, MMDC_P1_BASE_ADDR + 0x840, 0x0) ++ ++MXC_DCD_ITEM(77, MMDC_P0_BASE_ADDR + 0x858, 0xf00) ++MXC_DCD_ITEM(78, MMDC_P1_BASE_ADDR + 0x858, 0xf00) ++ ++MXC_DCD_ITEM(79, MMDC_P0_BASE_ADDR + 0x8b8, 0x800) ++MXC_DCD_ITEM(80, MMDC_P1_BASE_ADDR + 0x8b8, 0x800) ++ ++MXC_DCD_ITEM(81, MMDC_P0_BASE_ADDR + 0xc, 0x555a61a5) ++MXC_DCD_ITEM(82, MMDC_P0_BASE_ADDR + 0x4, 0x20036) ++MXC_DCD_ITEM(83, MMDC_P0_BASE_ADDR + 0x10, 0x160e83) ++MXC_DCD_ITEM(84, MMDC_P0_BASE_ADDR + 0x14, 0xdd) ++MXC_DCD_ITEM(85, MMDC_P0_BASE_ADDR + 0x18, 0x8174c) ++MXC_DCD_ITEM(86, MMDC_P0_BASE_ADDR + 0x2c, 0xf9f26d2) ++MXC_DCD_ITEM(87, MMDC_P0_BASE_ADDR + 0x30, 0x20e) ++MXC_DCD_ITEM(88, MMDC_P0_BASE_ADDR + 0x38, 0x200aac) ++MXC_DCD_ITEM(89, MMDC_P0_BASE_ADDR + 0x8, 0x0) ++ ++MXC_DCD_ITEM(90, MMDC_P0_BASE_ADDR + 0x40, 0x5f) ++ ++MXC_DCD_ITEM(91, MMDC_P0_BASE_ADDR + 0x0, 0xc3010000) ++ ++MXC_DCD_ITEM(92, MMDC_P1_BASE_ADDR + 0xc, 0x555a61a5) ++MXC_DCD_ITEM(93, MMDC_P1_BASE_ADDR + 0x4, 0x20036) ++MXC_DCD_ITEM(94, MMDC_P1_BASE_ADDR + 0x10, 0x160e83) ++MXC_DCD_ITEM(95, MMDC_P1_BASE_ADDR + 0x14, 0xdd) ++MXC_DCD_ITEM(96, MMDC_P1_BASE_ADDR + 0x18, 0x8174c) ++MXC_DCD_ITEM(97, MMDC_P1_BASE_ADDR + 0x2c, 0xf9f26d2) ++MXC_DCD_ITEM(98, MMDC_P1_BASE_ADDR + 0x30, 0x20e) ++MXC_DCD_ITEM(99, MMDC_P1_BASE_ADDR + 0x38, 0x200aac) ++MXC_DCD_ITEM(100, MMDC_P1_BASE_ADDR + 0x8, 0x0) ++ ++MXC_DCD_ITEM(101, MMDC_P1_BASE_ADDR + 0x40, 0x3f) ++MXC_DCD_ITEM(102, MMDC_P1_BASE_ADDR + 0x0, 0xc3010000) ++ ++MXC_DCD_ITEM(103, MMDC_P0_BASE_ADDR + 0x1c, 0x3f8030) ++MXC_DCD_ITEM(104, MMDC_P0_BASE_ADDR + 0x1c, 0xff0a8030) ++MXC_DCD_ITEM(105, MMDC_P0_BASE_ADDR + 0x1c, 0xc2018030) ++MXC_DCD_ITEM(106, MMDC_P0_BASE_ADDR + 0x1c, 0x6028030) ++MXC_DCD_ITEM(107, MMDC_P0_BASE_ADDR + 0x1c, 0x2038030) ++ ++MXC_DCD_ITEM(108, MMDC_P1_BASE_ADDR + 0x1c, 0x3f8030) ++MXC_DCD_ITEM(109, MMDC_P1_BASE_ADDR + 0x1c, 0xff0a8030) ++MXC_DCD_ITEM(110, MMDC_P1_BASE_ADDR + 0x1c, 0xc2018030) ++MXC_DCD_ITEM(111, MMDC_P1_BASE_ADDR + 0x1c, 0x6028030) ++MXC_DCD_ITEM(112, MMDC_P1_BASE_ADDR + 0x1c, 0x2038030) ++ ++MXC_DCD_ITEM(113, MMDC_P0_BASE_ADDR + 0x800, 0xa1390003) ++MXC_DCD_ITEM(114, MMDC_P1_BASE_ADDR + 0x800, 0xa1390003) ++ ++MXC_DCD_ITEM(115, MMDC_P0_BASE_ADDR + 0x20, 0x7800) ++MXC_DCD_ITEM(116, MMDC_P1_BASE_ADDR + 0x20, 0x7800) ++ ++MXC_DCD_ITEM(117, MMDC_P0_BASE_ADDR + 0x818, 0x0) ++MXC_DCD_ITEM(118, MMDC_P1_BASE_ADDR + 0x818, 0x0) ++ ++MXC_DCD_ITEM(119, MMDC_P0_BASE_ADDR + 0x800, 0xa1390003) ++MXC_DCD_ITEM(120, MMDC_P1_BASE_ADDR + 0x800, 0xa1390003) ++ ++MXC_DCD_ITEM(121, MMDC_P0_BASE_ADDR + 0x8b8, 0x800) ++MXC_DCD_ITEM(122, MMDC_P1_BASE_ADDR + 0x8b8, 0x800) ++ ++MXC_DCD_ITEM(123, MMDC_P0_BASE_ADDR + 0x1c, 0x0) ++MXC_DCD_ITEM(124, MMDC_P1_BASE_ADDR + 0x1c, 0x0) ++ ++MXC_DCD_ITEM(125, MMDC_P0_BASE_ADDR + 0x404, 0x00011006) ++ ++#else ++ ++dcd_hdr: .word 0x40B002D2 /* Tag=0xD2, Len=85*8 + 4 + 4, Ver=0x40 */ ++write_dcd_cmd: .word 0x04AC02CC /* Tag=0xCC, Len=85*8 + 4, Param=0x04 */ ++ ++/* DCD */ ++/* DDR3 initialization based on the MX6Q Auto Reference Design (ARD) */ ++ ++MXC_DCD_ITEM(1, IOMUXC_BASE_ADDR + 0x5a8, 0x00000028) ++MXC_DCD_ITEM(2, IOMUXC_BASE_ADDR + 0x5b0, 0x00000028) ++MXC_DCD_ITEM(3, IOMUXC_BASE_ADDR + 0x524, 0x00000028) ++MXC_DCD_ITEM(4, IOMUXC_BASE_ADDR + 0x51c, 0x00000028) ++ ++MXC_DCD_ITEM(5, IOMUXC_BASE_ADDR + 0x518, 0x00000028) ++MXC_DCD_ITEM(6, IOMUXC_BASE_ADDR + 0x50c, 0x00000028) ++MXC_DCD_ITEM(7, IOMUXC_BASE_ADDR + 0x5b8, 0x00000028) ++MXC_DCD_ITEM(8, IOMUXC_BASE_ADDR + 0x5c0, 0x00000028) ++ ++MXC_DCD_ITEM(9, IOMUXC_BASE_ADDR + 0x5ac, 0x00000028) ++MXC_DCD_ITEM(10, IOMUXC_BASE_ADDR + 0x5b4, 0x00000028) ++MXC_DCD_ITEM(11, IOMUXC_BASE_ADDR + 0x528, 0x00000028) ++MXC_DCD_ITEM(12, IOMUXC_BASE_ADDR + 0x520, 0x00000028) ++ ++MXC_DCD_ITEM(13, IOMUXC_BASE_ADDR + 0x514, 0x00000028) ++MXC_DCD_ITEM(14, IOMUXC_BASE_ADDR + 0x510, 0x00000028) ++MXC_DCD_ITEM(15, IOMUXC_BASE_ADDR + 0x5bc, 0x00000028) ++MXC_DCD_ITEM(16, IOMUXC_BASE_ADDR + 0x5c4, 0x00000028) ++ ++MXC_DCD_ITEM(17, IOMUXC_BASE_ADDR + 0x56c, 0x00000030) ++MXC_DCD_ITEM(18, IOMUXC_BASE_ADDR + 0x578, 0x00000030) ++MXC_DCD_ITEM(19, IOMUXC_BASE_ADDR + 0x588, 0x00000030) ++MXC_DCD_ITEM(20, IOMUXC_BASE_ADDR + 0x594, 0x00000030) ++ ++MXC_DCD_ITEM(21, IOMUXC_BASE_ADDR + 0x57c, 0x00000030) ++MXC_DCD_ITEM(22, IOMUXC_BASE_ADDR + 0x590, 0x00000030) ++MXC_DCD_ITEM(23, IOMUXC_BASE_ADDR + 0x598, 0x00000030) ++MXC_DCD_ITEM(24, IOMUXC_BASE_ADDR + 0x58c, 0x00000000) ++ ++MXC_DCD_ITEM(25, IOMUXC_BASE_ADDR + 0x59c, 0x00003030) ++MXC_DCD_ITEM(26, IOMUXC_BASE_ADDR + 0x5a0, 0x00003030) ++MXC_DCD_ITEM(27, IOMUXC_BASE_ADDR + 0x784, 0x00000028) ++MXC_DCD_ITEM(28, IOMUXC_BASE_ADDR + 0x788, 0x00000028) ++ ++MXC_DCD_ITEM(29, IOMUXC_BASE_ADDR + 0x794, 0x00000028) ++MXC_DCD_ITEM(30, IOMUXC_BASE_ADDR + 0x79c, 0x00000028) ++MXC_DCD_ITEM(31, IOMUXC_BASE_ADDR + 0x7a0, 0x00000028) ++MXC_DCD_ITEM(32, IOMUXC_BASE_ADDR + 0x7a4, 0x00000028) ++ ++MXC_DCD_ITEM(33, IOMUXC_BASE_ADDR + 0x7a8, 0x00000028) ++MXC_DCD_ITEM(34, IOMUXC_BASE_ADDR + 0x748, 0x00000028) ++MXC_DCD_ITEM(35, IOMUXC_BASE_ADDR + 0x74c, 0x00000030) ++MXC_DCD_ITEM(36, IOMUXC_BASE_ADDR + 0x750, 0x00020000) ++ ++MXC_DCD_ITEM(37, IOMUXC_BASE_ADDR + 0x758, 0x00000000) ++MXC_DCD_ITEM(38, IOMUXC_BASE_ADDR + 0x774, 0x00020000) ++MXC_DCD_ITEM(39, IOMUXC_BASE_ADDR + 0x78c, 0x00000030) ++MXC_DCD_ITEM(40, IOMUXC_BASE_ADDR + 0x798, 0x000C0000) ++ ++MXC_DCD_ITEM(41, MMDC_P0_BASE_ADDR + 0x81c, 0x33333333) ++MXC_DCD_ITEM(42, MMDC_P0_BASE_ADDR + 0x820, 0x33333333) ++MXC_DCD_ITEM(43, MMDC_P0_BASE_ADDR + 0x824, 0x33333333) ++MXC_DCD_ITEM(44, MMDC_P0_BASE_ADDR + 0x828, 0x33333333) ++ ++MXC_DCD_ITEM(45, MMDC_P1_BASE_ADDR + 0x81c, 0x33333333) ++MXC_DCD_ITEM(46, MMDC_P1_BASE_ADDR + 0x820, 0x33333333) ++MXC_DCD_ITEM(47, MMDC_P1_BASE_ADDR + 0x824, 0x33333333) ++MXC_DCD_ITEM(48, MMDC_P1_BASE_ADDR + 0x828, 0x33333333) ++ ++MXC_DCD_ITEM(49, MMDC_P0_BASE_ADDR + 0x018, 0x00001740) ++ ++MXC_DCD_ITEM(50, MMDC_P0_BASE_ADDR + 0x01c, 0x00008000) ++MXC_DCD_ITEM(51, MMDC_P0_BASE_ADDR + 0x00c, 0x8A8F7975) ++MXC_DCD_ITEM(52, MMDC_P0_BASE_ADDR + 0x010, 0xFF538E64) ++MXC_DCD_ITEM(53, MMDC_P0_BASE_ADDR + 0x014, 0x01FF00DB) ++MXC_DCD_ITEM(54, MMDC_P0_BASE_ADDR + 0x02c, 0x000026D2) ++ ++MXC_DCD_ITEM(55, MMDC_P0_BASE_ADDR + 0x030, 0x008F0E21) ++MXC_DCD_ITEM(56, MMDC_P0_BASE_ADDR + 0x008, 0x09444040) ++MXC_DCD_ITEM(57, MMDC_P0_BASE_ADDR + 0x004, 0x00020036) ++MXC_DCD_ITEM(58, MMDC_P0_BASE_ADDR + 0x040, 0x00000047) ++MXC_DCD_ITEM(59, MMDC_P0_BASE_ADDR + 0x000, 0x841A0000) ++ ++MXC_DCD_ITEM(60, MMDC_P0_BASE_ADDR + 0x01c, 0x04088032) ++MXC_DCD_ITEM(61, MMDC_P0_BASE_ADDR + 0x01c, 0x00008033) ++MXC_DCD_ITEM(62, MMDC_P0_BASE_ADDR + 0x01c, 0x00428031) ++MXC_DCD_ITEM(63, MMDC_P0_BASE_ADDR + 0x01c, 0x09408030) ++ ++MXC_DCD_ITEM(64, MMDC_P0_BASE_ADDR + 0x01c, 0x04008040) ++MXC_DCD_ITEM(65, MMDC_P0_BASE_ADDR + 0x800, 0xA1380003) ++MXC_DCD_ITEM(66, MMDC_P0_BASE_ADDR + 0x020, 0x00005800) ++MXC_DCD_ITEM(67, MMDC_P0_BASE_ADDR + 0x818, 0x00011117) ++MXC_DCD_ITEM(68, MMDC_P1_BASE_ADDR + 0x818, 0x00011117) ++ ++/* Calibration values based on ARD and 528MHz */ ++MXC_DCD_ITEM(69, MMDC_P0_BASE_ADDR + 0x83c, 0x434B0358) ++MXC_DCD_ITEM(70, MMDC_P0_BASE_ADDR + 0x840, 0x033D033C) ++MXC_DCD_ITEM(71, MMDC_P1_BASE_ADDR + 0x83c, 0x03520362) ++MXC_DCD_ITEM(72, MMDC_P1_BASE_ADDR + 0x840, 0x03480318) ++MXC_DCD_ITEM(73, MMDC_P0_BASE_ADDR + 0x848, 0x41383A3C) ++MXC_DCD_ITEM(74, MMDC_P1_BASE_ADDR + 0x848, 0x3F3C374A) ++MXC_DCD_ITEM(75, MMDC_P0_BASE_ADDR + 0x850, 0x42434444) ++MXC_DCD_ITEM(76, MMDC_P1_BASE_ADDR + 0x850, 0x4932473A) ++ ++MXC_DCD_ITEM(77, MMDC_P0_BASE_ADDR + 0x80c, 0x001F001F) ++MXC_DCD_ITEM(78, MMDC_P0_BASE_ADDR + 0x810, 0x001F001F) ++ ++MXC_DCD_ITEM(79, MMDC_P1_BASE_ADDR + 0x80c, 0x001F001F) ++MXC_DCD_ITEM(80, MMDC_P1_BASE_ADDR + 0x810, 0x001F001F) ++ ++MXC_DCD_ITEM(81, MMDC_P0_BASE_ADDR + 0x8b8, 0x00000800) ++MXC_DCD_ITEM(82, MMDC_P1_BASE_ADDR + 0x8b8, 0x00000800) ++ ++MXC_DCD_ITEM(83, MMDC_P0_BASE_ADDR + 0x404, 0x00011006) ++MXC_DCD_ITEM(84, MMDC_P0_BASE_ADDR + 0x004, 0x00025576) ++ ++MXC_DCD_ITEM(85, MMDC_P0_BASE_ADDR + 0x01c, 0x00000000) ++ ++#endif ++ ++#endif +diff --git a/board/freescale/wandboard/lowlevel_init.S b/board/freescale/wandboard/lowlevel_init.S +new file mode 100644 +index 0000000..b725b66 +--- /dev/null ++++ b/board/freescale/wandboard/lowlevel_init.S +@@ -0,0 +1,171 @@ ++/* ++ * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include <config.h> ++#include <asm/arch/mx6.h> ++ ++/* ++ Disable L2Cache because ROM turn it on when uboot use plug-in. ++ If L2Cache is on default, there are cache coherence problem if kernel have ++ not config L2Cache. ++*/ ++.macro init_l2cc ++ ldr r1, =0xa02000 ++ ldr r0, =0x0 ++ str r0, [r1, #0x100] ++.endm /* init_l2cc */ ++ ++/* invalidate the D-CACHE */ ++.macro inv_dcache ++ mov r0,#0 ++ mcr p15,2,r0,c0,c0,0 /* cache size selection register, select dcache */ ++ mrc p15,1,r0,c0,c0,0 /* cache size ID register */ ++ mov r0,r0,ASR #13 ++ ldr r3,=0xfff ++ and r0,r0,r3 ++ cmp r0,#0x7f ++ moveq r6,#0x1000 ++ beq size_done ++ cmp r0,#0xff ++ moveq r6,#0x2000 ++ movne r6,#0x4000 ++ ++size_done: ++ mov r2,#0 ++ mov r3,#0x40000000 ++ mov r4,#0x80000000 ++ mov r5,#0xc0000000 ++ ++d_inv_loop: ++ mcr p15,0,r2,c7,c6,2 /* invalidate dcache by set / way */ ++ mcr p15,0,r3,c7,c6,2 /* invalidate dcache by set / way */ ++ mcr p15,0,r4,c7,c6,2 /* invalidate dcache by set / way */ ++ mcr p15,0,r5,c7,c6,2 /* invalidate dcache by set / way */ ++ add r2,r2,#0x20 ++ add r3,r3,#0x20 ++ add r4,r4,#0x20 ++ add r5,r5,#0x20 ++ ++ cmp r2,r6 ++ bne d_inv_loop ++.endm ++ ++/* AIPS setup - Only setup MPROTx registers. ++ * The PACR default values are good.*/ ++.macro init_aips ++ /* ++ * Set all MPROTx to be non-bufferable, trusted for R/W, ++ * not forced to user-mode. ++ */ ++ ldr r0, =AIPS1_ON_BASE_ADDR ++ ldr r1, =0x77777777 ++ str r1, [r0, #0x0] ++ str r1, [r0, #0x4] ++ ldr r1, =0x0 ++ str r1, [r0, #0x40] ++ str r1, [r0, #0x44] ++ str r1, [r0, #0x48] ++ str r1, [r0, #0x4C] ++ str r1, [r0, #0x50] ++ ++ ldr r0, =AIPS2_ON_BASE_ADDR ++ ldr r1, =0x77777777 ++ str r1, [r0, #0x0] ++ str r1, [r0, #0x4] ++ ldr r1, =0x0 ++ str r1, [r0, #0x40] ++ str r1, [r0, #0x44] ++ str r1, [r0, #0x48] ++ str r1, [r0, #0x4C] ++ str r1, [r0, #0x50] ++.endm /* init_aips */ ++ ++.macro setup_pll pll, freq ++.endm ++ ++.macro init_clock ++ ++/* PLL1, PLL2, and PLL3 are enabled by ROM */ ++#ifdef CONFIG_PLL3 ++ /* enable PLL3 for UART */ ++ ldr r0, ANATOP_BASE_ADDR_W ++ ++ /* power up PLL */ ++ ldr r1, [r0, #ANATOP_USB1] ++ orr r1, r1, #0x1000 ++ str r1, [r0, #ANATOP_USB1] ++ ++ /* enable PLL */ ++ ldr r1, [r0, #ANATOP_USB1] ++ orr r1, r1, #0x2000 ++ str r1, [r0, #ANATOP_USB1] ++ ++ /* wait PLL lock */ ++100: ++ ldr r1, [r0, #ANATOP_USB1] ++ mov r1, r1, lsr #31 ++ cmp r1, #0x1 ++ bne 100b ++ ++ /* clear bypass bit */ ++ ldr r1, [r0, #ANATOP_USB1] ++ and r1, r1, #0xfffeffff ++ str r1, [r0, #ANATOP_USB1] ++#endif ++ ++ /* Restore the default values in the Gate registers */ ++ ldr r0, CCM_BASE_ADDR_W ++ ldr r1, =0xC0003F ++ str r1, [r0, #CLKCTL_CCGR0] ++ ldr r1, =0x30FC00 ++ str r1, [r0, #CLKCTL_CCGR1] ++ ldr r1, =0xFFFC000 ++ str r1, [r0, #CLKCTL_CCGR2] ++ ldr r1, =0x3FF00000 ++ str r1, [r0, #CLKCTL_CCGR3] ++ ldr r1, =0xFFF300 ++ str r1, [r0, #CLKCTL_CCGR4] ++ ldr r1, =0xF0000C3 ++ str r1, [r0, #CLKCTL_CCGR5] ++#ifdef CONFIG_CMD_WEIMNOR ++ ldr r1, =0xFFC ++#else ++ ldr r1, =0x3FC ++#endif ++ str r1, [r0, #CLKCTL_CCGR6] ++.endm ++ ++.section ".text.init", "x" ++ ++.globl lowlevel_init ++lowlevel_init: ++ ++ inv_dcache ++ ++ init_l2cc ++ ++ init_aips ++ ++ init_clock ++ ++ mov pc, lr ++ ++/* Board level setting value */ ++ANATOP_BASE_ADDR_W: .word ANATOP_BASE_ADDR ++CCM_BASE_ADDR_W: .word CCM_BASE_ADDR +diff --git a/board/freescale/wandboard/u-boot.lds b/board/freescale/wandboard/u-boot.lds +new file mode 100644 +index 0000000..650c8a8 +--- /dev/null ++++ b/board/freescale/wandboard/u-boot.lds +@@ -0,0 +1,74 @@ ++/* ++ * January 2004 - Changed to support H4 device ++ * Copyright (c) 2004 Texas Instruments ++ * ++ * (C) Copyright 2002 ++ * Gary Jennejohn, DENX Software Engineering, <[email protected]> ++ * ++ * (C) Copyright 2011 Freescale Semiconductor, Inc. ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") ++OUTPUT_ARCH(arm) ++ENTRY(_start) ++SECTIONS ++{ ++ . = 0x00000000; ++ ++ . = ALIGN(4); ++ .text : ++ { ++ /* WARNING - the following is hand-optimized to fit within */ ++ /* the sector layout of our flash chips! XXX FIXME XXX */ ++ board/freescale/wandboard/flash_header.o (.text.flasheader) ++ cpu/arm_cortexa8/start.o ++ board/freescale/wandboard/libwandboard.a (.text) ++ lib_arm/libarm.a (.text) ++ net/libnet.a (.text) ++ drivers/mtd/libmtd.a (.text) ++ drivers/mmc/libmmc.a (.text) ++ ++ . = DEFINED(env_offset) ? env_offset : .; ++ common/env_embedded.o(.text) ++ ++ *(.text) ++ } ++ ++ . = ALIGN(4); ++ .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } ++ ++ . = ALIGN(4); ++ .data : { *(.data) } ++ ++ . = ALIGN(4); ++ .got : { *(.got) } ++ ++ . = .; ++ __u_boot_cmd_start = .; ++ .u_boot_cmd : { *(.u_boot_cmd) } ++ __u_boot_cmd_end = .; ++ ++ . = ALIGN(4); ++ _end_of_copy = .; /* end_of ROM copy code here */ ++ __bss_start = .; ++ .bss : { *(.bss) } ++ _end = .; ++} +diff --git a/board/freescale/wandboard/wandboard.c b/board/freescale/wandboard/wandboard.c +new file mode 100644 +index 0000000..274febb +--- /dev/null ++++ b/board/freescale/wandboard/wandboard.c +@@ -0,0 +1,494 @@ ++/* ++ * Wandboard u-boot board-file. ++ * ++ * Copyright (C) Wandboard.org ++ * This file is a quick-mock up, to get a kernel booting. ++ * ++ * Maintainer: Tapani Utriainen <tapani at vmail me> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include <common.h> ++#include <asm/io.h> ++#include <asm/arch/mx6.h> ++#include <asm/arch/mx6_pins.h> ++#include <asm/arch/mx6dl_pins.h> ++#include <asm/arch/iomux-v3.h> ++#include <asm/errno.h> ++ ++#ifdef CONFIG_MXC_FEC ++#include <miiphy.h> ++#endif ++ ++#ifdef CONFIG_CMD_MMC ++#include <mmc.h> ++#include <fsl_esdhc.h> ++#endif ++ ++#ifdef CONFIG_ARCH_MMU ++#include <asm/mmu.h> ++#include <asm/arch/mmu.h> ++#endif ++ ++#ifdef CONFIG_CMD_CLOCK ++#include <asm/clock.h> ++#endif ++ ++#ifdef CONFIG_CMD_IMXOTP ++#include <imx_otp.h> ++#endif ++ ++DECLARE_GLOBAL_DATA_PTR; ++ ++static enum boot_device boot_dev; ++ ++static void set_gpio_output_val(unsigned base, unsigned mask, unsigned val) ++{ ++ unsigned reg = readl(base + GPIO_DR); ++ if (val & 1) ++ reg |= mask; /* set high */ ++ else ++ reg &= ~mask; /* clear low */ ++ writel(reg, base + GPIO_DR); ++ ++ reg = readl(base + GPIO_GDIR); ++ reg |= mask; /* configure GPIO line as output */ ++ writel(reg, base + GPIO_GDIR); ++} ++ ++static inline void setup_boot_device(void) ++{ ++ uint soc_sbmr = readl(SRC_BASE_ADDR + 0x4); ++ uint bt_mem_ctl = (soc_sbmr & 0x000000FF) >> 4 ; ++ uint bt_mem_type = (soc_sbmr & 0x00000008) >> 3; ++ ++ switch (bt_mem_ctl) { ++ case 0x0: ++ if (bt_mem_type) ++ boot_dev = ONE_NAND_BOOT; ++ else ++ boot_dev = WEIM_NOR_BOOT; ++ break; ++ case 0x2: ++ boot_dev = SATA_BOOT; ++ break; ++ case 0x3: ++ if (bt_mem_type) ++ boot_dev = I2C_BOOT; ++ else ++ boot_dev = SPI_NOR_BOOT; ++ break; ++ case 0x4: ++ case 0x5: ++ boot_dev = SD_BOOT; ++ break; ++ case 0x6: ++ case 0x7: ++ boot_dev = MMC_BOOT; ++ break; ++ case 0x8 ... 0xf: ++ boot_dev = NAND_BOOT; ++ break; ++ default: ++ boot_dev = UNKNOWN_BOOT; ++ break; ++ } ++} ++ ++enum boot_device get_boot_device(void) { ++ return boot_dev; ++} ++ ++u32 get_board_rev(void) { ++ return fsl_system_rev; ++} ++ ++#ifdef CONFIG_ARCH_MMU ++void board_mmu_init(void) ++{ ++ unsigned long ttb_base = PHYS_SDRAM_1 + 0x4000; ++ unsigned long i; ++ ++ /* ++ * Set the TTB register ++ */ ++ asm volatile ("mcr p15,0,%0,c2,c0,0" : : "r"(ttb_base) /*:*/); ++ ++ /* ++ * Set the Domain Access Control Register ++ */ ++ i = ARM_ACCESS_DACR_DEFAULT; ++ asm volatile ("mcr p15,0,%0,c3,c0,0" : : "r"(i) /*:*/); ++ ++ /* ++ * First clear all TT entries - ie Set them to Faulting ++ */ ++ memset((void *)ttb_base, 0, ARM_FIRST_LEVEL_PAGE_TABLE_SIZE); ++ /* Actual Virtual Size Attributes Function */ ++ /* Base Base MB cached? buffered? access permissions */ ++ /* xxx00000 xxx00000 */ ++ X_ARM_MMU_SECTION(0x000, 0x000, 0x001, ++ ARM_UNCACHEABLE, ARM_UNBUFFERABLE, ++ ARM_ACCESS_PERM_RW_RW); /* ROM, 1M */ ++ X_ARM_MMU_SECTION(0x001, 0x001, 0x008, ++ ARM_UNCACHEABLE, ARM_UNBUFFERABLE, ++ ARM_ACCESS_PERM_RW_RW); /* 8M */ ++ X_ARM_MMU_SECTION(0x009, 0x009, 0x001, ++ ARM_UNCACHEABLE, ARM_UNBUFFERABLE, ++ ARM_ACCESS_PERM_RW_RW); /* IRAM */ ++ X_ARM_MMU_SECTION(0x00A, 0x00A, 0x0F6, ++ ARM_UNCACHEABLE, ARM_UNBUFFERABLE, ++ ARM_ACCESS_PERM_RW_RW); /* 246M */ ++ /* 2 GB memory starting at 0x10000000, only map 1.875 GB */ ++ X_ARM_MMU_SECTION(0x100, 0x100, 0x780, ++ ARM_CACHEABLE, ARM_BUFFERABLE, ++ ARM_ACCESS_PERM_RW_RW); ++ /* uncached alias of the same 1.875 GB memory */ ++ X_ARM_MMU_SECTION(0x100, 0x880, 0x780, ++ ARM_UNCACHEABLE, ARM_UNBUFFERABLE, ++ ARM_ACCESS_PERM_RW_RW); ++ ++ /* Enable MMU */ ++ MMU_ON(); ++} ++#endif ++ ++int dram_init(void) ++{ ++ gd->bd->bi_dram[0].start = PHYS_SDRAM_1; ++ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; ++ return 0; ++} ++ ++static void setup_uart(void) { ++ /* UART1 TXD */ ++ mxc_iomux_v3_setup_pad(MX6DL_PAD_CSI0_DAT10__UART1_TXD); ++ ++ /* UART1 RXD */ ++ mxc_iomux_v3_setup_pad(MX6DL_PAD_CSI0_DAT11__UART1_RXD); ++ ++} ++ ++#ifdef CONFIG_CMD_MMC ++ ++/* On this board, only SD3 can support 1.8V signalling ++ * that is required for UHS-I mode of operation. ++ * Last element in struct is used to indicate 1.8V support. ++ */ ++struct fsl_esdhc_cfg usdhc_cfg[4] = { ++ {USDHC1_BASE_ADDR, 1, 1, 1, 0}, ++ {USDHC2_BASE_ADDR, 1, 1, 1, 0}, ++ {USDHC3_BASE_ADDR, 1, 1, 1, 0}, ++ {USDHC4_BASE_ADDR, 1, 1, 1, 0}, ++}; ++ ++#ifdef CONFIG_DYNAMIC_MMC_DEVNO ++int get_mmc_env_devno(void) ++{ ++ uint soc_sbmr = readl(SRC_BASE_ADDR + 0x4); ++ ++ if (SD_BOOT == boot_dev || MMC_BOOT == boot_dev) { ++ /* BOOT_CFG2[3] and BOOT_CFG2[4] */ ++ return (soc_sbmr & 0x00001800) >> 11; ++ } else ++ return -1; ++ ++} ++#endif ++ ++iomux_v3_cfg_t usdhc1_pads[] = { ++ MX6DL_PAD_SD1_CLK__USDHC1_CLK, ++ MX6DL_PAD_SD1_CMD__USDHC1_CMD, ++ MX6DL_PAD_SD1_DAT0__USDHC1_DAT0, ++ MX6DL_PAD_SD1_DAT1__USDHC1_DAT1, ++ MX6DL_PAD_SD1_DAT2__USDHC1_DAT2, ++ MX6DL_PAD_SD1_DAT3__USDHC1_DAT3, ++}; ++ ++iomux_v3_cfg_t usdhc2_pads[] = { ++ MX6DL_PAD_SD2_CLK__USDHC2_CLK, ++ MX6DL_PAD_SD2_CMD__USDHC2_CMD, ++ MX6DL_PAD_SD2_DAT0__USDHC2_DAT0, ++ MX6DL_PAD_SD2_DAT1__USDHC2_DAT1, ++ MX6DL_PAD_SD2_DAT2__USDHC2_DAT2, ++ MX6DL_PAD_SD2_DAT3__USDHC2_DAT3, ++}; ++ ++iomux_v3_cfg_t usdhc3_pads[] = { ++ MX6DL_PAD_SD3_CLK__USDHC3_CLK, ++ MX6DL_PAD_SD3_CMD__USDHC3_CMD, ++ MX6DL_PAD_SD3_DAT0__USDHC3_DAT0, ++ MX6DL_PAD_SD3_DAT1__USDHC3_DAT1, ++ MX6DL_PAD_SD3_DAT2__USDHC3_DAT2, ++ MX6DL_PAD_SD3_DAT3__USDHC3_DAT3, ++}; ++ ++int usdhc_pad_init(bd_t *bis) { ++ s32 status = 0; ++ u32 index = 0; ++ ++ for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++ ++index) { ++ switch (index) { ++ case 0: ++ mxc_iomux_v3_setup_multiple_pads(usdhc1_pads, ++ ARRAY_SIZE(usdhc1_pads)); ++ break; ++ case 1: ++ mxc_iomux_v3_setup_multiple_pads(usdhc2_pads, ++ ARRAY_SIZE(usdhc2_pads)); ++ break; ++ case 2: ++ mxc_iomux_v3_setup_multiple_pads(usdhc3_pads, ++ ARRAY_SIZE(usdhc3_pads)); ++ break; ++ default: ++ printf("Warning: you configured more USDHC controllers" ++ "(%d) then supported by the board (%d)\n", ++ index+1, CONFIG_SYS_FSL_USDHC_NUM); ++ return status; ++ } ++ status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]); ++ } ++ ++ return status; ++} ++ ++int board_mmc_init(bd_t *bis) { ++ if (!usdhc_pad_init(bis)) ++ return 0; ++ else ++ return -1; ++} ++ ++/* For DDR mode operation, provide target delay parameter for each SD port. ++ * Use cfg->esdhc_base to distinguish the SD port #. The delay for each port ++ * is dependent on signal layout for that particular port. If the following ++ * CONFIG is not defined, then the default target delay value will be used. ++ */ ++#ifdef CONFIG_GET_DDR_TARGET_DELAY ++u32 get_ddr_delay(struct fsl_esdhc_cfg *cfg) { return 0; } ++#endif ++ ++#endif ++ ++int board_init(void) { ++ mxc_iomux_v3_init((void *)IOMUXC_BASE_ADDR); ++ setup_boot_device(); ++ fsl_set_system_rev(); ++ ++ /* board id for linux */ ++ gd->bd->bi_arch_number = 4412; ++ ++ /* address of boot parameters */ ++ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; ++ ++ setup_uart(); ++ ++ return 0; ++} ++ ++extern int fec_get_mac_addr(unsigned char *mac); ++ ++int board_late_init(void) { ++ ++ unsigned char mac[6]; ++ int i; ++ ++ fec_get_mac_addr(mac); ++ printf("Got MAC = "); ++ for (i=0; i<6; i++) { ++ printf("%02X", mac[i]); ++ if (i<5) printf(":"); else printf("\n"); ++ } ++ ++ ++ return 0; ++} ++ ++#ifdef CONFIG_MXC_FEC ++static int phy_read(char *devname, unsigned char addr, unsigned char reg, ++ unsigned short *pdata) ++{ ++ int ret = miiphy_read(devname, addr, reg, pdata); ++ if (ret) ++ printf("Error reading from %s PHY addr=%02x reg=%02x\n", ++ devname, addr, reg); ++ return ret; ++} ++ ++static int phy_write(char *devname, unsigned char addr, unsigned char reg, ++ unsigned short value) ++{ ++ int ret = miiphy_write(devname, addr, reg, value); ++ if (ret) ++ printf("Error writing to %s PHY addr=%02x reg=%02x\n", devname, ++ addr, reg); ++ return ret; ++} ++ ++int mx6_rgmii_rework(char *devname, int phy_addr) ++{ ++ unsigned short val; ++ ++ /* To enable AR8031 ouput a 125MHz clk from CLK_25M */ ++ phy_write(devname, phy_addr, 0xd, 0x7); ++ phy_write(devname, phy_addr, 0xe, 0x8016); ++ phy_write(devname, phy_addr, 0xd, 0x4007); ++ phy_read(devname, phy_addr, 0xe, &val); ++ ++ val &= 0xffe3; ++ val |= 0x18; ++ phy_write(devname, phy_addr, 0xe, val); ++ ++ /* introduce tx clock delay */ ++ phy_write(devname, phy_addr, 0x1d, 0x5); ++ phy_read(devname, phy_addr, 0x1e, &val); ++ val |= 0x0100; ++ phy_write(devname, phy_addr, 0x1e, val); ++ ++ return 0; ++} ++ ++#if defined CONFIG_MX6Q ++iomux_v3_cfg_t enet_pads[] = { ++ MX6Q_PAD_ENET_MDIO__ENET_MDIO, ++ MX6Q_PAD_ENET_MDC__ENET_MDC, ++ MX6Q_PAD_RGMII_TXC__ENET_RGMII_TXC, ++ MX6Q_PAD_RGMII_TD0__ENET_RGMII_TD0, ++ MX6Q_PAD_RGMII_TD1__ENET_RGMII_TD1, ++ MX6Q_PAD_RGMII_TD2__ENET_RGMII_TD2, ++ MX6Q_PAD_RGMII_TD3__ENET_RGMII_TD3, ++ MX6Q_PAD_RGMII_TX_CTL__ENET_RGMII_TX_CTL, ++ MX6Q_PAD_ENET_REF_CLK__ENET_TX_CLK, ++ MX6Q_PAD_RGMII_RXC__ENET_RGMII_RXC, ++ MX6Q_PAD_RGMII_RD0__ENET_RGMII_RD0, ++ MX6Q_PAD_RGMII_RD1__ENET_RGMII_RD1, ++ MX6Q_PAD_RGMII_RD2__ENET_RGMII_RD2, ++ MX6Q_PAD_RGMII_RD3__ENET_RGMII_RD3, ++ MX6Q_PAD_RGMII_RX_CTL__ENET_RGMII_RX_CTL, ++ MX6Q_PAD_GPIO_0__CCM_CLKO, ++ MX6Q_PAD_GPIO_3__CCM_CLKO2, ++}; ++#elif defined CONFIG_MX6DL ++iomux_v3_cfg_t enet_pads[] = { ++ MX6DL_PAD_ENET_MDIO__ENET_MDIO, ++ MX6DL_PAD_ENET_MDC__ENET_MDC, ++ MX6DL_PAD_RGMII_TXC__ENET_RGMII_TXC, ++ MX6DL_PAD_RGMII_TD0__ENET_RGMII_TD0, ++ MX6DL_PAD_RGMII_TD1__ENET_RGMII_TD1, ++ MX6DL_PAD_RGMII_TD2__ENET_RGMII_TD2, ++ MX6DL_PAD_RGMII_TD3__ENET_RGMII_TD3, ++ MX6DL_PAD_RGMII_TX_CTL__ENET_RGMII_TX_CTL, ++ MX6DL_PAD_ENET_REF_CLK__ENET_TX_CLK, ++ MX6DL_PAD_RGMII_RXC__ENET_RGMII_RXC, ++ MX6DL_PAD_RGMII_RD0__ENET_RGMII_RD0, ++ MX6DL_PAD_RGMII_RD1__ENET_RGMII_RD1, ++ MX6DL_PAD_RGMII_RD2__ENET_RGMII_RD2, ++ MX6DL_PAD_RGMII_RD3__ENET_RGMII_RD3, ++ MX6DL_PAD_RGMII_RX_CTL__ENET_RGMII_RX_CTL, ++ MX6DL_PAD_GPIO_0__CCM_CLKO, ++}; ++#endif ++ ++void enet_board_init(void) ++{ ++ unsigned int reg; ++#if defined CONFIG_MX6Q ++ iomux_v3_cfg_t enet_reset = ++ (_MX6Q_PAD_EIM_D29__GPIO_3_29 & ++ ~MUX_PAD_CTRL_MASK) | ++ MUX_PAD_CTRL(0x48); ++#elif defined CONFIG_MX6DL ++ iomux_v3_cfg_t enet_reset = ++ (MX6DL_PAD_EIM_D29__GPIO_3_29 & ++ ~MUX_PAD_CTRL_MASK) | ++ MUX_PAD_CTRL(0x48); ++#endif ++ ++ mxc_iomux_v3_setup_multiple_pads(enet_pads, ++ ARRAY_SIZE(enet_pads)); ++ mxc_iomux_v3_setup_pad(enet_reset); ++ ++ /* PHY reset: gpio 3-29 */ ++ set_gpio_output_val(GPIO3_BASE_ADDR, (1 << 29), 0); ++ ++ udelay(500); ++ ++ set_gpio_output_val(GPIO3_BASE_ADDR, (1 << 29), 1); ++ ++} ++#endif ++ ++int checkboard(void) { ++ printf("Board: %s WandBoard 0x%x [", ++ mx6_chip_name(), ++ fsl_system_rev); ++ ++ switch (__REG(SRC_BASE_ADDR + 0x8)) { ++ case 0x0001: ++ printf("POR"); ++ break; ++ case 0x0009: ++ printf("RST"); ++ break; ++ case 0x0010: ++ case 0x0011: ++ printf("WDOG"); ++ break; ++ default: ++ printf("unknown"); ++ } ++ printf(" ]\n"); ++ ++ printf("Boot Device: "); ++ switch (get_boot_device()) { ++ case WEIM_NOR_BOOT: ++ printf("NOR\n"); ++ break; ++ case ONE_NAND_BOOT: ++ printf("ONE NAND\n"); ++ break; ++ case PATA_BOOT: ++ printf("PATA\n"); ++ break; ++ case SATA_BOOT: ++ printf("SATA\n"); ++ break; ++ case I2C_BOOT: ++ printf("I2C\n"); ++ break; ++ case SPI_NOR_BOOT: ++ printf("SPI NOR\n"); ++ break; ++ case SD_BOOT: ++ printf("SD\n"); ++ break; ++ case MMC_BOOT: ++ printf("MMC\n"); ++ break; ++ case NAND_BOOT: ++ printf("NAND\n"); ++ break; ++ case UNKNOWN_BOOT: ++ default: ++ printf("UNKNOWN\n"); ++ break; ++ } ++ return 0; ++} ++ +diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h +index 2630bac..e00b122 100644 +--- a/include/asm-arm/mach-types.h ++++ b/include/asm-arm/mach-types.h +@@ -3258,6 +3258,9 @@ extern unsigned int __machine_arch_type; + #define MACH_TYPE_MX6Q_SABRELITE 3769 + #define MACH_TYPE_MX6Q_ARM2 3837 + #define MACH_TYPE_MX6Q_SABRESD 3980 ++#define MACH_TYPE_EDM_SF_IMX6 4256 ++#define MACH_TYPE_EDM_CF_IMX6 4257 ++#define MACH_TYPE_WANDBOARD 4412 + #define MACH_TYPE_MX6SL_ARM2 4091 + #define MACH_TYPE_MX6SL_EVK 4307 + +@@ -42213,6 +42216,30 @@ extern unsigned int __machine_arch_type; + # define machine_is_mx6sl_evk() (0) + #endif + ++#ifdef CONFIG_MACH_EDM_SF_IMX6 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_EDM_SF_IMX6 ++# endif ++# define machine_is_edm_sf_imx6() (machine_arch_type == MACH_TYPE_EDM_SF_IMX6) ++#else ++# define machine_is_edm_sf_imx6() (0) ++#endif ++ ++#ifdef CONFIG_MACH_EDM_CF_IMX6 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_EDM_CF_IMX6 ++# endif ++# define machine_is_edm_cf_imx6() (machine_arch_type == MACH_TYPE_EDM_CF_IMX6) ++#else ++# define machine_is_edm_cf_imx6() (0) ++#endif ++ + /* + * These have not yet been registered + */ +diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h +new file mode 100644 +index 0000000..e872c6b +--- /dev/null ++++ b/include/configs/wandboard.h +@@ -0,0 +1,273 @@ ++/* ++ * Configuration settings for the Wandboard. ++ * ++ * Copyright (C) 2013 Wandboard.org ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++ ++#include <asm/arch/mx6.h> ++ ++ /* High Level Configuration Options */ ++#define CONFIG_ARMV7 ++#define CONFIG_MXC ++#define CONFIG_MX6DL ++#define CONFIG_WANDBOARD ++ ++/* Comment this line when compiling for the Wandboard Solo */ ++#define CONFIG_WANDBOARD_DUAL ++ ++/* Setup memory depending if we have 512M/1G. */ ++#ifdef CONFIG_WANDBOARD_DUAL ++#define CONFIG_MX6DL_DDR3 ++#define CONFIG_DDR_64BIT ++#else ++#define CONFIG_MX6SOLO_DDR3 ++#define CONFIG_DDR_32BIT ++#endif ++ ++#define CONFIG_FLASH_HEADER ++#define CONFIG_FLASH_HEADER_OFFSET 0x400 ++#define CONFIG_MX6_CLK32 32768 ++ ++#define CONFIG_SKIP_RELOCATE_UBOOT ++ ++#define CONFIG_ARCH_CPU_INIT ++#undef CONFIG_ARCH_MMU /* disable MMU first */ ++#define CONFIG_L2_OFF /* disable L2 cache first*/ ++ ++#define CONFIG_MX6_HCLK_FREQ 24000000 ++ ++#define CONFIG_DISPLAY_CPUINFO ++#define CONFIG_DISPLAY_BOARDINFO ++ ++#define CONFIG_SYS_64BIT_VSPRINTF ++ ++#define BOARD_LATE_INIT ++ ++#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ ++#define CONFIG_REVISION_TAG ++#define CONFIG_SETUP_MEMORY_TAGS ++ ++/* ++ * Size of malloc() pool ++ */ ++#define CONFIG_SYS_MALLOC_LEN (8 * 1024 * 1024) ++/* size in bytes reserved for initial data */ ++#define CONFIG_SYS_GBL_DATA_SIZE 128 ++ ++/* ++ * Hardware drivers ++ */ ++#define CONFIG_MXC_UART ++#define CONFIG_MXC_GPIO ++#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR ++ ++/* allow to overwrite serial and ethaddr */ ++#define CONFIG_ENV_OVERWRITE ++#define CONFIG_CONS_INDEX 1 ++#define CONFIG_BAUDRATE 115200 ++#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200} ++ ++/*********************************************************** ++ * Command definition ++ ***********************************************************/ ++ ++#define CONFIG_CMD_BDI /* bdinfo */ ++#define CONFIG_CMD_CONSOLE /* coninfo */ ++#define CONFIG_CMD_ECHO /* echo arguments */ ++#define CONFIG_CMD_IMI /* iminfo */ ++#define CONFIG_CMD_ITEST /* Integer (and string) test */ ++#define CONFIG_CMD_LOADB /* loadb */ ++#define CONFIG_CMD_LOADS /* loads */ ++#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */ ++#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/ ++#define CONFIG_CMD_RUN /* run command in env variable */ ++#define CONFIG_CMD_SAVEENV /* saveenv */ ++#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ ++#define CONFIG_CMD_SOURCE /* "source" command support */ ++#define CONFIG_CMD_XIMG /* Load part of Multi Image */ ++ ++#define CONFIG_PARTITIONS 1 ++ ++#define CONFIG_SYS_NO_FLASH ++#define CONFIG_CMD_BOOTD /* bootd */ ++ ++#define CONFIG_CMD_IMXOTP ++#define CONFIG_CMD_NET ++#define CONFIG_NET_MULTI 1 ++#define CONFIG_FEC0_IOBASE ENET_BASE_ADDR ++#define CONFIG_FEC0_PINMUX -1 ++#define CONFIG_FEC0_MIIBASE -1 ++#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM ++#define CONFIG_MXC_FEC ++#define CONFIG_FEC0_PHY_ADDR 0xFF ++#define CONFIG_DISCOVER_PHY ++#define CONFIG_ETH_PRIME ++#define CONFIG_RMII ++#define CONFIG_CMD_MII ++#define CONFIG_CMD_DHCP ++#define CONFIG_CMD_PING ++#define CONFIG_IPADDR 192.168.1.103 ++#define CONFIG_SERVERIP 192.168.1.101 ++#define CONFIG_NETMASK 255.255.255.0 ++ ++/* Enable below configure when supporting nand */ ++#define CONFIG_CMD_MMC ++#define CONFIG_CMD_ENV ++#define CONFIG_CMD_REGUL ++ ++#define CONFIG_CMD_CLOCK ++#define CONFIG_REF_CLK_FREQ CONFIG_MX6_HCLK_FREQ ++ ++#undef CONFIG_CMD_IMLS ++ ++#define CONFIG_CMD_IMX_DOWNLOAD_MODE ++ ++#define CONFIG_BOOTDELAY 1 ++ ++#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */ ++#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) ++ ++#define CONFIG_EXTRA_ENV_SETTINGS \ ++ "netdev=eth0\0" \ ++ "uboot=u-boot.bin\0" \ ++ "kernel=uImage\0" \ ++ "bootargs=console=ttymxc0,115200\0" \ ++ "videoargs=video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24\0" \ ++ "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \ ++ "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs " \ ++ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \ ++ "video=${videoargs}\0" \ ++ "bootcmd_net=dhcp; run bootargs_base bootargs_nfs;bootm\0" \ ++ "bootargs_mmc=setenv bootargs ${bootargs} " \ ++ "root=/dev/mmcblk0p2 rootwait rw " \ ++ "video=${videoargs}\0" \ ++ "bootcmd_mmc=run bootargs_base bootargs_mmc;mmc dev 2;" \ ++ "fatload mmc 2 ${loadaddr} ${kernel};bootm\0" \ ++ "bootcmd=run bootcmd_mmc\0" \ ++ "upgradeu=for disk in 0 1 ; do mmc dev ${disk} ;" \ ++ "for fs in fat ext2 ; do " \ ++ "${fs}load mmc ${disk}:1 10008000 " \ ++ "/6q_upgrade && " \ ++ "source 10008000 ; " \ ++ "done ; " \ ++ "done\0" \ ++ "bootfile=_BOOT_FILE_PATH_IN_TFTP_\0" \ ++ "nfsroot=_ROOTFS_PATH_IN_NFS_\0" ++ ++#define CONFIG_ARP_TIMEOUT 200UL ++ ++/* ++ * Miscellaneous configurable options ++ */ ++#define CONFIG_SYS_LONGHELP /* undef to save memory */ ++#define CONFIG_SYS_PROMPT "WANDBOARD U-Boot > " ++#define CONFIG_AUTO_COMPLETE ++#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ ++/* Print Buffer Size */ ++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) ++#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ ++#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ ++ ++#define CONFIG_SYS_MEMTEST_START 0x10000000 /* memtest works on */ ++#define CONFIG_SYS_MEMTEST_END 0x10010000 ++ ++#undef CONFIG_SYS_CLKS_IN_HZ /* everything, incl board info, in Hz */ ++ ++#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR ++ ++#define CONFIG_SYS_HZ 1000 ++ ++#define CONFIG_CMDLINE_EDITING ++ ++/* ++ * OCOTP Configs ++ */ ++#ifdef CONFIG_CMD_IMXOTP ++ #define CONFIG_IMX_OTP ++ #define IMX_OTP_BASE OCOTP_BASE_ADDR ++ #define IMX_OTP_ADDR_MAX 0x7F ++ #define IMX_OTP_DATA_ERROR_VAL 0xBADABADA ++#endif ++ ++/* Regulator Configs */ ++#ifdef CONFIG_CMD_REGUL ++ #define CONFIG_ANATOP_REGULATOR ++ #define CONFIG_CORE_REGULATOR_NAME "vdd1p1" ++ #define CONFIG_PERIPH_REGULATOR_NAME "vdd1p1" ++#endif ++ ++/* ++ * MMC Configs ++ */ ++#ifdef CONFIG_CMD_MMC ++ #define CONFIG_MMC ++ #define CONFIG_GENERIC_MMC ++ #define CONFIG_IMX_MMC ++ #define CONFIG_SYS_FSL_USDHC_NUM 3 ++ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 ++ #define CONFIG_SYS_MMC_ENV_DEV 2 ++ #define CONFIG_DOS_PARTITION 1 ++ #define CONFIG_CMD_FAT 1 ++ #define CONFIG_CMD_EXT2 1 ++ ++ /* detect whether SD1 or 3 is boot device */ ++ #define CONFIG_DYNAMIC_MMC_DEVNO ++ ++ /* No 8 bit MMC */ ++ #define CONFIG_MMC_8BIT_PORTS 0x0 ++#endif ++ ++/*----------------------------------------------------------------------- ++ * Stack sizes ++ * ++ * The stack sizes are set up in start.S using the settings below ++ */ ++#define CONFIG_STACKSIZE (256 * 1024) /* regular stack */ ++ ++/*----------------------------------------------------------------------- ++ * Physical Memory Map ++ */ ++#define CONFIG_NR_DRAM_BANKS 1 ++#define PHYS_SDRAM_1 CSD0_DDR_BASE_ADDR ++#ifdef CONFIG_DDR_64BIT ++ #define PHYS_SDRAM_1_SIZE (1u * 1024 * 1024 * 1024) ++#else ++ #define PHYS_SDRAM_1_SIZE (512u * 1024 * 1024) ++#endif ++#define iomem_valid_addr(addr, size) \ ++ (addr >= PHYS_SDRAM_1 && addr <= (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)) ++ ++/*----------------------------------------------------------------------- ++ * FLASH and environment organization ++ */ ++ ++/* No NAND */ ++#define CONFIG_SYS_NO_FLASH ++ ++/* Monitor at beginning of flash */ ++#define CONFIG_FSL_ENV_IN_MMC ++ ++#define CONFIG_ENV_SECT_SIZE (8 * 1024) ++#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE ++#define CONFIG_ENV_IS_IN_MMC 1 ++#define CONFIG_ENV_OFFSET (768 * 1024) ++ ++#endif /* __CONFIG_H */ +-- +1.7.9.5 +
recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend new file +8 -0
@@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" + +PRINC := "${@int(PRINC) + 1}" + +# Wandboard-specific patches +SRC_URI_append_wandboard-dual= " \ + file://wandboard-dual/0001-u-boot-2009.08-Add-Wandboard-Dual-support.patch \ +"
Signature · 1 line
1.7.9.5
PATCH v2 3/3 wandboard-dual: Add machine definition
In reply to John Weberwandboard-dual: Add machine definition
--- conf/machine/wandboard-dual.conf | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 conf/machine/wandboard-dual.conf
conf/machine/wandboard-dual.conf new file +20 -0
@@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: i.MX6 Wandboard Dual +#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Dual + +include conf/machine/include/imx-base.inc +include conf/machine/include/tune-cortexa9.inc + +SOC_FAMILY = "mx6dl:mx6" + +KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-wandboard.dts" + +PREFERRED_PROVIDER_u-boot = "u-boot-imx" + +UBOOT_MACHINE = "wandboard_config" +UBOOT_SUFFIX = "bin" +UBOOT_PADDING = "2" + +SERIAL_CONSOLE = "115200 ttymxc0" + +MACHINE_FEATURES += " pci wifi bluetooth"
Signature · 1 line
1.7.9.5
Quoted 10 lines · John Weber
This patchset adds support for Wandboard-dual.
Changes since v1:
Kernel patch no longer containswandboard_defconfigas it is not used. Upstream-status field added to all generated patches Shortlogs changed to reflect convention suggested by OtavioJohn Weber (3):
linux (3.0.35): Add support for Wandboard-Dual u-boot (2009.08): Add support for Wandboard-Dual
wandboard-dual: Add machine definition
All patchset merged; I've did minor changes:
- removed duplicated commitlog
- add space in SRC_URI
Please take a look in the changes I did.
Regards,
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Excellent! Thanks for correcting.
Quoted 26 lines · Otavio Salvador
Quoted 10 lines · John Weber
This patchset adds support for Wandboard-dual.
Changes since v1:
Kernel patch no longer containswandboard_defconfigas it is not used. Upstream-status field added to all generated patches Shortlogs changed to reflect convention suggested by OtavioJohn Weber (3):
linux (3.0.35): Add support for Wandboard-Dual u-boot (2009.08): Add support for Wandboard-Dual
wandboard-dual: Add machine definitionAll patchset merged; I've did minor changes:
- removed duplicated commitlog
- add space inSRC_URIPlease take a look in the changes I did.
Regards,
--
Otavio SalvadorO.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Fabio Estevam
reviewerOtavio,
Quoted 6 lines · Otavio Salvador
All patchset merged; I've did minor changes:
- removed duplicated commitlog
- add space inSRC_URIPlease take a look in the changes I did.
I can't see the patches in master:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-fsl-arm/log/
Have you pushed them already?
They should be in extra.
Quoted 17 lines · Fabio Estevam
Otavio,
Quoted 6 lines · On Wed, Feb 27, 2013 at 9:33 AM, Otavio Salvador <[email protected]…
All patchset merged; I've did minor changes:
- removed duplicated commitlog
- add space inSRC_URIPlease take a look in the changes I did.
I can't see the patches in master:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-fsl-arm/log/Have you pushed them already?
Fabio Estevam
reviewerQuoted 1 line · John Weber
They should be in extra.
Great, you are right. I see them at
https://github.com/Freescale/meta-fsl-arm-extra