diff --git a/0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch b/0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch deleted file mode 100644 index c8e1adf..0000000 --- a/0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 68b90e57bc034e237923b02acb633dc4e91d44cb Mon Sep 17 00:00:00 2001 -From: Heinrich Schuchardt -Date: Wed, 27 Feb 2019 20:05:43 +0100 -Subject: [PATCH] configs: tinker-rk3288 disable CONFIG_SPL_I2C_SUPPORT - -The SPL for the Tinker Board has to fit into 32 KiB. Currently this limit -is exceeded. - -CONFIG_SPL_I2C_SUPPORT is not needed to move to main U-Boot. So let's -disable it. - -Suggested-by: David Wu -Signed-off-by: Heinrich Schuchardt -Reviewed-by: David Wu -Reviewed-by: Philipp Tomsich ---- - configs/tinker-rk3288_defconfig | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig -index 4b48689ee8..0e8cf73fe9 100644 ---- a/configs/tinker-rk3288_defconfig -+++ b/configs/tinker-rk3288_defconfig -@@ -20,7 +20,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y - CONFIG_SPL_TEXT_BASE=0xff704000 - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 --CONFIG_SPL_I2C_SUPPORT=y - CONFIG_CMD_GPIO=y - CONFIG_CMD_GPT=y - CONFIG_CMD_I2C=y --- -2.21.0 - diff --git a/aarch64-boards b/aarch64-boards index 18a2a4f..4e337fb 100644 --- a/aarch64-boards +++ b/aarch64-boards @@ -45,6 +45,7 @@ pinebook pine_h64 poplar puma-rk3399 +rock64-rk3328 rock960-rk3399 rock-pi-4-rk3399 rockpro64-rk3399 diff --git a/mvebu-enable-generic-distro-boot-config.patch b/mvebu-enable-generic-distro-boot-config.patch deleted file mode 100644 index 51ec5b5..0000000 --- a/mvebu-enable-generic-distro-boot-config.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 8de891d0767aafb383b6f533b08a5c0b75b4718b Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 18 Sep 2017 15:48:32 +0100 -Subject: [PATCH] arm: mvebu: enable generic distro boot config - -Switch all of the mvebu boards to support disto generic booting -This will enable Fedora, Debian and other distros to support -mvebu systems easier. Tested on SolidRun ClearFog - -Signed-off-by: Dennis Gilmore -Signed-off-by: Peter Robinson ---- - include/configs/mv-common.h | 84 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 84 insertions(+) - -diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h -index 7c2bab2fc6..2819493fca 100644 ---- a/include/configs/mv-common.h -+++ b/include/configs/mv-common.h -@@ -130,4 +130,88 @@ - #define CONFIG_MTD_PARTITIONS - #endif - -+#ifndef CONFIG_SPL_BUILD -+#include -+ -+/* -+* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc. -+* 32M uncompressed kernel, 16M compressed kernel, 1M fdt, -+* 1M script, 1M pxe and the ramdisk at the end. -+*/ -+#define SDRAM_OFFSET(x) 0x0##x -+ -+#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(2000000)) -+#define FDT_ADDR_R __stringify(SDRAM_OFFSET(3000000)) -+#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3100000)) -+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000)) -+#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3300000)) -+ -+#define MEM_LAYOUT_ENV_SETTINGS \ -+ "bootm_size=0xa000000\0" \ -+ "kernel_addr_r=" KERNEL_ADDR_R "\0" \ -+ "fdt_addr_r=" FDT_ADDR_R "\0" \ -+ "scriptaddr=" SCRIPT_ADDR_R "\0" \ -+ "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \ -+ "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" -+ -+#ifdef CONFIG_MMC -+#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) -+#else -+#define BOOT_TARGET_DEVICES_MMC(func) -+#endif -+ -+#ifdef CONFIG_CMD_SATA -+#define BOOT_TARGET_DEVICES_SATA(func) func(SATA, sata, 0) func(SATA, sata, 1) -+#define CONFIG_PREBOOT "sata init" -+#else -+#define BOOT_TARGET_DEVICES_SATA(func) -+#endif -+ -+#ifdef CONFIG_USB_STORAGE -+#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) -+#else -+#define BOOT_TARGET_DEVICES_USB(func) -+#endif -+ -+#define BOOT_TARGET_DEVICES(func) \ -+ BOOT_TARGET_DEVICES_MMC(func) \ -+ BOOT_TARGET_DEVICES_SATA(func) \ -+ BOOT_TARGET_DEVICES_USB(func) \ -+ func(PXE, pxe, na) -+ -+#include -+ -+#ifdef CONFIG_USB_KEYBOARD -+#define CONSOLE_STDIN_SETTINGS \ -+ "preboot=usb start\0" \ -+ "stdin=serial,usbkbd\0" -+#else -+#define CONSOLE_STDIN_SETTINGS \ -+ "stdin=serial\0" -+#endif -+ -+#ifdef CONFIG_VIDEO -+#define CONSOLE_STDOUT_SETTINGS \ -+ "stdout=serial,vga\0" \ -+ "stderr=serial,vga\0" -+#else -+#define CONSOLE_STDOUT_SETTINGS \ -+ "stdout=serial\0" \ -+ "stderr=serial\0" -+#endif -+ -+#define CONSOLE_ENV_SETTINGS \ -+ CONSOLE_STDIN_SETTINGS \ -+ CONSOLE_STDOUT_SETTINGS -+ -+#define CONFIG_EXTRA_ENV_SETTINGS \ -+ CONSOLE_ENV_SETTINGS \ -+ MEM_LAYOUT_ENV_SETTINGS \ -+ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ -+ "console=ttyS0,115200\0" \ -+ BOOTENV -+#else /* ifndef CONFIG_SPL_BUILD */ -+#define CONFIG_EXTRA_ENV_SETTINGS -+#endif -+ - #endif /* _MV_COMMON_H */ --- -2.13.5 - diff --git a/mx6-utilite-distro-boot.patch b/mx6-utilite-distro-boot.patch deleted file mode 100644 index b2fd480..0000000 --- a/mx6-utilite-distro-boot.patch +++ /dev/null @@ -1,154 +0,0 @@ -From af017eb82317dc88c1b23301d76466b389c2e007 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Tue, 13 Sep 2016 08:47:34 +0100 -Subject: [PATCH] port utilite to distro generic boot commands - ---- - include/configs/cm_fx6.h | 115 ++++++++++++----------------------------------- - 1 file changed, 29 insertions(+), 86 deletions(-) - -diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h -index c839b03..4dd501e 100644 ---- a/include/configs/cm_fx6.h -+++ b/include/configs/cm_fx6.h -@@ -11,6 +11,7 @@ - #ifndef __CONFIG_CM_FX6_H - #define __CONFIG_CM_FX6_H - -+#include - #include "mx6_common.h" - - /* Machine config */ -@@ -78,101 +79,43 @@ - #define CONFIG_ENV_SIZE (8 * 1024) - #define CONFIG_ENV_OFFSET (768 * 1024) - -+#ifndef CONFIG_SPL_BUILD -+#include -+#include -+ -+#ifdef CONFIG_AHCI -+#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) -+#else -+#define BOOT_TARGET_DEVICES_SCSI(func) -+#endif -+ -+#define BOOT_TARGET_DEVICES(func) \ -+ func(MMC, mmc, 2) \ -+ BOOT_TARGET_DEVICES_SCSI(func) \ -+ func(PXE, pxe, na) \ -+ func(DHCP, dhcp, na) -+ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "stdin=serial,usbkbd\0" \ - "stdout=serial,vga\0" \ - "stderr=serial,vga\0" \ - "panel=HDMI\0" \ -- "autoload=no\0" \ -- "uImage=uImage-cm-fx6\0" \ -- "zImage=zImage-cm-fx6\0" \ -- "kernel=uImage-cm-fx6\0" \ -- "script=boot.scr\0" \ -- "dtb=cm-fx6.dtb\0" \ -- "bootm_low=18000000\0" \ -+ "dtb=imx6q-utilite-pro.dts\0" \ - "loadaddr=0x10800000\0" \ - "fdtaddr=0x11000000\0" \ -+ "fdt_addr_r=0x18000000\0" \ -+ "pxefile_addr_r=0x17f00000\0" \ -+ "scriptaddr=0x17e00000\0" \ -+ "kernel_addr_r=0x11000000\0" \ -+ "ramdisk_addr_r=0x18100000\0" \ -+ "bootm_size=0x20000000\0" \ - "console=ttymxc3,115200\0" \ - "ethprime=FEC0\0" \ -- "video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32@50,if=RGB32\0" \ -- "video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \ -- "doboot=bootm ${loadaddr}\0" \ -- "doloadfdt=false\0" \ -- "mtdids=" MTDIDS_DEFAULT "\0" \ -- "mtdparts=" MTDPARTS_DEFAULT "\0" \ -- "setboottypez=setenv kernel ${zImage};" \ -- "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \ -- "setenv doloadfdt true;\0" \ -- "setboottypem=setenv kernel ${uImage};" \ -- "setenv doboot bootm ${loadaddr};" \ -- "setenv doloadfdt false;\0"\ -- "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \ -- "sataroot=/dev/sda2 rw rootwait\0" \ -- "nandroot=/dev/mtdblock4 rw\0" \ -- "nandrootfstype=ubifs\0" \ -- "mmcargs=setenv bootargs console=${console} root=${mmcroot} " \ -- "${video} ${extrabootargs}\0" \ -- "sataargs=setenv bootargs console=${console} root=${sataroot} " \ -- "${video} ${extrabootargs}\0" \ -- "nandargs=setenv bootargs console=${console} " \ -- "root=${nandroot} " \ -- "rootfstype=${nandrootfstype} " \ -- "${video} ${extrabootargs}\0" \ -- "nandboot=if run nandloadkernel; then " \ -- "run nandloadfdt;" \ -- "run setboottypem;" \ -- "run storagebootcmd;" \ -- "run setboottypez;" \ -- "run storagebootcmd;" \ -- "fi;\0" \ -- "run_eboot=echo Starting EBOOT ...; "\ -- "mmc dev 2 && " \ -- "mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \ -- "loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0"\ -- "loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0"\ -- "loadfdt=load ${storagetype} ${storagedev} ${fdtaddr} ${dtb};\0" \ -- "bootscript=echo Running bootscript from ${storagetype} ...;" \ -- "source ${loadaddr};\0" \ -- "nandloadkernel=nand read ${loadaddr} 0 780000;\0" \ -- "nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \ -- "setupmmcboot=setenv storagetype mmc; setenv storagedev 2;\0" \ -- "setupsataboot=setenv storagetype sata; setenv storagedev 0;\0" \ -- "setupnandboot=setenv storagetype nand;\0" \ -- "setupusbboot=setenv storagetype usb; setenv storagedev 0;\0" \ -- "storagebootcmd=echo Booting from ${storagetype} ...;" \ -- "run ${storagetype}args; run doboot;\0" \ -- "trybootk=if run loadkernel; then " \ -- "if ${doloadfdt}; then " \ -- "run loadfdt;" \ -- "fi;" \ -- "run storagebootcmd;" \ -- "fi;\0" \ -- "trybootsmz=if run loadscript; then " \ -- "run bootscript;" \ -- "fi;" \ -- "run setboottypem;" \ -- "run trybootk;" \ -- "run setboottypez;" \ -- "run trybootk;\0" -- --#define CONFIG_BOOTCOMMAND \ -- "run setupmmcboot;" \ -- "mmc dev ${storagedev};" \ -- "if mmc rescan; then " \ -- "run trybootsmz;" \ -- "fi;" \ -- "run setupusbboot;" \ -- "if usb start; then "\ -- "if run loadscript; then " \ -- "run bootscript;" \ -- "fi;" \ -- "fi;" \ -- "run setupsataboot;" \ -- "if sata init; then " \ -- "run trybootsmz;" \ -- "fi;" \ -- "run setupnandboot;" \ -- "run nandboot;" -+ BOOTENV -+ -+#else /* ifndef CONFIG_SPL_BUILD */ -+#define CONFIG_EXTRA_ENV_SETTINGS -+#endif - - #define CONFIG_PREBOOT "usb start;sf probe" - --- -2.9.3 - diff --git a/rockchip-rk3399-Fix-USB3-support.patch b/rockchip-rk3399-Fix-USB3-support.patch new file mode 100644 index 0000000..792ada6 --- /dev/null +++ b/rockchip-rk3399-Fix-USB3-support.patch @@ -0,0 +1,415 @@ +From patchwork Sun Jun 30 16:01:53 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Mark Kettenis +X-Patchwork-Id: 1124932 +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=openbsd.org +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45cFdR5qfcz9sBp + for ; + Mon, 1 Jul 2019 02:02:35 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 69EB1C21DFD; Sun, 30 Jun 2019 16:02:22 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable + autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id A34D5C21D56; + Sun, 30 Jun 2019 16:02:07 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id E8483C21D56; Sun, 30 Jun 2019 16:02:05 +0000 (UTC) +Received: from lb3-smtp-cloud9.xs4all.net (lb3-smtp-cloud9.xs4all.net + [194.109.24.30]) + by lists.denx.de (Postfix) with ESMTPS id 88FC8C21C27 + for ; Sun, 30 Jun 2019 16:02:05 +0000 (UTC) +Received: from barber.sibelius.xs4all.nl ([83.163.83.176]) + by smtp-cloud9.xs4all.net with ESMTP + id hcHChhlcYAOfNhcHEhina2; Sun, 30 Jun 2019 18:02:04 +0200 +From: Mark Kettenis +To: u-boot@lists.denx.de +Date: Sun, 30 Jun 2019 18:01:53 +0200 +Message-Id: <20190630160156.51934-2-kettenis@openbsd.org> +X-Mailer: git-send-email 2.21.0 +In-Reply-To: <20190630160156.51934-1-kettenis@openbsd.org> +References: <20190630160156.51934-1-kettenis@openbsd.org> +MIME-Version: 1.0 +X-CMAE-Envelope: MS4wfLmEqKVrnQUzr99m+sewry4ejdvlsajihZ5fdwiyysrW7rHASkwT0EpvsDOXqW6cF7dQRh9fkLtTaJfdf4G0dKtcZjzy8i16ml/DtpRuO9PJFqcz0gBT + 8elsIXsJQPTnECIi3VFXugCXTgv8xgf9nsYOGsNpMpAop2NQ0gD5nksNRwnypHXYRO0b9cbZq82nwtPShl36CmI5hfMTI+zBeEEVjesvYmW9K73GUT503U6P + N/ohWQ8Ta35iWY0w5Rz2gMrBId0UTcIU4s5vRIp+cNmXPjnu09qT22WLAZcTT1PwhNb672Tji0a2TUU/zZkfVKI/ZmTvN6utmGPOx9GkOXPYpNJw2jzpwKhq + aMYImgg7RpoqHrOttDtjtRD8sohh3w== +Cc: Mark Kettenis +Subject: [U-Boot] [PATCH v2 1/4] rockchip: clk: rk3399: handle clk_enable + requests for USB3 +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +The "simple" OF glue layer for the Designware USB3 core enables +all refernced clocks. These need to be need to be implemented +otherwise the driver fails to probe. A dummy implementation +that simply returns success is sufficient since the RK3399 comes +out of reset with all clock gates open. + +Signed-off-by: Mark Kettenis +--- + drivers/clk/rockchip/clk_rk3399.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c +index 79007b8682..d9950c159b 100644 +--- a/drivers/clk/rockchip/clk_rk3399.c ++++ b/drivers/clk/rockchip/clk_rk3399.c +@@ -1080,6 +1080,18 @@ static int rk3399_clk_enable(struct clk *clk) + case PCLK_GMAC: + /* Required to successfully probe the Designware GMAC driver */ + return 0; ++ ++ case SCLK_USB3OTG0_REF: ++ case SCLK_USB3OTG1_REF: ++ case SCLK_USB3OTG0_SUSPEND: ++ case SCLK_USB3OTG1_SUSPEND: ++ case ACLK_USB3OTG0: ++ case ACLK_USB3OTG1: ++ case ACLK_USB3_RKSOC_AXI_PERF: ++ case ACLK_USB3: ++ case ACLK_USB3_GRF: ++ /* Required to successfully probe the Designware USB3 driver */ ++ return 0; + } + + debug("%s: unsupported clk %ld\n", __func__, clk->id); + +From patchwork Sun Jun 30 16:01:54 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Mark Kettenis +X-Patchwork-Id: 1124933 +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=openbsd.org +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45cFff0fKJz9sBp + for ; + Mon, 1 Jul 2019 02:03:37 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id B9E06C21E08; Sun, 30 Jun 2019 16:02:35 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable + autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 3FB43C21DE8; + Sun, 30 Jun 2019 16:02:08 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 6525AC21D56; Sun, 30 Jun 2019 16:02:06 +0000 (UTC) +Received: from lb3-smtp-cloud9.xs4all.net (lb3-smtp-cloud9.xs4all.net + [194.109.24.30]) + by lists.denx.de (Postfix) with ESMTPS id 1AF59C21C27 + for ; Sun, 30 Jun 2019 16:02:06 +0000 (UTC) +Received: from barber.sibelius.xs4all.nl ([83.163.83.176]) + by smtp-cloud9.xs4all.net with ESMTP + id hcHChhlcYAOfNhcHFhinaO; Sun, 30 Jun 2019 18:02:06 +0200 +From: Mark Kettenis +To: u-boot@lists.denx.de +Date: Sun, 30 Jun 2019 18:01:54 +0200 +Message-Id: <20190630160156.51934-3-kettenis@openbsd.org> +X-Mailer: git-send-email 2.21.0 +In-Reply-To: <20190630160156.51934-1-kettenis@openbsd.org> +References: <20190630160156.51934-1-kettenis@openbsd.org> +MIME-Version: 1.0 +X-CMAE-Envelope: MS4wfKRPj13LkDsqDLlh3dPjepDM22UaNHBR/NtZWFq6HmRoAycq/QLfscmB7RQ6Qr1EzV6RrTtOvCYZiuXKQbTJzDBJd2l/C/wPc01PHXZYBVSolpSIx7Ly + hMIN5wJInIHRjMUa8hqeaSNSBFz2GpCd4GNFk2Jv/DgHOiymkEftLBJQaPXPh0rdCGL8BGlEXKM1wseWX1aDf8efNApZ7outHAjzlrnS1hELt4c9zmfVQCMQ + lLQCSp7/S40oWg5OqC4X+ShBDOf9hrWZAHsoVInsS+diZkcnbIo7vT3N6zADrDcZoVO1I4NDa9c/YcVbLDdJv9yoHVHjFSNI3i0gBRMmnctZfmlWaYN0IrLC + 820zukHfOpaNEqKNAvPamCZLovpdOQ== +Cc: Mark Kettenis +Subject: [U-Boot] [PATCH v2 2/4] usb: dwc3-of-simple: Add support for RK3399 +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +Add compatible string for RK3399 and enable it by default on +Rockchip platforms with USB3 support. + +Signed-off-by: Mark Kettenis +Reviewed-by: Kever Yang +--- + drivers/usb/host/Kconfig | 1 + + drivers/usb/host/dwc3-of-simple.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig +index b1188bcbf5..ac68aa2d27 100644 +--- a/drivers/usb/host/Kconfig ++++ b/drivers/usb/host/Kconfig +@@ -24,6 +24,7 @@ config USB_XHCI_DWC3 + config USB_XHCI_DWC3_OF_SIMPLE + bool "DesignWare USB3 DRD Generic OF Simple Glue Layer" + depends on DM_USB ++ default y if ARCH_ROCKCHIP + default y if DRA7XX + help + Support USB2/3 functionality in simple SoC integrations with +diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c +index b118997f6e..45df614b09 100644 +--- a/drivers/usb/host/dwc3-of-simple.c ++++ b/drivers/usb/host/dwc3-of-simple.c +@@ -92,6 +92,7 @@ static int dwc3_of_simple_remove(struct udevice *dev) + + static const struct udevice_id dwc3_of_simple_ids[] = { + { .compatible = "amlogic,meson-gxl-dwc3" }, ++ { .compatible = "rockchip,rk3399-dwc3" }, + { .compatible = "ti,dwc3" }, + { } + }; + +From patchwork Sun Jun 30 16:01:55 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Mark Kettenis +X-Patchwork-Id: 1124934 +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=openbsd.org +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45cFg20RQ2z9sBp + for ; + Mon, 1 Jul 2019 02:03:57 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id BB0E3C21D8E; Sun, 30 Jun 2019 16:02:51 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable + autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id D894FC21DC1; + Sun, 30 Jun 2019 16:02:12 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 5461AC21C27; Sun, 30 Jun 2019 16:02:07 +0000 (UTC) +Received: from lb2-smtp-cloud9.xs4all.net (lb2-smtp-cloud9.xs4all.net + [194.109.24.26]) + by lists.denx.de (Postfix) with ESMTPS id 05FE4C21C27 + for ; Sun, 30 Jun 2019 16:02:07 +0000 (UTC) +Received: from barber.sibelius.xs4all.nl ([83.163.83.176]) + by smtp-cloud9.xs4all.net with ESMTP + id hcHChhlcYAOfNhcHGhinal; Sun, 30 Jun 2019 18:02:07 +0200 +From: Mark Kettenis +To: u-boot@lists.denx.de +Date: Sun, 30 Jun 2019 18:01:55 +0200 +Message-Id: <20190630160156.51934-4-kettenis@openbsd.org> +X-Mailer: git-send-email 2.21.0 +In-Reply-To: <20190630160156.51934-1-kettenis@openbsd.org> +References: <20190630160156.51934-1-kettenis@openbsd.org> +MIME-Version: 1.0 +X-CMAE-Envelope: MS4wfLs+8eVNa+4q5xvZxgD/7JFk5FDJvpyZbd3cSrXacdnFSq2kAy8QdBLQqG7pFgMwbbkh/zgisVHcqIrbLR4AS1bVVdY9OiI3glthx583ANub4fv/+FYG + p2vXmJ/g7+CCFcVSIOoJhY+thnwEIzY6/Azt309X5FXHFUhNyCIBYgwmeyfWokqW63nRuxAp4EwLljFsrFdd+RFtBY1nL3qyzpTszLkJg1yWdTar2dRe4svQ + oKXYd53kLhrnEWbesbCU0A2fpCT0KpWLXQGntr26HUrGujJxrdYRV4v9LX7FF4B1E5SuWpr3TmT0h9a7Z8CVprD6p5ZwpVLJ1GjFlgQGHB97Y1CKq2I0khV6 + JLYxojKfL1uhNq0F7gI/5ImOsua0rw== +Cc: Mark Kettenis +Subject: [U-Boot] [PATCH v2 3/4] usb: xhci-dwc3: Add USB2 PHY configuration +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +Configure USB2 PHY register based on "phy_type" property and +handle all the quirks that are relevant for Rockchip RK3399 SoCs. + +Signed-off-by: Mark Kettenis +--- + drivers/usb/host/xhci-dwc3.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c +index 83b9f119e7..9e8cae7ae4 100644 +--- a/drivers/usb/host/xhci-dwc3.c ++++ b/drivers/usb/host/xhci-dwc3.c +@@ -118,6 +118,8 @@ static int xhci_dwc3_probe(struct udevice *dev) + struct dwc3 *dwc3_reg; + enum usb_dr_mode dr_mode; + struct xhci_dwc3_platdata *plat = dev_get_platdata(dev); ++ const char *phy; ++ u32 reg; + int ret; + + hccr = (struct xhci_hccr *)((uintptr_t)dev_read_addr(dev)); +@@ -132,6 +134,24 @@ static int xhci_dwc3_probe(struct udevice *dev) + + dwc3_core_init(dwc3_reg); + ++ /* Set dwc3 usb2 phy config */ ++ reg = readl(&dwc3_reg->g_usb2phycfg[0]); ++ ++ phy = dev_read_string(dev, "phy_type"); ++ if (phy && strcmp(phy, "utmi_wide") == 0) { ++ reg |= DWC3_GUSB2PHYCFG_PHYIF; ++ reg &= ~DWC3_GUSB2PHYCFG_USBTRDTIM_MASK; ++ reg |= DWC3_GUSB2PHYCFG_USBTRDTIM_16BIT; ++ } ++ ++ if (dev_read_bool(dev, "snps,dis_enblslpm-quirk")) ++ reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM; ++ ++ if (dev_read_bool(dev, "snps,dis-u2-freeclk-exists-quirk")) ++ reg &= ~DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS; ++ ++ writel(reg, &dwc3_reg->g_usb2phycfg[0]); ++ + dr_mode = usb_get_dr_mode(dev_of_offset(dev)); + if (dr_mode == USB_DR_MODE_UNKNOWN) + /* by default set dual role mode to HOST */ + +From patchwork Sun Jun 30 16:01:56 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Mark Kettenis +X-Patchwork-Id: 1124935 +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=openbsd.org +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45cFgS2Mb4z9sBp + for ; + Mon, 1 Jul 2019 02:04:20 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id D32B4C21DD3; Sun, 30 Jun 2019 16:03:04 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable + autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 5BF87C21E08; + Sun, 30 Jun 2019 16:02:22 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id EBB2FC21E2F; Sun, 30 Jun 2019 16:02:11 +0000 (UTC) +Received: from lb3-smtp-cloud9.xs4all.net (lb3-smtp-cloud9.xs4all.net + [194.109.24.30]) + by lists.denx.de (Postfix) with ESMTPS id 0D156C21DD7 + for ; Sun, 30 Jun 2019 16:02:08 +0000 (UTC) +Received: from barber.sibelius.xs4all.nl ([83.163.83.176]) + by smtp-cloud9.xs4all.net with ESMTP + id hcHChhlcYAOfNhcHHhinbC; Sun, 30 Jun 2019 18:02:08 +0200 +From: Mark Kettenis +To: u-boot@lists.denx.de +Date: Sun, 30 Jun 2019 18:01:56 +0200 +Message-Id: <20190630160156.51934-5-kettenis@openbsd.org> +X-Mailer: git-send-email 2.21.0 +In-Reply-To: <20190630160156.51934-1-kettenis@openbsd.org> +References: <20190630160156.51934-1-kettenis@openbsd.org> +MIME-Version: 1.0 +X-CMAE-Envelope: MS4wfJt9aWnppnn1FrjUcIi+mVdSRXltWTpfX80VJftNdkow/RTDLd6RZhxL11k74NYLPOqe/UXQb2nIzkxqBuBVF3W1CvkWIgzYeNmbJTAbSmMsNnS491Uk + prEsRguT84I6QPh+YWtHv2yd9XN9NF5OkpHj05XsG0kmkXk0lLv42fxlsheATPb7hRo4UrN94niQPmKEWbW7fbHZgiIpp3W8JZ9ei3TLOx+t1TdA6uz3mFki + Xbwobdnaw3EpuVLHgTbKQWpdVl1n3+c2VK61rlNusZ+c8+ofBbSsiA3rybSGzm2gOBWDQiMrw05hTuZs2lluyqocc/i5dK+ODagwBGwH7IIgKBq2qMaKA6Sl + ymPOVIvlveSrgV/bugKVyUGhkerl7A== +Cc: Mark Kettenis +Subject: [U-Boot] [PATCH v2 4/4] rockchip: xhci: Remove RK3399 support +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +Remove RK3399 compatible strings as this driver is no longer +used on that SoC. + +Signed-off-by: Mark Kettenis +Reviewed-by: Kever Yang +--- + drivers/usb/host/xhci-rockchip.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c +index f19bea3a91..e7b0dbcca5 100644 +--- a/drivers/usb/host/xhci-rockchip.c ++++ b/drivers/usb/host/xhci-rockchip.c +@@ -167,7 +167,6 @@ static int xhci_usb_remove(struct udevice *dev) + } + + static const struct udevice_id xhci_usb_ids[] = { +- { .compatible = "rockchip,rk3399-xhci" }, + { .compatible = "rockchip,rk3328-xhci" }, + { } + }; +@@ -187,7 +186,6 @@ U_BOOT_DRIVER(usb_xhci) = { + }; + + static const struct udevice_id usb_phy_ids[] = { +- { .compatible = "rockchip,rk3399-usb3-phy" }, + { .compatible = "rockchip,rk3328-usb3-phy" }, + { } + }; diff --git a/rockchip-rock960.patch b/rockchip-rock960.patch new file mode 100644 index 0000000..513e144 --- /dev/null +++ b/rockchip-rock960.patch @@ -0,0 +1,799 @@ +From 15c14b923f29dc69d51964e63f4ed35a7ffcd97f Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Fri, 28 Jun 2019 14:09:02 +0100 +Subject: [PATCH 1/6] arm64: rockchip: rock960: sync dts files from Linux + 5.2-rc6 + +Sync the dts files for the Rock960 boards from Linux to get the +latest changes and fixes for the devices. + +Signed-off-by: Peter Robinson +--- + arch/arm/dts/rk3399-ficus.dts | 92 ++++++++++++- + arch/arm/dts/rk3399-rock960.dts | 91 +++++++++++- + arch/arm/dts/rk3399-rock960.dtsi | 229 +++++++++++++++++++++++++------ + 3 files changed, 366 insertions(+), 46 deletions(-) + +diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts +index 4b2dd82b67..6b059bd7a0 100644 +--- a/arch/arm/dts/rk3399-ficus.dts ++++ b/arch/arm/dts/rk3399-ficus.dts +@@ -23,6 +23,52 @@ + clock-output-names = "clkin_gmac"; + #clock-cells = <0>; + }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&user_led1>, <&user_led2>, <&user_led3>, ++ <&user_led4>, <&wlan_led>, <&bt_led>; ++ ++ user_led1 { ++ label = "red:user1"; ++ gpios = <&gpio4 25 0>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ ++ user_led2 { ++ label = "red:user2"; ++ gpios = <&gpio4 26 0>; ++ linux,default-trigger = "mmc0"; ++ }; ++ ++ user_led3 { ++ label = "red:user3"; ++ gpios = <&gpio4 30 0>; ++ linux,default-trigger = "mmc1"; ++ }; ++ ++ user_led4 { ++ label = "red:user4"; ++ gpios = <&gpio1 0 0>; ++ panic-indicator; ++ linux,default-trigger = "none"; ++ }; ++ ++ wlan_active_led { ++ label = "red:wlan"; ++ gpios = <&gpio1 1 0>; ++ linux,default-trigger = "phy0tx"; ++ default-state = "off"; ++ }; ++ ++ bt_active_led { ++ label = "red:bt"; ++ gpios = <&gpio1 4 0>; ++ linux,default-trigger = "hci0-power"; ++ default-state = "off"; ++ }; ++ }; + }; + + &gmac { +@@ -49,23 +95,63 @@ + gmac { + rgmii_sleep_pins: rgmii-sleep-pins { + rockchip,pins = +- <3 15 RK_FUNC_GPIO &pcfg_output_low>; ++ <3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>; + }; + }; + + pcie { + pcie_drv: pcie-drv { + rockchip,pins = +- <1 24 RK_FUNC_GPIO &pcfg_pull_none>; ++ <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + usb2 { + host_vbus_drv: host-vbus-drv { + rockchip,pins = +- <4 27 RK_FUNC_GPIO &pcfg_pull_none>; ++ <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; ++ ++ leds { ++ user_led1: user_led1 { ++ rockchip,pins = ++ <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ user_led2: user_led2 { ++ rockchip,pins = ++ <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ user_led3: user_led3 { ++ rockchip,pins = ++ <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ user_led4: user_led4 { ++ rockchip,pins = ++ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ wlan_led: wlan_led { ++ rockchip,pins = ++ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ bt_led: bt_led { ++ rockchip,pins = ++ <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++}; ++ ++&usbdrd_dwc3_0 { ++ dr_mode = "host"; ++}; ++ ++&usbdrd_dwc3_1 { ++ dr_mode = "host"; + }; + + &vcc3v3_pcie { +diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts +index 7e06bc97e5..12285c51cc 100644 +--- a/arch/arm/dts/rk3399-rock960.dts ++++ b/arch/arm/dts/rk3399-rock960.dts +@@ -1,6 +1,6 @@ +-// SPDX-License-Identifier: GPL-2.0+ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + /* +- * Copyright (C) 2018 Manivannan Sadhasivam ++ * Copyright (c) 2018 Linaro Ltd. + */ + + /dts-v1/; +@@ -13,6 +13,53 @@ + chosen { + stdout-path = "serial2:1500000n8"; + }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&user_led1>, <&user_led2>, <&user_led3>, ++ <&user_led4>, <&wlan_led>, <&bt_led>; ++ ++ user_led1 { ++ label = "green:user1"; ++ gpios = <&gpio4 RK_PC2 0>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ ++ user_led2 { ++ label = "green:user2"; ++ gpios = <&gpio4 RK_PC6 0>; ++ linux,default-trigger = "mmc0"; ++ }; ++ ++ user_led3 { ++ label = "green:user3"; ++ gpios = <&gpio4 RK_PD0 0>; ++ linux,default-trigger = "mmc1"; ++ }; ++ ++ user_led4 { ++ label = "green:user4"; ++ gpios = <&gpio4 RK_PD4 0>; ++ panic-indicator; ++ linux,default-trigger = "none"; ++ }; ++ ++ wlan_active_led { ++ label = "yellow:wlan"; ++ gpios = <&gpio4 RK_PD5 0>; ++ linux,default-trigger = "phy0tx"; ++ default-state = "off"; ++ }; ++ ++ bt_active_led { ++ label = "blue:bt"; ++ gpios = <&gpio4 RK_PD6 0>; ++ linux,default-trigger = "hci0-power"; ++ default-state = "off"; ++ }; ++ }; ++ + }; + + &pcie0 { +@@ -20,6 +67,38 @@ + }; + + &pinctrl { ++ leds { ++ user_led1: user_led1 { ++ rockchip,pins = ++ <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ user_led2: user_led2 { ++ rockchip,pins = ++ <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ user_led3: user_led3 { ++ rockchip,pins = ++ <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ user_led4: user_led4 { ++ rockchip,pins = ++ <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ wlan_led: wlan_led { ++ rockchip,pins = ++ <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ bt_led: bt_led { ++ rockchip,pins = ++ <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ + pcie { + pcie_drv: pcie-drv { + rockchip,pins = +@@ -35,6 +114,14 @@ + }; + }; + ++&usbdrd_dwc3_0 { ++ dr_mode = "otg"; ++}; ++ ++&usbdrd_dwc3_1 { ++ dr_mode = "host"; ++}; ++ + &vcc3v3_pcie { + gpio = <&gpio2 5 GPIO_ACTIVE_HIGH>; + }; +diff --git a/arch/arm/dts/rk3399-rock960.dtsi b/arch/arm/dts/rk3399-rock960.dtsi +index 51644d6d02..c7d48d41e1 100644 +--- a/arch/arm/dts/rk3399-rock960.dtsi ++++ b/arch/arm/dts/rk3399-rock960.dtsi +@@ -1,13 +1,32 @@ +-// SPDX-License-Identifier: GPL-2.0+ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + /* ++ * Copyright (c) 2018 Collabora Ltd. ++ * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. + * Copyright (c) 2018 Linaro Ltd. + */ + +-#include +-#include + #include "rk3399.dtsi" ++#include "rk3399-opp.dtsi" + + / { ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ clocks = <&rk808 1>; ++ clock-names = "ext_clock"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&wifi_enable_h>; ++ reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; ++ }; ++ ++ vcc12v_dcin: vcc12v-dcin { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc12v_dcin"; ++ regulator-min-microvolt = <12000000>; ++ regulator-max-microvolt = <12000000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ + vcc1v8_s0: vcc1v8-s0 { + compatible = "regulator-fixed"; + regulator-name = "vcc1v8_s0"; +@@ -16,12 +35,13 @@ + regulator-always-on; + }; + +- vcc_sys: vcc-sys { ++ vcc5v0_sys: vcc5v0-sys { + compatible = "regulator-fixed"; +- regulator-name = "vcc_sys"; ++ regulator-name = "vcc5v0_sys"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; ++ vin-supply = <&vcc12v_dcin>; + }; + + vcc3v3_sys: vcc3v3-sys { +@@ -30,7 +50,7 @@ + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; +- vin-supply = <&vcc_sys>; ++ vin-supply = <&vcc5v0_sys>; + }; + + vcc3v3_pcie: vcc3v3-pcie-regulator { +@@ -54,20 +74,8 @@ + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; +- vin-supply = <&vcc_sys>; +- }; +- +- vdd_log: vdd-log { +- compatible = "pwm-regulator"; +- pwms = <&pwm2 0 25000 0>; +- regulator-name = "vdd_log"; +- regulator-min-microvolt = <800000>; +- regulator-max-microvolt = <1400000>; +- regulator-always-on; +- regulator-boot-on; +- vin-supply = <&vcc_sys>; ++ vin-supply = <&vcc5v0_sys>; + }; +- + }; + + &cpu_l0 { +@@ -98,7 +106,19 @@ + status = "okay"; + }; + ++&gpu { ++ mali-supply = <&vdd_gpu>; ++ status = "okay"; ++}; ++ + &hdmi { ++ ddc-i2c-bus = <&i2c3>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&hdmi_cec>; ++ status = "okay"; ++}; ++ ++&hdmi_sound { + status = "okay"; + }; + +@@ -118,7 +138,7 @@ + regulator-ramp-delay = <1000>; + regulator-always-on; + regulator-boot-on; +- vin-supply = <&vcc_sys>; ++ vin-supply = <&vcc5v0_sys>; + status = "okay"; + + regulator-state-mem { +@@ -136,7 +156,7 @@ + regulator-ramp-delay = <1000>; + regulator-always-on; + regulator-boot-on; +- vin-supply = <&vcc_sys>; ++ vin-supply = <&vcc5v0_sys>; + regulator-state-mem { + regulator-off-in-suspend; + }; +@@ -154,16 +174,16 @@ + #clock-cells = <1>; + clock-output-names = "xin32k", "rk808-clkout2"; + +- vcc1-supply = <&vcc_sys>; +- vcc2-supply = <&vcc_sys>; +- vcc3-supply = <&vcc_sys>; +- vcc4-supply = <&vcc_sys>; +- vcc6-supply = <&vcc_sys>; +- vcc7-supply = <&vcc_sys>; ++ vcc1-supply = <&vcc5v0_sys>; ++ vcc2-supply = <&vcc5v0_sys>; ++ vcc3-supply = <&vcc5v0_sys>; ++ vcc4-supply = <&vcc5v0_sys>; ++ vcc6-supply = <&vcc5v0_sys>; ++ vcc7-supply = <&vcc5v0_sys>; + vcc8-supply = <&vcc3v3_sys>; +- vcc9-supply = <&vcc_sys>; +- vcc10-supply = <&vcc_sys>; +- vcc11-supply = <&vcc_sys>; ++ vcc9-supply = <&vcc5v0_sys>; ++ vcc10-supply = <&vcc5v0_sys>; ++ vcc11-supply = <&vcc5v0_sys>; + vcc12-supply = <&vcc3v3_sys>; + vddio-supply = <&vcc_1v8>; + +@@ -344,6 +364,10 @@ + status = "okay"; + }; + ++&i2s2 { ++ status = "okay"; ++}; ++ + &io_domains { + bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */ + audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */ +@@ -370,45 +394,92 @@ + }; + + &pinctrl { ++ bt { ++ bt_enable_h: bt-enable-h { ++ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ bt_host_wake_l: bt-host-wake-l { ++ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ bt_wake_l: bt-wake-l { ++ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ + sdmmc { + sdmmc_bus1: sdmmc-bus1 { + rockchip,pins = +- <4 8 RK_FUNC_1 &pcfg_pull_up_8ma>; ++ <4 RK_PB0 1 &pcfg_pull_up_8ma>; + }; + + sdmmc_bus4: sdmmc-bus4 { + rockchip,pins = +- <4 8 RK_FUNC_1 &pcfg_pull_up_8ma>, +- <4 9 RK_FUNC_1 &pcfg_pull_up_8ma>, +- <4 10 RK_FUNC_1 &pcfg_pull_up_8ma>, +- <4 11 RK_FUNC_1 &pcfg_pull_up_8ma>; ++ <4 RK_PB0 1 &pcfg_pull_up_8ma>, ++ <4 RK_PB1 1 &pcfg_pull_up_8ma>, ++ <4 RK_PB2 1 &pcfg_pull_up_8ma>, ++ <4 RK_PB3 1 &pcfg_pull_up_8ma>; + }; + + sdmmc_clk: sdmmc-clk { + rockchip,pins = +- <4 12 RK_FUNC_1 &pcfg_pull_none_18ma>; ++ <4 RK_PB4 1 &pcfg_pull_none_18ma>; + }; + + sdmmc_cmd: sdmmc-cmd { + rockchip,pins = +- <4 13 RK_FUNC_1 &pcfg_pull_up_8ma>; ++ <4 RK_PB5 1 &pcfg_pull_up_8ma>; ++ }; ++ }; ++ ++ sdio0 { ++ sdio0_bus4: sdio0-bus4 { ++ rockchip,pins = ++ <2 RK_PC4 1 &pcfg_pull_up_20ma>, ++ <2 RK_PC5 1 &pcfg_pull_up_20ma>, ++ <2 RK_PC6 1 &pcfg_pull_up_20ma>, ++ <2 RK_PC7 1 &pcfg_pull_up_20ma>; ++ }; ++ ++ sdio0_cmd: sdio0-cmd { ++ rockchip,pins = ++ <2 RK_PD0 1 &pcfg_pull_up_20ma>; ++ }; ++ ++ sdio0_clk: sdio0-clk { ++ rockchip,pins = ++ <2 RK_PD1 1 &pcfg_pull_none_20ma>; + }; + }; + + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = +- <1 21 RK_FUNC_GPIO &pcfg_pull_up>; ++ <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + vsel1_gpio: vsel1-gpio { + rockchip,pins = +- <1 17 RK_FUNC_GPIO &pcfg_pull_down>; ++ <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + vsel2_gpio: vsel2-gpio { + rockchip,pins = +- <1 14 RK_FUNC_GPIO &pcfg_pull_down>; ++ <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; ++ }; ++ }; ++ ++ sdio-pwrseq { ++ wifi_enable_h: wifi-enable-h { ++ rockchip,pins = ++ <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ wifi { ++ wifi_host_wake_l: wifi-host-wake-l { ++ rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + }; +@@ -421,6 +492,32 @@ + status = "okay"; + }; + ++&sdio0 { ++ bus-width = <4>; ++ clock-frequency = <50000000>; ++ cap-sdio-irq; ++ cap-sd-highspeed; ++ keep-power-in-suspend; ++ mmc-pwrseq = <&sdio_pwrseq>; ++ non-removable; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; ++ sd-uhs-sdr104; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ brcmf: wifi@1 { ++ compatible = "brcm,bcm4329-fmac"; ++ reg = <1>; ++ interrupt-parent = <&gpio0>; ++ interrupts = ; ++ interrupt-names = "host-wake"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&wifi_host_wake_l>; ++ }; ++}; ++ + &sdhci { + bus-width = <8>; + mmc-hs400-1_8v; +@@ -445,16 +542,42 @@ + status = "okay"; + }; + ++&tsadc { ++ rockchip,hw-tshut-mode = <1>; ++ rockchip,hw-tshut-polarity = <1>; ++ rockchip,hw-tshut-temp = <110000>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart0_xfer &uart0_cts>; ++ pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; + status = "okay"; ++ ++ bluetooth { ++ compatible = "brcm,bcm43438-bt"; ++ clocks = <&rk808 1>; ++ clock-names = "ext_clock"; ++ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; ++ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; ++ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>; ++ }; + }; + + &uart2 { + status = "okay"; + }; + ++&tcphy0 { ++ status = "okay"; ++}; ++ ++&tcphy1 { ++ status = "okay"; ++}; ++ + &u2phy0 { + status = "okay"; + }; +@@ -497,10 +620,34 @@ + status = "okay"; + }; + ++&usbdrd3_0 { ++ status = "okay"; ++}; ++ ++&usbdrd_dwc3_0 { ++ status = "okay"; ++}; ++ ++&usbdrd3_1 { ++ status = "okay"; ++}; ++ ++&usbdrd_dwc3_1 { ++ status = "okay"; ++}; ++ + &vopb { + status = "okay"; + }; + ++&vopb_mmu { ++ status = "okay"; ++}; ++ + &vopl { + status = "okay"; + }; ++ ++&vopl_mmu { ++ status = "okay"; ++}; +-- +2.21.0 + +From 66584f08b1a1eb122d4796d6923ac317bdf3c8ca Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sat, 29 Jun 2019 09:24:55 +0100 +Subject: [PATCH 2/6] configs: rockchip: rock960: drop options for non-existent + HW + +The Rock960 doesn't contain SPI flash so drop related config options. + +Signed-off-by: Peter Robinson +--- + configs/rock960-rk3399_defconfig | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig +index 1958b7e190..1aa986e9cd 100644 +--- a/configs/rock960-rk3399_defconfig ++++ b/configs/rock960-rk3399_defconfig +@@ -21,7 +21,6 @@ CONFIG_SYS_PROMPT="rock960 => " + CONFIG_CMD_BOOTZ=y + CONFIG_CMD_GPT=y + CONFIG_CMD_MMC=y +-CONFIG_CMD_SF=y + CONFIG_CMD_USB=y + # CONFIG_CMD_SETEXPR is not set + CONFIG_CMD_TIME=y +@@ -35,7 +34,6 @@ CONFIG_MMC_DW=y + CONFIG_MMC_DW_ROCKCHIP=y + CONFIG_MMC_SDHCI=y + CONFIG_MMC_SDHCI_ROCKCHIP=y +-CONFIG_SF_DEFAULT_SPEED=20000000 + CONFIG_PMIC_RK8XX=y + CONFIG_REGULATOR_PWM=y + CONFIG_REGULATOR_RK8XX=y +-- +2.21.0 + +From d9f234f28a17adad9f4b08114965815516605271 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sat, 29 Jun 2019 09:57:29 +0100 +Subject: [PATCH 3/6] configs: rockchip: rock960: enable pmic and regulator + commands + +We have both PMIC and Regulator functionality so it's useful to +be able to see output and debug with the commands enabled. + +Signed-off-by: Peter Robinson +--- + configs/rock960-rk3399_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig +index 1aa986e9cd..2381f0cd7e 100644 +--- a/configs/rock960-rk3399_defconfig ++++ b/configs/rock960-rk3399_defconfig +@@ -21,6 +21,8 @@ CONFIG_SYS_PROMPT="rock960 => " + CONFIG_CMD_BOOTZ=y + CONFIG_CMD_GPT=y + CONFIG_CMD_MMC=y ++CONFIG_CMD_PMIC=y ++CONFIG_CMD_REGULATOR=y + CONFIG_CMD_USB=y + # CONFIG_CMD_SETEXPR is not set + CONFIG_CMD_TIME=y +-- +2.21.0 + +From 08cf06897ef382f4568568ea4210e41ed4ae19e2 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sat, 29 Jun 2019 10:29:56 +0100 +Subject: [PATCH 4/6] configs: rockchip: rock960: enable DMA for SDHCI + controller + +Enable the SDMA controller so the eMMC connected to the SDHCI +controller (sdhci@fe330000) can make use of it. + +Signed-off-by: Peter Robinson +--- + configs/rock960-rk3399_defconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig +index 2381f0cd7e..20c9cdeda3 100644 +--- a/configs/rock960-rk3399_defconfig ++++ b/configs/rock960-rk3399_defconfig +@@ -35,6 +35,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y + CONFIG_MMC_DW=y + CONFIG_MMC_DW_ROCKCHIP=y + CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_SDMA=y + CONFIG_MMC_SDHCI_ROCKCHIP=y + CONFIG_PMIC_RK8XX=y + CONFIG_REGULATOR_PWM=y +-- +2.21.0 + +From 1340f50ee63727804cf7634b3679fe4208c8576f Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sat, 29 Jun 2019 10:43:01 +0100 +Subject: [PATCH 5/6] configs: rockchip: rock960: Add support for USB ethernet + adapters + +As the Rock960 doesn't have an onboard wired ethernet interface +it's useful to have some common USB wired ethernet devices added +to enable testing. + +Signed-off-by: Peter Robinson +--- + configs/rock960-rk3399_defconfig | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig +index 20c9cdeda3..90115e903b 100644 +--- a/configs/rock960-rk3399_defconfig ++++ b/configs/rock960-rk3399_defconfig +@@ -48,5 +48,12 @@ CONFIG_USB=y + CONFIG_USB_EHCI_HCD=y + CONFIG_USB_EHCI_GENERIC=y + CONFIG_ROCKCHIP_USB2_PHY=y ++CONFIG_DM_ETH=y ++CONFIG_USB_HOST_ETHER=y ++CONFIG_USB_ETHER_ASIX88179=y ++CONFIG_USB_ETHER_ASIX=y ++CONFIG_USB_ETHER_MCS7830=y ++CONFIG_USB_ETHER_RTL8152=y ++CONFIG_USB_ETHER_SMSC95XX=y + CONFIG_USE_TINY_PRINTF=y + CONFIG_ERRNO_STR=y +-- +2.21.0 + +From 1bb09008d279c533f4fd76697aa396d63c10ed58 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sat, 29 Jun 2019 18:34:57 +0100 +Subject: [PATCH 6/6] configs: rockchip: rock960: enable USB3 support + +Enable USB3 support via the dwc3 XHCI driver. + +Signed-off-by: Peter Robinson +--- + configs/rock960-rk3399_defconfig | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig +index 90115e903b..5be36383e1 100644 +--- a/configs/rock960-rk3399_defconfig ++++ b/configs/rock960-rk3399_defconfig +@@ -55,5 +55,8 @@ CONFIG_USB_ETHER_ASIX=y + CONFIG_USB_ETHER_MCS7830=y + CONFIG_USB_ETHER_RTL8152=y + CONFIG_USB_ETHER_SMSC95XX=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++# CONFIG_USB_XHCI_ROCKCHIP is not set + CONFIG_USE_TINY_PRINTF=y + CONFIG_ERRNO_STR=y +-- +2.21.0 + diff --git a/sources b/sources index a94cd69..b68a826 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2019.07-rc4.tar.bz2) = 71aa6e2eb30a3abf136a4128fb8bf00c8b1b71d6bc35cc65daac058fd4dae135080e4683c092edefffc6c1ba227bf07b49721b889ddfa02e7872beb5ab5fe92f +SHA512 (u-boot-2019.07.tar.bz2) = 879abf0c8773bfcdcbe7f28fc68e2b4369bcb74e276d95d510a9b2d1707e63eb01d82e304ba5a6a570552bc18bc593f27ba9b518bafa1d8f8e5bc83cf107c023 diff --git a/tegra-TX-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch b/tegra-TX-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch deleted file mode 100644 index 20fa98d..0000000 --- a/tegra-TX-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 80dda7644f2691d599bc87a7a96645bda0305424 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 20 Mar 2019 09:29:49 +0000 -Subject: [PATCH] tegra: TX: Add CONFIG_EFI_LOADER_BOUNCE_BUFFER - -Signed-off-by: Peter Robinson ---- - configs/p2371-2180_defconfig | 1 + - configs/p2771-0000-000_defconfig | 1 + - configs/p2771-0000-500_defconfig | 1 + - configs/p3450-0000_defconfig | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig -index b662ef1431..c1b87a8071 100644 ---- a/configs/p2371-2180_defconfig -+++ b/configs/p2371-2180_defconfig -@@ -5,6 +5,7 @@ CONFIG_TEGRA210=y - CONFIG_TARGET_P2371_2180=y - CONFIG_NR_DRAM_BANKS=2 - CONFIG_OF_SYSTEM_SETUP=y -+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y - CONFIG_CONSOLE_MUX=y - CONFIG_SYS_STDIO_DEREGISTER=y - CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # " -diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig -index ad0802067e..799a06e454 100644 ---- a/configs/p2771-0000-000_defconfig -+++ b/configs/p2771-0000-000_defconfig -@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80080000 - CONFIG_TEGRA186=y - CONFIG_NR_DRAM_BANKS=1026 - CONFIG_OF_SYSTEM_SETUP=y -+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y - CONFIG_CONSOLE_MUX=y - CONFIG_SYS_STDIO_DEREGISTER=y - CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # " -diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig -index 459b67fd19..6193cff822 100644 ---- a/configs/p2771-0000-500_defconfig -+++ b/configs/p2771-0000-500_defconfig -@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80080000 - CONFIG_TEGRA186=y - CONFIG_NR_DRAM_BANKS=1026 - CONFIG_OF_SYSTEM_SETUP=y -+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y - CONFIG_CONSOLE_MUX=y - CONFIG_SYS_STDIO_DEREGISTER=y - CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # " -diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig -index 32c2b65a29..6da9daebe5 100644 ---- a/configs/p3450-0000_defconfig -+++ b/configs/p3450-0000_defconfig -@@ -7,6 +7,7 @@ CONFIG_TARGET_P3450_0000=y - CONFIG_NR_DRAM_BANKS=2 - CONFIG_OF_SYSTEM_SETUP=y - CONFIG_OF_BOARD_SETUP=y -+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y - CONFIG_CONSOLE_MUX=y - CONFIG_SYS_STDIO_DEREGISTER=y - CONFIG_SYS_PROMPT="Tegra210 (P3450-0000) # " --- -2.20.1 - diff --git a/tegra186-jetson-tx2-disable-onboard-emmc.patch b/tegra186-jetson-tx2-disable-onboard-emmc.patch deleted file mode 100644 index d31a6df..0000000 --- a/tegra186-jetson-tx2-disable-onboard-emmc.patch +++ /dev/null @@ -1,52 +0,0 @@ -From dbe4dff86520a1373076563d1bee5ada1d7fd7c5 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Thu, 26 Apr 2018 16:56:54 +0100 -Subject: [PATCH] tegra186: jetson-tx2: disable onboard emmc - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/tegra186-p2771-0000.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/dts/tegra186-p2771-0000.dtsi b/arch/arm/dts/tegra186-p2771-0000.dtsi -index a1319dc493..e220f086ee 100644 ---- a/arch/arm/dts/tegra186-p2771-0000.dtsi -+++ b/arch/arm/dts/tegra186-p2771-0000.dtsi -@@ -53,7 +53,7 @@ - }; - - sdhci@3460000 { -- status = "okay"; -+ status = "disabled"; - bus-width = <8>; - non-removable; - }; --- -2.17.0 - -From 7bba3cc32c8b8b5d3688c42a803768761df0a23f Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 1 Aug 2018 11:47:56 +0100 -Subject: [PATCH] tegra210: Jetson TX1: disable onboard emmc - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/tegra210-p2371-2180.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts -index da4349bd039..87ce030e701 100644 ---- a/arch/arm/dts/tegra210-p2371-2180.dts -+++ b/arch/arm/dts/tegra210-p2371-2180.dts -@@ -80,7 +80,7 @@ - }; - - sdhci@700b0600 { -- status = "okay"; -+ status = "disabled"; - bus-width = <8>; - non-removable; - }; --- -2.17.1 - diff --git a/ti-am335x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch b/ti-am335x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch deleted file mode 100644 index 8415e8f..0000000 --- a/ti-am335x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch +++ /dev/null @@ -1,183 +0,0 @@ -From patchwork Tue Mar 19 11:19:21 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [U-Boot] ti: am335x_evm: Enable CONFIG_SPL_OF_CONTROL -X-Patchwork-Submitter: Tom Rini -X-Patchwork-Id: 1058350 -X-Patchwork-Delegate: trini@ti.com -Message-Id: <1552994361-32058-1-git-send-email-trini@konsulko.com> -To: u-boot@lists.denx.de -Date: Tue, 19 Mar 2019 07:19:21 -0400 -From: Tom Rini -List-Id: U-Boot discussion - -Enable support for SPL_OF_CONTROL on this platform. That means doing a -few things: -- Add u-boot,dm-pre-reloc to a number of nodes -- Drop static platdata in the board file. -- A lot of tweaks to the defconfig. We remove some things such as - SPL_USE_ARCH_MEMCPY/SET for space. Increase our malloc len. -- Drop, for now at least, USB SPL support as it's causing a hang. - -Cc: Faiz Abbas -Cc: Lokesh Vutla -Signed-off-by: Tom Rini ---- - arch/arm/dts/am335x-evm-u-boot.dtsi | 45 +++++++++++++++++++++++++++++++++++-- - board/ti/am335x/board.c | 30 ------------------------- - configs/am335x_evm_defconfig | 14 ++++++++---- - 3 files changed, 53 insertions(+), 36 deletions(-) - -diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi -index b6b97ed16d91..16a9f855ad1f 100644 ---- a/arch/arm/dts/am335x-evm-u-boot.dtsi -+++ b/arch/arm/dts/am335x-evm-u-boot.dtsi -@@ -3,11 +3,52 @@ - * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ - */ - -+#include "am33xx-u-boot.dtsi" - --&mmc3 { -- status = "disabled"; -+&l4_wkup { -+ u-boot,dm-pre-reloc; -+}; -+ -+&scm { -+ u-boot,dm-pre-reloc; -+}; -+ -+&am33xx_pinmux { -+ u-boot,dm-pre-reloc; -+}; -+ -+&uart0_pins { -+ u-boot,dm-pre-reloc; -+}; -+ -+&uart0 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&gpio0 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&i2c0 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&i2c0_pins { -+ u-boot,dm-pre-reloc; - }; - - &usb0 { - dr_mode = "peripheral"; - }; -+ -+&mmc1 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&mmc1_pins { -+ u-boot,dm-pre-reloc; -+}; -+ -+&mmc3 { -+ status = "disabled"; -+}; -diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c -index d67f94ad47ba..bfad1a75a456 100644 ---- a/board/ti/am335x/board.c -+++ b/board/ti/am335x/board.c -@@ -1054,33 +1054,3 @@ void board_fit_image_post_process(void **p_image, size_t *p_size) - secure_boot_verify_image(p_image, p_size); - } - #endif -- --#if !CONFIG_IS_ENABLED(OF_CONTROL) --static const struct omap_hsmmc_plat am335x_mmc0_platdata = { -- .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE, -- .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT, -- .cfg.f_min = 400000, -- .cfg.f_max = 52000000, -- .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195, -- .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, --}; -- --U_BOOT_DEVICE(am335x_mmc0) = { -- .name = "omap_hsmmc", -- .platdata = &am335x_mmc0_platdata, --}; -- --static const struct omap_hsmmc_plat am335x_mmc1_platdata = { -- .base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE, -- .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_8BIT, -- .cfg.f_min = 400000, -- .cfg.f_max = 52000000, -- .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195, -- .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, --}; -- --U_BOOT_DEVICE(am335x_mmc1) = { -- .name = "omap_hsmmc", -- .platdata = &am335x_mmc1_platdata, --}; --#endif -diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig -index 924116835251..dd690dcb495c 100644 ---- a/configs/am335x_evm_defconfig -+++ b/configs/am335x_evm_defconfig -@@ -1,23 +1,26 @@ - CONFIG_ARM=y -+# CONFIG_SPL_USE_ARCH_MEMCPY is not set -+# CONFIG_SPL_USE_ARCH_MEMSET is not set - CONFIG_ARCH_OMAP2PLUS=y - CONFIG_TI_COMMON_CMD_OPTIONS=y -+CONFIG_SYS_MALLOC_F_LEN=0x4000 - CONFIG_AM33XX=y -+CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000 - CONFIG_SPL=y - CONFIG_DISTRO_DEFAULTS=y -+CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000 - CONFIG_SPL_LOAD_FIT=y - CONFIG_OF_BOARD_SETUP=y - CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" -+CONFIG_LOGLEVEL=3 - CONFIG_SYS_CONSOLE_INFO_QUIET=y - CONFIG_VERSION_VARIABLE=y - CONFIG_ARCH_MISC_INIT=y - # CONFIG_SPL_FS_EXT4 is not set - CONFIG_SPL_MTD_SUPPORT=y --CONFIG_SPL_MUSB_NEW_SUPPORT=y - CONFIG_SPL_NET_SUPPORT=y - CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL" - CONFIG_SPL_OS_BOOT=y --CONFIG_SPL_USB_GADGET=y --CONFIG_SPL_USB_ETHER=y - CONFIG_CMD_SPL=y - CONFIG_CMD_SPL_NAND_OFS=0x00080000 - # CONFIG_CMD_FLASH is not set -@@ -28,10 +31,12 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0" - CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" - # CONFIG_SPL_EFI_PARTITION is not set - CONFIG_OF_CONTROL=y -+CONFIG_SPL_OF_CONTROL=y - CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" - CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" -+CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" - CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y --# CONFIG_BLK is not set -+CONFIG_SPL_OF_TRANSLATE=y - CONFIG_BOOTCOUNT_LIMIT=y - CONFIG_DFU_MMC=y - CONFIG_DFU_NAND=y -@@ -68,5 +73,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 - CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 - CONFIG_USB_ETHER=y - CONFIG_DYNAMIC_CRC_TABLE=y -+CONFIG_SPL_TINY_MEMSET=y - CONFIG_RSA=y - CONFIG_LZO=y diff --git a/uboot-tools.spec b/uboot-tools.spec index 571528f..06c2634 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc4 +#global candidate rc4 Name: uboot-tools Version: 2019.07 -Release: 0.2%{?candidate:.%{candidate}}%{?dist} +Release: 1%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -26,7 +26,8 @@ Patch6: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch Patch7: dragonboard-fixes.patch Patch8: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch Patch9: arm-tegra-defaine-fdtfile-for-all-devices.patch -Patch10: 0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch +Patch10: rockchip-rk3399-Fix-USB3-support.patch +Patch11: rockchip-rock960.patch BuildRequires: bc BuildRequires: dtc @@ -120,6 +121,11 @@ do echo "Board: $board using sun50i_h6" cp /usr/share/arm-trusted-firmware/sun50i_h6/* builds/$(echo $board)/ fi + rk3328=(rock64-rk3328) + if [[ " ${rk3328[*]} " == *" $board "* ]]; then + echo "Board: $board using rk3328" + cp /usr/share/arm-trusted-firmware/rk3328/* builds/$(echo $board)/ + fi rk3399=(evb-rk3399 ficus-rk3399 firefly-rk3399 nanopc-t4-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 orangepi-rk3399 orangepi-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4-rk3399 rockpro64-rk3399) if [[ " ${rk3399[*]} " == *" $board "* ]]; then echo "Board: $board using rk3399" @@ -128,10 +134,8 @@ do # End ATF make $(echo $board)_defconfig O=builds/$(echo $board)/ make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/$(echo $board)/ - rk33xx=(evb-rk3399 ficus-rk3399 firefly-rk3399 nanopc-t4-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 orangepi-rk3399 orangepi-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4-rk3399 rockpro64-rk3399) - if [[ " ${rk33xx[*]} " == *" $board "* ]]; then - echo "Board: $board using rk33xx" - make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" u-boot.itb V=1 O=builds/$(echo $board)/ + if [[ " ${rk3399[*]} " == *" $board "* ]]; then + echo "Board: $board using rk3399" builds/$(echo $board)/tools/mkimage -n rk3399 -T rksd -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_sd.img builds/$(echo $board)/tools/mkimage -n rk3399 -T rkspi -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_spi.img fi @@ -259,6 +263,11 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Mon Jul 8 2019 Peter Robinson 2019.07-1 +- 2019.07 +- Enable Rock64 +- Rock960 enhancements + * Fri Jun 28 2019 Peter Robinson 2019.07-0.2-rc4 - Fix build with explicit python2 - Drop a couple of unused boards