Enable USB on Udoo board (#1973)

* Enable USB on Udoo

config/kernel/linux-imx6-current.config

@@ -32,9 +32,9 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_LZ4=y
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_LZMA is not set
-CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
+CONFIG_KERNEL_LZ4=y
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -380,10 +380,10 @@ CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
-# CONFIG_SOC_IMX6SLL is not set
+CONFIG_SOC_IMX6SLL=y
 CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_IMX6UL=y
-# CONFIG_SOC_LS1021A is not set
+CONFIG_SOC_LS1021A=y
 
 #
 # Cortex-A/Cortex-M asymmetric multiprocessing platforms
@@ -709,8 +709,8 @@ CONFIG_ARM_SCPI_CPUFREQ=m
 CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
 CONFIG_ARM_IMX6Q_CPUFREQ=m
-# CONFIG_ARM_IMX_CPUFREQ_DT is not set
-# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
+CONFIG_ARM_IMX_CPUFREQ_DT=m
+CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -2348,6 +2348,7 @@ CONFIG_MTD_NAND_ORION=m
 CONFIG_MTD_NAND_MARVELL=m
 CONFIG_MTD_NAND_TMIO=m
 # CONFIG_MTD_NAND_BRCMNAND is not set
+CONFIG_MTD_NAND_FSL_IFC=m
 CONFIG_MTD_NAND_MXC=m
 CONFIG_MTD_NAND_SUNXI=m
 CONFIG_MTD_NAND_QCOM=m
@@ -2662,7 +2663,7 @@ CONFIG_SATA_PMP=y
 # CONFIG_SATA_AHCI_PLATFORM is not set
 CONFIG_AHCI_DM816=m
 CONFIG_AHCI_ST=m
-CONFIG_AHCI_IMX=y
+CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_MVEBU=m
 CONFIG_AHCI_SUNXI=m
@@ -3601,7 +3602,7 @@ CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
 CONFIG_KEYBOARD_SNVS_PWRKEY=m
-# CONFIG_KEYBOARD_IMX is not set
+CONFIG_KEYBOARD_IMX=m
 # CONFIG_KEYBOARD_NEWTON is not set
 CONFIG_KEYBOARD_TEGRA=m
 # CONFIG_KEYBOARD_OPENCORES is not set
@@ -4166,6 +4167,7 @@ CONFIG_SPI_FSL_QUADSPI=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_IMX=m
 # CONFIG_SPI_FSL_SPI is not set
+CONFIG_SPI_FSL_DSPI=m
 CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_OC_TINY is not set
@@ -4257,6 +4259,7 @@ CONFIG_PINCTRL_IMX51=y
 CONFIG_PINCTRL_IMX53=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_IMX6SL=y
+CONFIG_PINCTRL_IMX6SLL=y
 CONFIG_PINCTRL_IMX6SX=y
 CONFIG_PINCTRL_IMX6UL=y
 CONFIG_PINCTRL_IMX7D=y
@@ -4549,7 +4552,7 @@ CONFIG_CHARGER_TPS65217=m
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_UCS1002=m
 CONFIG_POWER_SEQUENCE=y
-# CONFIG_PWRSEQ_GENERIC is not set
+CONFIG_PWRSEQ_GENERIC=y
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -6176,7 +6179,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 CONFIG_FB_ARMCLCD=y
-# CONFIG_FB_IMX is not set
+CONFIG_FB_IMX=y
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
@@ -6221,7 +6224,7 @@ CONFIG_FB_SSD1307=m
 #
 # Backlight & LCD device support
 #
-CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
 CONFIG_LCD_LTV350QV=m
@@ -7516,6 +7519,7 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
 CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_LAYERSCAPE=m
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_HIGHBANK_L2=m
 # CONFIG_EDAC_ARMADA_XP is not set
@@ -7649,7 +7653,8 @@ CONFIG_RTC_DRV_CROS_EC=m
 #
 # on-CPU RTC drivers
 #
-# CONFIG_RTC_DRV_IMXDI is not set
+CONFIG_RTC_DRV_IMXDI=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
 CONFIG_RTC_DRV_MESON=m
 CONFIG_RTC_DRV_MESON_VRTC=m
 CONFIG_RTC_DRV_OMAP=m
@@ -7697,7 +7702,7 @@ CONFIG_DMA_SUN6I=m
 # CONFIG_DW_AXI_DMAC is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_QDMA is not set
-# CONFIG_IMX_DMA is not set
+CONFIG_IMX_DMA=m
 CONFIG_IMX_SDMA=m
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_MMP_PDMA=y
@@ -7886,7 +7891,15 @@ CONFIG_NVEC_PAZ00=y
 CONFIG_STAGING_MEDIA=y
 CONFIG_VIDEO_HANTRO=m
 CONFIG_VIDEO_HANTRO_ROCKCHIP=y
-# CONFIG_VIDEO_IMX_MEDIA is not set
+CONFIG_VIDEO_IMX_MEDIA=m
+
+#
+# i.MX5/6/7 Media Sub devices
+#
+CONFIG_VIDEO_IMX_CSI=m
+CONFIG_VIDEO_IMX7_CSI=m
+# end of i.MX5/6/7 Media Sub devices
+
 CONFIG_VIDEO_MESON_VDEC=m
 # CONFIG_VIDEO_OMAP4 is not set
 CONFIG_VIDEO_SUNXI=y
@@ -8347,7 +8360,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=m
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_ARM_TEGRA_DEVFREQ=m
-# CONFIG_ARM_TEGRA20_DEVFREQ is not set
+CONFIG_ARM_TEGRA20_DEVFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
@@ -8378,6 +8391,7 @@ CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
 CONFIG_TI_EMIF_SRAM=m
 CONFIG_MVEBU_DEVBUS=y
+CONFIG_FSL_IFC=y
 CONFIG_PL353_SMC=m
 CONFIG_SAMSUNG_MC=y
 CONFIG_EXYNOS5422_DMC=m
@@ -8897,7 +8911,7 @@ CONFIG_PWM_SYSFS=y
 CONFIG_PWM_BCM2835=m
 CONFIG_PWM_CROS_EC=m
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_IMX1 is not set
+CONFIG_PWM_IMX1=m
 CONFIG_PWM_IMX27=m
 CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_LP3943=m
@@ -8935,11 +8949,13 @@ CONFIG_ORION_IRQCHIP=y
 CONFIG_ST_IRQCHIP=y
 # CONFIG_TS4800_IRQ is not set
 CONFIG_IMX_GPCV2=y
+CONFIG_LS_EXTIRQ=y
+CONFIG_LS_SCFG_MSI=y
 CONFIG_PARTITION_PERCPU=y
 CONFIG_STM32_EXTI=y
 CONFIG_MESON_IRQ_GPIO=y
 CONFIG_QCOM_PDC=y
-# CONFIG_IMX_IRQSTEER is not set
+CONFIG_IMX_IRQSTEER=y
 CONFIG_IMX_INTMUX=y
 CONFIG_EXYNOS_IRQ_COMBINER=y
 # end of IRQ chip support
@@ -8981,7 +8997,7 @@ CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
+CONFIG_PHY_FSL_IMX8MQ_USB=m
 # CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 CONFIG_ARMADA375_USBCLUSTER_PHY=y
 # CONFIG_PHY_MVEBU_A3700_COMPHY is not set
@@ -9048,7 +9064,7 @@ CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_CCN=y
 CONFIG_ARM_PMU=y
-# CONFIG_FSL_IMX8_DDR_PMU is not set
+CONFIG_FSL_IMX8_DDR_PMU=y
 # end of Performance monitor support
 
 CONFIG_RAS=y

config/sources/families/imx6.conf

@@ -10,11 +10,11 @@ case $BOARD in
 
 	udoo)
 
