From 6f8387f120362bfa62d7b99760881736162b57da Mon Sep 17 00:00:00 2001 From: "B, Ravi" Date: Thu, 28 Jul 2016 17:39:17 +0530 Subject: dra7x: boot: add dfu bootmode support This patch enables the DFU boot mode support for dra7x platform. Signed-off-by: Ravi Babu Reviewed-by: Tom Rini --- arch/arm/cpu/armv7/omap-common/boot-common.c | 5 +++++ arch/arm/include/asm/arch-omap5/spl.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 60c367a2020..385310ba1ec 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -90,6 +90,11 @@ void save_omap_boot_params(void) case BOOT_DEVICE_CPGMAC: sys_boot_device = 1; break; +#endif +#if defined(BOOT_DEVICE_DFU) && !defined(CONFIG_SPL_DFU_SUPPORT) + case BOOT_DEVICE_DFU: + sys_boot_device = 1; + break; #endif } diff --git a/arch/arm/include/asm/arch-omap5/spl.h b/arch/arm/include/asm/arch-omap5/spl.h index 468ff5afd54..35828804242 100644 --- a/arch/arm/include/asm/arch-omap5/spl.h +++ b/arch/arm/include/asm/arch-omap5/spl.h @@ -20,7 +20,7 @@ #define BOOT_DEVICE_QSPI_1 0x0A #define BOOT_DEVICE_QSPI_4 0x0B #define BOOT_DEVICE_UART 0x43 -#define BOOT_DEVICE_USB 0x45 +#define BOOT_DEVICE_DFU 0x45 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1 #define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2_2 -- cgit v1.3.1 From 5aaad0647a582602078be143ca30faefb16498a2 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Tue, 9 Aug 2016 23:45:00 +0530 Subject: ARM: dts: vf: Add device tree node for USB on Vybrid Add device tree node for USB peripheral on Vybrid. Signed-off-by: Sanchayan Maity --- arch/arm/dts/vf.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'arch') diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi index 1530d2fc87e..d7d21a37ade 100644 --- a/arch/arm/dts/vf.dtsi +++ b/arch/arm/dts/vf.dtsi @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0+ or X11 */ /include/ "skeleton.dtsi" +#include / { aliases { @@ -20,6 +21,8 @@ serial5 = &uart5; spi0 = &dspi0; spi1 = &dspi1; + ehci0 = &ehci0; + ehci1 = &ehci1; }; soc { @@ -113,6 +116,12 @@ reg = <0x400ff100 0x40>; #gpio-cells = <2>; }; + + ehci0: ehci@40034000 { + compatible = "fsl,vf610-usb"; + reg = <0x40034000 0x800>; + status = "disabled"; + }; }; aips1: aips-bus@40080000 { @@ -133,6 +142,11 @@ status = "disabled"; }; + ehci1: ehci@400b4000 { + compatible = "fsl,vf610-usb"; + reg = <0x400b4000 0x800>; + status = "disabled"; + }; }; }; }; -- cgit v1.3.1 From 727f7908292c9cd3b356fde229cfeecad7df248a Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Tue, 9 Aug 2016 23:45:01 +0530 Subject: ARM: dts: vf-colibri: Enable USB device tree node for Colibri Vybrid Enable USB device tree node for Toradex Colibri Vybrid module. Signed-off-by: Sanchayan Maity --- arch/arm/dts/vf-colibri.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'arch') diff --git a/arch/arm/dts/vf-colibri.dtsi b/arch/arm/dts/vf-colibri.dtsi index dc52748c096..c2f104a89b4 100644 --- a/arch/arm/dts/vf-colibri.dtsi +++ b/arch/arm/dts/vf-colibri.dtsi @@ -21,6 +21,17 @@ }; }; +&ehci0 { + dr_mode = "otg"; + fsl,cdet-gpio = <&gpio3 6 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&ehci1 { + dr_mode = "host"; + status = "okay"; +}; + &uart0 { status = "okay"; }; -- cgit v1.3.1