MXSCM-290-2 mx6dqscm: convert to enable OF_CONTROL and DM drivers

Update mx6dqscm boards code and build configurations to enable
OF_CONTROL and DM drivers.

1. Update GPIO codes for adding gpio request
2. Enable USB DM driver
3. Update PMIC and LDO by-pass codes for DM PMIC
4. Add spinor boot support
5. Add lpddr2 modes, sizes and boards on local Kconfig
6. Update license with NXP 2017
7. Add defconfigs for qwks boards

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>

2 files changed, 42 insertions, 96 deletions

diff --git a/include/configs/mx6dqscm.h b/include/configs/mx6dqscm.h
index 8603289..6f92cab 100644
--- a/include/configs/mx6dqscm.h
+++ b/include/configs/mx6dqscm.h
@@ -1,9 +1,8 @@
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  *
- * Configuration settings for the Freescale i.MX6DQ SCM boards.
- *
- * SPDX-License-Identifier:	GPL-2.0+
+ * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __MX6DQSCM_CONFIG_H
@@ -11,34 +10,16 @@
 
 #include "mx6_common.h"
 
-/* uncomment for PLUGIN mode support */
-/* #define CONFIG_USE_PLUGIN */
-
-/* uncomment for SECURE mode support */
-/* #define CONFIG_SECURE_BOOT */
-
-#ifdef CONFIG_SECURE_BOOT
-#ifndef CONFIG_CSF_SIZE
-#define CONFIG_CSF_SIZE 0x4000
-#endif
-#endif
-
 #define CONFIG_IMX_THERMAL
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN           (16 * SZ_1M)
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
 #define CONFIG_MXC_UART
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_MII
 #define CONFIG_FEC_MXC
 #define CONFIG_MII
 #define IMX_FEC_BASE                    ENET_BASE_ADDR
@@ -55,17 +36,17 @@
 #define CONFIG_MACH_TYPE        3980
 #ifdef CONFIG_SCMHVB
 #define CONFIG_MXC_UART_BASE    UART4_BASE
-#define CONFIG_CONSOLE_DEV      "ttymxc3"
+#define CONSOLE_DEV      "ttymxc3"
 #else
 #define CONFIG_MXC_UART_BASE    UART1_BASE
-#define CONFIG_CONSOLE_DEV      "ttymxc0"
+#define CONSOLE_DEV      "ttymxc0"
 #endif
 #define CONFIG_MMCROOT          "/dev/mmcblk2p2"  /* SDHC3 */
 
 #if defined(CONFIG_SCMHVB) || defined(CONFIG_SCMEVB)
-#define CONFIG_VIDEO_PRIMARY	" "
+#define VIDEO_PRIMARY	" "
 #else
-#define CONFIG_VIDEO_PRIMARY	"video=mxcfb0:dev=hdmi,1920x1080M@60,bpp=32 "
+#define VIDEO_PRIMARY	"video=mxcfb0:dev=hdmi,1920x1080M@60,bpp=32 "
 #endif
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART    1
@@ -115,7 +96,7 @@
 
 
 #define CONFIG_MFG_ENV_SETTINGS \
-	"mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \
+	"mfgtool_args=setenv bootargs console=" CONSOLE_DEV ",115200 " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
 		"g_mass_storage.file=/fat g_mass_storage.ro=1 " \
@@ -150,12 +131,12 @@
 #define EMMC_ENV ""
 #endif
 
-#if defined(CONFIG_SYS_BOOT_SATA)
+#if defined(CONFIG_SATA_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	"fdt_addr=0x18000000\0" \
 	"fdt_high=0xffffffff\0"   \
-	"bootargs=console=" CONFIG_CONSOLE_DEV ",115200 \0"\
+	"bootargs=console=" CONSOLE_DEV ",115200 \0"\
 	"bootargs_sata=setenv bootargs ${bootargs} " \
 		"root=/dev/sda1 rootwait rw \0" \
 	"bootcmd_sata=run bootargs_sata; sata init; " \
@@ -168,16 +149,12 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM    3
 #define CONFIG_SYS_MMC_ENV_DEV       1  /* SDHC3 */
+#ifndef CONFIG_SYS_MMC_ENV_PART
 #define CONFIG_SYS_MMC_ENV_PART     0  /* user partition */
-
-#ifdef CONFIG_SYS_USE_SPINOR
-#define CONFIG_SF_DEFAULT_CS        0
 #endif
 
-
 #define CONFIG_ARP_TIMEOUT     200UL
 
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
@@ -187,20 +164,22 @@
 /* Environment organization */
 #define CONFIG_ENV_SIZE                 (8 * 1024)
 
-#ifndef CONFIG_SYS_NOSMP
-#define CONFIG_SYS_NOSMP
-#endif
 
-#if defined CONFIG_SYS_BOOT_SPINOR
-#define CONFIG_SYS_USE_SPINOR
+#if defined CONFIG_SPI_BOOT
+#define CONFIG_CMD_SF
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#elif defined CONFIG_SYS_BOOT_SATA
+#elif defined CONFIG_SATA_BOOT
 #define CONFIG_ENV_IS_IN_SATA
 #define CONFIG_CMD_SATA
 #else
 #define CONFIG_ENV_IS_IN_MMC
 #endif
 
+#ifdef CONFIG_CMD_SF
+#define CONFIG_SF_DEFAULT_CS        0
+#endif
+
+
 #ifdef CONFIG_CMD_SATA
 #define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE    1
@@ -210,8 +189,7 @@
 #define CONFIG_LIBATA
 #endif
 
-#ifdef CONFIG_SYS_USE_SPINOR
-#define CONFIG_CMD_SF
+#ifdef CONFIG_CMD_SF
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_MXC_SPI
@@ -222,36 +200,34 @@
 
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET              (12 * 64 * 1024)
+#define CONFIG_ENV_OFFSET              (896 * 1024)
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET              (768 * 1024)
+#define CONFIG_ENV_OFFSET              (896 * 1024)
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
 #define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
 #define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
 #define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #elif defined(CONFIG_ENV_IS_IN_SATA)
-#define CONFIG_ENV_OFFSET              (768 * 1024)
-#define CONFIG_SATA_ENV_DEV            0
+#define CONFIG_ENV_OFFSET              (896 * 1024)
+#define CONFIG_SYS_SATA_ENV_DEV		0
 #define CONFIG_SYS_DCACHE_OFF /* remove when sata driver support cache */
 #endif
 
 /* I2C Configs */
-#define CONFIG_CMD_I2C
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
+#endif
+#ifdef CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_MXC_I2C1    /* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2    /* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3    /* enable I2C bus 3 */
 #define CONFIG_SYS_I2C_SPEED       100000
+#endif
 
 /* Framebuffer */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_CFB_CONSOLE
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -266,33 +242,13 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
-#if defined(CONFIG_ANDROID_SUPPORT)
+#if defined(CONFIG_FASTBOOT)
 #include "mx6dqscm_android.h"
 #else
 
-#define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_DUALSPEED
-
-#define CONFIG_USB_GADGET
-#define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
-
-#define CONFIG_G_DNL_VENDOR_NUM      0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM     0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER    "FSL"
-
-/* USB Device Firmware Update support */
-#define CONFIG_CMD_DFU
-#define CONFIG_USB_FUNCTION_DFU
-#define CONFIG_DFU_MMC
-#if defined(CONFIG_SYS_USE_SPINOR)
-#define CONFIG_DFU_SF
-#endif
-
-#endif /* CONFIG_ANDROID_SUPPORT */
+#endif /* CONFIG_FASTBOOT */
 
 /*
  * imx6 q/dl/solo pcie would be failed to work properly in kernel, if
@@ -306,9 +262,8 @@
  * the kernel's, are required.
  */
 /* #define CONFIG_CMD_PCI */
-#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI
-#define CONFIG_PCI_PNP
+#ifdef CONFIG_PCI
+#define CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_PCIE_IMX
 #define CONFIG_PCIE_IMX_PERST_GPIO    IMX_GPIO_NR(7, 12)
@@ -316,17 +271,17 @@
 #endif
 
 /* PMIC */
+#ifndef CONFIG_DM_PMIC
 #define CONFIG_POWER
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR  0x08
+#endif
 
 /* USB Configs */
-#define CONFIG_CMD_USB
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MX6
-#define CONFIG_USB_STORAGE
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
@@ -335,7 +290,7 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */
 #endif
 