+		BOOTBRANCH='tag:v2017.11'
 		SERIALCON=ttymxc1
 		BOOTSCRIPT="boot-udoo.cmd:boot.cmd"
 		BOOTENV_FILE='udoo-default.txt'
 		UBOOT_USE_GCC='< 7.0'
-
 		
 	;;
 	

patch/kernel/imx6-current/unlock_atheros_regulatory_restrictions.disabled

@@ -1,72 +0,0 @@
-diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
-index ccc4c71..71a4d00 100644
---- a/drivers/net/wireless/ath/regd.c
-+++ b/drivers/net/wireless/ath/regd.c
-@@ -49,12 +49,9 @@ static int __ath_regd_init(struct ath_regulatory *reg);
- #define ATH9K_5GHZ_5725_5850	REG_RULE(5725-10, 5850+10, 40, 0, 30,\
- 				NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
- 
--#define ATH9K_2GHZ_ALL		ATH9K_2GHZ_CH01_11, \
--				ATH9K_2GHZ_CH12_13, \
--				ATH9K_2GHZ_CH14
-+#define ATH9K_2GHZ_ALL     REG_RULE(2400, 2483, 40, 0, 30, 0)
- 
--#define ATH9K_5GHZ_ALL		ATH9K_5GHZ_5150_5350, \
--				ATH9K_5GHZ_5470_5850
-+#define ATH9K_5GHZ_ALL     REG_RULE(5140, 5860, 40, 0, 30, 0)
- 
- /* This one skips what we call "mid band" */
- #define ATH9K_5GHZ_NO_MIDBAND	ATH9K_5GHZ_5150_5350, \
-@@ -76,9 +73,8 @@ static const struct ieee80211_regdomain ath_world_regdom_63_65 = {
- 	.n_reg_rules = 4,
- 	.alpha2 =  "99",
- 	.reg_rules = {
--		ATH9K_2GHZ_CH01_11,
--		ATH9K_2GHZ_CH12_13,
--		ATH9K_5GHZ_NO_MIDBAND,
-+		ATH9K_2GHZ_ALL,
-+		ATH9K_5GHZ_ALL,
- 	}
- };
- 
-@@ -87,8 +83,8 @@ static const struct ieee80211_regdomain ath_world_regdom_64 = {
- 	.n_reg_rules = 3,
- 	.alpha2 =  "99",
- 	.reg_rules = {
--		ATH9K_2GHZ_CH01_11,
--		ATH9K_5GHZ_NO_MIDBAND,
-+		ATH9K_2GHZ_ALL,
-+		ATH9K_5GHZ_ALL,
- 	}
- };
- 
-@@ -97,7 +93,7 @@ static const struct ieee80211_regdomain ath_world_regdom_66_69 = {
- 	.n_reg_rules = 3,
- 	.alpha2 =  "99",
- 	.reg_rules = {
--		ATH9K_2GHZ_CH01_11,
-+		ATH9K_2GHZ_ALL,
- 		ATH9K_5GHZ_ALL,
- 	}
- };
-@@ -107,8 +103,7 @@ static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = {
- 	.n_reg_rules = 4,
- 	.alpha2 =  "99",
- 	.reg_rules = {
--		ATH9K_2GHZ_CH01_11,
--		ATH9K_2GHZ_CH12_13,
-+		ATH9K_2GHZ_ALL,
- 		ATH9K_5GHZ_ALL,
- 	}
- };
-@@ -253,9 +253,7 @@ static bool ath_is_radar_freq(u16 center_freq,
- 			      struct ath_regulatory *reg)
- 
- {
--	if (reg->country_code == CTRY_INDIA)
--		return (center_freq >= 5500 && center_freq <= 5700);
--	return (center_freq >= 5260 && center_freq <= 5700);
-+	return false;
- }
- 
- static void ath_force_clear_no_ir_chan(struct wiphy *wiphy,

patch/u-boot/u-boot-imx6/board_udoo/revert_distro_config.patch

@@ -1,129 +0,0 @@
-diff --git a/include/configs/udoo.h b/include/configs/udoo.h
-old mode 100644
-new mode 100644
-index bcce41d..2296f89
---- a/include/configs/udoo.h
-+++ b/include/configs/udoo.h
-@@ -45,34 +45,100 @@
- #define CONFIG_SYS_FSL_ESDHC_ADDR	0
- 
- #define CONFIG_EXTRA_ENV_SETTINGS \
--	"console=ttymxc1,115200\0" \
-+	"script=boot.scr\0" \
-+	"image=zImage\0" \
-+	"console=ttymxc1\0" \
-+	"splashpos=m,m\0" \
- 	"fdt_high=0xffffffff\0" \
- 	"initrd_high=0xffffffff\0" \
--	"fdtfile=undefined\0" \
-+	"fdt_file=undefined\0" \
- 	"fdt_addr=0x18000000\0" \
--	"fdt_addr_r=0x18000000\0" \
-+	"boot_fdt=try\0" \
- 	"ip_dyn=yes\0" \
- 	"mmcdev=0\0" \
--	"mmcrootfstype=ext4\0" \
--	"findfdt="\
--		"if test ${board_rev} = MX6Q; then " \
--			"setenv fdtfile imx6q-udoo.dtb; fi; " \
--		"if test ${board_rev} = MX6DL; then " \
--			"setenv fdtfile imx6dl-udoo.dtb; fi; " \
--		"if test ${fdtfile} = undefined; then " \
--			"echo WARNING: Could not determine dtb to use; fi\0" \
--	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
--	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
--	"ramdisk_addr_r=0x13000000\0" \
--	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
--	BOOTENV
-+	"mmcpart=1\0" \
-+	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
-+	"update_sd_firmware_filename=u-boot.imx\0" \
-+	"update_sd_firmware=" \
-+		"if test ${ip_dyn} = yes; then " \
-+			"setenv get_cmd dhcp; " \
-+		"else " \
-+			"setenv get_cmd tftp; " \
-+		"fi; " \
-+		"if mmc dev ${mmcdev}; then "	\
-+			"if ${get_cmd} ${update_sd_firmware_filename}; then " \
-+				"setexpr fw_sz ${filesize} / 0x200; " \
-+				"setexpr fw_sz ${fw_sz} + 1; "	\
-+				"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
-+			"fi; "	\
-+		"fi\0" \
-+	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-+		"root=${mmcroot}\0" \
-+	"loadbootscript=" \
-+		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-+	"bootscript=echo Running bootscript from mmc ...; " \
-+		"source\0" \
-+	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-+	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-+	"mmcboot=echo Booting from mmc ...; " \
-+		"run mmcargs; " \
-+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-+			"if run loadfdt; then " \
-+				"bootz ${loadaddr} - ${fdt_addr}; " \
-+			"else " \
-+				"if test ${boot_fdt} = try; then " \
-+					"bootz; " \
-+				"else " \
-+					"echo WARN: Cannot load the DT; " \
-+				"fi; " \
-+			"fi; " \
-+		"else " \
-+			"bootz; " \
-+		"fi;\0" \
-+	"netargs=setenv bootargs console=${console},${baudrate} " \
-+		"root=/dev/nfs " \
-+	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-+		"netboot=echo Booting from net ...; " \
-+		"run netargs; " \
-+		"if test ${ip_dyn} = yes; then " \
-+			"setenv get_cmd dhcp; " \
-+		"else " \
-+			"setenv get_cmd tftp; " \
-+		"fi; " \
-+		"${get_cmd} ${image}; " \
-+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-+				"bootz ${loadaddr} - ${fdt_addr}; " \
-+			"else " \
-+				"if test ${boot_fdt} = try; then " \
-+					"bootz; " \
-+				"else " \
-+					"echo WARN: Cannot load the DT; " \
-+				"fi; " \
-+			"fi; " \
-+		"else " \
-+			"bootz; " \
-+		"fi;\0" \
-+		"findfdt=" \
-+			"if test $board_rev = MX6Q ; then " \
-+				"setenv fdt_file imx6q-udoo.dtb; fi; " \
-+			"if test $board_rev = MX6DL ; then " \
-+				"setenv fdt_file imx6dl-udoo.dtb; fi; " \
-+			"if test $fdt_file = undefined; then " \
-+				"echo WARNING: Could not determine dtb to use; fi; \0"
- 
--#define BOOT_TARGET_DEVICES(func) \
--	func(MMC, mmc, 0) \
--	func(SATA, sata, 0) \
--	func(DHCP, dhcp, na)
--
--#include <config_distro_bootcmd.h>
-+#define CONFIG_BOOTCOMMAND \
-+	   "run findfdt; " \
-+	   "mmc dev ${mmcdev}; if mmc rescan; then " \
-+		   "if run loadbootscript; then " \
-+			   "run bootscript; " \
-+		   "else " \
-+			   "if run loadimage; then " \
-+				   "run mmcboot; " \
-+			   "else run netboot; " \
-+			   "fi; " \
-+		   "fi; " \
-+	   "else run netboot; fi"
- 
- /* Physical Memory Map */
- #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR