From d0cb34815e2090f7dee3425c08f004342007021b Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 9 Aug 2019 13:21:46 +0300 Subject: apalis-tk1: support v1.2 hardware revision Support the V1.2 hardware revision with the following pin muxing changes: Ddc_scl_pv4 and ddc_sda_pv5 previously used as Apalis GPIO3 and GPIO4 are now used as DDC pins. Gen2_i2c_scl_pt5 and gen2_i2c_sda_pt6 previously used as DDC pins are now used as USB power enable signals. Usb_vbus_en0_pn4 and usb_vbus_en1_pn5 previously used as USB power enable signals are now used as GPIO3 and GPIO4. Additionally a new device tree file tegra124-apalis-v1.2-eval.dtb is loaded on V1.2 and later modules and resp. USB power enable signals activated. Signed-off-by: Marcel Ziswiler Signed-off-by: Igor Opaniuk Signed-off-by: Tom Warren (cherry picked from commit 4c63a601b90db131e92d3f6f6da6a4bc2b287df1) --- include/configs/apalis-tk1.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'include/configs/apalis-tk1.h') diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 843e64e3cc8..a21975050a5 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -18,6 +18,9 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE +#define FDT_MODULE "apalis-v1.2" +#define FDT_MODULE_V1_0 "apalis" + /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ CONFIG_TDX_CFG_BLOCK_OFFSET) @@ -58,7 +61,7 @@ "emmcbootpart=1\0" \ "emmcdev=0\0" \ "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \ - "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb && " \ + "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb && " \ "setenv dtbparam ${fdt_addr_r}\0" \ "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \ "emmcrootpart=2\0" @@ -70,7 +73,7 @@ "run nfsdtbload; dhcp ${kernel_addr_r} " \ "&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \ "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} " \ - "${soc}-apalis-${fdt_board}.dtb " \ + "${soc}-${fdt_module}-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" #define SD_BOOTCMD \ @@ -85,7 +88,7 @@ "sdbootpart=1\0" \ "sddev=1\0" \ "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \ - "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \ + "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" \ "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ "sdrootpart=2\0" @@ -102,7 +105,7 @@ "usbbootpart=1\0" \ "usbdev=0\0" \ "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \ - "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \ + "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" \ "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \ "usbrootpart=2\0" @@ -117,6 +120,7 @@ EMMC_BOOTCMD \ "fdt_board=eval\0" \ "fdt_fixup=;\0" \ + "fdt_module=" FDT_MODULE "\0" \ NFS_BOOTCMD \ SD_BOOTCMD \ USB_BOOTCMD \ -- cgit v1.2.3