-#if !defined(CONFIG_ANDROID_SUPPORT)
+#if !defined(CONFIG_FASTBOOT)
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
@@ -345,7 +300,7 @@
 	"fdt_addr=0x18000000\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
 	"fdt_high=0xffffffff\0"   \
 	"initrd_high=0xffffffff\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
@@ -366,9 +321,8 @@
 			"fi; "  \
 		"fi\0" \
 	EMMC_ENV	  \
-	"smp=" CONFIG_SYS_NOSMP "\0"\
 	"mmcargs=setenv bootargs console=${console},${baudrate} ${smp} " \
-		"root=${mmcroot} " CONFIG_VIDEO_PRIMARY "\0" \
+		"root=${mmcroot} " VIDEO_PRIMARY "\0" \
 	"loadbootscript=" \
 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
@@ -435,11 +389,11 @@
 #define CONFIG_ENV_OFFSET    (448 * 1024)
 #undef CONFIG_ENV_SECT_SIZE
 #define CONFIG_ENV_SECT_SIZE (64 * 1024)
-#define CONFIG_INTERNAL_SPI_NOR_PARTITION \
+#define INTERNAL_SPI_NOR_PARTITION \
 	"mtdparts=spi0.0:512k(uboot),64k(dtb),7m(linux),-(rootfs) "
 #undef CONFIG_MFG_ENV_SETTINGS
 #define CONFIG_MFG_ENV_SETTINGS \
-	"mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \
+	"mfgtool_args=setenv bootargs console=" CONSOLE_DEV ",115200 " \
 	"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
 		"g_mass_storage.file=/fat g_mass_storage.ro=1 " \
@@ -447,7 +401,7 @@
 		"g_mass_storage.idProduct=0x37FF "\
 		"g_mass_storage.iSerialNumber=\"\" "\
 		"enable_wait_mode=off "\
-		CONFIG_INTERNAL_SPI_NOR_PARTITION \
+		INTERNAL_SPI_NOR_PARTITION \
 		"\0" \
 	"initrd_addr=0x12C00000\0" \
 	"initrd_high=0xffffffff\0" \
@@ -462,7 +416,7 @@
 	"fdt_addr=0x18000000\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
-	"console=" CONFIG_CONSOLE_DEV "\0" \
+	"console=" CONSOLE_DEV "\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"initrd_high=0xffffffff\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
@@ -483,9 +437,8 @@
 			"fi; "	\
 		"fi\0" \
 	EMMC_ENV	  \
-	"smp=" CONFIG_SYS_NOSMP "\0"\
 	"mmcargs=setenv bootargs console=${console},${baudrate} ${smp} " \
-		"root=${mmcroot} " CONFIG_VIDEO_PRIMARY "\0" \
+		"root=${mmcroot} " VIDEO_PRIMARY "\0" \
 	"loadbootscript=" \
 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
@@ -533,7 +486,7 @@
 		"fi;\0" \
 	"spinorargs=setenv bootargs console=${console},${baudrate} " \
 		"root=/dev/mtdblock3 rootwait rw " \
-		CONFIG_INTERNAL_SPI_NOR_PARTITION "\0" \
+		INTERNAL_SPI_NOR_PARTITION "\0" \
 	"spinorboot=echo Booting from internal SPI-NOR Flash...; " \
 		"run spinorargs; sf probe; " \
 		"sf read 0x12000000 0x90000 0x700000; " \
diff --git a/include/configs/mx6dqscm_android.h b/include/configs/mx6dqscm_android.h
index 24ad0bf..6cd6076 100644
--- a/include/configs/mx6dqscm_android.h
+++ b/include/configs/mx6dqscm_android.h
@@ -36,13 +36,6 @@
 #define CONFIG_FASTBOOT_STORAGE_MMC
 #endif
 
-#define CONFIG_ANDROID_MAIN_MMC_BUS 2
-#define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
-#define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 5
-#define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 2
-#define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
-#define CONFIG_ANDROID_DATA_PARTITION_MMC 4
-
 #define CONFIG_CMD_BOOTA
 #define CONFIG_SUPPORT_RAW_INITRD
 #define CONFIG_SERIAL_TAG