mx6sabre: Add DM and SPL FIT support
Subsystems (7)
v4 cover mx6sabre: Add DM and SPL FIT support
The third version is here:
https://lists.denx.de/pipermail/u-boot/2019-January/356903.html
So, this time I hope I got it right. Before, I was stupidly trying to put a fit in another fit without a really good reason. To my excuse, that was working even with the spl_image->os set to 0, bug which I (hope) I fixed in the first patch (a new one) of this series.
Changes since v3:
* Reduced the SPL size by disabling EXT_SUPPORT, otherwise the 6qp-sabresd wouldn't boot due to having its dtb last in the fit. I forgot to mention in the last version that EFI and DOS SPL support also had to be disabled to get the size right.
* Dropped the fit_spl.its file
* Dropped the (now) unnecessary updates to the README files. We're sticking to the u-boot.img since it's exactly what is needed.
* Fixed a bug related to FIT_IMAGE_TINY when CONFIG_SPL_OS_BOOT is enabled. The short story here is that spl_image->os was remaining set to 0. (see first patch in the series for details)
Abel Vesa (20):
common: spl_fit: Fix the spl_fit_image_get_os for FIT_IMAGE_TINY
usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE
usb: ehci-mx6: Make regulator DM_REGULATOR dependent
configs: imx6sabreauto: Add DM_MMC support
configs: imx6sabreauto: Add DM_USB support
mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds
board: mx6sabresd: Add board_fit_config_name_match to support FIT in
SPL
board: mx6sabreauto: Add board_fit_config_name_match to support FIT in
SPL
arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files
arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd]
configs: mx6sabreauto: Add SPL FIT and DM support
configs: mx6sabresd: Add SPL FIT and DM support
mx6sabreauto: Add DM_GPIO support
mx6sabresd: Add DM_GPIO support
configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs
configs: mx6sabresd: Add DM_SPI_FLASH necessary configs
board: mx6sabreauto: Remove the non-DM code
board: mx6sabresd: Remove non-DM code
board: mx6sabresd: Remove the enet reset gpio handling
configs: mx6sabresd: Reduce SPL size by disabling DOS, EXT and EFI
support
arch/arm/dts/Makefile | 8 +- arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi | 6 + arch/arm/dts/imx6dl-sabreauto.dts | 13 + arch/arm/dts/imx6dl-sabresd-u-boot.dtsi | 6 + arch/arm/dts/imx6dl-sabresd.dts | 18 + arch/arm/dts/imx6dl.dtsi | 306 ++++++++++- arch/arm/dts/imx6q-sabreauto-u-boot.dtsi | 6 + arch/arm/dts/imx6q-sabreauto.dts | 18 + arch/arm/dts/imx6q-sabresd-u-boot.dtsi | 6 + arch/arm/dts/imx6q-sabresd.dts | 23 + arch/arm/dts/imx6q.dtsi | 310 +++++++++-- arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi | 21 + arch/arm/dts/imx6qdl-sabreauto.dtsi | 810 ++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 14 + arch/arm/dts/imx6qdl-sabresd.dtsi | 741 +++++++++++++++++++++++++ arch/arm/dts/imx6qdl-u-boot.dtsi | 4 +- arch/arm/dts/imx6qdl.dtsi | 455 +++++++++------- arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi | 6 + arch/arm/dts/imx6qp-sabreauto.dts | 55 ++ arch/arm/dts/imx6qp-sabresd-u-boot.dtsi | 6 + arch/arm/dts/imx6qp-sabresd.dts | 55 ++ arch/arm/dts/imx6qp.dtsi | 115 ++++ arch/arm/include/asm/arch-am33xx/spl.h | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- board/freescale/mx6sabreauto/mx6sabreauto.c | 91 +--- board/freescale/mx6sabresd/mx6sabresd.c | 78 +-- common/Makefile | 5 +- common/spl/Kconfig | 4 +- common/spl/Makefile | 2 +- common/spl/spl_fit.c | 4 - common/spl/spl_usb.c | 4 - configs/am43xx_evm_usbhost_boot_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/mx6sabreauto_defconfig | 20 +- configs/mx6sabresd_defconfig | 26 +- drivers/mmc/fsl_esdhc.c | 8 +- drivers/usb/host/ehci-mx6.c | 7 +- 37 files changed, 2847 insertions(+), 412 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-sabreauto.dts create mode 100644 arch/arm/dts/imx6dl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-sabresd.dts create mode 100644 arch/arm/dts/imx6q-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabreauto.dts create mode 100644 arch/arm/dts/imx6q-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabresd.dts create mode 100644 arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabreauto.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto.dts create mode 100644 arch/arm/dts/imx6qp-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabresd.dts create mode 100644 arch/arm/dts/imx6qp.dtsi
Signature · 1 line
2.7.4
PATCH v4 1/20 common: spl_fit: Fix the spl_fit_image_get_os for FIT_IMAGE_TINY
There is not really reducing codesize here since there is only a call. The function is always built in if CONFIG_$(SPL_TPL_)FIT is set. Plus, there was a change in behavior if CONFIG_SPL_OS_BOOT is defined. If CONFIG_FIT_IMAGE_TINY is defined, the spl_fit_image_get_os was returning -ENOTSUPP and then if CONFIG_SPL_OS_BOOT was also defined, the spl_image->os was left set to 0 which in turn was skipping the fdt appending resulting in boot-up failure.
--- common/spl/spl_fit.c | 4 ---- 1 file changed, 4 deletions(-)
common/spl/spl_fit.c +0 -4
@@ -333,11 +333,7 @@ static int spl_fit_record_loadable(const void *fit, int images, int index,static int spl_fit_image_get_os (const void *fit,int noffset,uint8_t *os) { -#if CONFIG_IS_ENABLED (FIT_IMAGE_TINY ) -return -ENOTSUPP ; -#else return fit_image_get_os (fit, noffset, os); -#endif } int spl_load_simple_fit(struct spl_image_info *spl_image,
Signature · 1 line
2.7.4
PATCH v4 1/20 common: spl_fit: Fix the spl_fit_image_get_os for FIT_IMAGE_TINY
Quoted 10 lines · Abel Vesa
There is not really reducing codesize here since there is only a call. The function is always built in if CONFIG_$(SPL_TPL_)FIT is set. Plus, there was a change in behavior if
CONFIG_SPL_OS_BOOTis defined. IfCONFIG_FIT_IMAGE_TINYis defined, thespl_fit_image_get_oswas returning-ENOTSUPPand then ifCONFIG_SPL_OS_BOOTwas also defined, thespl_image->oswas left set to 0 which in turn was skipping the fdt appending resulting in boot-up failure.Fixes 337bbb6297775e spl: fit: add SPL_FIT_IMAGE_TINY config to reduce code-sizeSigned-off-by Abel Vesa <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190201/3bdf82c3/attachment.sig>
PATCH v4 1/20 common: spl_fit: Fix the spl_fit_image_get_os for FIT_IMAGE_TINY
In reply to Abel VesaHi Abel,
Quoted 2 lines
There is not really reducing codesize here since there is only a call.
Yes, I also haven't observed any change.
Quoted 10 lines
The function is always built in if CONFIG_$(SPL_TPL_)FIT is set. Plus, there was a change in behavior if
CONFIG_SPL_OS_BOOTis defined. IfCONFIG_FIT_IMAGE_TINYis defined, thespl_fit_image_get_oswas returning-ENOTSUPPand then ifCONFIG_SPL_OS_BOOTwas also defined, thespl_image->oswas left set to 0 which in turn was skipping the fdt appending resulting in boot-up failure.Fixes 337bbb6297775e spl: fit: add SPL_FIT_IMAGE_TINY config toreduce code-size Signed-off-by: Abel Vesa <[email protected]>
However, this commit fixes the issue (the board didn't hang anymore after SPL loading), hence
I've tested it on mccmon6 HW (imx6q).
Just to share - for me CONFIG_USE_TINY_PRINTF=y gave reduction of SPL size from 38KiB to 34KiB.
Thanks for your commit.
Quoted 10 lines
--- common/spl/spl_fit.c | 4 ---- 1 file changed, 4 deletions(-)common/spl/spl_fit.c +0
-0@@ -333,11 +333,7 @@ static int spl_fit_record_loadable(const void *fit, int images, int index,
common/spl/spl_fit.c static int spl_fit_record_loadable(const void · line 339
Quoted 10 lines
common/spl/spl_fit.c +0
-4static int spl_fit_image_get_os (const void *fit,int noffset,uint8_t *os) { -#if CONFIG_IS_ENABLED (FIT_IMAGE_TINY ) -return -ENOTSUPP ; -#else return fit_image_get_os (fit, noffset, os); -#endif } int spl_load_simple_fit(struct spl_image_info *spl_image,
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190201/20c3e8de/attachment.sig>
Fabio Estevam
reviewerPATCH v4 1/20 common: spl_fit: Fix the spl_fit_image_get_os for FIT_IMAGE_TINY
In reply to Abel VesaQuoted 11 lines · Abel Vesa
There is not really reducing codesize here since there is only a call. The function is always built in if CONFIG_$(SPL_TPL_)FIT is set. Plus, there was a change in behavior if
CONFIG_SPL_OS_BOOTis defined. IfCONFIG_FIT_IMAGE_TINYis defined, thespl_fit_image_get_oswas returning-ENOTSUPPand then ifCONFIG_SPL_OS_BOOTwas also defined, thespl_image->oswas left set to 0 which in turn was skipping the fdt appending resulting in boot-up failure.Fixes 337bbb6297775e spl: fit: add SPL_FIT_IMAGE_TINY config to reduce code-sizeSigned-off-by Abel Vesa <[email protected]>
PATCH v4 1/20 common: spl_fit: Fix the spl_fit_image_get_os for FIT_IMAGE_TINY
In reply to Abel VesaHi Abel,
Quoted 8 lines · Abel Vesa
There is not really reducing codesize here since there is only a call. The function is always built in if CONFIG_$(SPL_TPL_)FIT is set. Plus, there was a change in behavior if
CONFIG_SPL_OS_BOOTis defined. IfCONFIG_FIT_IMAGE_TINYis defined, thespl_fit_image_get_oswas returning-ENOTSUPPand then ifCONFIG_SPL_OS_BOOTwas also defined, thespl_image->oswas left set to 0 which in turn was skipping the fdt appending resulting in boot-up failure.
Really there is a difference in codesize, even if it looks like a side effect. This patch breaks build for sun8i and sun50i due to increased size. So I have to drop this patch and I applied the rest of the series to u-boot-imx.
Best regards,
Stefano Babic
Quoted 23 lines
Fixes 337bbb6297775e spl: fit: add SPL_FIT_IMAGE_TINY config to reduce code-sizeSigned-off-by Abel Vesa <[email protected]>--- common/spl/spl_fit.c | 4 ---- 1 file changed, 4 deletions(-)common/spl/spl_fit.c +0
-4@@ -333,11 +333,7 @@ static int spl_fit_record_loadable(const void *fit, int images, int index,static int spl_fit_image_get_os (const void *fit,int noffset,uint8_t *os) { -#if CONFIG_IS_ENABLED (FIT_IMAGE_TINY ) -return -ENOTSUPP ; -#else return fit_image_get_os (fit, noffset, os); -#endif } int spl_load_simple_fit(struct spl_image_info *spl_image,
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 1/20 common: spl_fit: Fix the spl_fit_image_get_os for FIT_IMAGE_TINY
Quoted 12 lines · Stefano Babic
Hi Abel,
Quoted 8 lines · Abel Vesa
There is not really reducing codesize here since there is only a call. The function is always built in if CONFIG_$(SPL_TPL_)FIT is set. Plus, there was a change in behavior if
CONFIG_SPL_OS_BOOTis defined. IfCONFIG_FIT_IMAGE_TINYis defined, thespl_fit_image_get_oswas returning-ENOTSUPPand then ifCONFIG_SPL_OS_BOOTwas also defined, thespl_image->oswas left set to 0 which in turn was skipping the fdt appending resulting in boot-up failure.
Quoted 5 lines
Really there is a difference in codesize, even if it looks like a side effect. This patch breaks build for sun8i and sun50i due to increased size. So I have to drop this patch and I applied the rest of the series to u-boot-imx.
Ok then, but the real problem here is the fact that the spl_image->os remains unset. And, as per the comment from the common/spl/spl_fit.c call site, the fallback should be setting to IH_OS_U_BOOT. See below.
Quoted 9 lines
Best regards,
Stefano BabicQuoted 6 lines
Fixes 337bbb6297775e spl: fit: add SPL_FIT_IMAGE_TINY config to reduce code-sizeSigned-off-by Abel Vesa <[email protected]>--- common/spl/spl_fit.c | 4 ---- 1 file changed, 4 deletions(-)
Quoted 8 lines
common/spl/spl_fit.c static int spl_fit_record_loadable(const void *fit, int images, int index, · line 335
Quoted 8 lines
common/spl/spl_fit.c +0
-0@@ -333,11 +333,7 @@ static int spl_fit_record_loadable(const void *fit, int images, int index,static int spl_fit_image_get_os (const void *fit,int noffset,uint8_t *os) {
#if CONFIG_IS_ENABLED(FIT_IMAGE_TINY)
So I guess we can keep as it was before but add the following line here then:
+ *os = IH_OS_U_BOOT;
Let me know if I'm missing something here.
return -ENOTSUPP;
#else
return fit_image_get_os(fit, noffset, os);
#endif
Quoted 11 lines
Quoted 4 lines
common/spl/spl_fit.c +0
-0} int spl_load_simple_fit(struct spl_image_info *spl_image,Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 1/20 common: spl_fit: Fix the spl_fit_image_get_os for FIT_IMAGE_TINY
In reply to Abel VesaQuoted 7 lines
There is not really reducing codesize here since there is only a call. The function is always built in if CONFIG_$(SPL_TPL_)FIT is set. Plus, there was a change in behavior if
CONFIG_SPL_OS_BOOTis defined. IfCONFIG_FIT_IMAGE_TINYis defined, thespl_fit_image_get_oswas returning-ENOTSUPPand then ifCONFIG_SPL_OS_BOOTwas also defined, thespl_image->oswas left set to 0 which in turn was skipping the fdt appending resulting in boot-up failure.
Quoted 5 lines
Fixes 337bbb6297775e spl: fit: add SPL_FIT_IMAGE_TINY config to reduce code-sizeSigned-off-by Abel Vesa <[email protected]>Reviewed-by Tom Rini <[email protected]>Tested-by Lukasz Majewski <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 2/20 usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE
In reply to Abel VesaSince there is the SPL_USB_HOST_SUPPORT for enabling USB support in SPL, makes more sense to rename the SPL_USB_SUPPORT as SPL_USB_STORAGE. Everything that is not part of the usb storage support in SPL is now build under SPL_USB_HOST_SUPPORT.
--- arch/arm/include/asm/arch-am33xx/spl.h | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- common/Makefile | 5 +++-- common/spl/Kconfig | 4 ++-- common/spl/Makefile | 2 +- common/spl/spl_usb.c | 4 ---- configs/am43xx_evm_usbhost_boot_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-)
arch/arm/include/asm/arch-am33xx/spl.h +1 -1
@@ -62,7 +62,7 @@#define BOOT_DEVICE_CPGMAC 0x47#define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1 -#ifdef CONFIG_SPL_USB_SUPPORT +#ifdef CONFIG_SPL_USB_STORAGE #define MMC_BOOT_DEVICES_END BOOT_DEVICE_USB#else #define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2
arch/arm/mach-omap2/boot-common.c +1 -1
@@ -93,7 +93,7 @@ void save_omap_boot_params(void) sys_boot_device =1 ;break ;#endif -#if defined(BOOT_DEVICE_USB ) && !defined(CONFIG_SPL_USB_SUPPORT ) +#if defined(BOOT_DEVICE_USB ) && !defined(CONFIG_SPL_USB_STORAGE )case BOOT_DEVICE_USB : sys_boot_device =1 ;break ;
common/Makefile +3 -2
@@ -75,8 +75,9 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o ifdef CONFIG_SPL_USB_HOST_SUPPORT -obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o -obj-$(CONFIG_USB_STORAGE) += usb_storage.o +obj-y += usb.o +obj-y += usb_hub.o +obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o else obj-$(CONFIG_USB_MUSB_HOST) += usb.o endif
common/spl/Kconfig +2 -2
@@ -766,9 +766,9 @@ config SPL_USB_HOST_SUPPORT device can be attached. This option enables the drivers in drivers/usb/host as part of an SPL build. -config SPL_USB_SUPPORT +config SPL_USB_STORAGE bool "Support loading from USB" - depends on SPL_USB_HOST_SUPPORT + depends on SPL_USB_HOST_SUPPORT && !(BLK && !DM_USB) help Enable support for USB devices in SPL. This allows use of USB devices such as hard drives and flash drivers for loading U-Boot.
common/spl/Makefile +1 -1
@@ -22,7 +22,7 @@ obj-$(CONFIG_$(SPL_TPL_)NET_SUPPORT) += spl_net.o obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o -obj-$(CONFIG_$(SPL_TPL_)USB_SUPPORT) += spl_usb.o +obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o obj-$(CONFIG_$(SPL_TPL_)FAT_SUPPORT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o
common/spl/spl_usb.c +0 -4
@@ -15,9 +15,7 @@#include <usb.h> #include <fat.h> -#ifdef CONFIG_USB_STORAGE static int usb_stor_curr_dev =-1 ;/* current device */ -#endif static int spl_usb_load_image (struct spl_image_info *spl_image,struct spl_boot_device *bootdev)
@@ -34,13 +32,11 @@ static int spl_usb_load_image(struct spl_image_info *spl_image,return err; } -#ifdef CONFIG_USB_STORAGE /* try to recognize storage devices immediately */ usb_stor_curr_dev =usb_stor_scan (1 ); stor_dev =blk_get_devnum_by_type (IF_TYPE_USB , usb_stor_curr_dev);if (!stor_dev)return -ENODEV ; -#endif debug ("boot mode - FAT\n" );
configs/am43xx_evm_usbhost_boot_defconfig +1 -1
@@ -14,7 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_SPL_WRITE_SIZE=0x40000
configs/am43xx_hs_evm_defconfig +1 -1
@@ -24,7 +24,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_ETHER=y # CONFIG_CMD_FLASH is not set
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 2/20 usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE
Quoted 8 lines · Abel Vesa
Since there is the
SPL_USB_HOST_SUPPORTfor enabling USB support in SPL, makes more sense to rename theSPL_USB_SUPPORTasSPL_USB_STORAGE. Everything that is not part of the usb storage support in SPL is now build underSPL_USB_HOST_SUPPORT.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Tom Rini <[email protected]>
PATCH v4 2/20 usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE
In reply to Abel VesaQuoted 5 lines · On Fri, 1 Feb 2019 16:40:07 +0000 Abel Vesa <[email protected]> wrote:
Since there is the
SPL_USB_HOST_SUPPORTfor enabling USB support in SPL, makes more sense to rename theSPL_USB_SUPPORTasSPL_USB_STORAGE. Everything that is not part of the usb storage support in SPL is now build underSPL_USB_HOST_SUPPORT.
Quoted 130 lines
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Tom Rini <[email protected]>--- arch/arm/include/asm/arch-am33xx/spl.h | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- common/Makefile | 5 +++-- common/spl/Kconfig | 4 ++-- common/spl/Makefile | 2 +- common/spl/spl_usb.c | 4 ---- configs/am43xx_evm_usbhost_boot_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-am33xx/spl.hindex 0bf8c17..f3910c2 100644arch/arm/include/asm/arch-am33xx/spl.h +1
-1@@ -62,7 +62,7 @@#define BOOT_DEVICE_CPGMAC 0x47#define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1 -#ifdef CONFIG_SPL_USB_SUPPORT +#ifdef CONFIG_SPL_USB_STORAGE #define MMC_BOOT_DEVICES_END BOOT_DEVICE_USB#else #define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2(quoted diff) +0
-0
b/arch/arm/mach-omap2/boot-common.cindex 2db1922..c8b8ac6 100644arch/arm/mach-omap2/boot-common.c +1
-1@@ -93,7 +93,7 @@ void save_omap_boot_params(void) sys_boot_device =1 ;break ;#endif -#if defined(BOOT_DEVICE_USB ) && !defined(CONFIG_SPL_USB_SUPPORT ) +#if defined(BOOT_DEVICE_USB ) && !defined(CONFIG_SPL_USB_STORAGE )case BOOT_DEVICE_USB : sys_boot_device =1 ;break ;common/Makefile +3
-2@@ -75,8 +75,9 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o ifdef CONFIG_SPL_USB_HOST_SUPPORT -obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o -obj-$(CONFIG_USB_STORAGE) += usb_storage.o +obj-y += usb.o +obj-y += usb_hub.o +obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o else obj-$(CONFIG_USB_MUSB_HOST) += usb.o endifcommon/spl/Kconfig +2
-2@@ -766,9 +766,9 @@ config SPL_USB_HOST_SUPPORT device can be attached. This option enables the drivers in drivers/usb/host as part of an SPL build. -config SPL_USB_SUPPORT +config SPL_USB_STORAGE bool "Support loading from USB" - depends on SPL_USB_HOST_SUPPORT + depends on SPL_USB_HOST_SUPPORT && !(BLK && !DM_USB) help Enable support for USB devices in SPL. This allows use ofUSB devices such as hard drives and flash drivers for loading U-Boot.
common/spl/Makefile +1
-1@@ -22,7 +22,7 @@ obj-$(CONFIG_$(SPL_TPL_)NET_SUPPORT) += spl_net.o obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o -obj-$(CONFIG_$(SPL_TPL_)USB_SUPPORT) += spl_usb.o +obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o obj-$(CONFIG_$(SPL_TPL_)FAT_SUPPORT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.ocommon/spl/spl_usb.c +0
-4@@ -15,9 +15,7 @@#include <usb.h> #include <fat.h> -#ifdef CONFIG_USB_STORAGE static int usb_stor_curr_dev =-1 ;/* current device */ -#endif static int spl_usb_load_image (struct spl_image_info *spl_image,struct spl_boot_device *bootdev)@@ -34,13 +32,11 @@ static int spl_usb_load_image(struct spl_image_info *spl_image, return err; } -#ifdef CONFIG_USB_STORAGE /* try to recognize storage devices immediately */ usb_stor_curr_dev =usb_stor_scan (1 ); stor_dev =blk_get_devnum_by_type (IF_TYPE_USB , usb_stor_curr_dev);if (!stor_dev)return -ENODEV ; -#endif debug ("boot mode - FAT\n" );(quoted diff) +0
-0b/configs/am43xx_evm_usbhost_boot_defconfig index 5131f19..5bd919b 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig
configs/am43xx_evm_usbhost_boot_defconfig +1
-1@@ -14,7 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_SPL_WRITE_SIZE=0x40000(quoted diff) +0
-0b/configs/am43xx_hs_evm_defconfig index 99e4ccb..c01fda9 100644
configs/am43xx_hs_evm_defconfig CONFIG_SPL_MTD_SUPPORT=y · line 30
Quoted 8 lines
configs/am43xx_hs_evm_defconfig +1
-1@@ -24,7 +24,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_ETHER=y # CONFIG_CMD_FLASH is not set
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/0cda1f22/attachment.sig>
PATCH v4 2/20 usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE
In reply to Abel VesaQuoted 8 lines
Since there is the
SPL_USB_HOST_SUPPORTfor enabling USB support in SPL, makes more sense to rename theSPL_USB_SUPPORTasSPL_USB_STORAGE. Everything that is not part of the usb storage support in SPL is now build underSPL_USB_HOST_SUPPORT.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Tom Rini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 3/20 usb: ehci-mx6: Make regulator DM_REGULATOR dependent
In reply to Abel VesaDo the regulator related work only if the build has the DM_REGULATOR.
--- drivers/usb/host/ehci-mx6.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/host/ehci-mx6.c +6 -1
@@ -404,6 +404,7 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev)if (ret)return ret; +#if CONFIG_IS_ENABLED (DM_REGULATOR )if (priv->vbus_supply) { ret = regulator_set_enable(priv->vbus_supply, (type == USB_INIT_DEVICE) ?
@@ -413,6 +414,7 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev) return ret; } } +#endif if (type ==USB_INIT_DEVICE )return 0 ;
@@ -514,15 +516,17 @@ static int ehci_usb_probe(struct udevice *dev) priv->portnr = dev->seq; priv->init_type = type; +#if CONFIG_IS_ENABLED (DM_REGULATOR ) ret =device_get_supply_regulator (dev,"vbus-supply" , &priv->vbus_supply);if (ret)debug ("%s: No vbus supply\n" , dev->name); - +#endif ret =ehci_mx6_common_init (ehci, priv->portnr);if (ret)return ret; +#if CONFIG_IS_ENABLED (DM_REGULATOR )if (priv->vbus_supply) { ret = regulator_set_enable(priv->vbus_supply, (type == USB_INIT_DEVICE) ?
@@ -532,6 +536,7 @@ static int ehci_usb_probe(struct udevice *dev) return ret; } } +#endif if (priv->init_type ==USB_INIT_HOST ) {setbits_le32 (&ehci->usbmode,CM_HOST );
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 3/20 usb: ehci-mx6: Make regulator DM_REGULATOR dependent
Quoted 5 lines · Abel Vesa
Do the regulator related work only if the build has the
DM_REGULATOR.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>
PATCH v4 3/20 usb: ehci-mx6: Make regulator DM_REGULATOR dependent
In reply to Abel VesaQuoted 2 lines · On Fri, 1 Feb 2019 16:40:08 +0000 Abel Vesa <[email protected]> wrote:
Do the regulator related work only if the build has the
DM_REGULATOR.
Yes, this part was missing for IMX6Q - especially SPL can get away with enabling SPL_DM_REGULATOR if needed.
Quoted 47 lines
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>--- drivers/usb/host/ehci-mx6.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/usb/host/ehci-mx6.c +1
-0@@ -404,6 +404,7 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev) if (ret)return ret; +#if CONFIG_IS_ENABLED (DM_REGULATOR )if (priv->vbus_supply) { ret = regulator_set_enable(priv->vbus_supply, (type ==
USB_INIT_DEVICE) ? @@ -413,6 +414,7 @@ static intmx6_init_after_reset(struct ehci_ctrl *dev)return ret;drivers/usb/host/ehci-mx6.c +4
-1} } +#endif if (type ==USB_INIT_DEVICE )return 0 ;@@ -514,15 +516,17 @@ static int ehci_usb_probe(struct udevice *dev) priv->portnr = dev->seq; priv->init_type = type; +#if CONFIG_IS_ENABLED (DM_REGULATOR ) ret =device_get_supply_regulator (dev,"vbus-supply" , &priv->vbus_supply);if (ret)debug ("%s: No vbus supply\n" , dev->name); - +#endif ret =ehci_mx6_common_init (ehci, priv->portnr);if (ret)return ret; +#if CONFIG_IS_ENABLED (DM_REGULATOR )if (priv->vbus_supply) { ret = regulator_set_enable(priv->vbus_supply, (type ==
USB_INIT_DEVICE) ? @@ -532,6 +536,7 @@ static intehci_usb_probe(struct udevice *dev)return ret;
drivers/usb/host/ehci-mx6.c static int ehci_usb_probe(struct udevice *dev) · line 542
Quoted 6 lines
drivers/usb/host/ehci-mx6.c +1
-0} } +#endif if (priv->init_type ==USB_INIT_HOST ) {setbits_le32 (&ehci->usbmode,CM_HOST );
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/586863e1/attachment.sig>
PATCH v4 3/20 usb: ehci-mx6: Make regulator DM_REGULATOR dependent
In reply to Abel VesaQuoted 5 lines
Do the regulator related work only if the build has the
DM_REGULATOR.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 4/20 configs: imx6sabreauto: Add DM_MMC support
In reply to Abel VesaAdd DM_MMC config to imx6sabreauto defconfig.
--- configs/mx6sabreauto_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/mx6sabreauto_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXS=y
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 4/20 configs: imx6sabreauto: Add DM_MMC support
Quoted 4 lines · Abel Vesa
Add
DM_MMCconfig to imx6sabreauto defconfig.Signed-off-by Abel Vesa <[email protected]>
PATCH v4 4/20 configs: imx6sabreauto: Add DM_MMC support
In reply to Abel VesaQuoted 3 lines
Add
DM_MMCconfig to imx6sabreauto defconfig.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 5/20 configs: imx6sabreauto: Add DM_USB support
In reply to Abel VesaAdd the DM support for USB. For that, DM_REGULATOR is needed.
--- configs/mx6sabreauto_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/mx6sabreauto_defconfig +2 -0
@@ -52,9 +52,11 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_MII=y +CONFIG_DM_REGULATOR=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL"
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 5/20 configs: imx6sabreauto: Add DM_USB support
Quoted 4 lines · Abel Vesa
Add the DM support for USB. For that,
DM_REGULATORis needed.Signed-off-by Abel Vesa <[email protected]>
PATCH v4 5/20 configs: imx6sabreauto: Add DM_USB support
In reply to Abel VesaQuoted 3 lines
Add the DM support for USB. For that,
DM_REGULATORis needed.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 6/20 mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds
In reply to Abel VesaSince the fsl_esdhc will also be used by SPL, make the preprocessor switches more generic to allow any kind of build.
--- drivers/mmc/fsl_esdhc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mmc/fsl_esdhc.c +4 -4
@@ -804,7 +804,7 @@ static int esdhc_set_voltage(struct mmc *mmc)case MMC_SIGNAL_VOLTAGE_330 :if (priv->vs18_enable)return -EIO ; -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED (DM_REGULATOR )if (!IS_ERR_OR_NULL (priv->vqmmc_dev)) { ret =regulator_set_value (priv->vqmmc_dev,3300000 );if (ret) {
@@ -823,7 +823,7 @@ static int esdhc_set_voltage(struct mmc *mmc)return -EAGAIN ;case MMC_SIGNAL_VOLTAGE_180 : -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED (DM_REGULATOR )if (!IS_ERR_OR_NULL (priv->vqmmc_dev)) { ret =regulator_set_value (priv->vqmmc_dev,1800000 );if (ret) {
@@ -1442,7 +1442,7 @@ static int fsl_esdhc_probe(struct udevice *dev)int node =dev_of_offset (dev);struct esdhc_soc_data *data = (struct esdhc_soc_data *)dev_get_driver_data (dev); -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED (DM_REGULATOR )struct udevice *vqmmc_dev;#endif fdt_addr_t addr;
@@ -1500,7 +1500,7 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->vs18_enable =0 ; -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED (DM_REGULATOR )/* * If emmc I/O has a fixed voltage at 1.8V, this must be provided, * otherwise, emmc will work abnormally.
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 6/20 mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds
Quoted 5 lines · Abel Vesa
Since the
fsl_esdhcwill also be used by SPL, make the preprocessor switches more generic to allow any kind of build.Signed-off-by Abel Vesa <[email protected]>
PATCH v4 6/20 mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds
In reply to Abel VesaQuoted 3 lines · On Fri, 1 Feb 2019 16:40:11 +0000 Abel Vesa <[email protected]> wrote:
Since the
fsl_esdhcwill also be used by SPL, make the preprocessor switches more generic to allow any kind of build.
The same here - as with ehci-mx6.
Thanks Abel for this patch.
Quoted 45 lines
Signed-off-by Abel Vesa <[email protected]>--- drivers/mmc/fsl_esdhc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/mmc/fsl_esdhc.c +4
-4@@ -804,7 +804,7 @@ static int esdhc_set_voltage(struct mmc *mmc)case MMC_SIGNAL_VOLTAGE_330 :if (priv->vs18_enable)return -EIO ; -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED (DM_REGULATOR )if (!IS_ERR_OR_NULL (priv->vqmmc_dev)) { ret =regulator_set_value (priv->vqmmc_dev,3300000 );if (ret) {@@ -823,7 +823,7 @@ static int esdhc_set_voltage(struct mmc *mmc)return -EAGAIN ;case MMC_SIGNAL_VOLTAGE_180 : -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED (DM_REGULATOR )if (!IS_ERR_OR_NULL (priv->vqmmc_dev)) { ret =regulator_set_value (priv->vqmmc_dev,1800000 );if (ret) {@@ -1442,7 +1442,7 @@ static int fsl_esdhc_probe(struct udevice *dev)int node =dev_of_offset (dev);struct esdhc_soc_data *data = (struct esdhc_soc_data *)dev_get_driver_data (dev); -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED (DM_REGULATOR )struct udevice *vqmmc_dev;#endif fdt_addr_t addr;@@ -1500,7 +1500,7 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->vs18_enable =0 ; -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED (DM_REGULATOR )/* * If emmc I/O has a fixed voltage at 1.8V, this must be provided,
Quoted 1 line
* otherwise, emmc will work abnormally.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/df6e5e61/attachment.sig>
PATCH v4 6/20 mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds
In reply to Abel VesaQuoted 5 lines
Since the
fsl_esdhcwill also be used by SPL, make the preprocessor switches more generic to allow any kind of build.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 7/20 board: mx6sabresd: Add board_fit_config_name_match to support FIT in SPL
In reply to Abel VesaThis matches one of the following three boards (or fails):
- imx6q-sabresd
- imx6qp-sabresd
- imx6dl-sabresd
--- board/freescale/mx6sabresd/mx6sabresd.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
board/freescale/mx6sabresd/mx6sabresd.c +18 -0
@@ -1062,3 +1062,21 @@ void board_init_f(ulong dummy) board_init_r(NULL, 0); }#endif + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match (const char *name) +{ +if (is_mx6dq ()) { +if (!strcmp (name,"imx6q-sabresd" )) +return 0 ; + }else if (is_mx6dqp ()) { +if (!strcmp (name,"imx6qp-sabresd" )) +return 0 ; + }else if (is_mx6dl ()) { +if (!strcmp (name,"imx6dl-sabresd" )) +return 0 ; + } + +return -1 ; +} +#endif
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 7/20 board: mx6sabresd: Add board_fit_config_name_match to support FIT in SPL
Quoted 8 lines · Abel Vesa
This matches one of the following three boards (or fails):
- imx6q-sabresd
- imx6qp-sabresd
- imx6dl-sabresdSigned-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>
PATCH v4 7/20 board: mx6sabresd: Add board_fit_config_name_match to support FIT in SPL
In reply to Abel VesaQuoted 5 lines · On Fri, 1 Feb 2019 16:40:12 +0000 Abel Vesa <[email protected]> wrote:
This matches one of the following three boards (or fails):
- imx6q-sabresd
- imx6qp-sabresd
- imx6dl-sabresd
Quoted 22 lines
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>--- board/freescale/mx6sabresd/mx6sabresd.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)(quoted diff) +0
-0
b/board/freescale/mx6sabresd/mx6sabresd.cindex 0183ede..4688095 100644 ---a/board/freescale/mx6sabresd/mx6sabresd.c+++b/board/freescale/mx6sabresd/mx6sabresd.cboard/freescale/mx6sabresd/mx6sabresd.c +8
-0@@ -1062,3 +1062,21 @@ void board_init_f(ulong dummy)board_init_r (NULL ,0 ); }#endif + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match (const char *name) +{ +if (is_mx6dq ()) { +if (!strcmp (name,"imx6q-sabresd" )) +return 0 ; + }else if (is_mx6dqp ()) {
board/freescale/mx6sabresd/mx6sabresd.c void board_init_f(ulong dummy) · line 1082
Quoted 10 lines
board/freescale/mx6sabresd/mx6sabresd.c +10
-0+if (!strcmp (name,"imx6qp-sabresd" )) + return 0; + }else if (is_mx6dl ()) { +if (!strcmp (name,"imx6dl-sabresd" )) +return 0 ; + } + +return -1 ; +} +#endif
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/3f12a3e0/attachment.sig>
PATCH v4 7/20 board: mx6sabresd: Add board_fit_config_name_match to support FIT in SPL
In reply to Abel VesaQuoted 8 lines
This matches one of the following three boards (or fails):
- imx6q-sabresd
- imx6qp-sabresd
- imx6dl-sabresdSigned-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 8/20 board: mx6sabreauto: Add board_fit_config_name_match to support FIT in SPL
In reply to Abel VesaThis matches one of the following three boards (or fails):
- imx6q-sabreauto
- imx6qp-sabreauto
- imx6dl-sabreauto
--- board/freescale/mx6sabreauto/mx6sabreauto.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
board/freescale/mx6sabreauto/mx6sabreauto.c +18 -0
@@ -1097,3 +1097,21 @@ void board_init_f(ulong dummy) board_init_r(NULL, 0); }#endif + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match (const char *name) +{ +if (is_mx6dq ()) { +if (!strcmp (name,"imx6q-sabreauto" )) +return 0 ; + }else if (is_mx6dqp ()) { +if (!strcmp (name,"imx6qp-sabreauto" )) +return 0 ; + }else if (is_mx6dl ()) { +if (!strcmp (name,"imx6dl-sabreauto" )) +return 0 ; + } + +return -1 ; +} +#endif
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 8/20 board: mx6sabreauto: Add board_fit_config_name_match to support FIT in SPL
Quoted 8 lines · Abel Vesa
This matches one of the following three boards (or fails):
- imx6q-sabreauto
- imx6qp-sabreauto
- imx6dl-sabreautoSigned-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>
PATCH v4 8/20 board: mx6sabreauto: Add board_fit_config_name_match to support FIT in SPL
In reply to Abel VesaQuoted 5 lines · On Fri, 1 Feb 2019 16:40:13 +0000 Abel Vesa <[email protected]> wrote:
This matches one of the following three boards (or fails):
- imx6q-sabreauto
- imx6qp-sabreauto
- imx6dl-sabreauto
Quoted 22 lines
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>--- board/freescale/mx6sabreauto/mx6sabreauto.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)(quoted diff) +0
-0
b/board/freescale/mx6sabreauto/mx6sabreauto.cindex c1bef85..c8f1263 100644 ---a/board/freescale/mx6sabreauto/mx6sabreauto.c+++b/board/freescale/mx6sabreauto/mx6sabreauto.cboard/freescale/mx6sabreauto/mx6sabreauto.c +8
-0@@ -1097,3 +1097,21 @@ void board_init_f(ulong dummy)board_init_r (NULL ,0 ); }#endif + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match (const char *name) +{ +if (is_mx6dq ()) { +if (!strcmp (name,"imx6q-sabreauto" )) +return 0 ; + }else if (is_mx6dqp ()) {
board/freescale/mx6sabreauto/mx6sabreauto.c void board_init_f(ulong dummy) · line 1117
Quoted 10 lines
board/freescale/mx6sabreauto/mx6sabreauto.c +10
-0+if (!strcmp (name,"imx6qp-sabreauto" )) + return 0; + }else if (is_mx6dl ()) { +if (!strcmp (name,"imx6dl-sabreauto" )) +return 0 ; + } + +return -1 ; +} +#endif
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/45c8c1dd/attachment.sig>
PATCH v4 8/20 board: mx6sabreauto: Add board_fit_config_name_match to support FIT in SPL
In reply to Abel VesaQuoted 8 lines
This matches one of the following three boards (or fails):
- imx6q-sabreauto
- imx6qp-sabreauto
- imx6dl-sabreautoSigned-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 9/20 arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files
In reply to Abel VesaThis allows us to keep the basic dts[i] files up-to-date with the ones in kernel, but at the same time allowing the u-boot to add its own properties to the existing nodes.
--- arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6dl-sabresd-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6q-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6q-sabresd-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi | 21 +++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 14 ++++++++++++++ arch/arm/dts/imx6qdl-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6qp-sabresd-u-boot.dtsi | 6 ++++++ 9 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabresd-u-boot.dtsi
arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi new file +6 -0
@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabreauto-u-boot.dtsi"
arch/arm/dts/imx6dl-sabresd-u-boot.dtsi new file +6 -0
@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabresd-u-boot.dtsi"
arch/arm/dts/imx6q-sabreauto-u-boot.dtsi new file +6 -0
@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabreauto-u-boot.dtsi"
arch/arm/dts/imx6q-sabresd-u-boot.dtsi new file +6 -0
@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabresd-u-boot.dtsi"
arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-u-boot.dtsi" + +/ { + aliases { + mmc0 = &usdhc3; + }; +}; + +&usdhc3 { + no-1-8-v; + u-boot,dm-spl; +}; + +&pinctrl_usdhc3 { + u-boot,dm-spl; +};
arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-u-boot.dtsi" + +&usdhc3 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc3 { + u-boot,dm-spl; +};
arch/arm/dts/imx6qdl-u-boot.dtsi +2 -2
@@ -7,11 +7,11 @@ soc { u-boot,dm-spl; - aips-bus at 02000000 { + aips-bus at 2000000 { u-boot,dm-spl; }; - aips-bus at 02100000 { + aips-bus at 2100000 { u-boot,dm-spl; }; };
arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi new file +6 -0
@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabreauto-u-boot.dtsi"
arch/arm/dts/imx6qp-sabresd-u-boot.dtsi new file +6 -0
@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabresd-u-boot.dtsi"
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 9/20 arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files
Quoted 6 lines · Abel Vesa
This allows us to keep the basic dts[i] files up-to-date with the ones in kernel, but at the same time allowing the u-boot to add its own properties to the existing nodes.
Signed-off-by Abel Vesa <[email protected]>
PATCH v4 9/20 arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files
In reply to Abel VesaQuoted 4 lines · On Fri, 1 Feb 2019 16:40:14 +0000 Abel Vesa <[email protected]> wrote:
This allows us to keep the basic dts[i] files up-to-date with the ones in kernel, but at the same time allowing the u-boot to add its own properties to the existing nodes.
Quoted 152 lines
Signed-off-by Abel Vesa <[email protected]>--- arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6dl-sabresd-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6q-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6q-sabresd-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi | 21 +++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 14 ++++++++++++++ arch/arm/dts/imx6qdl-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6qp-sabresd-u-boot.dtsi | 6 ++++++ 9 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabresd-u-boot.dtsi(quoted diff) +0
-0
b/arch/arm/dts/imx6dl-sabreauto-u-boot.dtsinew file mode 100644 index 0000000..d75fcc1arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabreauto-u-boot.dtsi"(quoted diff) +0
-0
b/arch/arm/dts/imx6dl-sabresd-u-boot.dtsinew file mode 100644 index 0000000..e4d7d28arch/arm/dts/imx6dl-sabresd-u-boot.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabresd-u-boot.dtsi"(quoted diff) +0
-0
b/arch/arm/dts/imx6q-sabreauto-u-boot.dtsinew file mode 100644 index 0000000..d75fcc1arch/arm/dts/imx6q-sabreauto-u-boot.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabreauto-u-boot.dtsi"(quoted diff) +0
-0
b/arch/arm/dts/imx6q-sabresd-u-boot.dtsinew file mode 100644 index 0000000..e4d7d28arch/arm/dts/imx6q-sabresd-u-boot.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabresd-u-boot.dtsi"(quoted diff) +0
-0
b/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsinew file mode 100644 index 0000000..ea90f40arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi new file +21
-0@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-u-boot.dtsi" + +/ { + aliases { + mmc0 = &usdhc3; + }; +}; + +&usdhc3 { + no-1-8-v; + u-boot,dm-spl; +}; + +&pinctrl_usdhc3 { + u-boot,dm-spl; +};(quoted diff) +0
-0
b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsinew file mode 100644 index 0000000..45f02b1arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi new file +14
-0@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-u-boot.dtsi" + +&usdhc3 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc3 { + u-boot,dm-spl; +};(quoted diff) +0
-0
b/arch/arm/dts/imx6qdl-u-boot.dtsiindex dffc21b..45ae2fa 100644arch/arm/dts/imx6qdl-u-boot.dtsi +2
-2@@ -7,11 +7,11 @@ soc { u-boot,dm-spl; - aips-bus at 02000000 { + aips-bus at 2000000 { u-boot,dm-spl; }; - aips-bus at 02100000 { + aips-bus at 2100000 { u-boot,dm-spl; }; };(quoted diff) +0
-0
b/arch/arm/dts/imx6qp-sabreauto-u-boot.dtsinew file mode 100644 index 0000000..d75fcc1arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabreauto-u-boot.dtsi"(quoted diff) +0
-0
b/arch/arm/dts/imx6qp-sabresd-u-boot.dtsinew file mode 100644 index 0000000..e4d7d28
arch/arm/dts/imx6qp-sabresd-u-boot.dtsi line 6
Quoted 6 lines
arch/arm/dts/imx6qp-sabresd-u-boot.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabresd-u-boot.dtsi"
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/96e447d7/attachment.sig>
PATCH v4 9/20 arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files
In reply to Abel VesaQuoted 6 lines
This allows us to keep the basic dts[i] files up-to-date with the ones in kernel, but at the same time allowing the u-boot to add its own properties to the existing nodes.
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 10/20 arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd]
In reply to Abel VesaUpdate all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] to the ones from kernel v4.20 (commit 8fe28cb58bcb2).
--- arch/arm/dts/Makefile | 8 +- arch/arm/dts/imx6dl-sabreauto.dts | 13 + arch/arm/dts/imx6dl-sabresd.dts | 18 + arch/arm/dts/imx6dl.dtsi | 306 ++++++++++++-- arch/arm/dts/imx6q-sabreauto.dts | 18 + arch/arm/dts/imx6q-sabresd.dts | 23 + arch/arm/dts/imx6q.dtsi | 310 ++++++++++++-- arch/arm/dts/imx6qdl-sabreauto.dtsi | 810 ++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd.dtsi | 741 +++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl.dtsi | 455 +++++++++++--------- arch/arm/dts/imx6qp-sabreauto.dts | 55 +++ arch/arm/dts/imx6qp-sabresd.dts | 55 +++ arch/arm/dts/imx6qp.dtsi | 115 +++++ 13 files changed, 2669 insertions(+), 258 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabreauto.dts create mode 100644 arch/arm/dts/imx6dl-sabresd.dts create mode 100644 arch/arm/dts/imx6q-sabreauto.dts create mode 100644 arch/arm/dts/imx6q-sabresd.dts create mode 100644 arch/arm/dts/imx6qdl-sabreauto.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto.dts create mode 100644 arch/arm/dts/imx6qp-sabresd.dts create mode 100644 arch/arm/dts/imx6qp.dtsi
arch/arm/dts/Makefile +7 -1
@@ -443,7 +443,13 @@ dtb-$(CONFIG_MX6QDL) += \ imx6q-icore.dtb \ imx6q-icore-mipi.dtb \ imx6q-icore-rqs.dtb \ - imx6q-logicpd.dtb + imx6q-logicpd.dtb \ + imx6q-sabreauto.dtb \ + imx6q-sabresd.dtb \ + imx6dl-sabreauto.dtb \ + imx6dl-sabresd.dtb \ + imx6qp-sabreauto.dtb \ + imx6qp-sabresd.dtb dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb
arch/arm/dts/imx6dl-sabreauto.dts new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2013 Freescale Semiconductor, Inc. + +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-sabreauto.dtsi" + +/ { + model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board"; + compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl"; +};
arch/arm/dts/imx6dl-sabresd.dts new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2013 Freescale Semiconductor, Inc. + +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-sabresd.dtsi" + +/ { + model = "Freescale i.MX6 DualLite SABRE Smart Device Board"; + compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl"; +}; + +&ipu1_csi1_from_ipu1_csi1_mux { + clock-lanes = <0>; + data-lanes = <1 2>; +};
arch/arm/dts/imx6dl.dtsi +282 -24
365 lines not on this page · raw message
arch/arm/dts/imx6q-sabreauto.dts new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-sabreauto.dtsi" + +/ { + model = "Freescale i.MX6 Quad SABRE Automotive Board"; + compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; +}; + +&sata { + status = "okay"; +};
arch/arm/dts/imx6q-sabresd.dts new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-sabresd.dtsi" + +/ { + model = "Freescale i.MX6 Quad SABRE Smart Device Board"; + compatible = "fsl,imx6q-sabresd", "fsl,imx6q"; +}; + +&sata { + status = "okay"; +}; + +&ipu1_csi1_from_mipi_vc1 { + clock-lanes = <0>; + data-lanes = <1 2>; +};
arch/arm/dts/imx6q.dtsi +276 -34
450 lines not on this page · raw message
arch/arm/dts/imx6qdl-sabreauto.dtsi new file +810 -0
810 lines not on this page · raw message
arch/arm/dts/imx6qdl-sabresd.dtsi new file +741 -0
741 lines not on this page · raw message
arch/arm/dts/imx6qdl.dtsi +256 -199
548 lines not on this page · raw message
arch/arm/dts/imx6qp-sabreauto.dts new file +55 -0
55 lines not on this page · raw message
arch/arm/dts/imx6qp-sabresd.dts new file +55 -0
55 lines not on this page · raw message
arch/arm/dts/imx6qp.dtsi new file +115 -0
115 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.7.4
Part of the diff is not shown here. View the raw message.
Fabio Estevam
reviewerPATCH v4 10/20 arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd]
Quoted 6 lines · Abel Vesa
Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] to the ones from kernel v4.20 (commit
8fe28cb58bcb2).Signed-off-by Abel Vesa <[email protected]>Acked-by Peng Fan <[email protected]>
PATCH v4 10/20 arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd]
In reply to Abel VesaQuoted 3 lines · On Fri, 1 Feb 2019 16:40:16 +0000 Abel Vesa <[email protected]> wrote:
Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] to the ones from kernel v4.20 (commit
8fe28cb58bcb2).
arch/arm/dts/imx6qp.dtsi
Quoted 4,383 lines
Signed-off-by Abel Vesa <[email protected]>Acked-by Peng Fan <[email protected]>--- arch/arm/dts/Makefile | 8 +- arch/arm/dts/imx6dl-sabreauto.dts | 13 + arch/arm/dts/imx6dl-sabresd.dts | 18 + arch/arm/dts/imx6dl.dtsi | 306 ++++++++++++-- arch/arm/dts/imx6q-sabreauto.dts | 18 + arch/arm/dts/imx6q-sabresd.dts | 23 + arch/arm/dts/imx6q.dtsi | 310 ++++++++++++-- arch/arm/dts/imx6qdl-sabreauto.dtsi | 810 ++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd.dtsi | 741 +++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl.dtsi | 455 +++++++++++--------- arch/arm/dts/imx6qp-sabreauto.dts | 55 +++ arch/arm/dts/imx6qp-sabresd.dts | 55 +++ arch/arm/dts/imx6qp.dtsi | 115 +++++ 13 files changed,2669 insertions(+), 258 deletions(-) create mode 100644
arch/arm/dts/imx6dl-sabreauto.dtscreate mode 100644arch/arm/dts/imx6dl-sabresd.dtscreate mode 100644arch/arm/dts/imx6q-sabreauto.dtscreate mode 100644arch/arm/dts/imx6q-sabresd.dtscreate mode 100644arch/arm/dts/imx6qdl-sabreauto.dtsicreate mode 100644arch/arm/dts/imx6qdl-sabresd.dtsicreate mode 100644arch/arm/dts/imx6qp-sabreauto.dtscreate mode 100644arch/arm/dts/imx6qp-sabresd.dtscreate mode 100644arch/arm/dts/imx6qp.dtsiarch/arm/dts/Makefile +7
-1@@ -443,7 +443,13 @@ dtb-$(CONFIG_MX6QDL) += \ imx6q-icore.dtb \ imx6q-icore-mipi.dtb \ imx6q-icore-rqs.dtb \ - imx6q-logicpd.dtb + imx6q-logicpd.dtb \ + imx6q-sabreauto.dtb \ + imx6q-sabresd.dtb \ + imx6dl-sabreauto.dtb \ + imx6dl-sabresd.dtb \ + imx6qp-sabreauto.dtb \ + imx6qp-sabresd.dtb dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb(quoted diff) +0
-0
b/arch/arm/dts/imx6dl-sabreauto.dtsnew file mode 100644 index 0000000..660d52aarch/arm/dts/imx6dl-sabreauto.dts new file +11
-0@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2013 Freescale Semiconductor, Inc. + +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-sabreauto.dtsi" + +/ { + model = "Freescale i.MX6 DualLite/Solo SABRE AutomotiveBoard";
arch/arm/dts/imx6dl-sabreauto.dts new file +2
-0+ compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl"; +};(quoted diff) +0
-0
b/arch/arm/dts/imx6dl-sabresd.dtsnew file mode 100644 index 0000000..cd6bbf2arch/arm/dts/imx6dl-sabresd.dts new file +18
-0@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2013 Freescale Semiconductor, Inc. + +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-sabresd.dtsi" + +/ { + model = "Freescale i.MX6 DualLite SABRE Smart Device Board"; + compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl"; +}; + +&ipu1_csi1_from_ipu1_csi1_mux { + clock-lanes = <0>; + data-lanes = <1 2>; +};arch/arm/dts/imx6dl.dtsi +0
-5@@ -1,12 +1,6 @@ - -/* - * Copyright 2013 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/ormodify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */arch/arm/dts/imx6dl.dtsi +3
-0+// SPDX-License-Identifier: GPL-2.0 +// +// Copyright 2013 Freescale Semiconductor, Inc. #include <dt-bindings/interrupt-controller/irq.h> #include "imx6dl-pinfunc.h"@@ -39,6 +33,7 @@ 396000 1175000 >; clock-latency = <61036>; /* two CLK32periods */
arch/arm/dts/imx6dl.dtsi +14
-0+ #cooling-cells = <2>; clocks = <&clks IMX6QDL_CLK_ARM>, <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, <&clks IMX6QDL_CLK_STEP>,@@ -56,39 +51,57 @@ device_type = "cpu"; reg = <1>; next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 996000 1250000 + 792000 1175000 + 396000 1150000 + >; + fsl,soc-operating-points = < + /* ARM kHz SOC-PU uV */ + 996000 1175000 + 792000 1175000 + 396000 1175000 + >; + clock-latency = <61036>; /* two CLK32periods */
arch/arm/dts/imx6dl.dtsi +6
-0+ clocks = <&clks IMX6QDL_CLK_ARM>, + <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, + <&clks IMX6QDL_CLK_STEP>, + <&clks IMX6QDL_CLK_PLL1_SW>, + <&clks IMX6QDL_CLK_PLL1_SYS>; + clock-names = "arm", "pll2_pfd2_396m","step",
arch/arm/dts/imx6dl.dtsi +8
-4+ "pll1_sw", "pll1_sys"; + arm-supply = <®_arm>; + pu-supply = <®_pu>; + soc-supply = <®_soc>; }; }; soc { - ocram: sram at 00900000 { + ocram: sram at 900000 { compatible = "mmio-sram"; reg = <0x00900000 0x20000>; clocks = <&clks IMX6QDL_CLK_OCRAM>; }; - aips1: aips-bus at 02000000 { - iomuxc: iomuxc at 020e0000 { + aips1: aips-bus at 2000000 { + iomuxc: iomuxc at 20e0000 { compatible = "fsl,imx6dl-iomuxc"; }; - pxp: pxp at 020f0000 { + pxp: pxp at 20f0000 { reg = <0x020f0000 0x4000>; interrupts = <0 98
IRQ_TYPE_LEVEL_HIGH>; };arch/arm/dts/imx6dl.dtsi +1
-1- epdc: epdc at 020f4000 { + epdc: epdc at 20f4000 { reg = <0x020f4000 0x4000>; interrupts = <0 97
IRQ_TYPE_LEVEL_HIGH>; };arch/arm/dts/imx6dl.dtsi +0
-4- - lcdif: lcdif at 020f8000 { - reg = <0x020f8000 0x4000>; - interrupts = <0 39
IRQ_TYPE_LEVEL_HIGH>;arch/arm/dts/imx6dl.dtsi +2
-3- }; }; - aips2: aips-bus at 02100000 { - i2c4: i2c at 021f8000 { + aips2: aips-bus at 2100000 { + i2c4: i2c at 21f8000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-i2c","fsl,imx21-i2c"; @@ -100,14 +113,177 @@
arch/arm/dts/imx6dl.dtsi +9
-0}; }; + capture-subsystem { + compatible = "fsl,imx-capture-subsystem"; + ports = <&ipu1_csi0>, <&ipu1_csi1>; + }; + display-subsystem { compatible = "fsl,imx-display-subsystem"; ports = <&ipu1_di0>, <&ipu1_di1>; }; +}; + +&gpio1 { + gpio-ranges = <&iomuxc 0 131 2>, <&iomuxc 2 137 8>,<&iomuxc 10 189 2>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 12 194 1>, <&iomuxc 13 193 1>,<&iomuxc 14 192 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 15 191 1>, <&iomuxc 16 185 2>,<&iomuxc 18 184 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 19 187 1>, <&iomuxc 20 183 1>,<&iomuxc 21 188 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 22 123 3>, <&iomuxc 25 121 1>,<&iomuxc 26 127 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 27 126 1>, <&iomuxc 28 128 1>,<&iomuxc 29 130 1>,
arch/arm/dts/imx6dl.dtsi +5
-0+ <&iomuxc 30 129 1>, <&iomuxc 31 122 1>; +}; + +&gpio2 { + gpio-ranges = <&iomuxc 0 161 8>, <&iomuxc 8 208 8>,<&iomuxc 16 74 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 17 73 1>, <&iomuxc 18 72 1>,<&iomuxc 19 71 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 20 70 1>, <&iomuxc 21 69 1>,<&iomuxc 22 68 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 23 79 2>, <&iomuxc 25 118 2>,<&iomuxc 27 117 1>,
arch/arm/dts/imx6dl.dtsi +5
-0+ <&iomuxc 28 113 4>; +}; + +&gpio3 { + gpio-ranges = <&iomuxc 0 97 2>, <&iomuxc 2 105 8>,<&iomuxc 10 99 6>,
arch/arm/dts/imx6dl.dtsi +5
-0+ <&iomuxc 16 81 16>; +}; + +&gpio4 { + gpio-ranges = <&iomuxc 5 136 1>, <&iomuxc 6 145 1>,<&iomuxc 7 150 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 8 146 1>, <&iomuxc 9 151 1>,<&iomuxc 10 147 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 11 152 1>, <&iomuxc 12 148 1>,<&iomuxc 13 153 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 14 149 1>, <&iomuxc 15 154 1>,<&iomuxc 16 39 7>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 23 56 1>, <&iomuxc 24 61 7>,<&iomuxc 31 46 1>; +};
arch/arm/dts/imx6dl.dtsi +2
-3- gpu-subsystem { - compatible = "fsl,imx-gpu-subsystem"; - cores = <&gpu_2d>, <&gpu_3d>; +&gpio5 { + gpio-ranges = <&iomuxc 0 120 1>, <&iomuxc 2 77 1>,<&iomuxc 4 76 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 5 47 9>, <&iomuxc 14 57 4>,<&iomuxc 18 37 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 19 36 1>, <&iomuxc 20 35 1>,<&iomuxc 21 38 1>,
arch/arm/dts/imx6dl.dtsi +5
-0+ <&iomuxc 22 29 6>, <&iomuxc 28 19 4>; +}; + +&gpio6 { + gpio-ranges = <&iomuxc 0 23 6>, <&iomuxc 6 75 1>,<&iomuxc 7 156 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 8 155 1>, <&iomuxc 9 170 1>,<&iomuxc 10 169 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 11 157 1>, <&iomuxc 14 158 3>,<&iomuxc 17 204 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 18 203 1>, <&iomuxc 19 182 1>,<&iomuxc 20 177 4>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 24 175 1>, <&iomuxc 25 171 1>,<&iomuxc 26 181 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 27 172 3>, <&iomuxc 30 176 1>,<&iomuxc 31 78 1>; +};
arch/arm/dts/imx6dl.dtsi +3
-0+ +&gpio7 { + gpio-ranges = <&iomuxc 0 202 1>, <&iomuxc 1 201 1>,<&iomuxc 2 196 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 3 195 1>, <&iomuxc 4 197 4>,<&iomuxc 8 205 1>,
arch/arm/dts/imx6dl.dtsi +1
-0+ <&iomuxc 9 207 1>, <&iomuxc 10 206 1>,<&iomuxc 11 133 3>; +};
arch/arm/dts/imx6dl.dtsi +13
-0+ +&gpr { + ipu1_csi0_mux { + compatible = "video-mux"; + mux-controls = <&mux 0>; + #address-cells = <1>; + #size-cells = <0>; + + port at 0 { + reg = <0>; + + ipu1_csi0_mux_from_mipi_vc0: endpoint { + remote-endpoint =<
&mipi_vc0_to_ipu1_csi0_mux>;arch/arm/dts/imx6dl.dtsi +8
-0+ }; + }; + + port at 1 { + reg = <1>; + + ipu1_csi0_mux_from_mipi_vc1: endpoint { + remote-endpoint =<
&mipi_vc1_to_ipu1_csi0_mux>;arch/arm/dts/imx6dl.dtsi +8
-0+ }; + }; + + port at 2 { + reg = <2>; + + ipu1_csi0_mux_from_mipi_vc2: endpoint { + remote-endpoint =<
&mipi_vc2_to_ipu1_csi0_mux>;arch/arm/dts/imx6dl.dtsi +8
-0+ }; + }; + + port at 3 { + reg = <3>; + + ipu1_csi0_mux_from_mipi_vc3: endpoint { + remote-endpoint =<
&mipi_vc3_to_ipu1_csi0_mux>;arch/arm/dts/imx6dl.dtsi +7
-0+ }; + }; + + port at 4 { + reg = <4>; + + ipu1_csi0_mux_from_parallel_sensor: endpoint{
arch/arm/dts/imx6dl.dtsi +8
-0+ }; + }; + + port at 5 { + reg = <5>; + + ipu1_csi0_mux_to_ipu1_csi0: endpoint { + remote-endpoint =<
&ipu1_csi0_from_ipu1_csi0_mux>;arch/arm/dts/imx6dl.dtsi +15
-0+ }; + }; + }; + + ipu1_csi1_mux { + compatible = "video-mux"; + mux-controls = <&mux 1>; + #address-cells = <1>; + #size-cells = <0>; + + port at 0 { + reg = <0>; + + ipu1_csi1_mux_from_mipi_vc0: endpoint { + remote-endpoint =<
&mipi_vc0_to_ipu1_csi1_mux>;arch/arm/dts/imx6dl.dtsi +8
-0+ }; + }; + + port at 1 { + reg = <1>; + + ipu1_csi1_mux_from_mipi_vc1: endpoint { + remote-endpoint =<
&mipi_vc1_to_ipu1_csi1_mux>;arch/arm/dts/imx6dl.dtsi +8
-0+ }; + }; + + port at 2 { + reg = <2>; + + ipu1_csi1_mux_from_mipi_vc2: endpoint { + remote-endpoint =<
&mipi_vc2_to_ipu1_csi1_mux>;arch/arm/dts/imx6dl.dtsi +8
-0+ }; + }; + + port at 3 { + reg = <3>; + + ipu1_csi1_mux_from_mipi_vc3: endpoint { + remote-endpoint =<
&mipi_vc3_to_ipu1_csi1_mux>;arch/arm/dts/imx6dl.dtsi +7
-0+ }; + }; + + port at 4 { + reg = <4>; + + ipu1_csi1_mux_from_parallel_sensor: endpoint{
arch/arm/dts/imx6dl.dtsi +8
-0+ }; + }; + + port at 5 { + reg = <5>; + + ipu1_csi1_mux_to_ipu1_csi1: endpoint { + remote-endpoint =<
&ipu1_csi1_from_ipu1_csi1_mux>;arch/arm/dts/imx6dl.dtsi +8
-0+ }; + }; }; };@@ -119,6 +295,12 @@ compatible = "fsl,imx6dl-hdmi"; }; +&ipu1_csi1 { + ipu1_csi1_from_ipu1_csi1_mux: endpoint { + remote-endpoint = <&ipu1_csi1_mux_to_ipu1_csi1>; + }; +}; + &ldb { clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks
IMX6QDL_CLK_LDB_DI1_SEL>, <&clksIMX6QDL_CLK_IPU1_DI0_SEL>, <&clksIMX6QDL_CLK_IPU1_DI1_SEL>, @@ -128,6 +310,82 @@arch/arm/dts/imx6dl.dtsi +9
-0"di0", "di1"; }; +&mipi_csi { + port at 1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc0_to_ipu1_csi0_mux: endpoint at 0 { + reg = <0>; + remote-endpoint =<
&ipu1_csi0_mux_from_mipi_vc0>;arch/arm/dts/imx6dl.dtsi +5
-0+ }; + + mipi_vc0_to_ipu1_csi1_mux: endpoint at 1 { + reg = <1>; + remote-endpoint =<
&ipu1_csi1_mux_from_mipi_vc0>;arch/arm/dts/imx6dl.dtsi +11
-0+ }; + }; + + port at 2 { + reg = <2>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc1_to_ipu1_csi0_mux: endpoint at 0 { + reg = <0>; + remote-endpoint =<
&ipu1_csi0_mux_from_mipi_vc1>;arch/arm/dts/imx6dl.dtsi +5
-0+ }; + + mipi_vc1_to_ipu1_csi1_mux: endpoint at 1 { + reg = <1>; + remote-endpoint =<
&ipu1_csi1_mux_from_mipi_vc1>;arch/arm/dts/imx6dl.dtsi +11
-0+ }; + }; + + port at 3 { + reg = <3>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc2_to_ipu1_csi0_mux: endpoint at 0 { + reg = <0>; + remote-endpoint =<
&ipu1_csi0_mux_from_mipi_vc2>;arch/arm/dts/imx6dl.dtsi +5
-0+ }; + + mipi_vc2_to_ipu1_csi1_mux: endpoint at 1 { + reg = <1>; + remote-endpoint =<
&ipu1_csi1_mux_from_mipi_vc2>;arch/arm/dts/imx6dl.dtsi +11
-0+ }; + }; + + port at 4 { + reg = <4>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc3_to_ipu1_csi0_mux: endpoint at 0 { + reg = <0>; + remote-endpoint =<
&ipu1_csi0_mux_from_mipi_vc3>;arch/arm/dts/imx6dl.dtsi +5
-0+ }; + + mipi_vc3_to_ipu1_csi1_mux: endpoint at 1 { + reg = <1>; + remote-endpoint =<
&ipu1_csi1_mux_from_mipi_vc3>;arch/arm/dts/imx6dl.dtsi +14
-0+ }; + }; +}; + +&mux { + mux-reg-masks = <0x34 0x00000007>, /* IPU_CSI0_MUX */ + <0x34 0x00000038>, /* IPU_CSI1_MUX */ + <0x0c 0x0000000c>, /* HDMI_MUX_CTL */ + <0x0c 0x000000c0>, /* LVDS0_MUX_CTL */ + <0x0c 0x00000300>, /* LVDS1_MUX_CTL */ + <0x28 0x00000003>, /* DCIC1_MUX_CTL */ + <0x28 0x0000000c>; /* DCIC2_MUX_CTL */ +}; + &vpu { compatible = "fsl,imx6dl-vpu", "cnm,coda960"; };(quoted diff) +0
-0
b/arch/arm/dts/imx6q-sabreauto.dtsnew file mode 100644 index 0000000..6e981a3arch/arm/dts/imx6q-sabreauto.dts new file +18
-0@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-sabreauto.dtsi" + +/ { + model = "Freescale i.MX6 Quad SABRE Automotive Board"; + compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; +}; + +&sata { + status = "okay"; +};(quoted diff) +0
-0
b/arch/arm/dts/imx6q-sabresd.dtsnew file mode 100644 index 0000000..eec9446arch/arm/dts/imx6q-sabresd.dts new file +23
-0@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-sabresd.dtsi" + +/ { + model = "Freescale i.MX6 Quad SABRE Smart Device Board"; + compatible = "fsl,imx6q-sabresd", "fsl,imx6q"; +}; + +&sata { + status = "okay"; +}; + +&ipu1_csi1_from_mipi_vc1 { + clock-lanes = <0>; + data-lanes = <1 2>; +};arch/arm/dts/imx6q.dtsi +0
-5@@ -1,12 +1,6 @@ - -/* - * Copyright 2013 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/ormodify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */arch/arm/dts/imx6q.dtsi +3
-0+// SPDX-License-Identifier: GPL-2.0 +// +// Copyright 2013 Freescale Semiconductor, Inc. #include <dt-bindings/interrupt-controller/irq.h> #include "imx6q-pinfunc.h"@@ -44,6 +38,7 @@ 396000 1175000 >; clock-latency = <61036>; /* two CLK32periods */
arch/arm/dts/imx6q.dtsi +19
-1+ #cooling-cells = <2>; clocks = <&clks IMX6QDL_CLK_ARM>, <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, <&clks IMX6QDL_CLK_STEP>,@@ -56,38 +51,119 @@ soc-supply = <®_soc>; }; - cpu at 1 { + cpu1: cpu at 1 { compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <1>; next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 975000 + >; + fsl,soc-operating-points = < + /* ARM kHz SOC-PU uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 1175000 + >; + clock-latency = <61036>; /* two CLK32periods */
arch/arm/dts/imx6q.dtsi +6
-0+ clocks = <&clks IMX6QDL_CLK_ARM>, + <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, + <&clks IMX6QDL_CLK_STEP>, + <&clks IMX6QDL_CLK_PLL1_SW>, + <&clks IMX6QDL_CLK_PLL1_SYS>; + clock-names = "arm", "pll2_pfd2_396m","step",
arch/arm/dts/imx6q.dtsi +22
-1+ "pll1_sw", "pll1_sys"; + arm-supply = <®_arm>; + pu-supply = <®_pu>; + soc-supply = <®_soc>; }; - cpu at 2 { + cpu2: cpu at 2 { compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <2>; next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 975000 + >; + fsl,soc-operating-points = < + /* ARM kHz SOC-PU uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 1175000 + >; + clock-latency = <61036>; /* two CLK32periods */
arch/arm/dts/imx6q.dtsi +6
-0+ clocks = <&clks IMX6QDL_CLK_ARM>, + <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, + <&clks IMX6QDL_CLK_STEP>, + <&clks IMX6QDL_CLK_PLL1_SW>, + <&clks IMX6QDL_CLK_PLL1_SYS>; + clock-names = "arm", "pll2_pfd2_396m","step",
arch/arm/dts/imx6q.dtsi +22
-1+ "pll1_sw", "pll1_sys"; + arm-supply = <®_arm>; + pu-supply = <®_pu>; + soc-supply = <®_soc>; }; - cpu at 3 { + cpu3: cpu at 3 { compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <3>; next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 975000 + >; + fsl,soc-operating-points = < + /* ARM kHz SOC-PU uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 1175000 + >; + clock-latency = <61036>; /* two CLK32periods */
arch/arm/dts/imx6q.dtsi +6
-0+ clocks = <&clks IMX6QDL_CLK_ARM>, + <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, + <&clks IMX6QDL_CLK_STEP>, + <&clks IMX6QDL_CLK_PLL1_SW>, + <&clks IMX6QDL_CLK_PLL1_SYS>; + clock-names = "arm", "pll2_pfd2_396m","step",
arch/arm/dts/imx6q.dtsi +8
-4+ "pll1_sw", "pll1_sys"; + arm-supply = <®_arm>; + pu-supply = <®_pu>; + soc-supply = <®_soc>; }; }; soc { - ocram: sram at 00900000 { + ocram: sram at 900000 { compatible = "mmio-sram"; reg = <0x00900000 0x40000>; clocks = <&clks IMX6QDL_CLK_OCRAM>; }; - aips-bus at 02000000 { /* AIPS1 */ - spba-bus at 02000000 { - ecspi5: ecspi at 02018000 { + aips-bus at 2000000 { /* AIPS1 */ + spba-bus at 2000000 { + ecspi5: spi at 2018000 { #address-cells = <1>; #size-cells = <0>; compatible ="fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -96,18 +172,18 @@
clocks = <&clksIMX6Q_CLK_ECSPI5>, <&clksIMX6Q_CLK_ECSPI5>;arch/arm/dts/imx6q.dtsi +0
-1clock-names = "ipg", "per"; - dmas = <&sdma 11 7 1>,<&sdma 12 7 2>;
arch/arm/dts/imx6q.dtsi +1
-0+ dmas = <&sdma 11 8 1>,<&sdma 12 8 2>; dma-names = "rx", "tx";
arch/arm/dts/imx6q.dtsi +13
-5status = "disabled"; }; }; - iomuxc: iomuxc at 020e0000 { + iomuxc: iomuxc at 20e0000 { compatible = "fsl,imx6q-iomuxc"; }; }; - sata: sata at 02200000 { + sata: sata at 2200000 { compatible = "fsl,imx6q-ahci"; reg = <0x02200000 0x4000>; interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;@@ -118,17 +194,17 @@ status = "disabled"; }; - gpu_vg: gpu at 02204000 { + gpu_vg: gpu at 2204000 { compatible = "vivante,gc"; reg = <0x02204000 0x4000>; interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_OPENVG_AXI>, <&clks IMX6QDL_CLK_GPU2D_CORE>; clock-names = "bus", "core"; - power-domains = <&gpc 1>; + power-domains = <&pd_pu>; }; - ipu2: ipu at 02800000 { + ipu2: ipu at 2800000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ipu";@@ -143,10 +219,18 @@ ipu2_csi0: port at 0 { reg = <0>; + + ipu2_csi0_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu2_csi0>; + }; }; ipu2_csi1: port at 1 { reg = <1>; + + ipu2_csi1_from_ipu2_csi1_mux: endpoint { + remote-endpoint = <&ipu2_csi1_mux_to_ipu2_csi1>; + };arch/arm/dts/imx6q.dtsi +41
-9}; ipu2_di0: port at 2 {@@ -154,22 +238,27 @@ #size-cells = <0>; reg = <2>; - ipu2_di0_disp0: disp0-endpoint { + ipu2_di0_disp0: endpoint at 0 { + reg = <0>; }; - ipu2_di0_hdmi: hdmi-endpoint { + ipu2_di0_hdmi: endpoint at 1 { + reg = <1>; remote-endpoint = <&hdmi_mux_2>; }; - ipu2_di0_mipi: mipi-endpoint { + ipu2_di0_mipi: endpoint at 2 { + reg = <2>; remote-endpoint = <&mipi_mux_2>; }; - ipu2_di0_lvds0: lvds0-endpoint { + ipu2_di0_lvds0: endpoint at 3 { + reg = <3>; remote-endpoint = <&lvds0_mux_2>; }; - ipu2_di0_lvds1: lvds1-endpoint { + ipu2_di0_lvds1: endpoint at 4 { + reg = <4>; remote-endpoint = <&lvds1_mux_2>; }; };@@ -179,33 +268,136 @@ #size-cells = <0>; reg = <3>; - ipu2_di1_hdmi: hdmi-endpoint { + ipu2_di1_hdmi: endpoint at 1 { + reg = <1>; remote-endpoint = <&hdmi_mux_3>; }; - ipu2_di1_mipi: mipi-endpoint { + ipu2_di1_mipi: endpoint at 2 { + reg = <2>; remote-endpoint = <&mipi_mux_3>; }; - ipu2_di1_lvds0: lvds0-endpoint { + ipu2_di1_lvds0: endpoint at 3 { + reg = <3>; remote-endpoint = <&lvds0_mux_3>; }; - ipu2_di1_lvds1: lvds1-endpoint { + ipu2_di1_lvds1: endpoint at 4 { + reg = <4>; remote-endpoint = <&lvds1_mux_3>; }; }; }; }; + capture-subsystem { + compatible = "fsl,imx-capture-subsystem"; + ports = <&ipu1_csi0>, <&ipu1_csi1>, <&ipu2_csi0>, <&ipu2_csi1>; + }; + display-subsystem { compatible = "fsl,imx-display-subsystem"; ports = <&ipu1_di0>, <&ipu1_di1>, <&ipu2_di0>, <&ipu2_di1>; }; +}; + +&gpio1 { + gpio-ranges = <&iomuxc 0 136 2>, <&iomuxc 2 141 1>, <&iomuxc 3 139 1>, + <&iomuxc 4 142 2>, <&iomuxc 6 140 1>, <&iomuxc 7 144 2>, + <&iomuxc 9 138 1>, <&iomuxc 10 213 3>, <&iomuxc 13 20 1>, + <&iomuxc 14 19 1>, <&iomuxc 15 21 1>, <&iomuxc 16 208 1>, + <&iomuxc 17 207 1>, <&iomuxc 18 210 3>, <&iomuxc 21 209 1>, + <&iomuxc 22 116 10>; +}; + +&gpio2 { + gpio-ranges = <&iomuxc 0 191 16>, <&iomuxc 16 55 14>, <&iomuxc 30 35 1>, + <&iomuxc 31 44 1>; +}; + +&gpio3 { + gpio-ranges = <&iomuxc 0 69 16>, <&iomuxc 16 36 8>, <&iomuxc24 45 8>; +};
arch/arm/dts/imx6q.dtsi +3
-0+ +&gpio4 { + gpio-ranges = <&iomuxc 5 149 1>, <&iomuxc 6 126 10>,<&iomuxc 16 87 16>; +};
arch/arm/dts/imx6q.dtsi +3
-0+ +&gpio5 { + gpio-ranges = <&iomuxc 0 85 1>, <&iomuxc 2 34 1>,<&iomuxc 4 53 1>,
arch/arm/dts/imx6q.dtsi +5
-0+ <&iomuxc 5 103 13>, <&iomuxc 18 150 14>; +}; + +&gpio6 { + gpio-ranges = <&iomuxc 0 164 6>, <&iomuxc 6 54 1>,<&iomuxc 7 181 5>,
arch/arm/dts/imx6q.dtsi +1
-0+ <&iomuxc 14 186 3>, <&iomuxc 17 170 2>,<&iomuxc 19 22 12>,
arch/arm/dts/imx6q.dtsi +5
-0+ <&iomuxc 31 86 1>; +}; + +&gpio7 { + gpio-ranges = <&iomuxc 0 172 9>, <&iomuxc 9 189 2>, <&iomuxc11 146 3>; +};
arch/arm/dts/imx6q.dtsi +13
-0+ +&gpr { + ipu1_csi0_mux { + compatible = "video-mux"; + mux-controls = <&mux 0>; + #address-cells = <1>; + #size-cells = <0>; + + port at 0 { + reg = <0>; + + ipu1_csi0_mux_from_mipi_vc0: endpoint { + remote-endpoint =<
&mipi_vc0_to_ipu1_csi0_mux>;arch/arm/dts/imx6q.dtsi +7
-0+ }; + }; + + port at 1 { + reg = <1>; + + ipu1_csi0_mux_from_parallel_sensor: endpoint{
arch/arm/dts/imx6q.dtsi +7
-3+ }; + }; - gpu-subsystem { - compatible = "fsl,imx-gpu-subsystem"; - cores = <&gpu_2d>, <&gpu_3d>, <&gpu_vg>; + port at 2 { + reg = <2>; + + ipu1_csi0_mux_to_ipu1_csi0: endpoint { + remote-endpoint =<
&ipu1_csi0_from_ipu1_csi0_mux>;arch/arm/dts/imx6q.dtsi +15
-0+ }; + }; + }; + + ipu2_csi1_mux { + compatible = "video-mux"; + mux-controls = <&mux 1>; + #address-cells = <1>; + #size-cells = <0>; + + port at 0 { + reg = <0>; + + ipu2_csi1_mux_from_mipi_vc3: endpoint { + remote-endpoint =<
&mipi_vc3_to_ipu2_csi1_mux>;arch/arm/dts/imx6q.dtsi +7
-0+ }; + }; + + port at 1 { + reg = <1>; + + ipu2_csi1_mux_from_parallel_sensor: endpoint{
arch/arm/dts/imx6q.dtsi +8
-0+ }; + }; + + port at 2 { + reg = <2>; + + ipu2_csi1_mux_to_ipu2_csi1: endpoint { + remote-endpoint =<
&ipu2_csi1_from_ipu2_csi1_mux>;arch/arm/dts/imx6q.dtsi +8
-0+ }; + }; }; };@@ -229,6 +421,12 @@ }; }; +&ipu1_csi1 { + ipu1_csi1_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi1>; + }; +}; + &ldb { clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks
IMX6QDL_CLK_LDB_DI1_SEL>, <&clksIMX6QDL_CLK_IPU1_DI0_SEL>, <&clksIMX6QDL_CLK_IPU1_DI1_SEL>, @@ -275,6 +473,40 @@arch/arm/dts/imx6q.dtsi +6
-0}; }; +&mipi_csi { + port at 1 { + reg = <1>; + + mipi_vc0_to_ipu1_csi0_mux: endpoint { + remote-endpoint =<
&ipu1_csi0_mux_from_mipi_vc0>;arch/arm/dts/imx6q.dtsi +24
-0+ }; + }; + + port at 2 { + reg = <2>; + + mipi_vc1_to_ipu1_csi1: endpoint { + remote-endpoint = <&ipu1_csi1_from_mipi_vc1>; + }; + }; + + port at 3 { + reg = <3>; + + mipi_vc2_to_ipu2_csi0: endpoint { + remote-endpoint = <&ipu2_csi0_from_mipi_vc2>; + }; + }; + + port at 4 { + reg = <4>; + + mipi_vc3_to_ipu2_csi1_mux: endpoint { + remote-endpoint =<
&ipu2_csi1_mux_from_mipi_vc3>;arch/arm/dts/imx6q.dtsi +14
-0+ }; + }; +}; + &mipi_dsi { ports { port at 2 {@@ -295,6 +527,16 @@ }; }; +&mux { + mux-reg-masks = <0x04 0x00080000>, /* MIPI_IPU1_MUX */ + <0x04 0x00100000>, /* MIPI_IPU2_MUX */ + <0x0c 0x0000000c>, /* HDMI_MUX_CTL */ + <0x0c 0x000000c0>, /* LVDS0_MUX_CTL */ + <0x0c 0x00000300>, /* LVDS1_MUX_CTL */ + <0x28 0x00000003>, /* DCIC1_MUX_CTL */ + <0x28 0x0000000c>; /* DCIC2_MUX_CTL */ +}; + &vpu { compatible = "fsl,imx6q-vpu", "cnm,coda960"; };(quoted diff) +0
-0
b/arch/arm/dts/imx6qdl-sabreauto.dtsinew file mode 100644 index 0000000..a6dc5c4arch/arm/dts/imx6qdl-sabreauto.dtsi new file +169
-0@@ -0,0 +1,810 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + chosen { + stdout-path = &uart4; + }; + + memory at 10000000 { + reg = <0x10000000 0x80000000>; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; + + user { + label = "debug"; + gpios = <&gpio5 15 GPIO_ACTIVE_HIGH>; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; + + home { + label = "Home"; + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + linux,code = <KEY_HOME>; + wakeup-source; + }; + + back { + label = "Back"; + gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + linux,code = <KEY_BACK>; + wakeup-source; + }; + + program { + label = "Program"; + gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; + linux,code = <KEY_PROGRAM>; + wakeup-source; + }; + + volume-up { + label = "Volume Up"; + gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; + linux,code = <KEY_VOLUMEUP>; + wakeup-source; + }; + + volume-down { + label = "Volume Down"; + gpios = <&gpio5 14 GPIO_ACTIVE_LOW>; + linux,code = <KEY_VOLUMEDOWN>; + wakeup-source; + }; + }; + + clocks { + codec_osc: anaclk2 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24576000>; + }; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + reg_audio: regulator at 0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "cs42888_supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_usb_h1_vbus: regulator at 1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&max7310_b 7 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_usb_otg_vbus: regulator at 2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&max7310_c 1 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + }; + + sound-cs42888 { + compatible = "fsl,imx6-sabreauto-cs42888", + "fsl,imx-audio-cs42888"; + model = "imx-cs42888"; + audio-cpu = <&esai>; + audio-asrc = <&asrc>; + audio-codec = <&codec>; + audio-routing = + "Line Out Jack", "AOUT1L", + "Line Out Jack", "AOUT1R", + "Line Out Jack", "AOUT2L", + "Line Out Jack", "AOUT2R", + "Line Out Jack", "AOUT3L", + "Line Out Jack", "AOUT3R", + "Line Out Jack", "AOUT4L", + "Line Out Jack", "AOUT4R", + "AIN1L", "Line In Jack", + "AIN1R", "Line In Jack", + "AIN2L", "Line In Jack", + "AIN2R", "Line In Jack"; + }; + + sound-spdif { + compatible = "fsl,imx-audio-spdif", + "fsl,imx-sabreauto-spdif"; + model = "imx-spdif"; + spdif-controller = <&spdif>; + spdif-in; + }; + + backlight { + compatible = "pwm-backlight"; + pwms = <&pwm3 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <7>; + status = "okay"; + }; + + i2cmux { + compatible = "i2c-mux-gpio"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3mux>; + mux-gpios = <&gpio5 4 0>; + i2c-parent = <&i2c3>; + idle-state = <0>; + + i2c at 1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + adv7180: camera at 21 { + compatible = "adi,adv7180"; + reg = <0x21>; + powerdown-gpios = <&max7310_b 2
GPIO_ACTIVE_LOW>;arch/arm/dts/imx6qdl-sabreauto.dtsi new file +5
-0+ interrupt-parent = <&gpio1>; + interrupts = <27 IRQ_TYPE_LEVEL_LOW>; + + port { + adv7180_to_ipu1_csi0_mux:endpoint {
arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ remote-endpoint =<
&ipu1_csi0_mux_from_parallel_sensor>;arch/arm/dts/imx6qdl-sabreauto.dtsi new file +20
-0+ bus-width = <8>; + }; + }; + }; + + max7310_a: gpio at 30 { + compatible = "maxim,max7310"; + reg = <0x30>; + gpio-controller; + #gpio-cells = <2>; + }; + + max7310_b: gpio at 32 { + compatible = "maxim,max7310"; + reg = <0x32>; + gpio-controller; + #gpio-cells = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_max7310>; + reset-gpios = <&gpio1 15
GPIO_ACTIVE_LOW>;arch/arm/dts/imx6qdl-sabreauto.dtsi new file +14
-0+ }; + + max7310_c: gpio at 34 { + compatible = "maxim,max7310"; + reg = <0x34>; + gpio-controller; + #gpio-cells = <2>; + }; + + light-sensor at 44 { + compatible = "isil,isl29023"; + reg = <0x44>; + interrupt-parent = <&gpio5>; + interrupts = <17
IRQ_TYPE_EDGE_FALLING>;arch/arm/dts/imx6qdl-sabreauto.dtsi new file +7
-0+ }; + + magnetometer at e { + compatible = "fsl,mag3110"; + reg = <0x0e>; + interrupt-parent = <&gpio2>; + interrupts = <29
IRQ_TYPE_EDGE_RISING>;arch/arm/dts/imx6qdl-sabreauto.dtsi new file +228
-0+ }; + + accelerometer at 1c { + compatible = "fsl,mma8451"; + reg = <0x1c>; + interrupt-parent = <&gpio6>; + interrupts = <31 IRQ_TYPE_LEVEL_LOW>; + }; + }; + }; +}; + +&ipu1_csi0_from_ipu1_csi0_mux { + bus-width = <8>; +}; + +&ipu1_csi0_mux_from_parallel_sensor { + remote-endpoint = <&adv7180_to_ipu1_csi0_mux>; + bus-width = <8>; +}; + +&ipu1_csi0 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0>; +}; + +&clks { + assigned-clocks = <&clks IMX6QDL_PLL4_BYPASS_SRC>, + <&clks IMX6QDL_PLL4_BYPASS>, + <&clks IMX6QDL_CLK_LDB_DI0_SEL>, + <&clks IMX6QDL_CLK_LDB_DI1_SEL>, + <&clks IMX6QDL_CLK_PLL4_POST_DIV>; + assigned-clock-parents = <&clks IMX6QDL_CLK_LVDS2_IN>, + <&clks IMX6QDL_PLL4_BYPASS_SRC>, + <&clks IMX6QDL_CLK_PLL3_USB_OTG>, + <&clks IMX6QDL_CLK_PLL3_USB_OTG>; + assigned-clock-rates = <0>, <0>, <0>, <0>, <24576000>; +}; + +&ecspi1 { + cs-gpios = <&gpio3 19 0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; + status = "disabled"; /* pin conflict with WEIM NOR */ + + flash: m25p80 at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p32", "jedec,spi-nor"; + spi-max-frequency = <20000000>; + reg = <0>; + }; +}; + +&esai { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_esai>; + assigned-clocks = <&clks IMX6QDL_CLK_ESAI_SEL>, + <&clks IMX6QDL_CLK_ESAI_EXTAL>; + assigned-clock-parents = <&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>; + assigned-clock-rates = <0>, <24576000>; + status = "okay"; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + phy-mode = "rgmii"; + interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, + <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; + fsl,err006687-workaround-present; + status = "okay"; +}; + +&gpmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand>; + status = "okay"; +}; + +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_cec>; + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + pmic: pfuze100 at 8 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { + sw1a_reg: sw1ab { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw1c_reg: sw1c { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3b_reg: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw4_reg: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + }; + + snvs_reg: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + regulator-always-on; + }; + + vref_reg: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + vgen1_reg: vgen1 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen2_reg: vgen2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + vgen4_reg: vgen4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen5_reg: vgen5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vgen6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; + + codec: cs42888 at 48 { + compatible = "cirrus,cs42888"; + reg = <0x48>; + clocks = <&codec_osc>; + clock-names = "mclk"; + VA-supply = <®_audio>; + VD-supply = <®_audio>; + VLS-supply = <®_audio>; + VLC-supply = <®_audio>; + }; + + touchscreen at 4 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_egalax_int>; + interrupt-parent = <&gpio2>; + interrupts = <28 IRQ_TYPE_EDGE_FALLING>; + wakeup-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; + }; +}; + +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx6qdl-sabreauto { + pinctrl_hog: hoggrp { + fsl,pins = < + MX6QDL_PAD_NANDF_CS2__GPIO6_IO15
0x80000000arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_SD2_DAT2__GPIO1_IO13
0x80000000arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_GPIO_18__SD3_VSELECT
0x17059arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_ecspi1: ecspi1grp { + fsl,pins = < +
MX6QDL_PAD_EIM_D17__ECSPI1_MISO0x100b1
+MX6QDL_PAD_EIM_D18__ECSPI1_MOSI0x100b1
+MX6QDL_PAD_EIM_D16__ECSPI1_SCLK0x100b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_ecspi1_cs: ecspi1cs { + fsl,pins = < + MX6QDL_PAD_EIM_D19__GPIO3_IO19
0x80000000arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_egalax_int: egalax-intgrp { + fsl,pins = < +
MX6QDL_PAD_EIM_EB0__GPIO2_IO280xb0b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_enet: enetgrp { + fsl,pins = < +
MX6QDL_PAD_KEY_COL1__ENET_MDIO0x1b0b0
+MX6QDL_PAD_KEY_COL2__ENET_MDC0x1b0b0
+MX6QDL_PAD_RGMII_TXC__RGMII_TXC0x1b030
+MX6QDL_PAD_RGMII_TD0__RGMII_TD00x1b030
+MX6QDL_PAD_RGMII_TD1__RGMII_TD10x1b030
+MX6QDL_PAD_RGMII_TD2__RGMII_TD20x1b030
+MX6QDL_PAD_RGMII_TD3__RGMII_TD30x1b030
+MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL0x1b030
+MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK0x1b0b0
+MX6QDL_PAD_RGMII_RXC__RGMII_RXC0x1b030
+MX6QDL_PAD_RGMII_RD0__RGMII_RD00x1b030
+MX6QDL_PAD_RGMII_RD1__RGMII_RD10x1b030
+MX6QDL_PAD_RGMII_RD2__RGMII_RD20x1b030
+MX6QDL_PAD_RGMII_RD3__RGMII_RD30x1b030
+MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL0x1b030
+MX6QDL_PAD_GPIO_6__ENET_IRQ0x000b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_esai: esaigrp { + fsl,pins = < + MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_GPIO_5__ESAI_TX2_RX3
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_GPIO_17__ESAI_TX0
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_NANDF_CS3__ESAI_TX1
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_ENET_MDIO__ESAI_RX_CLK
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_GPIO_9__ESAI_RX_FS
0x1b030arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_gpio_keys: gpiokeysgrp { + fsl,pins = < +
MX6QDL_PAD_SD2_CMD__GPIO1_IO110x1b0b0
+MX6QDL_PAD_SD2_DAT3__GPIO1_IO120x1b0b0
+MX6QDL_PAD_SD4_DAT4__GPIO2_IO120x1b0b0
+MX6QDL_PAD_SD4_DAT7__GPIO2_IO150x1b0b0
+MX6QDL_PAD_DISP0_DAT20__GPIO5_IO140x1b0b0arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = < +
MX6QDL_PAD_DISP0_DAT21__GPIO5_IO150x80000000arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_gpmi_nand: gpminandgrp { + fsl,pins = < +
MX6QDL_PAD_NANDF_CLE__NAND_CLE0xb0b1
+MX6QDL_PAD_NANDF_ALE__NAND_ALE0xb0b1
+MX6QDL_PAD_NANDF_WP_B__NAND_WP_B0xb0b1
+MX6QDL_PAD_NANDF_RB0__NAND_READY_B0xb000
+MX6QDL_PAD_NANDF_CS0__NAND_CE0_B0xb0b1
+MX6QDL_PAD_NANDF_CS1__NAND_CE1_B0xb0b1
+MX6QDL_PAD_SD4_CMD__NAND_RE_B0xb0b1
+MX6QDL_PAD_SD4_CLK__NAND_WE_B0xb0b1
+MX6QDL_PAD_NANDF_D0__NAND_DATA000xb0b1
+MX6QDL_PAD_NANDF_D1__NAND_DATA010xb0b1
+MX6QDL_PAD_NANDF_D2__NAND_DATA020xb0b1
+MX6QDL_PAD_NANDF_D3__NAND_DATA030xb0b1
+MX6QDL_PAD_NANDF_D4__NAND_DATA040xb0b1
+MX6QDL_PAD_NANDF_D5__NAND_DATA050xb0b1
+MX6QDL_PAD_NANDF_D6__NAND_DATA060xb0b1
+MX6QDL_PAD_NANDF_D7__NAND_DATA070xb0b1
+MX6QDL_PAD_SD4_DAT0__NAND_DQS0x00b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_hdmi_cec: hdmicecgrp { + fsl,pins = < +
MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE0x1f8b0arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX6QDL_PAD_EIM_EB2__I2C2_SCL
0x4001b8b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA
0x4001b8b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX6QDL_PAD_GPIO_3__I2C3_SCL
0x4001b8b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +1
-0+ MX6QDL_PAD_EIM_D18__I2C3_SDA
0x4001b8b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_i2c3mux: i2c3muxgrp { + fsl,pins = < + MX6QDL_PAD_EIM_A24__GPIO5_IO04
0x0b0b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_ipu1_csi0: ipu1csi0grp { + fsl,pins = < +
MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA120x1b0b0
+MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA130x1b0b0
+MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA140x1b0b0
+MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA150x1b0b0
+MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA160x1b0b0
+MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA170x1b0b0
+MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA180x1b0b0
+MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA190x1b0b0
+MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK0x1b0b0
+MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC0x1b0b0
+MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC0x1b0b0arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_max7310: max7310grp { + fsl,pins = < + MX6QDL_PAD_SD2_DAT0__GPIO1_IO15
0x1b0b0arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_pwm3: pwm1grp { + fsl,pins = < +
MX6QDL_PAD_SD4_DAT1__PWM3_OUT0x1b0b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_gpt_input_capture0: gptinputcapture0grp { + fsl,pins = < +
MX6QDL_PAD_SD1_DAT0__GPT_CAPTURE10x1b0b0arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_gpt_input_capture1: gptinputcapture1grp { + fsl,pins = < +
MX6QDL_PAD_SD1_DAT1__GPT_CAPTURE20x1b0b0arch/arm/dts/imx6qdl-sabreauto.dtsi new file +12
-0+ >; + }; + + pinctrl_spdif: spdifgrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__SPDIF_IN 0x1b0b0 + >; + }; + + pinctrl_uart4: uart4grp { + fsl,pins = < +
MX6QDL_PAD_KEY_COL0__UART4_TX_DATA0x1b0b1
+MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA0x1b0b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID
0x17059arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < +
MX6QDL_PAD_SD3_CMD__SD3_CMD0x17059
+MX6QDL_PAD_SD3_CLK__SD3_CLK0x10059
+MX6QDL_PAD_SD3_DAT0__SD3_DATA00x17059
+MX6QDL_PAD_SD3_DAT1__SD3_DATA10x17059
+MX6QDL_PAD_SD3_DAT2__SD3_DATA20x17059
+MX6QDL_PAD_SD3_DAT3__SD3_DATA30x17059
+MX6QDL_PAD_SD3_DAT4__SD3_DATA40x17059
+MX6QDL_PAD_SD3_DAT5__SD3_DATA50x17059
+MX6QDL_PAD_SD3_DAT6__SD3_DATA60x17059
+MX6QDL_PAD_SD3_DAT7__SD3_DATA70x17059arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_usdhc3_100mhz: usdhc3grp100mhz { + fsl,pins = < +
MX6QDL_PAD_SD3_CMD__SD3_CMD0x170b9
+MX6QDL_PAD_SD3_CLK__SD3_CLK0x100b9
+MX6QDL_PAD_SD3_DAT0__SD3_DATA00x170b9
+MX6QDL_PAD_SD3_DAT1__SD3_DATA10x170b9
+MX6QDL_PAD_SD3_DAT2__SD3_DATA20x170b9
+MX6QDL_PAD_SD3_DAT3__SD3_DATA30x170b9
+MX6QDL_PAD_SD3_DAT4__SD3_DATA40x170b9
+MX6QDL_PAD_SD3_DAT5__SD3_DATA50x170b9
+MX6QDL_PAD_SD3_DAT6__SD3_DATA60x170b9
+MX6QDL_PAD_SD3_DAT7__SD3_DATA70x170b9arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_usdhc3_200mhz: usdhc3grp200mhz { + fsl,pins = < +
MX6QDL_PAD_SD3_CMD__SD3_CMD0x170f9
+MX6QDL_PAD_SD3_CLK__SD3_CLK0x100f9
+MX6QDL_PAD_SD3_DAT0__SD3_DATA00x170f9
+MX6QDL_PAD_SD3_DAT1__SD3_DATA10x170f9
+MX6QDL_PAD_SD3_DAT2__SD3_DATA20x170f9
+MX6QDL_PAD_SD3_DAT3__SD3_DATA30x170f9
+MX6QDL_PAD_SD3_DAT4__SD3_DATA40x170f9
+MX6QDL_PAD_SD3_DAT5__SD3_DATA50x170f9
+MX6QDL_PAD_SD3_DAT6__SD3_DATA60x170f9
+MX6QDL_PAD_SD3_DAT7__SD3_DATA70x170f9arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_weim_cs0: weimcs0grp { + fsl,pins = < +
MX6QDL_PAD_EIM_CS0__EIM_CS0_B0xb0b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +6
-0+ >; + }; + + pinctrl_weim_nor: weimnorgrp { + fsl,pins = < +
MX6QDL_PAD_EIM_OE__EIM_OE_B0xb0b1
+MX6QDL_PAD_EIM_RW__EIM_RW0xb0b1
+MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B0xb060
+MX6QDL_PAD_EIM_D16__EIM_DATA160x1b0b0
+MX6QDL_PAD_EIM_D17__EIM_DATA170x1b0b0
+MX6QDL_PAD_EIM_D18__EIM_DATA180x1b0b0
+MX6QDL_PAD_EIM_D19__EIM_DATA190x1b0b0
+MX6QDL_PAD_EIM_D20__EIM_DATA200x1b0b0
+MX6QDL_PAD_EIM_D21__EIM_DATA210x1b0b0
+MX6QDL_PAD_EIM_D22__EIM_DATA220x1b0b0
+MX6QDL_PAD_EIM_D23__EIM_DATA230x1b0b0
+MX6QDL_PAD_EIM_D24__EIM_DATA240x1b0b0
+MX6QDL_PAD_EIM_D25__EIM_DATA250x1b0b0
+MX6QDL_PAD_EIM_D26__EIM_DATA260x1b0b0
+MX6QDL_PAD_EIM_D27__EIM_DATA270x1b0b0
+MX6QDL_PAD_EIM_D28__EIM_DATA280x1b0b0
+MX6QDL_PAD_EIM_D29__EIM_DATA290x1b0b0
+MX6QDL_PAD_EIM_D30__EIM_DATA300x1b0b0
+MX6QDL_PAD_EIM_D31__EIM_DATA310x1b0b0
+MX6QDL_PAD_EIM_A23__EIM_ADDR230xb0b1
+MX6QDL_PAD_EIM_A22__EIM_ADDR220xb0b1
+MX6QDL_PAD_EIM_A21__EIM_ADDR210xb0b1
+MX6QDL_PAD_EIM_A20__EIM_ADDR200xb0b1
+MX6QDL_PAD_EIM_A19__EIM_ADDR190xb0b1
+MX6QDL_PAD_EIM_A18__EIM_ADDR180xb0b1
+MX6QDL_PAD_EIM_A17__EIM_ADDR170xb0b1
+MX6QDL_PAD_EIM_A16__EIM_ADDR160xb0b1
+MX6QDL_PAD_EIM_DA15__EIM_AD150xb0b1
+MX6QDL_PAD_EIM_DA14__EIM_AD140xb0b1
+MX6QDL_PAD_EIM_DA13__EIM_AD130xb0b1
+MX6QDL_PAD_EIM_DA12__EIM_AD120xb0b1
+MX6QDL_PAD_EIM_DA11__EIM_AD110xb0b1
+MX6QDL_PAD_EIM_DA10__EIM_AD100xb0b1
+MX6QDL_PAD_EIM_DA9__EIM_AD090xb0b1
+MX6QDL_PAD_EIM_DA8__EIM_AD080xb0b1
+MX6QDL_PAD_EIM_DA7__EIM_AD070xb0b1
+MX6QDL_PAD_EIM_DA6__EIM_AD060xb0b1
+MX6QDL_PAD_EIM_DA5__EIM_AD050xb0b1
+MX6QDL_PAD_EIM_DA4__EIM_AD040xb0b1
+MX6QDL_PAD_EIM_DA3__EIM_AD030xb0b1
+MX6QDL_PAD_EIM_DA2__EIM_AD020xb0b1
+MX6QDL_PAD_EIM_DA1__EIM_AD010xb0b1
+MX6QDL_PAD_EIM_DA0__EIM_AD000xb0b1arch/arm/dts/imx6qdl-sabreauto.dtsi new file +83
-0+ >; + }; + }; +}; + +&ldb { + status = "okay"; + + lvds-channel at 0 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&timing0>; + timing0: hsd100pxn1 { + clock-frequency = <65000000>; + hactive = <1024>; + vactive = <768>; + hback-porch = <220>; + hfront-porch = <40>; + vback-porch = <21>; + vfront-porch = <7>; + hsync-len = <60>; + vsync-len = <10>; + }; + }; + }; +}; + +&pwm3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm3>; + status = "okay"; +}; + +&spdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spdif>; + status = "okay"; +}; + +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart4>; + status = "okay"; +}; + +&usbh1 { + vbus-supply = <®_usb_h1_vbus>; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc3>; + pinctrl-1 = <&pinctrl_usdhc3_100mhz>; + pinctrl-2 = <&pinctrl_usdhc3_200mhz>; + cd-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&weim { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_weim_nor &pinctrl_weim_cs0>; + ranges = <0 0 0x08000000 0x08000000>; + status = "disabled"; /* pin conflict with SPI NOR */ + + nor at 0,0 { + compatible = "cfi-flash"; + reg = <0 0 0x02000000>; + #address-cells = <1>; + #size-cells = <1>; + bank-width = <2>; + fsl,weim-cs-timing = <0x00620081 0x00000001
0x1c022000arch/arm/dts/imx6qdl-sabreauto.dtsi new file +3
-0+ 0x0000c000 0x1404a38e 0x00000000>; + }; +};(quoted diff) +0
-0
b/arch/arm/dts/imx6qdl-sabresd.dtsinew file mode 100644 index 0000000..2cd5a9farch/arm/dts/imx6qdl-sabresd.dtsi new file +255
-0@@ -0,0 +1,741 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +#include <dt-bindings/clock/imx6qdl-clock.h> +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + aliases { + mmc1 = &usdhc3; + }; + + chosen { + stdout-path = &uart1; + }; + + memory at 10000000 { + reg = <0x10000000 0x40000000>; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + reg_usb_otg_vbus: regulator at 0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio3 22 0>; + enable-active-high; + vin-supply = <&swbst_reg>; + }; + + reg_usb_h1_vbus: regulator at 1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio1 29 0>; + enable-active-high; + vin-supply = <&swbst_reg>; + }; + + reg_audio: regulator at 2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "wm8962-supply"; + gpio = <&gpio4 10 0>; + enable-active-high; + }; + + reg_pcie: regulator at 3 { + compatible = "regulator-fixed"; + reg = <3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie_reg>; + regulator-name = "MPCIE_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio3 19 0>; + enable-active-high; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; + + power { + label = "Power Button"; + gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_POWER>; + }; + + volume-up { + label = "Volume Up"; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_VOLUMEUP>; + }; + + volume-down { + label = "Volume Down"; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_VOLUMEDOWN>; + }; + }; + + sound { + compatible = "fsl,imx6q-sabresd-wm8962", + "fsl,imx-audio-wm8962"; + model = "wm8962-audio"; + ssi-controller = <&ssi2>; + audio-codec = <&codec>; + audio-routing = + "Headphone Jack", "HPOUTL", + "Headphone Jack", "HPOUTR", + "Ext Spk", "SPKOUTL", + "Ext Spk", "SPKOUTR", + "AMIC", "MICBIAS", + "IN3R", "AMIC"; + mux-int-port = <2>; + mux-ext-port = <3>; + }; + + backlight_lvds: backlight-lvds { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <7>; + status = "okay"; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; + + red { + gpios = <&gpio1 2 0>; + default-state = "on"; + }; + }; + + panel { + compatible = "hannstar,hsd100pxn1"; + backlight = <&backlight_lvds>; + + port { + panel_in: endpoint { + remote-endpoint = <&lvds0_out>; + }; + }; + }; +}; + +&ipu1_csi0_from_ipu1_csi0_mux { + bus-width = <8>; + data-shift = <12>; /* Lines 19:12 used */ + hsync-active = <1>; + vsync-active = <1>; +}; + +&ipu1_csi0_mux_from_parallel_sensor { + remote-endpoint = <&ov5642_to_ipu1_csi0_mux>; +}; + +&ipu1_csi0 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0>; +}; + +&mipi_csi { + status = "okay"; + + port at 0 { + reg = <0>; + + mipi_csi2_in: endpoint { + remote-endpoint = <&ov5640_to_mipi_csi2>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; +}; + +&audmux { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_audmux>; + status = "okay"; +}; + +&clks { + assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, + <&clks IMX6QDL_CLK_LDB_DI1_SEL>; + assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>, + <&clks IMX6QDL_CLK_PLL3_USB_OTG>; +}; + +&ecspi1 { + cs-gpios = <&gpio4 9 0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi1>; + status = "okay"; + + flash: m25p80 at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p32", "jedec,spi-nor"; + spi-max-frequency = <20000000>; + reg = <0>; + }; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + phy-mode = "rgmii"; + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_cec>; + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c1 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; + + codec: wm8962 at 1a { + compatible = "wlf,wm8962"; + reg = <0x1a>; + clocks = <&clks IMX6QDL_CLK_CKO>; + DCVDD-supply = <®_audio>; + DBVDD-supply = <®_audio>; + AVDD-supply = <®_audio>; + CPVDD-supply = <®_audio>; + MICVDD-supply = <®_audio>; + PLLVDD-supply = <®_audio>; + SPKVDD1-supply = <®_audio>; + SPKVDD2-supply = <®_audio>; + gpio-cfg = < + 0x0000 /* 0:Default */ + 0x0000 /* 1:Default */ + 0x0013 /* 2:FN_DMICCLK */ + 0x0000 /* 3:Default */ + 0x8014 /* 4:FN_DMICCDAT */ + 0x0000 /* 5:Default */ + >; + }; + + ov5642: camera at 3c { + compatible = "ovti,ov5642"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ov5642>; + clocks = <&clks IMX6QDL_CLK_CKO>; + clock-names = "xclk"; + reg = <0x3c>; + DOVDD-supply = <&vgen4_reg>; /* 1.8v */ + AVDD-supply = <&vgen3_reg>; /* 2.8v, rev C board isVGEN3
arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ rev B board is VGEN5*/
arch/arm/dts/imx6qdl-sabresd.dtsi new file +8
-0+ DVDD-supply = <&vgen2_reg>; /* 1.5v*/ + powerdown-gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + status = "disabled"; + + port { + ov5642_to_ipu1_csi0_mux: endpoint { + remote-endpoint =<
&ipu1_csi0_mux_from_parallel_sensor>;arch/arm/dts/imx6qdl-sabresd.dtsi new file +23
-0+ bus-width = <8>; + hsync-active = <1>; + vsync-active = <1>; + }; + }; + }; +}; + +&i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + ov5640: camera at 3c { + compatible = "ovti,ov5640"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ov5640>; + reg = <0x3c>; + clocks = <&clks IMX6QDL_CLK_CKO>; + clock-names = "xclk"; + DOVDD-supply = <&vgen4_reg>; /* 1.8v */ + AVDD-supply = <&vgen3_reg>; /* 2.8v, rev C board isVGEN3
arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ rev B board is VGEN5*/
arch/arm/dts/imx6qdl-sabresd.dtsi new file +138
-0+ DVDD-supply = <&vgen2_reg>; /* 1.5v*/ + powerdown-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; + + port { + ov5640_to_mipi_csi2: endpoint { + remote-endpoint = <&mipi_csi2_in>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + }; + + pmic: pfuze100 at 8 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { + sw1a_reg: sw1ab { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw1c_reg: sw1c { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3b_reg: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw4_reg: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + }; + + snvs_reg: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + regulator-always-on; + }; + + vref_reg: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + vgen1_reg: vgen1 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen2_reg: vgen2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + vgen4_reg: vgen4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen5_reg: vgen5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vgen6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; +}; + +&i2c3 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; + + egalax_ts at 4 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + interrupt-parent = <&gpio6>; + interrupts = <7 2>; + wakeup-gpios = <&gpio6 7 0>; + }; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx6qdl-sabresd { + pinctrl_hog: hoggrp { + fsl,pins = < + MX6QDL_PAD_NANDF_D0__GPIO2_IO00
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_NANDF_D1__GPIO2_IO01
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_NANDF_D2__GPIO2_IO02
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_NANDF_D3__GPIO2_IO03
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_GPIO_0__CCM_CLKO1
0x130b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_NANDF_CLE__GPIO6_IO07
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_ENET_TXD1__GPIO1_IO29
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_EIM_D22__GPIO3_IO22
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_audmux: audmuxgrp { + fsl,pins = < +
MX6QDL_PAD_CSI0_DAT7__AUD3_RXD0x130b0
+MX6QDL_PAD_CSI0_DAT4__AUD3_TXC0x130b0
+MX6QDL_PAD_CSI0_DAT5__AUD3_TXD0x110b0
+MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS0x130b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_ecspi1: ecspi1grp { + fsl,pins = < +
MX6QDL_PAD_KEY_COL1__ECSPI1_MISO0x100b1
+MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI0x100b1
+MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK0x100b1
+MX6QDL_PAD_KEY_ROW1__GPIO4_IO090x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_enet: enetgrp { + fsl,pins = < +
MX6QDL_PAD_ENET_MDIO__ENET_MDIO0x1b0b0
+MX6QDL_PAD_ENET_MDC__ENET_MDC0x1b0b0
+MX6QDL_PAD_RGMII_TXC__RGMII_TXC0x1b030
+MX6QDL_PAD_RGMII_TD0__RGMII_TD00x1b030
+MX6QDL_PAD_RGMII_TD1__RGMII_TD10x1b030
+MX6QDL_PAD_RGMII_TD2__RGMII_TD20x1b030
+MX6QDL_PAD_RGMII_TD3__RGMII_TD30x1b030
+MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL0x1b030
+MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK0x1b0b0
+MX6QDL_PAD_RGMII_RXC__RGMII_RXC0x1b030
+MX6QDL_PAD_RGMII_RD0__RGMII_RD00x1b030
+MX6QDL_PAD_RGMII_RD1__RGMII_RD10x1b030
+MX6QDL_PAD_RGMII_RD2__RGMII_RD20x1b030
+MX6QDL_PAD_RGMII_RD3__RGMII_RD30x1b030
+MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL0x1b030
+MX6QDL_PAD_GPIO_16__ENET_REF_CLK0x4001b0a8arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_gpio_keys: gpio_keysgrp { + fsl,pins = < + MX6QDL_PAD_EIM_D29__GPIO3_IO29
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_GPIO_4__GPIO1_IO04
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_GPIO_5__GPIO1_IO05
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_hdmi_cec: hdmicecgrp { + fsl,pins = < +
MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE0x1f8b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_i2c1: i2c1grp { + fsl,pins = < +
MX6QDL_PAD_CSI0_DAT8__I2C1_SDA0x4001b8b1
+MX6QDL_PAD_CSI0_DAT9__I2C1_SCL0x4001b8b1arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < +
MX6QDL_PAD_KEY_COL3__I2C2_SCL0x4001b8b1
+MX6QDL_PAD_KEY_ROW3__I2C2_SDA0x4001b8b1arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_i2c3: i2c3grp { + fsl,pins = < +
MX6QDL_PAD_GPIO_3__I2C3_SCL0x4001b8b1
+MX6QDL_PAD_GPIO_6__I2C3_SDA0x4001b8b1arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_ipu1_csi0: ipu1csi0grp { + fsl,pins = < +
MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA120x1b0b0
+MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA130x1b0b0
+MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA140x1b0b0
+MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA150x1b0b0
+MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA160x1b0b0
+MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA170x1b0b0
+MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA180x1b0b0
+MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA190x1b0b0
+MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK0x1b0b0
+MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC0x1b0b0
+MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_ov5640: ov5640grp { + fsl,pins = < + MX6QDL_PAD_SD1_DAT2__GPIO1_IO19
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_SD1_CLK__GPIO1_IO20
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_ov5642: ov5642grp { + fsl,pins = < + MX6QDL_PAD_SD1_DAT0__GPIO1_IO16
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +1
-0+ MX6QDL_PAD_SD1_DAT1__GPIO1_IO17
0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_pcie: pciegrp { + fsl,pins = < +
MX6QDL_PAD_GPIO_17__GPIO7_IO120x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_pcie_reg: pciereggrp { + fsl,pins = < +
MX6QDL_PAD_EIM_D19__GPIO3_IO190x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_pwm1: pwm1grp { + fsl,pins = < +
MX6QDL_PAD_SD1_DAT3__PWM1_OUT0x1b0b1arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_uart1: uart1grp { + fsl,pins = < +
MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA0x1b0b1
+MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA0x1b0b1arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < +
MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID0x17059arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < +
MX6QDL_PAD_SD2_CMD__SD2_CMD0x17059
+MX6QDL_PAD_SD2_CLK__SD2_CLK0x10059
+MX6QDL_PAD_SD2_DAT0__SD2_DATA00x17059
+MX6QDL_PAD_SD2_DAT1__SD2_DATA10x17059
+MX6QDL_PAD_SD2_DAT2__SD2_DATA20x17059
+MX6QDL_PAD_SD2_DAT3__SD2_DATA30x17059
+MX6QDL_PAD_NANDF_D4__SD2_DATA40x17059
+MX6QDL_PAD_NANDF_D5__SD2_DATA50x17059
+MX6QDL_PAD_NANDF_D6__SD2_DATA60x17059
+MX6QDL_PAD_NANDF_D7__SD2_DATA70x17059arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < +
MX6QDL_PAD_SD3_CMD__SD3_CMD0x17059
+MX6QDL_PAD_SD3_CLK__SD3_CLK0x10059
+MX6QDL_PAD_SD3_DAT0__SD3_DATA00x17059
+MX6QDL_PAD_SD3_DAT1__SD3_DATA10x17059
+MX6QDL_PAD_SD3_DAT2__SD3_DATA20x17059
+MX6QDL_PAD_SD3_DAT3__SD3_DATA30x17059
+MX6QDL_PAD_SD3_DAT4__SD3_DATA40x17059
+MX6QDL_PAD_SD3_DAT5__SD3_DATA50x17059
+MX6QDL_PAD_SD3_DAT6__SD3_DATA60x17059
+MX6QDL_PAD_SD3_DAT7__SD3_DATA70x17059arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_usdhc4: usdhc4grp { + fsl,pins = < +
MX6QDL_PAD_SD4_CMD__SD4_CMD0x17059
+MX6QDL_PAD_SD4_CLK__SD4_CLK0x10059
+MX6QDL_PAD_SD4_DAT0__SD4_DATA00x17059
+MX6QDL_PAD_SD4_DAT1__SD4_DATA10x17059
+MX6QDL_PAD_SD4_DAT2__SD4_DATA20x17059
+MX6QDL_PAD_SD4_DAT3__SD4_DATA30x17059
+MX6QDL_PAD_SD4_DAT4__SD4_DATA40x17059
+MX6QDL_PAD_SD4_DAT5__SD4_DATA50x17059
+MX6QDL_PAD_SD4_DAT6__SD4_DATA60x17059
+MX6QDL_PAD_SD4_DAT7__SD4_DATA70x17059arch/arm/dts/imx6qdl-sabresd.dtsi new file +6
-0+ >; + }; + + pinctrl_wdog: wdoggrp { + fsl,pins = < +
MX6QDL_PAD_GPIO_1__WDOG2_B0x1b0b0arch/arm/dts/imx6qdl-sabresd.dtsi new file +121
-0+ >; + }; + }; + + gpio_leds { + pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b0 + >; + }; + }; +}; + +&ldb { + status = "okay"; + + lvds-channel at 1 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + port at 4 { + reg = <4>; + + lvds0_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie>; + reset-gpio = <&gpio7 12 GPIO_ACTIVE_LOW>; + vpcie-supply = <®_pcie>; + status = "okay"; +}; + +&pwm1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm1>; + status = "okay"; +}; + +®_arm { + vin-supply = <&sw1a_reg>; +}; + +®_pu { + vin-supply = <&sw1c_reg>; +}; + +®_soc { + vin-supply = <&sw1c_reg>; +}; + +&snvs_poweroff { + status = "okay"; +}; + +&ssi2 { + status = "okay"; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; + status = "okay"; +}; + +&usbh1 { + vbus-supply = <®_usb_h1_vbus>; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg>; + disable-over-current; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + bus-width = <8>; + cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3>; + bus-width = <8>; + cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&usdhc4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc4>; + bus-width = <8>; + non-removable; + no-1-8-v; + status = "okay"; +}; + +&wdog1 { + status = "disabled"; +}; + +&wdog2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdog>; + fsl,ext-reset-output; + status = "okay"; +};arch/arm/dts/imx6qdl.dtsi +73
-16@@ -1,21 +1,23 @@ -/* - * Copyright 2011 Freescale Semiconductor, Inc. - * Copyright 2011 Linaro Ltd. - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2011 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. #include <dt-bindings/clock/imx6qdl-clock.h> #include <dt-bindings/interrupt-controller/arm-gic.h> -#include "skeleton.dtsi" - / { + #address-cells = <1>; + #size-cells = <1>; + /* + * The decompressor and also some bootloaders rely on a + * pre-existing /chosen node to be available to insert the + * command line and merge other ATAGS info. + * Also for U-Boot there must be a pre-existing /memory node. + */ + chosen {}; + memory { device_type = "memory"; }; + aliases { ethernet0 = &fec; can0 = &can1;@@ -49,9 +51,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - ckil { compatible = "fsl,imx-ckil", "fixed-clock"; #clock-cells = <0>;@@ -71,6 +70,75 @@ }; }; + tempmon: tempmon { + compatible = "fsl,imx6q-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + fsl,tempmon-data = <&ocotp>; + clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>; + }; + + ldb: ldb { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb"; + gpr = <&gpr>; + status = "disabled"; + + lvds-channel at 0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + status = "disabled"; + + port at 0 { + reg = <0>; + + lvds0_mux_0: endpoint { + remote-endpoint = <&ipu1_di0_lvds0>; + }; + }; + + port at 1 { + reg = <1>; + + lvds0_mux_1: endpoint { + remote-endpoint = <&ipu1_di1_lvds0>; + }; + }; + }; + + lvds-channel at 1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + status = "disabled"; + + port at 0 { + reg = <0>; + + lvds1_mux_0: endpoint { + remote-endpoint = <&ipu1_di0_lvds1>; + }; + }; + + port at 1 { + reg = <1>; + + lvds1_mux_1: endpoint { + remote-endpoint =<
&ipu1_di1_lvds1>;arch/arm/dts/imx6qdl.dtsi +23
-11+ }; + }; + }; + }; + + pmu: pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&gpc>; + interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>; + }; + soc { #address-cells = <1>; #size-cells = <1>;@@ -78,7 +146,7 @@ interrupt-parent = <&gpc>; ranges; - dma_apbh: dma-apbh at 00110000 { + dma_apbh: dma-apbh at 110000 { compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh"; reg = <0x00110000 0x2000>; interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,@@ -91,7 +159,7 @@ clocks = <&clks IMX6QDL_CLK_APBH_DMA>; }; - gpmi: gpmi-nand at 00112000 { + gpmi: gpmi-nand at 112000 { compatible = "fsl,imx6q-gpmi-nand"; #address-cells = <1>; #size-cells = <1>;@@ -111,7 +179,7 @@ status = "disabled"; }; - hdmi: hdmi at 0120000 { + hdmi: hdmi at 120000 { #address-cells = <1>; #size-cells = <0>; reg = <0x00120000 0x9000>;@@ -139,7 +207,7 @@ }; }; - gpu_3d: gpu at 00130000 { + gpu_3d: gpu at 130000 { compatible = "vivante,gc"; reg = <0x00130000 0x4000>; interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;@@ -147,20 +215,20 @@ <&clks IMX6QDL_CLK_GPU3D_CORE>, <&clks IMX6QDL_CLK_GPU3D_SHADER>; clock-names = "bus", "core", "shader"; - power-domains = <&gpc 1>; + power-domains = <&pd_pu>; }; - gpu_2d: gpu at 00134000 { + gpu_2d: gpu at 134000 { compatible = "vivante,gc"; reg = <0x00134000 0x4000>; interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_GPU2D_AXI>, <&clks IMX6QDL_CLK_GPU2D_CORE>; clock-names = "bus", "core"; - power-domains = <&gpc 1>; + power-domains = <&pd_pu>; }; - timer at 00a00600 { + timer at a00600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0x00a00600 0x20>; interrupts = <1 13 0xf01>;@@ -168,7 +236,7 @@ clocks = <&clks IMX6QDL_CLK_TWD>; }; - intc: interrupt-controller at 00a01000 { + intc: interrupt-controller at a01000 { compatible = "arm,cortex-a9-gic"; #interrupt-cells = <3>; interrupt-controller;@@ -177,7 +245,7 @@ interrupt-parent = <&intc>; }; - L2: l2-cache at 00a02000 { + L2: l2-cache at a02000 { compatible = "arm,pl310-cache"; reg = <0x00a02000 0x1000>; interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;@@ -188,7 +256,7 @@ arm,shared-override; }; - pcie: pcie at 0x01000000 { + pcie: pcie at 1ffc000 { compatible = "fsl,imx6q-pcie", "snps,dw-pcie"; reg = <0x01ffc000 0x04000>, <0x01f00000 0x80000>;@@ -196,6 +264,7 @@ #address-cells = <3>; #size-cells = <2>; device_type = "pci"; + bus-range = <0x00 0xff>; ranges = <0x81000000 0 0 0x01f800000
0x00010000/* downstream I/O */0x8200000000x010000000x0100000000x00f00000>; /* non-prefetchable memory */ num-lanes = <1>;arch/arm/dts/imx6qdl.dtsi +0
-3@@ -204,9 +273,9 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>; interrupt-map = <0 0 0 1 &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gpc GIC_SPI 120
IRQ_TYPE_LEVEL_HIGH>;arch/arm/dts/imx6qdl.dtsi +1
-0+ <0 0 0 2 &gpc GIC_SPI 122
IRQ_TYPE_LEVEL_HIGH>,arch/arm/dts/imx6qdl.dtsi +1
-0+ <0 0 0 3 &gpc GIC_SPI 121
IRQ_TYPE_LEVEL_HIGH>,arch/arm/dts/imx6qdl.dtsi +1
-0+ <0 0 0 4 &gpc GIC_SPI 120
IRQ_TYPE_LEVEL_HIGH>; clocks = <&clksIMX6QDL_CLK_PCIE_AXI>,arch/arm/dts/imx6qdl.dtsi +3
-8<&clks IMX6QDL_CLK_LVDS1_GATE>, <&clks IMX6QDL_CLK_PCIE_REF_125M>;@@ -214,26 +283,21 @@ status = "disabled"; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>; - }; - - aips-bus at 02000000 { /* AIPS1 */ + aips-bus at 2000000 { /* AIPS1 */ compatible = "fsl,aips-bus", "simple-bus"; #address-cells = <1>; #size-cells = <1>; reg = <0x02000000 0x100000>; ranges; - spba-bus at 02000000 { + spba-bus at 2000000 { compatible = "fsl,spba-bus", "simple-bus"; #address-cells = <1>; #size-cells = <1>; reg = <0x02000000 0x40000>; ranges; - spdif: spdif at 02004000 { + spdif: spdif at 2004000 { compatible = "fsl,imx35-spdif"; reg = <0x02004000 0x4000>; interrupts = <0 52
IRQ_TYPE_LEVEL_HIGH>; @@ -253,7 +317,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - ecspi1: ecspi at 02008000 { + ecspi1: spi at 2008000 { #address-cells = <1>; #size-cells = <0>; compatible ="fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -267,7 +331,7 @@
arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - ecspi2: ecspi at 0200c000 { + ecspi2: spi at 200c000 { #address-cells = <1>; #size-cells = <0>; compatible ="fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -281,7 +345,7 @@
arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - ecspi3: ecspi at 02010000 { + ecspi3: spi at 2010000 { #address-cells = <1>; #size-cells = <0>; compatible ="fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -295,7 +359,7 @@
arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - ecspi4: ecspi at 02014000 { + ecspi4: spi at 2014000 { #address-cells = <1>; #size-cells = <0>; compatible ="fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -309,7 +373,7 @@
arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - uart1: serial at 02020000 { + uart1: serial at 2020000 { compatible ="fsl,imx6q-uart", "fsl,imx21-uart"; reg = <
0x020200000x4000>;
interrupts = <0 26IRQ_TYPE_LEVEL_HIGH>; @@ -321,7 +385,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - esai: esai at 02024000 { + esai: esai at 2024000 { #sound-dai-cells = <0>; compatible ="fsl,imx35-esai"; reg = <
0x020240000x4000>;arch/arm/dts/imx6qdl.dtsi +4
-4@@ -337,7 +401,7 @@ status = "disabled"; }; - ssi1: ssi at 02028000 { + ssi1: ssi at 2028000 { #sound-dai-cells = <0>; compatible = "fsl,imx6q-ssi", "fsl,imx51-ssi";@@ -353,7 +417,7 @@ status = "disabled"; }; - ssi2: ssi at 0202c000 { + ssi2: ssi at 202c000 { #sound-dai-cells = <0>; compatible = "fsl,imx6q-ssi", "fsl,imx51-ssi";@@ -369,7 +433,7 @@ status = "disabled"; }; - ssi3: ssi at 02030000 { + ssi3: ssi at 2030000 { #sound-dai-cells = <0>; compatible = "fsl,imx6q-ssi", "fsl,imx51-ssi";@@ -385,7 +449,7 @@ status = "disabled"; }; - asrc: asrc at 02034000 { + asrc: asrc at 2034000 { compatible = "fsl,imx53-asrc"; reg = <0x02034000 0x4000>; interrupts = <0 50
IRQ_TYPE_LEVEL_HIGH>; @@ -410,12 +474,12 @@arch/arm/dts/imx6qdl.dtsi +2
-2status = "okay"; }; - spba at 0203c000 { + spba at 203c000 { reg = <0x0203c000 0x4000>; }; }; - vpu: vpu at 02040000 { + vpu: vpu at 2040000 { compatible = "cnm,coda960"; reg = <0x02040000 0x3c000>; interrupts = <0 12
IRQ_TYPE_LEVEL_HIGH>, @@ -424,16 +488,16 @@arch/arm/dts/imx6qdl.dtsi +0
-0clocks = <&clks IMX6QDL_CLK_VPU_AXI>, <&clks
IMX6QDL_CLK_MMDC_CH0_AXI>; clock-names = "per", "ahb";arch/arm/dts/imx6qdl.dtsi +3
-3- power-domains = <&gpc 1>; + power-domains = <&pd_pu>; resets = <&src 1>; iram = <&ocram>; }; - aipstz at 0207c000 { /* AIPSTZ1 */ + aipstz at 207c000 { /* AIPSTZ1 */ reg = <0x0207c000 0x4000>; }; - pwm1: pwm at 02080000 { + pwm1: pwm at 2080000 { #pwm-cells = <2>; compatible = "fsl,imx6q-pwm","fsl,imx27-pwm"; reg = <
0x020800000x4000>;arch/arm/dts/imx6qdl.dtsi +4
-4@@ -444,7 +508,7 @@ status = "disabled"; }; - pwm2: pwm at 02084000 { + pwm2: pwm at 2084000 { #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x02084000 0x4000>;@@ -455,7 +519,7 @@ status = "disabled"; }; - pwm3: pwm at 02088000 { + pwm3: pwm at 2088000 { #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x02088000 0x4000>;@@ -466,7 +530,7 @@ status = "disabled"; }; - pwm4: pwm at 0208c000 { + pwm4: pwm at 208c000 { #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x0208c000 0x4000>;@@ -477,7 +541,7 @@ status = "disabled"; }; - can1: flexcan at 02090000 { + can1: flexcan at 2090000 { compatible = "fsl,imx6q-flexcan"; reg = <0x02090000 0x4000>; interrupts = <0 110
IRQ_TYPE_LEVEL_HIGH>; @@ -487,7 +551,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - can2: flexcan at 02094000 { + can2: flexcan at 2094000 { compatible = "fsl,imx6q-flexcan"; reg = <0x02094000 0x4000>; interrupts = <0 111
IRQ_TYPE_LEVEL_HIGH>; @@ -497,7 +561,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - gpt: gpt at 02098000 { + gpt: gpt at 2098000 { compatible = "fsl,imx6q-gpt","fsl,imx31-gpt"; reg = <
0x020980000x4000>;
interrupts = <0 55IRQ_TYPE_LEVEL_HIGH>; @@ -507,7 +571,7 @@
clock-names = "ipg", "per",
"osc_per"; };arch/arm/dts/imx6qdl.dtsi +1
-1- gpio1: gpio at 0209c000 { + gpio1: gpio at 209c000 { compatible = "fsl,imx6q-gpio","fsl,imx35-gpio"; reg = <
0x0209c0000x4000>;
interrupts = <0 66IRQ_TYPE_LEVEL_HIGH>, @@ -518,7 +582,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1#interrupt-cells = <2>; }; - gpio2: gpio at 020a0000 { + gpio2: gpio at 20a0000 { compatible = "fsl,imx6q-gpio","fsl,imx35-gpio"; reg = <
0x020a00000x4000>;
interrupts = <0 68IRQ_TYPE_LEVEL_HIGH>, @@ -529,7 +593,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1#interrupt-cells = <2>; }; - gpio3: gpio at 020a4000 { + gpio3: gpio at 20a4000 { compatible = "fsl,imx6q-gpio","fsl,imx35-gpio"; reg = <
0x020a40000x4000>;
interrupts = <0 70IRQ_TYPE_LEVEL_HIGH>, @@ -540,7 +604,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1#interrupt-cells = <2>; }; - gpio4: gpio at 020a8000 { + gpio4: gpio at 20a8000 { compatible = "fsl,imx6q-gpio","fsl,imx35-gpio"; reg = <
0x020a80000x4000>;
interrupts = <0 72IRQ_TYPE_LEVEL_HIGH>, @@ -551,7 +615,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1#interrupt-cells = <2>; }; - gpio5: gpio at 020ac000 { + gpio5: gpio at 20ac000 { compatible = "fsl,imx6q-gpio","fsl,imx35-gpio"; reg = <
0x020ac0000x4000>;
interrupts = <0 74IRQ_TYPE_LEVEL_HIGH>, @@ -562,7 +626,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1#interrupt-cells = <2>; }; - gpio6: gpio at 020b0000 { + gpio6: gpio at 20b0000 { compatible = "fsl,imx6q-gpio","fsl,imx35-gpio"; reg = <
0x020b00000x4000>;
interrupts = <0 76IRQ_TYPE_LEVEL_HIGH>, @@ -573,7 +637,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1#interrupt-cells = <2>; }; - gpio7: gpio at 020b4000 { + gpio7: gpio at 20b4000 { compatible = "fsl,imx6q-gpio","fsl,imx35-gpio"; reg = <
0x020b40000x4000>;
interrupts = <0 78IRQ_TYPE_LEVEL_HIGH>, @@ -584,7 +648,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1#interrupt-cells = <2>; }; - kpp: kpp at 020b8000 { + kpp: kpp at 20b8000 { compatible = "fsl,imx6q-kpp","fsl,imx21-kpp"; reg = <
0x020b80000x4000>;
interrupts = <0 82IRQ_TYPE_LEVEL_HIGH>; @@ -592,14 +656,14 @@arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - wdog1: wdog at 020bc000 { + wdog1: wdog at 20bc000 { compatible = "fsl,imx6q-wdt","fsl,imx21-wdt"; reg = <
0x020bc0000x4000>;
interrupts = <0 80IRQ_TYPE_LEVEL_HIGH>; clocks = <&clksIMX6QDL_CLK_DUMMY>;arch/arm/dts/imx6qdl.dtsi +1
-1}; - wdog2: wdog at 020c0000 { + wdog2: wdog at 20c0000 { compatible = "fsl,imx6q-wdt","fsl,imx21-wdt"; reg = <
0x020c00000x4000>;
interrupts = <0 81IRQ_TYPE_LEVEL_HIGH>; @@ -607,7 +671,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1status = "disabled"; }; - clks: ccm at 020c4000 { + clks: ccm at 20c4000 { compatible = "fsl,imx6q-ccm"; reg = <0x020c4000 0x4000>; interrupts = <0 87
IRQ_TYPE_LEVEL_HIGH>, @@ -615,7 +679,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1#clock-cells = <1>; }; - anatop: anatop at 020c8000 { + anatop: anatop at 20c8000 { compatible = "fsl,imx6q-anatop","syscon", "simple-bus"; reg = <
0x020c80000x1000>;
interrupts = <0 49IRQ_TYPE_LEVEL_HIGH>, @@ -625,8 +689,8 @@arch/arm/dts/imx6qdl.dtsi +0
-0regulator-1p1 { compatible ="fsl,anatop-regulator"; regulator-name = "vdd1p1";
arch/arm/dts/imx6qdl.dtsi +0
-1- regulator-min-microvolt =<800000>;
arch/arm/dts/imx6qdl.dtsi +0
-1- regulator-max-microvolt =<1375000>;
arch/arm/dts/imx6qdl.dtsi +1
-0+ regulator-min-microvolt =<1000000>;
arch/arm/dts/imx6qdl.dtsi +1
-0+ regulator-max-microvolt =<1200000>; regulator-always-on;
arch/arm/dts/imx6qdl.dtsi +4
-3anatop-reg-offset = <0x110>; anatop-vol-bit-shift = <8>;@@ -634,6 +698,7 @@ anatop-min-bit-val = <4>; anatop-min-voltage = <800000>; anatop-max-voltage = <1375000>; + anatop-enable-bit = <0>; }; regulator-3p0 {@@ -648,20 +713,22 @@ anatop-min-bit-val = <0>; anatop-min-voltage = <2625000>; anatop-max-voltage = <3400000>; + anatop-enable-bit = <0>; }; regulator-2p5 { compatible = "fsl,anatop-regulator"; regulator-name = "vdd2p5"; - regulator-min-microvolt = <2000000>; + regulator-min-microvolt = <2250000>; regulator-max-microvolt = <2750000>; regulator-always-on; anatop-reg-offset = <0x130>; anatop-vol-bit-shift = <8>; anatop-vol-bit-width = <5>; anatop-min-bit-val = <0>; - anatop-min-voltage = <2000000>; - anatop-max-voltage = <2750000>; + anatop-min-voltage =<2100000>;
arch/arm/dts/imx6qdl.dtsi +1
-0+ anatop-max-voltage =<2875000>;
arch/arm/dts/imx6qdl.dtsi +2
-9+ anatop-enable-bit = <0>; }; reg_arm: regulator-vddcore {@@ -716,15 +783,7 @@ }; }; - tempmon: tempmon { - compatible = "fsl,imx6q-tempmon"; - interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - fsl,tempmon-data = <&ocotp>; - clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>; - }; - - usbphy1: usbphy at 020c9000 { + usbphy1: usbphy at 20c9000 { compatible = "fsl,imx6q-usbphy","fsl,imx23-usbphy"; reg = <
0x020c90000x1000>;
interrupts = <0 44IRQ_TYPE_LEVEL_HIGH>; @@ -732,7 +791,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1fsl,anatop = <&anatop>; }; - usbphy2: usbphy at 020ca000 { + usbphy2: usbphy at 20ca000 { compatible = "fsl,imx6q-usbphy","fsl,imx23-usbphy"; reg = <
0x020ca0000x1000>;
interrupts = <0 45IRQ_TYPE_LEVEL_HIGH>; @@ -740,7 +799,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1fsl,anatop = <&anatop>; }; - snvs: snvs at 020cc000 { + snvs: snvs at 20cc000 { compatible = "fsl,sec-v4.0-mon","syscon", "simple-mfd"; reg = <
0x020cc0000x4000>;arch/arm/dts/imx6qdl.dtsi +8
-3@@ -756,22 +815,27 @@ compatible = "syscon-poweroff"; regmap = <&snvs>; offset = <0x38>; + value = <0x60>; mask = <0x60>; status = "disabled"; }; + + snvs_lpgpr: snvs-lpgpr { + compatible = "fsl,imx6q-snvs-lpgpr"; + }; }; - epit1: epit at 020d0000 { /* EPIT1 */ + epit1: epit at 20d0000 { /* EPIT1 */ reg = <0x020d0000 0x4000>; interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>; }; - epit2: epit at 020d4000 { /* EPIT2 */ + epit2: epit at 20d4000 { /* EPIT2 */ reg = <0x020d4000 0x4000>; interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>; }; - src: src at 020d8000 { + src: src at 20d8000 { compatible = "fsl,imx6q-src", "fsl,imx51-src"; reg = <0x020d8000 0x4000>;interrupts = <0 91
IRQ_TYPE_LEVEL_HIGH>, @@ -779,7 +843,7 @@arch/arm/dts/imx6qdl.dtsi +19
-58#reset-cells = <1>; }; - gpc: gpc at 020dc000 { + gpc: gpc at 20dc000 { compatible = "fsl,imx6q-gpc"; reg = <0x020dc000 0x4000>; interrupt-controller;@@ -787,91 +851,57 @@ interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>, <0 90 IRQ_TYPE_LEVEL_HIGH>; interrupt-parent = <&intc>; - pu-supply = <®_pu>; - clocks = <&clks IMX6QDL_CLK_GPU3D_CORE>, - <&clks IMX6QDL_CLK_GPU3D_SHADER>, - <&clks IMX6QDL_CLK_GPU2D_CORE>, - <&clks IMX6QDL_CLK_GPU2D_AXI>, - <&clks IMX6QDL_CLK_OPENVG_AXI>, - <&clks IMX6QDL_CLK_VPU_AXI>; - #power-domain-cells = <1>; - }; - - gpr: iomuxc-gpr at 020e0000 { - compatible = "fsl,imx6q-iomuxc-gpr", "syscon"; - reg = <0x020e0000 0x38>; - }; - - iomuxc: iomuxc at 020e0000 { - compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc"; - reg = <0x020e0000 0x4000>; - }; - - ldb: ldb at 020e0008 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb"; - gpr = <&gpr>; - status = "disabled"; + clocks = <&clks IMX6QDL_CLK_IPG>; + clock-names = "ipg"; - lvds-channel at 0 { + pgc { #address-cells = <1>; #size-cells = <0>; - reg = <0>; - status = "disabled"; - port at 0 { + power-domain at 0 { reg = <0>; - - lvds0_mux_0: endpoint { - remote-endpoint = <&ipu1_di0_lvds0>; - }; + #power-domain-cells = <0>; }; - - port at 1 { + pd_pu: power-domain at 1 { reg = <1>; - - lvds0_mux_1: endpoint { - remote-endpoint = <&ipu1_di1_lvds0>; - }; + #power-domain-cells = <0>; + power-supply = <®_pu>; + clocks = <&clks IMX6QDL_CLK_GPU3D_CORE>, + <&clks IMX6QDL_CLK_GPU3D_SHADER>, + <&clks IMX6QDL_CLK_GPU2D_CORE>, + <&clks IMX6QDL_CLK_GPU2D_AXI>, + <&clks IMX6QDL_CLK_OPENVG_AXI>, + <&clks IMX6QDL_CLK_VPU_AXI>; }; }; + }; - lvds-channel at 1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - status = "disabled"; - - port at 0 { - reg = <0>; - - lvds1_mux_0: endpoint { - remote-endpoint = <&ipu1_di0_lvds1>; - }; - }; + gpr: iomuxc-gpr at 20e0000 { + compatible = "fsl,imx6q-iomuxc-gpr", "syscon", "simple-mfd"; + reg = <0x20e0000 0x38>; - port at 1 { - reg = <1>; - - lvds1_mux_1:endpoint {
-
remote-endpoint = <&ipu1_di1_lvds1>;arch/arm/dts/imx6qdl.dtsi +5
-3- }; - }; + mux: mux-controller { + compatible = "mmio-mux"; + #mux-control-cells = <1>; }; }; - dcic1: dcic at 020e4000 { + iomuxc: iomuxc at 20e0000 { + compatible = "fsl,imx6dl-iomuxc","fsl,imx6q-iomuxc";
arch/arm/dts/imx6qdl.dtsi +4
-0+ reg = <0x20e0000 0x4000>; + }; + + dcic1: dcic at 20e4000 { reg = <0x020e4000 0x4000>; interrupts = <0 124
IRQ_TYPE_LEVEL_HIGH>; };arch/arm/dts/imx6qdl.dtsi +1
-1- dcic2: dcic at 020e8000 { + dcic2: dcic at 20e8000 { reg = <0x020e8000 0x4000>; interrupts = <0 125
IRQ_TYPE_LEVEL_HIGH>; };arch/arm/dts/imx6qdl.dtsi +1
-1- sdma: sdma at 020ec000 { + sdma: sdma at 20ec000 { compatible = "fsl,imx6q-sdma","fsl,imx35-sdma"; reg = <
0x020ec0000x4000>;
interrupts = <0 2IRQ_TYPE_LEVEL_HIGH>; @@ -883,7 +913,7 @@arch/arm/dts/imx6qdl.dtsi +3
-4}; }; - aips-bus at 02100000 { /* AIPS2 */ + aips-bus at 2100000 { /* AIPS2 */ compatible = "fsl,aips-bus", "simple-bus"; #address-cells = <1>; #size-cells = <1>;@@ -892,7 +922,6 @@ crypto: caam at 2100000 { compatible = "fsl,sec-v4.0"; - fsl,sec-era = <4>; #address-cells = <1>; #size-cells = <1>; reg = <0x2100000 0x10000>;@@ -916,11 +945,11 @@ }; }; - aipstz at 0217c000 { /* AIPSTZ2 */ + aipstz at 217c000 { /* AIPSTZ2 */ reg = <0x0217c000 0x4000>; };Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_LEVEL_HIGH>; @@ -933,7 +962,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx27-usb"; reg = <
0x021842000x200>;
interrupts = <0 40IRQ_TYPE_LEVEL_HIGH>; @@ -947,7 +976,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx27-usb"; reg = <
0x021844000x200>;
interrupts = <0 41IRQ_TYPE_LEVEL_HIGH>; @@ -960,7 +989,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx27-usb"; reg = <
0x021846000x200>;
interrupts = <0 42IRQ_TYPE_LEVEL_HIGH>; @@ -973,16 +1002,17 @@arch/arm/dts/imx6qdl.dtsi +3
-2Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119IRQ_TYPE_LEVEL_HIGH>;arch/arm/dts/imx6qdl.dtsi +2
-2Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_LEVEL_HIGH>; @@ -1012,7 +1042,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_LEVEL_HIGH>; @@ -1024,7 +1054,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_LEVEL_HIGH>; @@ -1036,7 +1066,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_LEVEL_HIGH>; @@ -1048,7 +1078,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx21-i2c"; @@ -1058,7 +1088,7 @@
arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx21-i2c"; @@ -1068,7 +1098,7 @@
arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx21-i2c"; @@ -1078,55 +1108,66 @@
arch/arm/dts/imx6qdl.dtsi +6
-4Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_LEVEL_HIGH>; clocks = <&clksIMX6QDL_CLK_EIM_SLOW>;arch/arm/dts/imx6qdl.dtsi +3
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"syscon"; reg = <
0x021bc0000x4000>;arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_LEVEL_HIGH>; };arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_LEVEL_HIGH>; };arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx31-audmux"; reg = <
0x021d80000x4000>;arch/arm/dts/imx6qdl.dtsi +3
-4Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
0x04>;arch/arm/dts/imx6qdl.dtsi +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_VIDEO_27M>,arch/arm/dts/imx6qdl.dtsi +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_EIM_PODF>;arch/arm/dts/imx6qdl.dtsi +9
-2Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
interrupts = <0 27
IRQ_TYPE_LEVEL_HIGH>; @@ -1169,7 +1212,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx21-uart"; reg = <
0x021ec0000x4000>;
interrupts = <0 28IRQ_TYPE_LEVEL_HIGH>; @@ -1181,7 +1224,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx21-uart"; reg = <
0x021f00000x4000>;
interrupts = <0 29IRQ_TYPE_LEVEL_HIGH>; @@ -1193,7 +1236,7 @@arch/arm/dts/imx6qdl.dtsi +1
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
"fsl,imx21-uart"; reg = <
0x021f40000x4000>;
interrupts = <0 30IRQ_TYPE_LEVEL_HIGH>; @@ -1206,7 +1249,7 @@arch/arm/dts/imx6qdl.dtsi +5
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
arch/arm/dts/imx6qdl.dtsi +20
-10Lines of this file are not shown. View the raw message.
(quoted diff) +0
-0The rest of this diff is not shown. View the raw message.
b/arch/arm/dts/imx6qp-sabreauto.dtsnew file mode 100644 index 0000000..d4caeebarch/arm/dts/imx6qp-sabreauto.dts new file +28
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
MX6QDL_PAD_KEY_COL1__ENET_MDIO0x1b0b0
+MX6QDL_PAD_KEY_COL2__ENET_MDC0x1b0b0
+MX6QDL_PAD_RGMII_TXC__RGMII_TXC0x1b018
+MX6QDL_PAD_RGMII_TD0__RGMII_TD00x1b018
+MX6QDL_PAD_RGMII_TD1__RGMII_TD10x1b018
+MX6QDL_PAD_RGMII_TD2__RGMII_TD20x1b018
+MX6QDL_PAD_RGMII_TD3__RGMII_TD30x1b018
+MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL0x1b018
+MX6QDL_PAD_RGMII_RXC__RGMII_RXC0x1b018
+MX6QDL_PAD_RGMII_RD0__RGMII_RD00x1b018
+MX6QDL_PAD_RGMII_RD1__RGMII_RD10x1b018
+MX6QDL_PAD_RGMII_RD2__RGMII_RD20x1b018
+MX6QDL_PAD_RGMII_RD3__RGMII_RD30x1b018
+MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL0x1b018
+MX6QDL_PAD_GPIO_16__ENET_REF_CLK0x4001b0a8
+MX6QDL_PAD_GPIO_6__ENET_IRQ0x000b1arch/arm/dts/imx6qp-sabreauto.dts new file +12
-0Lines of this file are not shown. View the raw message.
(quoted diff) +0
-0The rest of this diff is not shown. View the raw message.
b/arch/arm/dts/imx6qp-sabresd.dtsnew file mode 100644 index 0000000..f1b9cb1arch/arm/dts/imx6qp-sabresd.dts new file +23
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
MX6QDL_PAD_SD2_CMD__SD2_CMD0x17059
+MX6QDL_PAD_SD2_CLK__SD2_CLK0x10071
+MX6QDL_PAD_SD2_DAT0__SD2_DATA00x17059
+MX6QDL_PAD_SD2_DAT1__SD2_DATA10x17059
+MX6QDL_PAD_SD2_DAT2__SD2_DATA20x17059
+MX6QDL_PAD_SD2_DAT3__SD2_DATA30x17059
+MX6QDL_PAD_NANDF_D4__SD2_DATA40x17059
+MX6QDL_PAD_NANDF_D5__SD2_DATA50x17059
+MX6QDL_PAD_NANDF_D6__SD2_DATA60x17059
+MX6QDL_PAD_NANDF_D7__SD2_DATA70x17059arch/arm/dts/imx6qp-sabresd.dts new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
MX6QDL_PAD_SD3_CMD__SD3_CMD0x17059
+MX6QDL_PAD_SD3_CLK__SD3_CLK0x10071
+MX6QDL_PAD_SD3_DAT0__SD3_DATA00x17059
+MX6QDL_PAD_SD3_DAT1__SD3_DATA10x17059
+MX6QDL_PAD_SD3_DAT2__SD3_DATA20x17059
+MX6QDL_PAD_SD3_DAT3__SD3_DATA30x17059
+MX6QDL_PAD_SD3_DAT4__SD3_DATA40x17059
+MX6QDL_PAD_SD3_DAT5__SD3_DATA50x17059
+MX6QDL_PAD_SD3_DAT6__SD3_DATA60x17059
+MX6QDL_PAD_SD3_DAT7__SD3_DATA70x17059arch/arm/dts/imx6qp-sabresd.dts new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_EDGE_RISING>;arch/arm/dts/imx6qp.dtsi new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_EDGE_RISING>;arch/arm/dts/imx6qp.dtsi new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_EDGE_RISING>;arch/arm/dts/imx6qp.dtsi new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IRQ_TYPE_EDGE_RISING>;arch/arm/dts/imx6qp.dtsi new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_PRG0_APB>,arch/arm/dts/imx6qp.dtsi new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_PRG0_AXI>;arch/arm/dts/imx6qp.dtsi new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_PRG1_APB>,arch/arm/dts/imx6qp.dtsi new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_PRG1_AXI>;arch/arm/dts/imx6qp.dtsi new file +29
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_LDB_DI1_SEL>,arch/arm/dts/imx6qp.dtsi new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_IPU1_DI1_SEL>,arch/arm/dts/imx6qp.dtsi new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_IPU2_DI1_SEL>,arch/arm/dts/imx6qp.dtsi new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
IMX6QDL_CLK_LDB_DI1_PODF>;arch/arm/dts/imx6qp.dtsi new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/88467f01/attachment.sig>
Part of the diff is not shown here. View the raw message.
PATCH v4 10/20 arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd]
In reply to Abel VesaQuoted 6 lines
Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] to the ones from kernel v4.20 (commit
8fe28cb58bcb2).Signed-off-by Abel Vesa <[email protected]>Acked-by Peng Fan <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 11/20 configs: mx6sabreauto: Add SPL FIT and DM support
In reply to Abel VesaEnable all the necessary configs for SPL DM and FIT support for mx6sabreauto.
--- configs/mx6sabreauto_defconfig | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
configs/mx6sabreauto_defconfig +13 -1
@@ -11,12 +11,18 @@ CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_NXP_BOARD_REVISION=y CONFIG_NR_DRAM_BANKS=1 +# CONFIG_SYS_MALLOC_F is not set +CONFIG_FIT=y +CONFIG_SPL_FIT_PRINT=y +CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOUNCE_BUFFER=y +CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y
@@ -40,8 +46,15 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto" +CONFIG_OF_LIST="imx6dl-sabreauto imx6q-sabreauto imx6qp-sabreauto" +CONFIG_MULTI_DTB_FIT=y +CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y CONFIG_DM_MMC=y
@@ -68,4 +81,3 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_OF_LIBFDT=y
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 11/20 configs: mx6sabreauto: Add SPL FIT and DM support
Quoted 5 lines · Abel Vesa
Enable all the necessary configs for SPL DM and FIT support for mx6sabreauto.
Signed-off-by Abel Vesa <[email protected]>
PATCH v4 11/20 configs: mx6sabreauto: Add SPL FIT and DM support
In reply to Abel VesaQuoted 4 lines
Enable all the necessary configs for SPL DM and FIT support for mx6sabreauto.
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 12/20 configs: mx6sabresd: Add SPL FIT and DM support
In reply to Abel VesaEnable all the necessary configs for SPL DM and FIT support for mx6sabresd.
--- configs/mx6sabresd_defconfig | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
configs/mx6sabresd_defconfig +18 -2
@@ -10,12 +10,18 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 +# CONFIG_SYS_MALLOC_F is not set +CONFIG_FIT=y +CONFIG_SPL_FIT_PRINT=y +CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOUNCE_BUFFER=y +CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y
@@ -47,23 +53,34 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabresd" +CONFIG_OF_LIST="imx6q-sabresd imx6qp-sabresd imx6dl-sabresd" +CONFIG_MULTI_DTB_FIT=y +CONFIG_SPL_MULTI_DTB_FIT=y +CONFIG_SPL_OF_LIST="imx6dl-sabresd imx6q-sabresd imx6qp-sabresd" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_SPL_DM=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_SIZE=0x10000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=2 +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PCI=y +CONFIG_DM_REGULATOR=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y -CONFIG_USB_STORAGE=y +CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -73,4 +90,3 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_OF_LIBFDT=y
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 12/20 configs: mx6sabresd: Add SPL FIT and DM support
Quoted 5 lines · Abel Vesa
Enable all the necessary configs for SPL DM and FIT support for mx6sabresd.
Signed-off-by Abel Vesa <[email protected]>
PATCH v4 12/20 configs: mx6sabresd: Add SPL FIT and DM support
In reply to Abel VesaQuoted 4 lines
Enable all the necessary configs for SPL DM and FIT support for mx6sabresd.
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 13/20 mx6sabreauto: Add DM_GPIO support
In reply to Abel VesaAdd the DM_GPIO related config for mx6sabreauto.
Also add the gpio request calls.
--- board/freescale/mx6sabreauto/mx6sabreauto.c | 3 +++ configs/mx6sabreauto_defconfig | 1 + 2 files changed, 4 insertions(+)
board/freescale/mx6sabreauto/mx6sabreauto.c +3 -0
@@ -501,6 +501,7 @@ iomux_v3_cfg_t const backlight_pads[] = {static void setup_iomux_backlight (void ) { +gpio_request (IMX_GPIO_NR (2 ,9 ),"backlight" );gpio_direction_output (IMX_GPIO_NR (2 ,9 ),1 );SETUP_IOMUX_PADS (backlight_pads); }
@@ -594,6 +595,7 @@ int board_init(void)else setup_i2c (1 ,CONFIG_SYS_I2C_SPEED ,0x7f , &mx6dl_i2c_pad_info1);/* I2C 3 Steer */ +gpio_request (IMX_GPIO_NR (5 ,4 ),"steer logic" );gpio_direction_output (IMX_GPIO_NR (5 ,4 ),1 );SETUP_IOMUX_PADS (i2c3_pads);#ifndef CONFIG_SYS_FLASH_CFI
@@ -602,6 +604,7 @@ int board_init(void) else setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info2);#endif +gpio_request (IMX_GPIO_NR (1 ,15 ),"expander en" );gpio_direction_output (IMX_GPIO_NR (1 ,15 ),1 );SETUP_IOMUX_PADS (port_exp);
configs/mx6sabreauto_defconfig +1 -0
@@ -57,6 +57,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_NAND=y
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 13/20 mx6sabreauto: Add DM_GPIO support
Quoted 6 lines · Abel Vesa
Add the
DM_GPIOrelated config for mx6sabreauto.
Also add the gpio request calls.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>
PATCH v4 13/20 mx6sabreauto: Add DM_GPIO support
In reply to Abel VesaQuoted 5 lines
Add the
DM_GPIOrelated config for mx6sabreauto. Also add the gpio request calls.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 14/20 mx6sabresd: Add DM_GPIO support
In reply to Abel VesaAdd the DM_GPIO related config for mx6sabresd.
Also add the gpio request calls.
--- board/freescale/mx6sabresd/mx6sabresd.c | 5 +++++ configs/mx6sabresd_defconfig | 1 + 2 files changed, 6 insertions(+)
board/freescale/mx6sabresd/mx6sabresd.c +5 -0
@@ -96,6 +96,7 @@ static void setup_iomux_enet(void)SETUP_IOMUX_PADS (enet_pads);/* Reset AR8031 PHY */ +gpio_request (IMX_GPIO_NR (1 ,25 ),"ENET PHY Reset" );gpio_direction_output (IMX_GPIO_NR (1 ,25 ) ,0 );mdelay (10 );gpio_set_value (IMX_GPIO_NR (1 ,25 ),1 );
@@ -189,6 +190,7 @@ static iomux_v3_cfg_t const bl_pads[] = {static void enable_backlight (void ) {SETUP_IOMUX_PADS (bl_pads); +gpio_request (DISP0_PWR_EN ,"Display Power Enable" );gpio_direction_output (DISP0_PWR_EN ,1 ); }
@@ -307,11 +309,13 @@ int board_mmc_init(bd_t *bis)switch (i) {case 0 :SETUP_IOMUX_PADS (usdhc2_pads); +gpio_request (USDHC2_CD_GPIO ,"USDHC2 CD" );gpio_direction_input (USDHC2_CD_GPIO ); usdhc_cfg[0 ].sdhc_clk =mxc_get_clock (MXC_ESDHC2_CLK );break ;case 1 :SETUP_IOMUX_PADS (usdhc3_pads); +gpio_request (USDHC3_CD_GPIO ,"USDHC3 CD" );gpio_direction_input (USDHC3_CD_GPIO ); usdhc_cfg[1 ].sdhc_clk =mxc_get_clock (MXC_ESDHC3_CLK );break ;
@@ -729,6 +733,7 @@ int checkboard(void)#ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot (void ) { +gpio_request (KEY_VOL_UP ,"KEY Volume UP" );gpio_direction_input (KEY_VOL_UP );/* Only enter in Falcon mode if KEY_VOL_UP is pressed */
configs/mx6sabresd_defconfig +1 -0
@@ -68,6 +68,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_SIZE=0x10000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=2 +CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 14/20 mx6sabresd: Add DM_GPIO support
Quoted 6 lines · Abel Vesa
Add the
DM_GPIOrelated config for mx6sabresd.
Also add the gpio request calls.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>
PATCH v4 14/20 mx6sabresd: Add DM_GPIO support
In reply to Abel VesaQuoted 5 lines
Add the
DM_GPIOrelated config for mx6sabresd. Also add the gpio request calls.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 15/20 configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs
In reply to Abel VesaEnable all neceassary configs to support DM_SPI_FLASH on mx6sabreauto.
--- configs/mx6sabreauto_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/mx6sabreauto_defconfig +2 -0
@@ -62,12 +62,14 @@ CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXS=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_DM_REGULATOR=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 15/20 configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs
Quoted 5 lines · Abel Vesa
Enable all neceassary configs to support
DM_SPI_FLASHon mx6sabreauto.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>
PATCH v4 15/20 configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs
In reply to Abel VesaQuoted 4 lines
Enable all neceassary configs to support
DM_SPI_FLASHon mx6sabreauto.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 16/20 configs: mx6sabresd: Add DM_SPI_FLASH necessary configs
In reply to Abel VesaEnable all neceassary configs to support DM_SPI_FLASH on mx6sabresd.
--- configs/mx6sabresd_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/mx6sabresd_defconfig +2 -0
@@ -71,6 +71,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=2 CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y
@@ -78,6 +79,7 @@ CONFIG_MII=y CONFIG_PCI=y CONFIG_DM_REGULATOR=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 16/20 configs: mx6sabresd: Add DM_SPI_FLASH necessary configs
Quoted 5 lines · Abel Vesa
Enable all neceassary configs to support
DM_SPI_FLASHon mx6sabresd.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>
PATCH v4 16/20 configs: mx6sabresd: Add DM_SPI_FLASH necessary configs
In reply to Abel VesaQuoted 4 lines
Enable all neceassary configs to support
DM_SPI_FLASHon mx6sabresd.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Peng Fan <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 17/20 board: mx6sabreauto: Remove the non-DM code
In reply to Abel VesaSince the mx6sabreauto has DM support, remove the unused non-DM code from mx6sabreauto board file.
--- board/freescale/mx6sabreauto/mx6sabreauto.c | 70 ----------------------------- 1 file changed, 70 deletions(-)
board/freescale/mx6sabreauto/mx6sabreauto.c +0 -70
@@ -159,44 +159,6 @@ static iomux_v3_cfg_t const port_exp[] = { IOMUX_PADS(PAD_SD2_DAT0__GPIO1_IO15 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; -/*Define for building port exp gpio, pin starts from 0*/ -#define PORTEXP_IO_NR (chip, pin) \ - ((chip << 5) + pin) - -/*Get the chip addr from a ioexp gpio*/ -#define PORTEXP_IO_TO_CHIP (gpio_nr) \ - (gpio_nr >> 5) - -/*Get the pin number from a ioexp gpio*/ -#define PORTEXP_IO_TO_PIN (gpio_nr) \ - (gpio_nr & 0x1f) - -static int port_exp_direction_output (unsigned gpio,int value) -{ -int ret; - -i2c_set_bus_num (2 ); - ret =i2c_probe (PORTEXP_IO_TO_CHIP (gpio)); -if (ret) -return ret; - - ret =pca953x_set_dir (PORTEXP_IO_TO_CHIP (gpio), - (1 <<PORTEXP_IO_TO_PIN (gpio)), - (PCA953X_DIR_OUT <<PORTEXP_IO_TO_PIN (gpio))); - -if (ret) -return ret; - - ret =pca953x_set_val (PORTEXP_IO_TO_CHIP (gpio), - (1 <<PORTEXP_IO_TO_PIN (gpio)), - (value <<PORTEXP_IO_TO_PIN (gpio))); - -if (ret) -return ret; - -return 0 ; -} -#ifdef CONFIG_MTD_NOR_FLASH static iomux_v3_cfg_t const eimnor_pads[] = { IOMUX_PADS(PAD_EIM_D16__EIM_DATA16 | MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)),
@@ -681,19 +643,10 @@ int checkboard(void) }#ifdef CONFIG_USB_EHCI_MX6 -#define USB_HOST1_PWR PORTEXP_IO_NR(0x32, 7) -#define USB_OTG_PWR PORTEXP_IO_NR(0x34, 1) - -iomux_v3_cfg_t const usb_otg_pads[] = { -IOMUX_PADS (PAD_ENET_RX_ER__USB_OTG_ID |MUX_PAD_CTRL (NO_PAD_CTRL )), -}; -int board_ehci_hcd_init (int port) {switch (port) {case 0 : -SETUP_IOMUX_PADS (usb_otg_pads); -/* * Set daisy chain for otg_pin_id on 6q. * For 6dl, this bit is reserved.
@@ -708,29 +661,6 @@ int board_ehci_hcd_init(int port) }return 0 ; } - -int board_ehci_power (int port,int on) -{ -switch (port) { -case 0 : -if (on) -port_exp_direction_output (USB_OTG_PWR ,1 ); -else -port_exp_direction_output (USB_OTG_PWR ,0 ); -break ; -case 1 : -if (on) -port_exp_direction_output (USB_HOST1_PWR ,1 ); -else -port_exp_direction_output (USB_HOST1_PWR ,0 ); -break ; -default : -printf ("MXC USB port %d not yet supported\n" , port); -return -EINVAL ; - } - -return 0 ; -}#endif #ifdef CONFIG_SPL_BUILD
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 17/20 board: mx6sabreauto: Remove the non-DM code
Quoted 5 lines · Abel Vesa
Since the mx6sabreauto has DM support, remove the unused non-DM code from mx6sabreauto board file.
Signed-off-by Abel Vesa <[email protected]>
PATCH v4 17/20 board: mx6sabreauto: Remove the non-DM code
In reply to Abel VesaQuoted 4 lines
Since the mx6sabreauto has DM support, remove the unused non-DM code from mx6sabreauto board file.
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 18/20 board: mx6sabresd: Remove non-DM code
In reply to Abel VesaSince the mx6sabreauto has DM support, remove the unused non-DM code from mx6sabresd board file.
--- board/freescale/mx6sabresd/mx6sabresd.c | 50 --------------------------------- 1 file changed, 50 deletions(-)
board/freescale/mx6sabresd/mx6sabresd.c +0 -50
@@ -563,63 +563,13 @@ int board_eth_init(bd_t *bis) }#ifdef CONFIG_USB_EHCI_MX6 -#define USB_OTHERREGS_OFFSET 0x800 -#define UCTRL_PWR_POL (1 << 9) - -static iomux_v3_cfg_t const usb_otg_pads[] = { -IOMUX_PADS (PAD_EIM_D22__USB_OTG_PWR |MUX_PAD_CTRL (NO_PAD_CTRL )), -IOMUX_PADS (PAD_ENET_RX_ER__USB_OTG_ID |MUX_PAD_CTRL (NO_PAD_CTRL )), -}; - -static iomux_v3_cfg_t const usb_hc1_pads[] = { -IOMUX_PADS (PAD_ENET_TXD1__GPIO1_IO29 |MUX_PAD_CTRL (NO_PAD_CTRL )), -}; -static void setup_usb (void ) { -SETUP_IOMUX_PADS (usb_otg_pads); -/* * set daisy chain for otg_pin_id on 6q. * for 6dl, this bit is reserved */ imx_iomux_set_gpr_register (1 ,13 ,1 ,0 ); - -SETUP_IOMUX_PADS (usb_hc1_pads); -} - -int board_ehci_hcd_init (int port) -{ -u32 *usbnc_usb_ctrl; - -if (port >1 ) -return -EINVAL ; - - usbnc_usb_ctrl = (u32 *)(USB_BASE_ADDR +USB_OTHERREGS_OFFSET + - port *4 ); - -setbits_le32 (usbnc_usb_ctrl,UCTRL_PWR_POL ); - -return 0 ; -} - -int board_ehci_power (int port,int on) -{ -switch (port) { -case 0 : -break ; -case 1 : -if (on) -gpio_direction_output (IMX_GPIO_NR (1 ,29 ),1 ); -else -gpio_direction_output (IMX_GPIO_NR (1 ,29 ),0 ); -break ; -default : -printf ("MXC USB port %d not yet supported\n" , port); -return -EINVAL ; - } - -return 0 ; }#endif
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 18/20 board: mx6sabresd: Remove non-DM code
Quoted 5 lines · Abel Vesa
Since the mx6sabreauto has DM support, remove the unused non-DM code from mx6sabresd board file.
Signed-off-by Abel Vesa <[email protected]>
PATCH v4 18/20 board: mx6sabresd: Remove non-DM code
In reply to Abel VesaQuoted 4 lines
Since the mx6sabreauto has DM support, remove the unused non-DM code from mx6sabresd board file.
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 19/20 board: mx6sabresd: Remove the enet reset gpio handling
In reply to Abel VesaRely on the phy-reset-gpios which is set in imx6qdl-sabresd dtsi and get rid of the enet reset gpio handling from the board file.
--- board/freescale/mx6sabresd/mx6sabresd.c | 7 ------- 1 file changed, 7 deletions(-)
board/freescale/mx6sabresd/mx6sabresd.c +0 -7
@@ -94,13 +94,6 @@ static iomux_v3_cfg_t const enet_pads[] = {static void setup_iomux_enet (void ) {SETUP_IOMUX_PADS (enet_pads); - -/* Reset AR8031 PHY */ -gpio_request (IMX_GPIO_NR (1 ,25 ),"ENET PHY Reset" ); -gpio_direction_output (IMX_GPIO_NR (1 ,25 ) ,0 ); -mdelay (10 ); -gpio_set_value (IMX_GPIO_NR (1 ,25 ),1 ); -udelay (100 ); }static iomux_v3_cfg_t const usdhc2_pads[] = {
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 19/20 board: mx6sabresd: Remove the enet reset gpio handling
Quoted 5 lines · Abel Vesa
Rely on the phy-reset-gpios which is set in imx6qdl-sabresd dtsi and get rid of the enet reset gpio handling from the board file.
Signed-off-by Abel Vesa <[email protected]>
PATCH v4 19/20 board: mx6sabresd: Remove the enet reset gpio handling
Quoted 6 lines · Fabio Estevam
Quoted 4 lines · Abel Vesa
Rely on the phy-reset-gpios which is set in imx6qdl-sabresd dtsi and get rid of the enet reset gpio handling from the board file.
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Fabio,
I tried to understand this patch, in order to also apply it for the tbs2910 board.
What I read from the fec_mxc driver, this only works with DM_ETH enabled, but this is not enabled for mx6sabresd.
Can you point me to what I miss here?
Thanks,
Soeren
Fabio Estevam
reviewerPATCH v4 19/20 board: mx6sabresd: Remove the enet reset gpio handling
Hi Soeren,
Quoted 6 lines · Soeren Moch
Fabio,
I tried to understand this patch, in order to also apply it for the tbs2910 board.
What I read from thefec_mxcdriver, this only works withDM_ETHenabled, but this is not enabled for mx6sabresd.
Good catch. DM_ETH needs to be enabled for mx6sabresd.
However, I noticed that when using U-Boot master I can not boot mx6sabresd anymore:
U-Boot SPL 2019.04-rc2-00134-g783e66816d (Feb 28 2019 - 16:17:32 -0300) Trying to boot from MMC1
(It hangs here)
Abel, Peng,
Could you please take a look at this?
Thanks
PATCH v4 19/20 board: mx6sabresd: Remove the enet reset gpio handling
In reply to Abel VesaQuoted 4 lines
Rely on the phy-reset-gpios which is set in imx6qdl-sabresd dtsi and get rid of the enet reset gpio handling from the board file.
Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v4 20/20 configs: mx6sabresd: Reduce SPL size by disabling DOS, EXT and EFI support
In reply to Abel VesaWith DM and FIT enabled in SPL, there is an sram overflow. By disabling CONFIG_SPL_DOS_PARTITION, CONFIG_SPL_EXT_SUPPORT and CONFIG_SPL_EFI_PARTITION, we get to keep the 'one binary to fit all' for imx6[q|qp|dl] on sabresd since the final SPL image is now under 64KB.
--- configs/mx6sabresd_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
configs/mx6sabresd_defconfig +2 -1
@@ -22,7 +22,6 @@ CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_FIT_IMAGE_TINY=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y
@@ -53,6 +52,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabresd"
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v4 20/20 configs: mx6sabresd: Reduce SPL size by disabling DOS, EXT and EFI support
Quoted 7 lines · Abel Vesa
With DM and FIT enabled in SPL, there is an sram overflow. By disabling
CONFIG_SPL_DOS_PARTITION,CONFIG_SPL_EXT_SUPPORTandCONFIG_SPL_EFI_PARTITION, we get to keep the 'one binary to fit all' for imx6[q|qp|dl] on sabresd since the final SPL image is now under 64KB.Signed-off-by Abel Vesa <[email protected]>
PATCH v4 20/20 configs: mx6sabresd: Reduce SPL size by disabling DOS, EXT and EFI support
In reply to Abel VesaQuoted 6 lines
With DM and FIT enabled in SPL, there is an sram overflow. By disabling
CONFIG_SPL_DOS_PARTITION,CONFIG_SPL_EXT_SUPPORTandCONFIG_SPL_EFI_PARTITION, we get to keep the 'one binary to fit all' for imx6[q|qp|dl] on sabresd since the final SPL image is now under 64KB.Signed-off-by Abel Vesa <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
Fabio Estevam
reviewerv4 cover mx6sabre: Add DM and SPL FIT support
In reply to Abel VesaHi Abel,
Quoted 9 lines · Abel Vesa
The third version is here:
https://lists.denx.de/pipermail/u-boot/2019-January/356903.htmlSo, this time I hope I got it right. Before, I was stupidly trying to put a fit in another fit without a really good reason. To my excuse, that was working even with the
spl_image->osset to 0, bug which I (hope) I fixed in the first patch (a new one) of this series.
Thanks for your work on this!
Just to confirm: with this series all sabresd variants (imx6q, imx6dl, imx6qp) boot with the same binary, right?
Is there anything known to be not working that used to work before due to missing driver model conversion?
Is Ethernet functional?
Thanks
v4 cover mx6sabre: Add DM and SPL FIT support
Quoted 13 lines · Fabio Estevam
Hi Abel,
Quoted 9 lines · Abel Vesa
So, this time I hope I got it right. Before, I was stupidly trying to put a fit in another fit without a really good reason. To my excuse, that was working even with the
spl_image->osset to 0, bug which I (hope) I fixed in the first patch (a new one) of this series.
Quoted 5 lines
Thanks for your work on this!
Just to confirm: with this series all sabresd variants (imx6q, imx6dl, imx6qp) boot with the same binary, right?
That is correct.
For mx6sabresd_defconfig, all imx6q_sabresd, imx6qp_sabresd and imx6dl_sabresd have been tested with the same binary.
And I've tested exactly the same the mx6sabreauto_defconfig with all three SoC combinations.
Quoted 3 lines
Is there anything known to be not working that used to work before due to missing driver model conversion?
I don't know about anything that might not work. As specified in the cover letter I had to get rid (disable) of EFI, EXT and DOS support in SPL.
Quoted 1 line
Is Ethernet functional?
I haven't tested the ethernet on all of them, just one of each (sabresd/sabreauto).
I'll test them all when I get back at the office tomorrow.
Quoted 2 lines
Thanks
Fabio Estevam
reviewerv4 cover mx6sabre: Add DM and SPL FIT support
Quoted 5 lines · Abel Vesa
Quoted 1 line
Is Ethernet functional?
I haven't tested the ethernet on all of them, just one of each (sabresd/sabreauto).
I'll test them all when I get back at the office tomorrow.
Don't worry about that. If you tested in one of each then it is fine.
Thanks
v4 cover mx6sabre: Add DM and SPL FIT support
In reply to Abel VesaQuoted 9 lines · Abel Vesa
The third version is here:
https://lists.denx.de/pipermail/u-boot/2019-January/356903.htmlSo, this time I hope I got it right. Before, I was stupidly trying to put a fit in another fit without a really good reason. To my excuse, that was working even with the
spl_image->osset to 0, bug which I (hope) I fixed in the first patch (a new one) of this series.
Quoted 11 lines
Changes since v3:
* Reduced the SPL size by disablingEXT_SUPPORT, otherwise the 6qp-sabresd wouldn't boot due to having its dtb last in the fit. I forgot to mention in the last version that EFI and DOS SPL support also had to be disabled to get the size right.
* Dropped the fit_spl.its file
* Dropped the (now) unnecessary updates to the README files. We're sticking to the u-boot.img since it's exactly what is needed.
* Fixed a bug related toFIT_IMAGE_TINYwhenCONFIG_SPL_OS_BOOTis enabled. The short story here is thatspl_image->oswas remaining set to 0. (see first patch in the series for details)
Thanks for being persistent and figuring all of this out!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190201/4b7b2931/attachment.sig>
Fabio Estevam
reviewerv4 cover mx6sabre: Add DM and SPL FIT support
In reply to Abel VesaHi Abel,
Quoted 9 lines · Abel Vesa
The third version is here:
https://lists.denx.de/pipermail/u-boot/2019-January/356903.htmlSo, this time I hope I got it right. Before, I was stupidly trying to put a fit in another fit without a really good reason. To my excuse, that was working even with the
spl_image->osset to 0, bug which I (hope) I fixed in the first patch (a new one) of this series.
I am happy with the entire series.
One more question: do we get build error when the SPL gets larger than 64kB?
v4 cover mx6sabre: Add DM and SPL FIT support
Quoted 13 lines · Fabio Estevam
Hi Abel,
Quoted 9 lines · Abel Vesa
So, this time I hope I got it right. Before, I was stupidly trying to put a fit in another fit without a really good reason. To my excuse, that was working even with the
spl_image->osset to 0, bug which I (hope) I fixed in the first patch (a new one) of this series.
Quoted 3 lines
I am happy with the entire series.
One more question: do we get build error when the SPL gets larger than 64kB?
If the SPL size (without the dtb appended) is larger then yes, the build fails. Trouble is if the SPL (without the dtb appended) is, lets say, 63kB and then the dtb is larger than 1kB. Then there is no mechanism in place to check that and it will just fail to boot without giving any clues why. But this is a totally unrelated problem from this patchset's point of view and I think it impacts all the platforms that support SPL with DM.
Fabio Estevam
reviewerv4 cover mx6sabre: Add DM and SPL FIT support
Quoted 6 lines · Abel Vesa
If the SPL size (without the dtb appended) is larger then yes, the build fails. Trouble is if the SPL (without the dtb appended) is, lets say, 63kB and then the dtb is larger than 1kB. Then there is no mechanism in place to check that and it will just fail to boot without giving any clues why. But this is a totally unrelated problem from this patchset's point of view and I think it impacts all the platforms that support SPL with DM.
Yes, it is unrelated to this series and should be treated separately.
v4 cover mx6sabre: Add DM and SPL FIT support
Quoted 10 lines · Fabio Estevam
Quoted 6 lines · Abel Vesa
If the SPL size (without the dtb appended) is larger then yes, the build fails. Trouble is if the SPL (without the dtb appended) is, lets say, 63kB and then the dtb is larger than 1kB. Then there is no mechanism in place to check that and it will just fail to boot without giving any clues why. But this is a totally unrelated problem from this patchset's point of view and I think it impacts all the platforms that support SPL with DM.
Yes, it is unrelated to this series and should be treated separately.
I also agree. But, don't we have a mechanism for that? It sounds like some additional targets need to call $(BOARD_SIZE_CHECK) at the end. Or am I missing something?
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190204/5baa9361/attachment.sig>
v4 cover mx6sabre: Add DM and SPL FIT support
Quoted 10 lines · Tom Rini
Quoted 9 lines · Fabio Estevam
Quoted 6 lines · Abel Vesa
If the SPL size (without the dtb appended) is larger then yes, the build fails. Trouble is if the SPL (without the dtb appended) is, lets say, 63kB and then the dtb is larger than 1kB. Then there is no mechanism in place to check that and it will just fail to boot without giving any clues why. But this is a totally unrelated problem from this patchset's point of view and I think it impacts all the platforms that support SPL with DM.
Quoted 6 lines
Quoted 1 line
Yes, it is unrelated to this series and should be treated separately.
I also agree. But, don't we have a mechanism for that? It sounds like some additional targets need to call $(BOARD_SIZE_CHECK) at the end. Or am I missing something?
Hmm, I believe that is true. I haven't looked deeper into it but it seems that's the thing the SPL is missing.
Quoted 2 lines
Signature · 1 line
Tom
v4 cover mx6sabre: Add DM and SPL FIT support
Am Mo., 4. Feb. 2019, 16:16 hat Abel Vesa <[email protected]> geschrieben:
Quoted 18 lines · Tom Rini
Quoted 4 lines · Fabio Estevam
Quoted 3 lines · Abel Vesa
Quoted 2 lines
If the SPL size (without the dtb appended) is larger then yes, the
build fails.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Trouble is if the SPL (without the dtb appended) is, lets say, 63kB
and
Quoted 1 line
Quoted 1 line
Quoted 1 line
then the dtb is larger than 1kB. Then there is no mechanism in place
to check that
Quoted 1 line
Quoted 1 line
Quoted 1 line
and it will just fail to boot without giving any clues why. But this
is a totally
Quoted 1 line
Quoted 1 line
Quoted 1 line
unrelated problem from this patchset's point of view and I think it
impacts all
Quoted 4 lines
Quoted 3 lines
Quoted 1 line
the platforms that support SPL with DM.
Yes, it is unrelated to this series and should be treated separately.
Quoted 7 lines
Quoted 4 lines
I also agree. But, don't we have a mechanism for that? It sounds like some additional targets need to call $(BOARD_SIZE_CHECK) at the end. Or am I missing something?
Hmm, I believe that is true. I haven't looked deeper into it but it seems that's the thing the SPL is missing.
Haven't we talked about that just some days or weeks ago? That's exactly what I am missing for socfpga. I keep getting broken SPL images when adding functionality. And you don't even get an error message because the dtb is broken and cannot provide the serial output mode...
Regards,
Simon
v4 cover mx6sabre: Add DM and SPL FIT support
Quoted 25 lines · Simon Goldschmidt
Am Mo., 4. Feb. 2019, 16:16 hat Abel Vesa <[email protected]> geschrieben:
Quoted 23 lines · Tom Rini
Quoted 4 lines · Fabio Estevam
Quoted 3 lines · Abel Vesa
Quoted 2 lines
If the SPL size (without the dtb appended) is larger then yes, the
build fails.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Trouble is if the SPL (without the dtb appended) is, lets say, 63kB
and
Quoted 1 line
Quoted 1 line
Quoted 1 line
then the dtb is larger than 1kB. Then there is no mechanism in place
to check that
Quoted 1 line
Quoted 1 line
Quoted 1 line
and it will just fail to boot without giving any clues why. But this
is a totally
Quoted 1 line
Quoted 1 line
Quoted 1 line
unrelated problem from this patchset's point of view and I think it
impacts all
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
the platforms that support SPL with DM.
Yes, it is unrelated to this series and should be treated separately.
I also agree. But, don't we have a mechanism for that? It sounds like some additional targets need to call $(BOARD_SIZE_CHECK) at the end. Or am I missing something?
Quoted 8 lines
Quoted 2 lines
Hmm, I believe that is true. I haven't looked deeper into it but it seems that's the thing the SPL is missing.
Haven't we talked about that just some days or weeks ago? That's exactly what I am missing for socfpga. I keep getting broken SPL images when adding functionality. And you don't even get an error message because the dtb is broken and cannot provide the serial output mode...
Yes, I believe it is. I guess what I'm waiting / hoping for is someone to patch the top-level Makefile to call $(BOARD_SIZE_CHECK) on a number of make targets that look reasonable, throw it at travis and see what if anything fails (and if stuff fails, ask for help to see if it's right or investigate a bit more). More or less, if it's a final target for U-Boot, we should probably give BOARD_SIZE_CHECK a try. Most of the rules start with u-boot, but I bet the %.imx target should also do it, and then we can drop all of that from arch/arm/mach-imx/Makefile.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190204/e880d7c4/attachment.sig>
v4 cover mx6sabre: Add DM and SPL FIT support
In reply to Tom RiniQuoted 10 lines · Tom Rini
Quoted 9 lines · Fabio Estevam
Quoted 6 lines · Abel Vesa
If the SPL size (without the dtb appended) is larger then yes, the build fails. Trouble is if the SPL (without the dtb appended) is, lets say, 63kB and then the dtb is larger than 1kB. Then there is no mechanism in place to check that and it will just fail to boot without giving any clues why. But this is a totally unrelated problem from this patchset's point of view and I think it impacts all the platforms that support SPL with DM.
Quoted 6 lines
Quoted 1 line
Yes, it is unrelated to this series and should be treated separately.
I also agree. But, don't we have a mechanism for that? It sounds like some additional targets need to call $(BOARD_SIZE_CHECK) at the end. Or am I missing something?
So, do I need to resend this with all the R-bs ?
Quoted 2 lines
Signature · 1 line
Tom
Fabio Estevam
reviewerv4 cover mx6sabre: Add DM and SPL FIT support
Quoted 1 line · Abel Vesa
So, do I need to resend this with all the R-bs ?
Just realized that you missed to Cc Stefano Babic <[email protected]> on this series.
Stefano,
Should Abel resend this series with you on Cc or can you get review it from patchwork?
Thanks