From f2e16593da2af10ae34d6852745d8ff664311380 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 9 Jul 2019 00:18:59 +0100 Subject: [PATCH 1/5] 2019.07, Rock64, Rock960 enhancements, cleanups --- ...k3288-disable-CONFIG_SPL_I2C_SUPPORT.patch | 34 - aarch64-boards | 1 + mvebu-enable-generic-distro-boot-config.patch | 111 --- mx6-utilite-distro-boot.patch | 154 ---- rockchip-rk3399-Fix-USB3-support.patch | 415 +++++++++ rockchip-rock960.patch | 799 ++++++++++++++++++ sources | 2 +- ...-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch | 64 -- ...a186-jetson-tx2-disable-onboard-emmc.patch | 52 -- ...35x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch | 183 ---- uboot-tools.spec | 23 +- 11 files changed, 1232 insertions(+), 606 deletions(-) delete mode 100644 0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch delete mode 100644 mvebu-enable-generic-distro-boot-config.patch delete mode 100644 mx6-utilite-distro-boot.patch create mode 100644 rockchip-rk3399-Fix-USB3-support.patch create mode 100644 rockchip-rock960.patch delete mode 100644 tegra-TX-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch delete mode 100644 tegra186-jetson-tx2-disable-onboard-emmc.patch delete mode 100644 ti-am335x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch 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 From 0b3a57d4744a5031115ac161b2680d5314b21b5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:16:46 +0000 Subject: [PATCH 2/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uboot-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uboot-tools.spec b/uboot-tools.spec index 06c2634..3ce8149 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2019.07 -Release: 1%{?candidate:.%{candidate}}%{?dist} +Release: 2%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -263,6 +263,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2019.07-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jul 8 2019 Peter Robinson 2019.07-1 - 2019.07 - Enable Rock64 From f215defee6ed2b8d62bae9a7a34810aaccc4f0b6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 4 Aug 2019 20:35:49 +0100 Subject: [PATCH 3/5] Rock960 fix, Iniital Raspberry Pi 4 support --- Raspberry-Pi-32-64-support.patch | 1155 +++++++++++++++++ aarch64-boards | 1 + arm-boards | 1 + ...ble-booting-from-eMMC-when-using-SPL.patch | 262 ++++ uboot-tools.spec | 8 +- 5 files changed, 1426 insertions(+), 1 deletion(-) create mode 100644 Raspberry-Pi-32-64-support.patch create mode 100644 rock960-Enable-booting-from-eMMC-when-using-SPL.patch diff --git a/Raspberry-Pi-32-64-support.patch b/Raspberry-Pi-32-64-support.patch new file mode 100644 index 0000000..38a094f --- /dev/null +++ b/Raspberry-Pi-32-64-support.patch @@ -0,0 +1,1155 @@ +From patchwork Wed Jul 24 14:39:04 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136358 +X-Patchwork-Delegate: matthias.bgg@gmail.com +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=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyhH0gbgz9s8m + for ; + Thu, 25 Jul 2019 00:41:03 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 92844C21D9A; Wed, 24 Jul 2019 14:39:46 +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.8 required=5.0 tests=UPPERCASE_50_75 autolearn=no + autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 882B5C21D72; + Wed, 24 Jul 2019 14:39:40 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 7C7EBC21C27; Wed, 24 Jul 2019 14:39:35 +0000 (UTC) +Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com + [209.85.221.65]) + by lists.denx.de (Postfix) with ESMTPS id 2B1D6C21BE5 + for ; Wed, 24 Jul 2019 14:39:35 +0000 (UTC) +Received: by mail-wr1-f65.google.com with SMTP id x1so32293472wrr.9 + for ; Wed, 24 Jul 2019 07:39:35 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=8Z82pQdbffuUA8JpsYMwwHCjbZBONEoOwfFh2hjslOs=; + b=rJPUcmpkh37qDajtL1440DjXD+gxop4QeK685/B+RpJIrTVrBVPe9Z8ahOzM4t6MfA + R9KYo3KoDOOvp0dm6Ovih0rgEVLjUL9K+/tzqQi9Y3YbflK/VRA7WUuzKWq7o/732qqh + CLtDHeYCaaAepsl6TzeXSndNd74QoJJFlMtFUf2kDHV3ERIqIDvRd2LI1144GMTFOBjj + gkZr28fm0BVQPbHVN9p7mZ4vXcKUf2I2Wkje7P6EN6IJTrIcKZvcT2IpnzvsEdbPJ14r + 1JkPI3Bg7pf7iTVAcHDhZ0HWOxnuRuB3KzmC0WkOgYIWpjgUGdNCIys1VHusa8JGUmtz + X/OQ== +X-Gm-Message-State: APjAAAV4zaznNtIjQJuMF7dLBX4DR9QvnvmUcRzNftXStiuRuXXWnXS1 + MP7oLCr936klnQUkQAkOlyr/cP0s +X-Google-Smtp-Source: APXvYqxJiPSQ9vd5GlT71/+cluS1CRb303VcbpLDq5FS1UdhoChDRrXDGMI6wz5akinycJIMwNQZrg== +X-Received: by 2002:adf:f3d1:: with SMTP id g17mr58097903wrp.38.1563979174441; + Wed, 24 Jul 2019 07:39:34 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.33 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:34 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:04 +0100 +Message-Id: <20190724143911.29770-2-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 1/8] RPI: Add defconfigs for rpi4 (32/64) +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" + +This defines a minimum defconfig for each of the two Raspberry Pi 4 +variants. One notable difference is that we don't have a embedded dt for +this board given that the fw supplies us with one which we can reuse. +Furthermore, the ram size is not queryable through mbox interface as the +maximum reported size is 1G. The fw patches the dt with the right +memory configuration and uboot uses it as it is. We avoid u-boot +touching this configuration by making sure CONFIG_ARCH_FIXUP_FDT_MEMORY +is deactivated. + +Signed-off-by: Andrei Gherzan +--- + configs/rpi_4_32b_defconfig | 33 +++++++++++++++++++++++++++++++++ + configs/rpi_4_defconfig | 33 +++++++++++++++++++++++++++++++++ + 2 files changed, 66 insertions(+) + create mode 100644 configs/rpi_4_32b_defconfig + create mode 100644 configs/rpi_4_defconfig + +diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig +new file mode 100644 +index 0000000000..a31a617a5f +--- /dev/null ++++ b/configs/rpi_4_32b_defconfig +@@ -0,0 +1,33 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_BCM283X=y ++CONFIG_SYS_TEXT_BASE=0x00008000 ++CONFIG_TARGET_RPI_4_32B=y ++CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_DISTRO_DEFAULTS=y ++CONFIG_NR_DRAM_BANKS=1 ++# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set ++CONFIG_OF_BOARD=y ++CONFIG_OF_BOARD_SETUP=y ++CONFIG_MISC_INIT_R=y ++# CONFIG_DISPLAY_CPUINFO is not set ++# CONFIG_DISPLAY_BOARDINFO is not set ++CONFIG_SYS_PROMPT="U-Boot> " ++# CONFIG_CMD_FLASH is not set ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_FS_UUID=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y ++CONFIG_DM_KEYBOARD=y ++CONFIG_DM_MMC=y ++CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_BCM2835=y ++CONFIG_PINCTRL=y ++# CONFIG_PINCTRL_GENERIC is not set ++# CONFIG_REQUIRE_SERIAL_CONSOLE is not set ++CONFIG_DM_VIDEO=y ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_CONSOLE_SCROLL_LINES=10 ++CONFIG_PHYS_TO_BUS=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig +new file mode 100644 +index 0000000000..da8c960a2a +--- /dev/null ++++ b/configs/rpi_4_defconfig +@@ -0,0 +1,33 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_BCM283X=y ++CONFIG_SYS_TEXT_BASE=0x00080000 ++CONFIG_TARGET_RPI_4=y ++CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_DISTRO_DEFAULTS=y ++CONFIG_NR_DRAM_BANKS=1 ++# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set ++CONFIG_OF_BOARD=y ++CONFIG_OF_BOARD_SETUP=y ++CONFIG_MISC_INIT_R=y ++# CONFIG_DISPLAY_CPUINFO is not set ++# CONFIG_DISPLAY_BOARDINFO is not set ++CONFIG_SYS_PROMPT="U-Boot> " ++# CONFIG_CMD_FLASH is not set ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_FS_UUID=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y ++CONFIG_DM_KEYBOARD=y ++CONFIG_DM_MMC=y ++CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_BCM2835=y ++CONFIG_PINCTRL=y ++# CONFIG_PINCTRL_GENERIC is not set ++# CONFIG_REQUIRE_SERIAL_CONSOLE is not set ++CONFIG_DM_VIDEO=y ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_CONSOLE_SCROLL_LINES=10 ++CONFIG_PHYS_TO_BUS=y ++CONFIG_OF_LIBFDT_OVERLAY=y + +From patchwork Wed Jul 24 14:39:05 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136357 +X-Patchwork-Delegate: matthias.bgg@gmail.com +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=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tygm6ldWz9s3l + for ; + Thu, 25 Jul 2019 00:40:36 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 9DA33C21CB6; Wed, 24 Jul 2019 14:39:59 +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=RCVD_IN_MSPIKE_H2 + 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 17CAEC21D8E; + Wed, 24 Jul 2019 14:39:47 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 82DD4C21CB6; Wed, 24 Jul 2019 14:39:36 +0000 (UTC) +Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com + [209.85.221.67]) + by lists.denx.de (Postfix) with ESMTPS id 01AFFC21BE5 + for ; Wed, 24 Jul 2019 14:39:36 +0000 (UTC) +Received: by mail-wr1-f67.google.com with SMTP id 31so47328827wrm.1 + for ; Wed, 24 Jul 2019 07:39:36 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=SBRknuqaA8nrsEqGUKyxns0jOTIIj2fE4uzSYMyIGew=; + b=PM1drqcqaap81ZOvnmAJY7X232GJ1xovWSwf0Gfii33S1JHlV0lXbcT6pHy/MY5C1Y + GVqDd9jEF6nKvHAGx2xHd2df1KTAaYpuxqmmo89okoq1FQ80/gwzWj+AZJ/AsoZHiR0W + Jo/QZmK8NjcG9xVEPkdvq2kYg7V7FGrTQgKFCn8y4tSk6rdFXH6x71luCFr9GTiHqmes + XE5UGqaitR84yV9d5U4NL8pNnZbhtyxT8YYgkRyRbtOTwYi44C0XYsVwHP4G8DSjMjeE + 5jdjVUB8rmMki3Bqtj5aGkS0F+k/RvLiQPKbkssavqHl24M4ohWNlZ4fI9VXzg+4DJjZ + aT7g== +X-Gm-Message-State: APjAAAXvh2LHWYIbEeX1TSDzEtnms+hdW6mVhDH8RRCsABLlzzPSCiUf + 8um70SOfA7+T6IFVzjiHE/2q21x6 +X-Google-Smtp-Source: APXvYqzpQ+14M+bTmm58qDfrEm+q5psg5hqSSHCmXarzdL9SPFCPF5TlXBFq2NrJt8Zn5k7Cm+vgzQ== +X-Received: by 2002:adf:e444:: with SMTP id t4mr83713613wrm.262.1563979175247; + Wed, 24 Jul 2019 07:39:35 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.34 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:34 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:05 +0100 +Message-Id: <20190724143911.29770-3-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 2/8] ARM: bcm283x: Add BCM283x_BASE define +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" + +From: Matthias Brugger + +Devices of bcm283x have different base address, depending if they are on +bcm2835 or bcm2836/7. Use BCM283x_BASE depending on the SoC you want to +build and only add the offset in the header files. + +Signed-off-by: Matthias Brugger +Signed-off-by: Andrei Gherzan +--- + arch/arm/mach-bcm283x/Kconfig | 5 +++++ + arch/arm/mach-bcm283x/include/mach/mbox.h | 6 +----- + arch/arm/mach-bcm283x/include/mach/sdhci.h | 6 +----- + arch/arm/mach-bcm283x/include/mach/timer.h | 6 +----- + arch/arm/mach-bcm283x/include/mach/wdog.h | 6 +----- + 5 files changed, 9 insertions(+), 20 deletions(-) + +diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig +index 3eb5a9a897..8e69914a83 100644 +--- a/arch/arm/mach-bcm283x/Kconfig ++++ b/arch/arm/mach-bcm283x/Kconfig +@@ -141,4 +141,9 @@ config SYS_SOC + config SYS_CONFIG_NAME + default "rpi" + ++config BCM283x_BASE ++ hex ++ default "0x20000000" if BCM2835 ++ default "0x3f000000" if BCM2836 || BCM2837 ++ + endmenu +diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h +index e3a893e49c..e44c7577da 100644 +--- a/arch/arm/mach-bcm283x/include/mach/mbox.h ++++ b/arch/arm/mach-bcm283x/include/mach/mbox.h +@@ -37,11 +37,7 @@ + + /* Raw mailbox HW */ + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_MBOX_PHYSADDR 0x3f00b880 +-#else +-#define BCM2835_MBOX_PHYSADDR 0x2000b880 +-#endif ++#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) + + struct bcm2835_mbox_regs { + u32 read; +diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h +index 5cb6ec3340..b443c379d8 100644 +--- a/arch/arm/mach-bcm283x/include/mach/sdhci.h ++++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h +@@ -6,11 +6,7 @@ + #ifndef _BCM2835_SDHCI_H_ + #define _BCM2835_SDHCI_H_ + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_SDHCI_BASE 0x3f300000 +-#else +-#define BCM2835_SDHCI_BASE 0x20300000 +-#endif ++#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) + + int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); + +diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h +index 56b0c356bb..014355e759 100644 +--- a/arch/arm/mach-bcm283x/include/mach/timer.h ++++ b/arch/arm/mach-bcm283x/include/mach/timer.h +@@ -6,11 +6,7 @@ + #ifndef _BCM2835_TIMER_H + #define _BCM2835_TIMER_H + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_TIMER_PHYSADDR 0x3f003000 +-#else +-#define BCM2835_TIMER_PHYSADDR 0x20003000 +-#endif ++#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) + + #define BCM2835_TIMER_CS_M3 (1 << 3) + #define BCM2835_TIMER_CS_M2 (1 << 2) +diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h +index 99c88e5df7..8292b3cf1f 100644 +--- a/arch/arm/mach-bcm283x/include/mach/wdog.h ++++ b/arch/arm/mach-bcm283x/include/mach/wdog.h +@@ -6,11 +6,7 @@ + #ifndef _BCM2835_WDOG_H + #define _BCM2835_WDOG_H + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_WDOG_PHYSADDR 0x3f100000 +-#else +-#define BCM2835_WDOG_PHYSADDR 0x20100000 +-#endif ++#define BCM2835_WDOG_PHYSADDR (CONFIG_BCM283x_BASE + 0x00100000) + + struct bcm2835_wdog_regs { + u32 unknown0[7]; + +From patchwork Wed Jul 24 14:39:06 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136372 +X-Patchwork-Delegate: matthias.bgg@gmail.com +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=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyl70FC2z9s3l + for ; + Thu, 25 Jul 2019 00:43:30 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id A8034C21DF3; Wed, 24 Jul 2019 14:40:46 +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=RCVD_IN_MSPIKE_H2 + 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 4C777C21DCA; + Wed, 24 Jul 2019 14:40:10 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 474FDC21D74; Wed, 24 Jul 2019 14:39:39 +0000 (UTC) +Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com + [209.85.128.68]) + by lists.denx.de (Postfix) with ESMTPS id 55C9DC21D4A + for ; Wed, 24 Jul 2019 14:39:37 +0000 (UTC) +Received: by mail-wm1-f68.google.com with SMTP id s15so20507009wmj.3 + for ; Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=pWvZ588J48xOgvZOVW9fhkWibsiRtNBVuM4VBynrLQw=; + b=Am1Me0M/J3HedD2FzOBBvEpBhsNfG5psGW0Lap+uSDun9LynEo+RqAgmLAAp3KtUFD + vUkieSMQZAjAIyzy8ySvUjuVA8iEUPN8wbo55HZ+3X5HfhgsbMwu70KZDA9UBw1T4v6V + CE1pyL9enGgcwdDiTcXztZo57iM/vq1B6HilY8J27ZJFb9fJNH4L7IxE4O/febLJ4ljc + micbK/014Ibg6DqlmHbBh4akENSDlXOrQLqMC8FdK0lsJIP7EH9Xqc6MubvgCzyhvS89 + xPFsmuRVAZVvpnQ6+mcSidfeiyYCMXh2IE8wgKExlyysSAjkZPC8Z+1H2qOnvOz+XEjX + GVrg== +X-Gm-Message-State: APjAAAVcUgx+4UkyQKJDr3/tCu0zV2vBZk5reX2ukIrxHlkjQSBTYuSa + Napy/FHrIjVsWObEdv0xTsrwwqT8 +X-Google-Smtp-Source: APXvYqz1dOMBUWbTH/jK138AvmFcmCjdMc9s6oLE6NbSPeUiM4M0S3istSFU+IBlBRGqC2zlitzAQg== +X-Received: by 2002:a7b:cc86:: with SMTP id p6mr69114900wma.123.1563979176511; + Wed, 24 Jul 2019 07:39:36 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.35 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:35 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:06 +0100 +Message-Id: <20190724143911.29770-4-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 3/8] ARM: bcm283x: Define configs for RaspberryPi 4 +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" + +Define two target configs for Raspberry Pi 4 (32 and 64bit) and the +corresponding BCM2838* configs. + +Be aware of the current limitation in firmware which requires an +explicit configuration to force the arm in 64bit mode when the +respective target is used. + +Signed-off-by: Andrei Gherzan +Signed-off-by: Matthias Brugger +--- + arch/arm/mach-bcm283x/Kconfig | 62 +++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + +diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig +index 8e69914a83..09a5b42bbb 100644 +--- a/arch/arm/mach-bcm283x/Kconfig ++++ b/arch/arm/mach-bcm283x/Kconfig +@@ -26,6 +26,23 @@ config BCM2837_64B + select BCM2837 + select ARM64 + ++config BCM2838 ++ bool "Broadcom BCM2838 SoC support" ++ depends on ARCH_BCM283X ++ ++config BCM2838_32B ++ bool "Broadcom BCM2838 SoC 32-bit support" ++ depends on ARCH_BCM283X ++ select BCM2838 ++ select ARMV7_LPAE ++ select CPU_V7A ++ ++config BCM2838_64B ++ bool "Broadcom BCM2838 SoC 64-bit support" ++ depends on ARCH_BCM283X ++ select BCM2838 ++ select ARM64 ++ + menu "Broadcom BCM283X family" + depends on ARCH_BCM283X + +@@ -127,6 +144,50 @@ config TARGET_RPI_3 + This option creates a build targeting the ARMv8/AArch64 ISA. + select BCM2837_64B + ++config TARGET_RPI_4_32B ++ bool "Raspberry Pi 4 32-bit build" ++ help ++ Support for all BCM2838-based Raspberry Pi variants, such as ++ the RPi 4 model B, in AArch32 (32-bit) mode. ++ ++ This option assumes the VideoCore firmware is configured to use the ++ mini UART (rather than PL011) for the serial console. This is the ++ default on the RPi 4. To enable the UART console, the following non- ++ default option must be present in config.txt: enable_uart=1. This is ++ required for U-Boot to operate correctly, even if you only care ++ about the HDMI/usbkbd console. ++ ++ Due to hardware incompatibilities, this can't be used with ++ BCM283/5/6/7. ++ ++ This option creates a build targeting the ARMv7/AArch32 ISA. ++ select BCM2838_32B ++ ++config TARGET_RPI_4 ++ bool "Raspberry Pi 4 64-bit build" ++ help ++ Support for all BCM2838-based Raspberry Pi variants, such as ++ the RPi 4 model B, in AArch64 (64-bit) mode. ++ ++ This option assumes the VideoCore firmware is configured to use the ++ mini UART (rather than PL011) for the serial console. This is the ++ default on the RPi 4. To enable the UART console, the following non- ++ default option must be present in config.txt: enable_uart=1. This is ++ required for U-Boot to operate correctly, even if you only care ++ about the HDMI/usbkbd console. ++ ++ Due to hardware incompatibilities, this can't be used with ++ BCM283/5/6/7. ++ ++ Also, due to a bug in firmware, switching to 64bit mode doesn't ++ happen automatically based on the kernel's image filename. See ++ https://github.com/raspberrypi/firmware/issues/1193 for more details. ++ Until that is resolved, the configuration (config.txt) needs to ++ explicitly set: arm_64bit=1. ++ ++ This option creates a build targeting the ARMv8/AArch64 ISA. ++ select BCM2838_64B ++ + endchoice + + config SYS_BOARD +@@ -145,5 +206,6 @@ config BCM283x_BASE + hex + default "0x20000000" if BCM2835 + default "0x3f000000" if BCM2836 || BCM2837 ++ default "0xfe000000" if BCM2838 + + endmenu + +From patchwork Wed Jul 24 14:39:07 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136366 +X-Patchwork-Delegate: matthias.bgg@gmail.com +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=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyjX1rBvz9s3l + for ; + Thu, 25 Jul 2019 00:42:08 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id F1D99C21CB6; Wed, 24 Jul 2019 14:40:11 +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=RCVD_IN_MSPIKE_H2 + 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 937A0C21D65; + Wed, 24 Jul 2019 14:39:51 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 748BCC21C2F; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) +Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com + [209.85.128.68]) + by lists.denx.de (Postfix) with ESMTPS id CE175C21C29 + for ; Wed, 24 Jul 2019 14:39:37 +0000 (UTC) +Received: by mail-wm1-f68.google.com with SMTP id a15so42072601wmj.5 + for ; Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=u/X0NAp+r55Bugx2HDgeaVfXBeYCSiyWcV7zL0w2yXE=; + b=meBOAW1SzAbuPxzp+nYt716FpccdfeH1Xh3xWr+zMzkGW0O6P+hkYAjOsYmnzj/5rX + WNazbP1wNvSVBowPChoHa1zwn2I8PhxW9EDSfNkECgfLCYdPettoGRQ94zsUSZAkp4dD + FJkwXFsPDQX4UoFpLxN7fhbkYqdcezpK7kv2ijiYnQR9z/RfadD4yVQHLYt+M6UsmWph + FjXmBWf8Dqj0HniyCpAFBQclBp2LF6Cf3teLv0SKjJfkyJnfnB2D26Sig1t5Z1JIRw8h + +2J1FXpChqug7KpnKuQNHWz1P/yhSY/b+dPHkLABO1yCQ9N5+IvUCw+KXXd8o3RtpwuS + UnjA== +X-Gm-Message-State: APjAAAULyjSTt+VemoBBXMausXImPmWbP6ymxMkyPmdzjRXNS/pvDSjw + SvFvIJXwqw2UxgfJbVQsZf3L04kE +X-Google-Smtp-Source: APXvYqwDVdWVyjv8DnkgBTqEwcrcxXXF1Xof6TjgZnG7RMtXzWC3l2a8f4Awp1bVLNcspHnduMBWqg== +X-Received: by 2002:a1c:a909:: with SMTP id s9mr74064408wme.20.1563979177108; + Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.36 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:36 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:07 +0100 +Message-Id: <20190724143911.29770-5-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 4/8] RPI: Add entry for Raspberry Pi 4 model B +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 Raspebrry Pi 4 uses the new revision code scheme as documented by +the foundation. This change adds an entry for this board as well. + +Signed-off-by: Andrei Gherzan +--- + board/raspberrypi/rpi/rpi.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c +index 617c892dde..6d6f1ef39a 100644 +--- a/board/raspberrypi/rpi/rpi.c ++++ b/board/raspberrypi/rpi/rpi.c +@@ -148,6 +148,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { + DTB_DIR "bcm2837-rpi-cm3.dtb", + false, + }, ++ [0x11] = { ++ "4 Model B", ++ DTB_DIR "bcm2711-rpi-4-b.dtb", ++ true, ++ }, + }; + + static const struct rpi_model rpi_models_old_scheme[] = { + +From patchwork Wed Jul 24 14:39:08 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136373 +X-Patchwork-Delegate: matthias.bgg@gmail.com +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=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyl91yqVz9s3l + for ; + Thu, 25 Jul 2019 00:43:33 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 0991BC21D74; Wed, 24 Jul 2019 14:40:59 +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 118D3C21D8E; + Wed, 24 Jul 2019 14:40:25 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 3020BC21DA2; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) +Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com + [209.85.221.65]) + by lists.denx.de (Postfix) with ESMTPS id 9468EC21C4A + for ; Wed, 24 Jul 2019 14:39:38 +0000 (UTC) +Received: by mail-wr1-f65.google.com with SMTP id r1so47270575wrl.7 + for ; Wed, 24 Jul 2019 07:39:38 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=INTj2ZkmrgCvQnwXSkRkNgGGyv8wKd+4Dp1WiNdZg9A=; + b=Q12tNYAAjgCy4zkzIOEnY6VGsX14oy+bwAD75RZPvG/KwLZEgoIWaH67glrnxVMKCW + lnIUiim0jTu+lUQws/OaHw3Nl55HUaXoZMrKZ50vANqXzk0brozRNLBsZTBmFZGlyrP4 + 1ftizkEJMJr74KxyuZBbSHmN5gMxoEH/r6V8DZ1b8dH5RXr0J4hEuoeDiKT26fxfOpMk + dLXJd/Mx/4t6AVkcdVJIs3jdcw4neuiDThpHeLeNiuZgKEIOy7HHs+Zfz4iTRmu5IrHK + LwIYdSl6UeGnJNPE595PyB1HtUzUwEoUWuyzP062TGzGxfEvMjnFJ5bzm/dV9sOSNBtx + 308g== +X-Gm-Message-State: APjAAAUR5WDXsRNKCCMKSHatakaD4J0JzmZMzF3dOkiIj5/vqS01j3nF + 6aVr6nFQUuBmYJrMYEjaAwJqc6dm +X-Google-Smtp-Source: APXvYqwd9TOCUBNszoD7ZZhvAYwth50GqOLaqpKiC/HlGaXndFYzgPMhMhFr3nL9Gf6MfsBZ5Sho3Q== +X-Received: by 2002:adf:eb0f:: with SMTP id + s15mr12285481wrn.324.1563979177934; + Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.37 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:08 +0100 +Message-Id: <20190724143911.29770-6-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 5/8] ARM: bcm283x: Include definition for + additional emmc clock +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" + +This clock has a different mbox ID so have this included in the relevant +header file. + +Signed-off-by: Andrei Gherzan +--- + arch/arm/mach-bcm283x/include/mach/mbox.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h +index e44c7577da..f2a98acddd 100644 +--- a/arch/arm/mach-bcm283x/include/mach/mbox.h ++++ b/arch/arm/mach-bcm283x/include/mach/mbox.h +@@ -230,6 +230,7 @@ struct bcm2835_mbox_tag_set_power_state { + #define BCM2835_MBOX_CLOCK_ID_SDRAM 8 + #define BCM2835_MBOX_CLOCK_ID_PIXEL 9 + #define BCM2835_MBOX_CLOCK_ID_PWM 10 ++#define BCM2835_MBOX_CLOCK_ID_EMMC2 12 + + struct bcm2835_mbox_tag_get_clock_rate { + struct bcm2835_mbox_tag_hdr tag_hdr; + +From patchwork Wed Jul 24 14:39:09 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136365 +X-Patchwork-Delegate: matthias.bgg@gmail.com +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=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyjV5JXbz9sBF + for ; + Thu, 25 Jul 2019 00:42:06 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 77213C21C27; Wed, 24 Jul 2019 14:40:36 +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=RCVD_IN_MSPIKE_H2 + 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 A24EDC21DB5; + Wed, 24 Jul 2019 14:40:00 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 4193AC21C2F; Wed, 24 Jul 2019 14:39:42 +0000 (UTC) +Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com + [209.85.221.68]) + by lists.denx.de (Postfix) with ESMTPS id AE825C21D4A + for ; Wed, 24 Jul 2019 14:39:39 +0000 (UTC) +Received: by mail-wr1-f68.google.com with SMTP id 31so47329072wrm.1 + for ; Wed, 24 Jul 2019 07:39:39 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=fpnN0uOMvR4DjRJfxVux4tdvICr5Rjygmvsk8TlIvnA=; + b=MQVZ2YY2EKhWHLLaavQarKM51ls7jOHZ7N8mWZpNRCJNQtRJfYkVDlHw5vbIV2dFXF + W6qAp6fnL+fb9/RHiw786uJCu/L1CZ95P9ksjyGYE62VQLWFE5OxDF2NGkoxZ0HGkqiw + cMAcpX5+Zn+/ZA6Q7OGOz1dZqASEH8mWaPI5TS1afkxMn5E14RKVHN6//bkvXwIpXL7d + 0M7zjoEQGuDlZK3PoRhxESbXrtznvm2PS2xiTdgtH5i9dJ24bbfjQulbBx9EMR++tB8O + e+SLxw9eT3N8XZwF0YD4XJRcFc8kwyiwhKFU2tuNJTC7pIkBSOeLxUUyJGsypxREq54n + 11GA== +X-Gm-Message-State: APjAAAXU6kbWgi4nhW5lhQR6pbZIhBdAkcKNmC1i59gWXdb8lL6dbHqL + Q2Ye3JGmLehlU2z4+7T/uXzHhO+V +X-Google-Smtp-Source: APXvYqyYzkP4kraoV8icuHlxBOcusLrizbOSQSILHq90ieWqGbICGdj7ZQRO5lX7n4DS1rr/nKThUQ== +X-Received: by 2002:adf:ea82:: with SMTP id s2mr82009745wrm.91.1563979179031; + Wed, 24 Jul 2019 07:39:39 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.38 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:38 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:09 +0100 +Message-Id: <20190724143911.29770-7-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 6/8] mmc: bcm283x: Add support for bcm2711 + device in bcm2835_sdhci +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" + +From: Matthias Brugger + +The bcm2711 has two emmc controllers. The difference is the clocks +they use. Add support for the second emmc controller. + +Signed-off-by: Matthias Brugger +Signed-off-by: Andrei Gherzan +--- + drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c +index 08bddd410e..e68dec3be7 100644 +--- a/drivers/mmc/bcm2835_sdhci.c ++++ b/drivers/mmc/bcm2835_sdhci.c +@@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev) + fdt_addr_t base; + int emmc_freq; + int ret; ++ int clock_id = (int)dev_get_driver_data(dev); + + base = devfdt_get_addr(dev); + if (base == FDT_ADDR_T_NONE) + return -EINVAL; + +- ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); ++ ret = bcm2835_get_mmc_clock(clock_id); + if (ret < 0) { + debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); + return ret; +@@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev) + } + + static const struct udevice_id bcm2835_sdhci_match[] = { +- { .compatible = "brcm,bcm2835-sdhci" }, ++ { ++ .compatible = "brcm,bcm2835-sdhci", ++ .data = BCM2835_MBOX_CLOCK_ID_EMMC ++ }, ++ { ++ .compatible = "brcm,bcm2711-emmc2", ++ .data = BCM2835_MBOX_CLOCK_ID_EMMC2 ++ }, + { /* sentinel */ } + }; + + +From patchwork Wed Jul 24 14:39:10 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136369 +X-Patchwork-Delegate: matthias.bgg@gmail.com +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=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyk04V3zz9s3l + for ; + Thu, 25 Jul 2019 00:42:32 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 47E81C21DD3; Wed, 24 Jul 2019 14:41:08 +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=RCVD_IN_MSPIKE_H2 + 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 A7B62C21C93; + Wed, 24 Jul 2019 14:40:30 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 05EE7C21D65; Wed, 24 Jul 2019 14:39:43 +0000 (UTC) +Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com + [209.85.221.67]) + by lists.denx.de (Postfix) with ESMTPS id A0C53C21CB1 + for ; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) +Received: by mail-wr1-f67.google.com with SMTP id p17so47250123wrf.11 + for ; Wed, 24 Jul 2019 07:39:40 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=vke+aeJLlm+hH0ZbApV2tQXwcQSNthXhQrHw3uTUjCY=; + b=fXeMysXcz5ZFzv+beEbqCcjHVfBZuIIVE7p40QdU2ckI7M3z1jdwMCXENGpwnVdMks + H+k4EDysfUSZmD9YGLyX+rFUMPgHEZm7DcxpQGDoT28zXRKo1I/5BQhEm5VHZYudmzLM + A9Juze34OYZ+qop/80ZSAARNy/grkz+9EL0hz+/cGoKbQM2vnYeK9IhqY1MT+Jnjaqeo + Avmh6DcXZN5MtJOGGt7TsXETUzeCZViAJDpgT+lIy8aFAABW4ZHBF6eZtgzd/aNn0dk7 + RJHyQlXxpKIeZGVzZz6kO+VFwHV++awYsZK1wzhqNDvAA0kGbkvgIWc1qOii+4j351tr + FmfA== +X-Gm-Message-State: APjAAAUddD7/P+xcAGZeEeanF39Kb1CjavSwOjql/I604nDwgzGThPdu + QltkJmJtpo31uSwBMKkalJwi1Xg3 +X-Google-Smtp-Source: APXvYqydROkNjRTwQxNzaMfPcjFShYCgunskcjaWkRPeJsf9HRFmaH/uThvtF9xRw5cFaHtr2ixI2w== +X-Received: by 2002:a5d:668e:: with SMTP id + l14mr31747640wru.156.1563979179920; + Wed, 24 Jul 2019 07:39:39 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.39 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:39 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:10 +0100 +Message-Id: <20190724143911.29770-8-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 7/8] RPI: Add memory map for bcm2838 +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" + +Define the memory map for the BCM2838 based on the dt configuration +available in the Raspberry Pi kernel fork. + +Signed-off-by: Andrei Gherzan +--- + board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c +index 6d6f1ef39a..1c4fae9166 100644 +--- a/board/raspberrypi/rpi/rpi.c ++++ b/board/raspberrypi/rpi/rpi.c +@@ -249,7 +249,8 @@ static uint32_t rev_type; + static const struct rpi_model *model; + + #ifdef CONFIG_ARM64 +-static struct mm_region bcm2837_mem_map[] = { ++#ifndef CONFIG_BCM2838 ++static struct mm_region bcm283x_mem_map[] = { + { + .virt = 0x00000000UL, + .phys = 0x00000000UL, +@@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = { + 0, + } + }; +- +-struct mm_region *mem_map = bcm2837_mem_map; ++#else ++static struct mm_region bcm283x_mem_map[] = { ++ { ++ .virt = 0x00000000UL, ++ .phys = 0x00000000UL, ++ .size = 0xfe000000UL, ++ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | ++ PTE_BLOCK_INNER_SHARE ++ }, { ++ .virt = 0xfe000000UL, ++ .phys = 0xfe000000UL, ++ .size = 0x01800000UL, ++ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | ++ PTE_BLOCK_NON_SHARE | ++ PTE_BLOCK_PXN | PTE_BLOCK_UXN ++ }, { ++ /* List terminator */ ++ 0, ++ } ++}; ++#endif ++struct mm_region *mem_map = bcm283x_mem_map; + #endif + + int dram_init(void) + +From patchwork Wed Jul 24 14:39:11 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136370 +X-Patchwork-Delegate: matthias.bgg@gmail.com +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=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyk61mBqz9s3l + for ; + Thu, 25 Jul 2019 00:42:38 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id EF268C21DA2; Wed, 24 Jul 2019 14:40:21 +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 18B41C21DDC; + Wed, 24 Jul 2019 14:39:52 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id DD62DC21C2F; Wed, 24 Jul 2019 14:39:44 +0000 (UTC) +Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com + [209.85.128.66]) + by lists.denx.de (Postfix) with ESMTPS id 8735EC21DB3 + for ; Wed, 24 Jul 2019 14:39:41 +0000 (UTC) +Received: by mail-wm1-f66.google.com with SMTP id 207so42087264wma.1 + for ; Wed, 24 Jul 2019 07:39:41 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=Su0sVvS3yD62leuIKZb3pxg8i/NN5tZXXSx8RoqiHBw=; + b=d7yjVaKAs5z1TFruY3Dqyo5v+F+4E+6cfpsthOMt+m9MZeGD4gERwCAslKdO4akkyp + wWRBoQCMMMWzwpoRBvjczC5hM7xQ/pKqEZAJ9KP5gyzmlCmx+CznVjJGkVsbKE/9Mjz8 + 8fTflQbyCszmiwMdPOjMJnLHi5cbT1R0qbiwMeYPNkab9mmWczX7x6u9JfzS51kG3G3A + hD5QehF28N7XODXttdFd1kMGzEC+6xzJPdYrCcGCoGeOBkg3KiHS/dkB8sXp/tvwHQv/ + 4dPZmjtq5exSdZ0Mm2E5RsvISeMK6G8Iqv0PcUXUGYBQryXiw1DDve4wnDR1gw/YJNV0 + 07yQ== +X-Gm-Message-State: APjAAAVxgFnLbdj7oxAR7jyH5MO8StfPsSq/KejdOEq2tDuha3i9EwGn + dS6MsHWnNMhYVuzQdHZwaQ2aOYon +X-Google-Smtp-Source: APXvYqyVLBWemfnQgqJJ6fX0KGAaRRkuU+DwxqsmiT4cxbq4NFvAxBdWRSZ2PrRk7ZhY55qr3+jwcg== +X-Received: by 2002:a1c:a997:: with SMTP id + s145mr72938337wme.106.1563979180848; + Wed, 24 Jul 2019 07:39:40 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.40 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:40 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:11 +0100 +Message-Id: <20190724143911.29770-9-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 8/8] git-mailrc: Add rpi and bcm283x maintainer +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" + +Signed-off-by: Andrei Gherzan +Acked-by: Matthias Brugger +--- + doc/git-mailrc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/doc/git-mailrc b/doc/git-mailrc +index a63b76befc..68110e1963 100644 +--- a/doc/git-mailrc ++++ b/doc/git-mailrc +@@ -35,6 +35,7 @@ alias mariosix Mario Six + alias masahiro Masahiro Yamada + alias mateusz Mateusz Kulikowski + alias maxime Maxime Ripard ++alias mbrugger Matthias Brugger + alias monstr Michal Simek + alias prom Minkyu Kang + alias ptomsich Philipp Tomsich +@@ -74,6 +75,9 @@ alias uniphier uboot, masahiro + alias zynq uboot, monstr + alias rockchip uboot, sjg, kevery, ptomsich + ++alias bcm283x uboot,mbrugger ++alias rpi uboot,mbrugger ++ + alias m68k uboot, alisonwang, angelo_ts + alias coldfire m68k + diff --git a/aarch64-boards b/aarch64-boards index 4e337fb..f6a2000 100644 --- a/aarch64-boards +++ b/aarch64-boards @@ -50,6 +50,7 @@ rock960-rk3399 rock-pi-4-rk3399 rockpro64-rk3399 rpi_3 +rpi_4 sopine_baseboard teres_i turris_mox diff --git a/arm-boards b/arm-boards index 98b1141..76af0e2 100644 --- a/arm-boards +++ b/arm-boards @@ -117,6 +117,7 @@ rock rock2 rpi_2 rpi_3_32b +rpi_4_32b Sinlinx_SinA31s Sinovoip_BPI_M2 Sinovoip_BPI_M3 diff --git a/rock960-Enable-booting-from-eMMC-when-using-SPL.patch b/rock960-Enable-booting-from-eMMC-when-using-SPL.patch new file mode 100644 index 0000000..a34934a --- /dev/null +++ b/rock960-Enable-booting-from-eMMC-when-using-SPL.patch @@ -0,0 +1,262 @@ +From patchwork Mon Jul 29 13:52:27 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Manivannan Sadhasivam +X-Patchwork-Id: 1138381 +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=fail (p=none dis=none) header.from=linaro.org +Authentication-Results: ozlabs.org; + dkim=fail reason="signature verification failed" (2048-bit key; + unprotected) header.d=linaro.org header.i=@linaro.org + header.b="WyWxUYr0"; dkim-atps=neutral +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45y1NM4Q0Qz9sBt + for ; + Mon, 29 Jul 2019 23:52:51 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 3FE81C21DCA; Mon, 29 Jul 2019 13:52:48 +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=RCVD_IN_MSPIKE_H3, + RCVD_IN_MSPIKE_WL, + T_DKIM_INVALID 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 744C2C21D56; + Mon, 29 Jul 2019 13:52:45 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 4CD6EC21D56; Mon, 29 Jul 2019 13:52:44 +0000 (UTC) +Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com + [209.85.210.193]) + by lists.denx.de (Postfix) with ESMTPS id A797CC21CB6 + for ; Mon, 29 Jul 2019 13:52:43 +0000 (UTC) +Received: by mail-pf1-f193.google.com with SMTP id i189so28084100pfg.10 + for ; Mon, 29 Jul 2019 06:52:43 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; + h=from:to:cc:subject:date:message-id; + bh=3FPv5tbwMZSlglyfdX7Tp9nk6Cmnwv8xAql9ei/9XMI=; + b=WyWxUYr0OxZM2s1uFdLeSMmcp5oyNnL8MU4JHdEwgNt1lJd7Utgi3AQ3Lzc7gFM0BL + XMcezhoSk3X3IeUtcJhysMP3DP7sbY5roK8NFp1oTVNKPvCneRKiAVtqgHQMXuzVV+nb + 078IoKyU10IHRfQUEtrjZ4p2lwaQPPnC07YzMtENo+uGH6y0Zs76Wxj4Kx0IUhxYZa8O + APPOKpyDCtM0+D1TowK0w39vyWoF5ORjfsn8KHDaq6Xkkgu6Lor0pNA4N1NtrHjid3V4 + l1Qqe+1arhC9hkEp8ZegM8NKpk5z94MRxtSX0M+hcNz0CXCSEE8sfrQ+A/ndY7gvLn3L + Yajg== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id; + bh=3FPv5tbwMZSlglyfdX7Tp9nk6Cmnwv8xAql9ei/9XMI=; + b=kGpw9+JaJZ7VhtOe4HxM/24olmF5cPFaw94JpSXNUxVtSBAx45xFv4eymfEVtCBswg + tqAXbRuIfaOceGoIbtZA5pgcnwnRB1d6Vv0zbF5eoiXCtjjn+3xKx2sbPM0kdIPNtJph + dr+5gKiLRUOqvGCMKEvmBtU/gTqa+3oMGQ3alzpd5QjPnfIj3eYmCWpXjCg1sOSUbvdx + DxKGKqCk2EAYLRBVI+r3RGlea1Ccyrdma6G+KjhwAS1E9KnTw4Pt0ehttBAEHylukS21 + vMVC54pX1tuKHLI5q5Q2hqXBf1I6AaZ0saGg3h5iO+MBUz6CgzSBu6yfHvyuJhR/JdtK + 6w3g== +X-Gm-Message-State: APjAAAXrm30Hcs5qRxqy46mx7q1uHtii+pHCdOM+5yq8fhHcHocjMIJn + A2hlX799KPgmg40gXYkCkQCW +X-Google-Smtp-Source: APXvYqxt2EtMzNxTXZlfwUpo1lD/FyVZHuM5wM5aogloWnIt7GCC/yn8I0XXZ7c9Gx5++D2yLhrvJw== +X-Received: by 2002:a63:1765:: with SMTP id 37mr35777700pgx.447.1564408361779; + Mon, 29 Jul 2019 06:52:41 -0700 (PDT) +Received: from localhost.localdomain ([103.59.133.81]) + by smtp.googlemail.com with ESMTPSA id + i137sm62554902pgc.4.2019.07.29.06.52.38 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Mon, 29 Jul 2019 06:52:41 -0700 (PDT) +From: Manivannan Sadhasivam +To: kever.yang@rock-chips.com, + philipp.tomsich@theobroma-systems.com +Date: Mon, 29 Jul 2019 19:22:27 +0530 +Message-Id: <20190729135228.2878-1-manivannan.sadhasivam@linaro.org> +X-Mailer: git-send-email 2.17.1 +Cc: sahaj.sarup@linaro.org, u-boot@lists.denx.de, + Manivannan Sadhasivam +Subject: [U-Boot] [PATCH v2 1/2] arm: dts: rock960: Enable booting from eMMC + when using SPL +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: , + +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +This commits enables booting from eMMC when using SPL on 96Boards +Rock960 board by adding SDHCI to boot order. Since the SDHCI driver +already has the reloc flag, this works straightaway. While we are at it, +let's also include the common u-boot dtsi for rk3399. + +Signed-off-by: Manivannan Sadhasivam +--- + +Changes in v2: + +* Moved the change to -u-boot.dtsi as spotted by Peter. + + arch/arm/dts/rk3399-rock960-u-boot.dtsi | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi +index 5256f6d3f2..4850debdf0 100644 +--- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi ++++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi +@@ -3,4 +3,11 @@ + * Copyright (C) 2019 Jagan Teki + */ + ++#include "rk3399-u-boot.dtsi" + #include "rk3399-sdram-lpddr3-2GB-1600.dtsi" ++ ++/ { ++ chosen { ++ u-boot,spl-boot-order = &sdhci, &sdmmc; ++ }; ++}; + +From patchwork Mon Jul 29 13:52:28 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Manivannan Sadhasivam +X-Patchwork-Id: 1138382 +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=fail (p=none dis=none) header.from=linaro.org +Authentication-Results: ozlabs.org; + dkim=fail reason="signature verification failed" (2048-bit key; + unprotected) header.d=linaro.org header.i=@linaro.org + header.b="I/oZzIEr"; dkim-atps=neutral +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45y1Ns4wdXz9sBt + for ; + Mon, 29 Jul 2019 23:53:17 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 68C65C21DDC; Mon, 29 Jul 2019 13:53:01 +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=RCVD_IN_MSPIKE_H3, + RCVD_IN_MSPIKE_WL, + T_DKIM_INVALID 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 E09FFC21DB5; + Mon, 29 Jul 2019 13:52:59 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 81FF8C21DFB; Mon, 29 Jul 2019 13:52:51 +0000 (UTC) +Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com + [209.85.215.196]) + by lists.denx.de (Postfix) with ESMTPS id 4A806C21E31 + for ; Mon, 29 Jul 2019 13:52:48 +0000 (UTC) +Received: by mail-pg1-f196.google.com with SMTP id s1so22006632pgr.2 + for ; Mon, 29 Jul 2019 06:52:48 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=gt12XFZLAmGoM4GrNfchORnQFKGUVndeEjBMHCG7lcE=; + b=I/oZzIEr7tYSrBDPxym2AlLU8ZdN3EGquuY5N/ry7Vv5U5riF6Q2yHuBCa6xZK4zZS + pIy9wesXLpKQcLxrUvpu6SnZeEh6EKlq//AojFiDGFwINxgC/IYvny7F/9xU0k2EgwQt + FSM859QYUEM22zEtk8tFWFYJjP1k0wKB4mWoXCyK7NP/LkdrAvprlMSKFpmoeV37mvRs + ajFaVQbBwluibDwuST7sH2huCwaP4AuMor4IXlLIXHVA+J27ghX4k7n+6Oj23L8LPc4y + 6bPJnPvAHlx4jUco3/IK1IBAvZwFAylGAM1qEoWSiiV2iLmjYsrcrBRm3XRy1IbZ1cq8 + G6Sw== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references; + bh=gt12XFZLAmGoM4GrNfchORnQFKGUVndeEjBMHCG7lcE=; + b=JfG8sw0VQKGTtXTXhpi8k/WlOzJ4Us5POL/f4501qVIY3emIvOTb5Ce7q49YhIQ+LL + zN84aZJVYIpRlbfoxcXzWpYKlfI87yV/GUkck1PJGVHaK80t76wkie9uL/8GRdCawNgS + b1B5SgBU4hsIsDGd+xV0mExbWNvsy/h6fvZkfrtARhWgjzL49xgnUd841/iWp8teLfw4 + /OqF+dxLcNgPRCQlbRmiFU/i9ywonwEH3NVLaygUqh8lxw1U4o4QhTwOOfzK0mx91Ybp + jWmqLakr4wXO5Ih2tBjdQ1b4e07UBgGR8SzdD5n24WUrvy3fBzSIeqlnAss+70EoOGML + ixYw== +X-Gm-Message-State: APjAAAViCoU69CbeN+RPaNsqwOd6kKu6iQicolMLDsc/nDNpWj8X2pDZ + Q88+Mu1ogtYsvYb63814wt4G +X-Google-Smtp-Source: APXvYqyS8NrywDBj415S/KbF/5oGplbBDQdupMHZ/JrZfmw72r4T5Ifq/+OdJUaph2elH1tzrs99cg== +X-Received: by 2002:a63:a346:: with SMTP id v6mr58285420pgn.57.1564408366723; + Mon, 29 Jul 2019 06:52:46 -0700 (PDT) +Received: from localhost.localdomain ([103.59.133.81]) + by smtp.googlemail.com with ESMTPSA id + i137sm62554902pgc.4.2019.07.29.06.52.43 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Mon, 29 Jul 2019 06:52:46 -0700 (PDT) +From: Manivannan Sadhasivam +To: kever.yang@rock-chips.com, + philipp.tomsich@theobroma-systems.com +Date: Mon, 29 Jul 2019 19:22:28 +0530 +Message-Id: <20190729135228.2878-2-manivannan.sadhasivam@linaro.org> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20190729135228.2878-1-manivannan.sadhasivam@linaro.org> +References: <20190729135228.2878-1-manivannan.sadhasivam@linaro.org> +Cc: sahaj.sarup@linaro.org, u-boot@lists.denx.de, + Manivannan Sadhasivam +Subject: [U-Boot] [PATCH v2 2/2] arm: dts: ficus: Enable booting from eMMC + when using SPL +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: , + +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +This commits enables booting from eMMC when using SPL on 96Boards +Ficus board by adding SDHCI to boot order. Since the SDHCI driver +already has the reloc flag, this works straightaway. While we are at it, +let's also include the common u-boot dtsi for rk3399. + +Signed-off-by: Manivannan Sadhasivam +--- + +Changes in v2: + +* Moved the change to -u-boot.dtsi as spotted by Peter. + + arch/arm/dts/rk3399-ficus-u-boot.dtsi | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi +index eab86bdb30..f3f7aa7c45 100644 +--- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi ++++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi +@@ -3,4 +3,11 @@ + * Copyright (C) 2019 Jagan Teki + */ + ++#include "rk3399-u-boot.dtsi" + #include "rk3399-sdram-ddr3-1600.dtsi" ++ ++/ { ++ chosen { ++ u-boot,spl-boot-order = &sdhci, &sdmmc; ++ }; ++}; diff --git a/uboot-tools.spec b/uboot-tools.spec index 3ce8149..226bbb6 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2019.07 -Release: 2%{?candidate:.%{candidate}}%{?dist} +Release: 3%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -28,6 +28,8 @@ Patch8: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch Patch9: arm-tegra-defaine-fdtfile-for-all-devices.patch Patch10: rockchip-rk3399-Fix-USB3-support.patch Patch11: rockchip-rock960.patch +Patch12: rock960-Enable-booting-from-eMMC-when-using-SPL.patch +Patch13: Raspberry-Pi-32-64-support.patch BuildRequires: bc BuildRequires: dtc @@ -263,6 +265,10 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Sun Aug 4 2019 Peter Robinson 2019.07-3 +- Fixes for Rock960 +- Iniital Raspberry Pi 4 support + * Sat Jul 27 2019 Fedora Release Engineering - 2019.07-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d1ce3181e98844a6a20f20090e61777a892e23f5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 4 Aug 2019 22:37:25 +0100 Subject: [PATCH 4/5] fix crash on rpi4 with no display --- Raspberry-Pi-32-64-support.patch | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/Raspberry-Pi-32-64-support.patch b/Raspberry-Pi-32-64-support.patch index 38a094f..23566ae 100644 --- a/Raspberry-Pi-32-64-support.patch +++ b/Raspberry-Pi-32-64-support.patch @@ -1153,3 +1153,40 @@ index a63b76befc..68110e1963 100644 alias m68k uboot, alisonwang, angelo_ts alias coldfire m68k +From 970baf16d1322d3930a57fc78ddfb15d594d690c Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Thu, 11 Jul 2019 16:56:24 +0200 +Subject: [PATCH] video: arm: rpi: Bail out early if querying video information + fails + +When probing we query for the width and hight of the display. If the +firmware does not report any connected display the system will crash. +See https://github.com/raspberrypi/firmware/issues/1157 for details. + +Signed-off-by: Fabian Vogt +[mb: update commit message] +Signed-off-by: Matthias Brugger +Reviewed-by: Andre Przywara +Tested-by: Andre Przywara + +diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c +index bc41090aed..1d2eda084c 100644 +--- a/drivers/video/bcm2835.c ++++ b/drivers/video/bcm2835.c +@@ -19,13 +19,15 @@ static int bcm2835_video_probe(struct udevice *dev) + + debug("bcm2835: Query resolution...\n"); + ret = bcm2835_get_video_size(&w, &h); +- if (ret) ++ if (ret || w == 0 || h == 0) + return -EIO; + + debug("bcm2835: Setting up display for %d x %d\n", w, h); + ret = bcm2835_set_video_params(&w, &h, 32, BCM2835_MBOX_PIXEL_ORDER_RGB, + BCM2835_MBOX_ALPHA_MODE_IGNORED, + &fb_base, &fb_size, &pitch); ++ if (ret) ++ return -EIO; + + debug("bcm2835: Final resolution is %d x %d\n", w, h); + From d66aef9a14461ffbadcdaae42fa35b01aff1c11a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 14 Aug 2019 11:06:09 +0100 Subject: [PATCH 5/5] 2019.10 RC2 --- Raspberry-Pi-32-64-support.patch | 1192 ----------------- ...ble-booting-from-eMMC-when-using-SPL.patch | 262 ---- rockchip-rk3399-Fix-USB3-support.patch | 415 ------ rockchip-rock960.patch | 799 ----------- sources | 2 +- uboot-tools.spec | 13 +- 6 files changed, 7 insertions(+), 2676 deletions(-) delete mode 100644 Raspberry-Pi-32-64-support.patch delete mode 100644 rock960-Enable-booting-from-eMMC-when-using-SPL.patch delete mode 100644 rockchip-rk3399-Fix-USB3-support.patch delete mode 100644 rockchip-rock960.patch diff --git a/Raspberry-Pi-32-64-support.patch b/Raspberry-Pi-32-64-support.patch deleted file mode 100644 index 23566ae..0000000 --- a/Raspberry-Pi-32-64-support.patch +++ /dev/null @@ -1,1192 +0,0 @@ -From patchwork Wed Jul 24 14:39:04 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136358 -X-Patchwork-Delegate: matthias.bgg@gmail.com -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=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyhH0gbgz9s8m - for ; - Thu, 25 Jul 2019 00:41:03 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 92844C21D9A; Wed, 24 Jul 2019 14:39:46 +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.8 required=5.0 tests=UPPERCASE_50_75 autolearn=no - autolearn_force=no version=3.4.0 -Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 882B5C21D72; - Wed, 24 Jul 2019 14:39:40 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 7C7EBC21C27; Wed, 24 Jul 2019 14:39:35 +0000 (UTC) -Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com - [209.85.221.65]) - by lists.denx.de (Postfix) with ESMTPS id 2B1D6C21BE5 - for ; Wed, 24 Jul 2019 14:39:35 +0000 (UTC) -Received: by mail-wr1-f65.google.com with SMTP id x1so32293472wrr.9 - for ; Wed, 24 Jul 2019 07:39:35 -0700 (PDT) -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=8Z82pQdbffuUA8JpsYMwwHCjbZBONEoOwfFh2hjslOs=; - b=rJPUcmpkh37qDajtL1440DjXD+gxop4QeK685/B+RpJIrTVrBVPe9Z8ahOzM4t6MfA - R9KYo3KoDOOvp0dm6Ovih0rgEVLjUL9K+/tzqQi9Y3YbflK/VRA7WUuzKWq7o/732qqh - CLtDHeYCaaAepsl6TzeXSndNd74QoJJFlMtFUf2kDHV3ERIqIDvRd2LI1144GMTFOBjj - gkZr28fm0BVQPbHVN9p7mZ4vXcKUf2I2Wkje7P6EN6IJTrIcKZvcT2IpnzvsEdbPJ14r - 1JkPI3Bg7pf7iTVAcHDhZ0HWOxnuRuB3KzmC0WkOgYIWpjgUGdNCIys1VHusa8JGUmtz - X/OQ== -X-Gm-Message-State: APjAAAV4zaznNtIjQJuMF7dLBX4DR9QvnvmUcRzNftXStiuRuXXWnXS1 - MP7oLCr936klnQUkQAkOlyr/cP0s -X-Google-Smtp-Source: APXvYqxJiPSQ9vd5GlT71/+cluS1CRb303VcbpLDq5FS1UdhoChDRrXDGMI6wz5akinycJIMwNQZrg== -X-Received: by 2002:adf:f3d1:: with SMTP id g17mr58097903wrp.38.1563979174441; - Wed, 24 Jul 2019 07:39:34 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.33 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:34 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:04 +0100 -Message-Id: <20190724143911.29770-2-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 1/8] RPI: Add defconfigs for rpi4 (32/64) -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" - -This defines a minimum defconfig for each of the two Raspberry Pi 4 -variants. One notable difference is that we don't have a embedded dt for -this board given that the fw supplies us with one which we can reuse. -Furthermore, the ram size is not queryable through mbox interface as the -maximum reported size is 1G. The fw patches the dt with the right -memory configuration and uboot uses it as it is. We avoid u-boot -touching this configuration by making sure CONFIG_ARCH_FIXUP_FDT_MEMORY -is deactivated. - -Signed-off-by: Andrei Gherzan ---- - configs/rpi_4_32b_defconfig | 33 +++++++++++++++++++++++++++++++++ - configs/rpi_4_defconfig | 33 +++++++++++++++++++++++++++++++++ - 2 files changed, 66 insertions(+) - create mode 100644 configs/rpi_4_32b_defconfig - create mode 100644 configs/rpi_4_defconfig - -diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig -new file mode 100644 -index 0000000000..a31a617a5f ---- /dev/null -+++ b/configs/rpi_4_32b_defconfig -@@ -0,0 +1,33 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_BCM283X=y -+CONFIG_SYS_TEXT_BASE=0x00008000 -+CONFIG_TARGET_RPI_4_32B=y -+CONFIG_SYS_MALLOC_F_LEN=0x2000 -+CONFIG_DISTRO_DEFAULTS=y -+CONFIG_NR_DRAM_BANKS=1 -+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set -+CONFIG_OF_BOARD=y -+CONFIG_OF_BOARD_SETUP=y -+CONFIG_MISC_INIT_R=y -+# CONFIG_DISPLAY_CPUINFO is not set -+# CONFIG_DISPLAY_BOARDINFO is not set -+CONFIG_SYS_PROMPT="U-Boot> " -+# CONFIG_CMD_FLASH is not set -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_FS_UUID=y -+CONFIG_ENV_FAT_INTERFACE="mmc" -+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -+CONFIG_DM_KEYBOARD=y -+CONFIG_DM_MMC=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_BCM2835=y -+CONFIG_PINCTRL=y -+# CONFIG_PINCTRL_GENERIC is not set -+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set -+CONFIG_DM_VIDEO=y -+CONFIG_SYS_WHITE_ON_BLACK=y -+CONFIG_CONSOLE_SCROLL_LINES=10 -+CONFIG_PHYS_TO_BUS=y -+CONFIG_OF_LIBFDT_OVERLAY=y -diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig -new file mode 100644 -index 0000000000..da8c960a2a ---- /dev/null -+++ b/configs/rpi_4_defconfig -@@ -0,0 +1,33 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_BCM283X=y -+CONFIG_SYS_TEXT_BASE=0x00080000 -+CONFIG_TARGET_RPI_4=y -+CONFIG_SYS_MALLOC_F_LEN=0x2000 -+CONFIG_DISTRO_DEFAULTS=y -+CONFIG_NR_DRAM_BANKS=1 -+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set -+CONFIG_OF_BOARD=y -+CONFIG_OF_BOARD_SETUP=y -+CONFIG_MISC_INIT_R=y -+# CONFIG_DISPLAY_CPUINFO is not set -+# CONFIG_DISPLAY_BOARDINFO is not set -+CONFIG_SYS_PROMPT="U-Boot> " -+# CONFIG_CMD_FLASH is not set -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_FS_UUID=y -+CONFIG_ENV_FAT_INTERFACE="mmc" -+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -+CONFIG_DM_KEYBOARD=y -+CONFIG_DM_MMC=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_BCM2835=y -+CONFIG_PINCTRL=y -+# CONFIG_PINCTRL_GENERIC is not set -+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set -+CONFIG_DM_VIDEO=y -+CONFIG_SYS_WHITE_ON_BLACK=y -+CONFIG_CONSOLE_SCROLL_LINES=10 -+CONFIG_PHYS_TO_BUS=y -+CONFIG_OF_LIBFDT_OVERLAY=y - -From patchwork Wed Jul 24 14:39:05 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136357 -X-Patchwork-Delegate: matthias.bgg@gmail.com -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=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tygm6ldWz9s3l - for ; - Thu, 25 Jul 2019 00:40:36 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 9DA33C21CB6; Wed, 24 Jul 2019 14:39:59 +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=RCVD_IN_MSPIKE_H2 - 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 17CAEC21D8E; - Wed, 24 Jul 2019 14:39:47 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 82DD4C21CB6; Wed, 24 Jul 2019 14:39:36 +0000 (UTC) -Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com - [209.85.221.67]) - by lists.denx.de (Postfix) with ESMTPS id 01AFFC21BE5 - for ; Wed, 24 Jul 2019 14:39:36 +0000 (UTC) -Received: by mail-wr1-f67.google.com with SMTP id 31so47328827wrm.1 - for ; Wed, 24 Jul 2019 07:39:36 -0700 (PDT) -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=SBRknuqaA8nrsEqGUKyxns0jOTIIj2fE4uzSYMyIGew=; - b=PM1drqcqaap81ZOvnmAJY7X232GJ1xovWSwf0Gfii33S1JHlV0lXbcT6pHy/MY5C1Y - GVqDd9jEF6nKvHAGx2xHd2df1KTAaYpuxqmmo89okoq1FQ80/gwzWj+AZJ/AsoZHiR0W - Jo/QZmK8NjcG9xVEPkdvq2kYg7V7FGrTQgKFCn8y4tSk6rdFXH6x71luCFr9GTiHqmes - XE5UGqaitR84yV9d5U4NL8pNnZbhtyxT8YYgkRyRbtOTwYi44C0XYsVwHP4G8DSjMjeE - 5jdjVUB8rmMki3Bqtj5aGkS0F+k/RvLiQPKbkssavqHl24M4ohWNlZ4fI9VXzg+4DJjZ - aT7g== -X-Gm-Message-State: APjAAAXvh2LHWYIbEeX1TSDzEtnms+hdW6mVhDH8RRCsABLlzzPSCiUf - 8um70SOfA7+T6IFVzjiHE/2q21x6 -X-Google-Smtp-Source: APXvYqzpQ+14M+bTmm58qDfrEm+q5psg5hqSSHCmXarzdL9SPFCPF5TlXBFq2NrJt8Zn5k7Cm+vgzQ== -X-Received: by 2002:adf:e444:: with SMTP id t4mr83713613wrm.262.1563979175247; - Wed, 24 Jul 2019 07:39:35 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.34 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:34 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:05 +0100 -Message-Id: <20190724143911.29770-3-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 2/8] ARM: bcm283x: Add BCM283x_BASE define -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" - -From: Matthias Brugger - -Devices of bcm283x have different base address, depending if they are on -bcm2835 or bcm2836/7. Use BCM283x_BASE depending on the SoC you want to -build and only add the offset in the header files. - -Signed-off-by: Matthias Brugger -Signed-off-by: Andrei Gherzan ---- - arch/arm/mach-bcm283x/Kconfig | 5 +++++ - arch/arm/mach-bcm283x/include/mach/mbox.h | 6 +----- - arch/arm/mach-bcm283x/include/mach/sdhci.h | 6 +----- - arch/arm/mach-bcm283x/include/mach/timer.h | 6 +----- - arch/arm/mach-bcm283x/include/mach/wdog.h | 6 +----- - 5 files changed, 9 insertions(+), 20 deletions(-) - -diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig -index 3eb5a9a897..8e69914a83 100644 ---- a/arch/arm/mach-bcm283x/Kconfig -+++ b/arch/arm/mach-bcm283x/Kconfig -@@ -141,4 +141,9 @@ config SYS_SOC - config SYS_CONFIG_NAME - default "rpi" - -+config BCM283x_BASE -+ hex -+ default "0x20000000" if BCM2835 -+ default "0x3f000000" if BCM2836 || BCM2837 -+ - endmenu -diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h -index e3a893e49c..e44c7577da 100644 ---- a/arch/arm/mach-bcm283x/include/mach/mbox.h -+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h -@@ -37,11 +37,7 @@ - - /* Raw mailbox HW */ - --#ifndef CONFIG_BCM2835 --#define BCM2835_MBOX_PHYSADDR 0x3f00b880 --#else --#define BCM2835_MBOX_PHYSADDR 0x2000b880 --#endif -+#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) - - struct bcm2835_mbox_regs { - u32 read; -diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h -index 5cb6ec3340..b443c379d8 100644 ---- a/arch/arm/mach-bcm283x/include/mach/sdhci.h -+++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h -@@ -6,11 +6,7 @@ - #ifndef _BCM2835_SDHCI_H_ - #define _BCM2835_SDHCI_H_ - --#ifndef CONFIG_BCM2835 --#define BCM2835_SDHCI_BASE 0x3f300000 --#else --#define BCM2835_SDHCI_BASE 0x20300000 --#endif -+#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) - - int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); - -diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h -index 56b0c356bb..014355e759 100644 ---- a/arch/arm/mach-bcm283x/include/mach/timer.h -+++ b/arch/arm/mach-bcm283x/include/mach/timer.h -@@ -6,11 +6,7 @@ - #ifndef _BCM2835_TIMER_H - #define _BCM2835_TIMER_H - --#ifndef CONFIG_BCM2835 --#define BCM2835_TIMER_PHYSADDR 0x3f003000 --#else --#define BCM2835_TIMER_PHYSADDR 0x20003000 --#endif -+#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) - - #define BCM2835_TIMER_CS_M3 (1 << 3) - #define BCM2835_TIMER_CS_M2 (1 << 2) -diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h -index 99c88e5df7..8292b3cf1f 100644 ---- a/arch/arm/mach-bcm283x/include/mach/wdog.h -+++ b/arch/arm/mach-bcm283x/include/mach/wdog.h -@@ -6,11 +6,7 @@ - #ifndef _BCM2835_WDOG_H - #define _BCM2835_WDOG_H - --#ifndef CONFIG_BCM2835 --#define BCM2835_WDOG_PHYSADDR 0x3f100000 --#else --#define BCM2835_WDOG_PHYSADDR 0x20100000 --#endif -+#define BCM2835_WDOG_PHYSADDR (CONFIG_BCM283x_BASE + 0x00100000) - - struct bcm2835_wdog_regs { - u32 unknown0[7]; - -From patchwork Wed Jul 24 14:39:06 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136372 -X-Patchwork-Delegate: matthias.bgg@gmail.com -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=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyl70FC2z9s3l - for ; - Thu, 25 Jul 2019 00:43:30 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id A8034C21DF3; Wed, 24 Jul 2019 14:40:46 +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=RCVD_IN_MSPIKE_H2 - 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 4C777C21DCA; - Wed, 24 Jul 2019 14:40:10 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 474FDC21D74; Wed, 24 Jul 2019 14:39:39 +0000 (UTC) -Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com - [209.85.128.68]) - by lists.denx.de (Postfix) with ESMTPS id 55C9DC21D4A - for ; Wed, 24 Jul 2019 14:39:37 +0000 (UTC) -Received: by mail-wm1-f68.google.com with SMTP id s15so20507009wmj.3 - for ; Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=pWvZ588J48xOgvZOVW9fhkWibsiRtNBVuM4VBynrLQw=; - b=Am1Me0M/J3HedD2FzOBBvEpBhsNfG5psGW0Lap+uSDun9LynEo+RqAgmLAAp3KtUFD - vUkieSMQZAjAIyzy8ySvUjuVA8iEUPN8wbo55HZ+3X5HfhgsbMwu70KZDA9UBw1T4v6V - CE1pyL9enGgcwdDiTcXztZo57iM/vq1B6HilY8J27ZJFb9fJNH4L7IxE4O/febLJ4ljc - micbK/014Ibg6DqlmHbBh4akENSDlXOrQLqMC8FdK0lsJIP7EH9Xqc6MubvgCzyhvS89 - xPFsmuRVAZVvpnQ6+mcSidfeiyYCMXh2IE8wgKExlyysSAjkZPC8Z+1H2qOnvOz+XEjX - GVrg== -X-Gm-Message-State: APjAAAVcUgx+4UkyQKJDr3/tCu0zV2vBZk5reX2ukIrxHlkjQSBTYuSa - Napy/FHrIjVsWObEdv0xTsrwwqT8 -X-Google-Smtp-Source: APXvYqz1dOMBUWbTH/jK138AvmFcmCjdMc9s6oLE6NbSPeUiM4M0S3istSFU+IBlBRGqC2zlitzAQg== -X-Received: by 2002:a7b:cc86:: with SMTP id p6mr69114900wma.123.1563979176511; - Wed, 24 Jul 2019 07:39:36 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.35 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:35 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:06 +0100 -Message-Id: <20190724143911.29770-4-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 3/8] ARM: bcm283x: Define configs for RaspberryPi 4 -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" - -Define two target configs for Raspberry Pi 4 (32 and 64bit) and the -corresponding BCM2838* configs. - -Be aware of the current limitation in firmware which requires an -explicit configuration to force the arm in 64bit mode when the -respective target is used. - -Signed-off-by: Andrei Gherzan -Signed-off-by: Matthias Brugger ---- - arch/arm/mach-bcm283x/Kconfig | 62 +++++++++++++++++++++++++++++++++++ - 1 file changed, 62 insertions(+) - -diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig -index 8e69914a83..09a5b42bbb 100644 ---- a/arch/arm/mach-bcm283x/Kconfig -+++ b/arch/arm/mach-bcm283x/Kconfig -@@ -26,6 +26,23 @@ config BCM2837_64B - select BCM2837 - select ARM64 - -+config BCM2838 -+ bool "Broadcom BCM2838 SoC support" -+ depends on ARCH_BCM283X -+ -+config BCM2838_32B -+ bool "Broadcom BCM2838 SoC 32-bit support" -+ depends on ARCH_BCM283X -+ select BCM2838 -+ select ARMV7_LPAE -+ select CPU_V7A -+ -+config BCM2838_64B -+ bool "Broadcom BCM2838 SoC 64-bit support" -+ depends on ARCH_BCM283X -+ select BCM2838 -+ select ARM64 -+ - menu "Broadcom BCM283X family" - depends on ARCH_BCM283X - -@@ -127,6 +144,50 @@ config TARGET_RPI_3 - This option creates a build targeting the ARMv8/AArch64 ISA. - select BCM2837_64B - -+config TARGET_RPI_4_32B -+ bool "Raspberry Pi 4 32-bit build" -+ help -+ Support for all BCM2838-based Raspberry Pi variants, such as -+ the RPi 4 model B, in AArch32 (32-bit) mode. -+ -+ This option assumes the VideoCore firmware is configured to use the -+ mini UART (rather than PL011) for the serial console. This is the -+ default on the RPi 4. To enable the UART console, the following non- -+ default option must be present in config.txt: enable_uart=1. This is -+ required for U-Boot to operate correctly, even if you only care -+ about the HDMI/usbkbd console. -+ -+ Due to hardware incompatibilities, this can't be used with -+ BCM283/5/6/7. -+ -+ This option creates a build targeting the ARMv7/AArch32 ISA. -+ select BCM2838_32B -+ -+config TARGET_RPI_4 -+ bool "Raspberry Pi 4 64-bit build" -+ help -+ Support for all BCM2838-based Raspberry Pi variants, such as -+ the RPi 4 model B, in AArch64 (64-bit) mode. -+ -+ This option assumes the VideoCore firmware is configured to use the -+ mini UART (rather than PL011) for the serial console. This is the -+ default on the RPi 4. To enable the UART console, the following non- -+ default option must be present in config.txt: enable_uart=1. This is -+ required for U-Boot to operate correctly, even if you only care -+ about the HDMI/usbkbd console. -+ -+ Due to hardware incompatibilities, this can't be used with -+ BCM283/5/6/7. -+ -+ Also, due to a bug in firmware, switching to 64bit mode doesn't -+ happen automatically based on the kernel's image filename. See -+ https://github.com/raspberrypi/firmware/issues/1193 for more details. -+ Until that is resolved, the configuration (config.txt) needs to -+ explicitly set: arm_64bit=1. -+ -+ This option creates a build targeting the ARMv8/AArch64 ISA. -+ select BCM2838_64B -+ - endchoice - - config SYS_BOARD -@@ -145,5 +206,6 @@ config BCM283x_BASE - hex - default "0x20000000" if BCM2835 - default "0x3f000000" if BCM2836 || BCM2837 -+ default "0xfe000000" if BCM2838 - - endmenu - -From patchwork Wed Jul 24 14:39:07 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136366 -X-Patchwork-Delegate: matthias.bgg@gmail.com -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=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyjX1rBvz9s3l - for ; - Thu, 25 Jul 2019 00:42:08 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id F1D99C21CB6; Wed, 24 Jul 2019 14:40:11 +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=RCVD_IN_MSPIKE_H2 - 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 937A0C21D65; - Wed, 24 Jul 2019 14:39:51 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 748BCC21C2F; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) -Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com - [209.85.128.68]) - by lists.denx.de (Postfix) with ESMTPS id CE175C21C29 - for ; Wed, 24 Jul 2019 14:39:37 +0000 (UTC) -Received: by mail-wm1-f68.google.com with SMTP id a15so42072601wmj.5 - for ; Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=u/X0NAp+r55Bugx2HDgeaVfXBeYCSiyWcV7zL0w2yXE=; - b=meBOAW1SzAbuPxzp+nYt716FpccdfeH1Xh3xWr+zMzkGW0O6P+hkYAjOsYmnzj/5rX - WNazbP1wNvSVBowPChoHa1zwn2I8PhxW9EDSfNkECgfLCYdPettoGRQ94zsUSZAkp4dD - FJkwXFsPDQX4UoFpLxN7fhbkYqdcezpK7kv2ijiYnQR9z/RfadD4yVQHLYt+M6UsmWph - FjXmBWf8Dqj0HniyCpAFBQclBp2LF6Cf3teLv0SKjJfkyJnfnB2D26Sig1t5Z1JIRw8h - +2J1FXpChqug7KpnKuQNHWz1P/yhSY/b+dPHkLABO1yCQ9N5+IvUCw+KXXd8o3RtpwuS - UnjA== -X-Gm-Message-State: APjAAAULyjSTt+VemoBBXMausXImPmWbP6ymxMkyPmdzjRXNS/pvDSjw - SvFvIJXwqw2UxgfJbVQsZf3L04kE -X-Google-Smtp-Source: APXvYqwDVdWVyjv8DnkgBTqEwcrcxXXF1Xof6TjgZnG7RMtXzWC3l2a8f4Awp1bVLNcspHnduMBWqg== -X-Received: by 2002:a1c:a909:: with SMTP id s9mr74064408wme.20.1563979177108; - Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.36 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:36 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:07 +0100 -Message-Id: <20190724143911.29770-5-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 4/8] RPI: Add entry for Raspberry Pi 4 model B -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 Raspebrry Pi 4 uses the new revision code scheme as documented by -the foundation. This change adds an entry for this board as well. - -Signed-off-by: Andrei Gherzan ---- - board/raspberrypi/rpi/rpi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index 617c892dde..6d6f1ef39a 100644 ---- a/board/raspberrypi/rpi/rpi.c -+++ b/board/raspberrypi/rpi/rpi.c -@@ -148,6 +148,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { - DTB_DIR "bcm2837-rpi-cm3.dtb", - false, - }, -+ [0x11] = { -+ "4 Model B", -+ DTB_DIR "bcm2711-rpi-4-b.dtb", -+ true, -+ }, - }; - - static const struct rpi_model rpi_models_old_scheme[] = { - -From patchwork Wed Jul 24 14:39:08 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136373 -X-Patchwork-Delegate: matthias.bgg@gmail.com -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=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyl91yqVz9s3l - for ; - Thu, 25 Jul 2019 00:43:33 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 0991BC21D74; Wed, 24 Jul 2019 14:40:59 +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 118D3C21D8E; - Wed, 24 Jul 2019 14:40:25 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 3020BC21DA2; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) -Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com - [209.85.221.65]) - by lists.denx.de (Postfix) with ESMTPS id 9468EC21C4A - for ; Wed, 24 Jul 2019 14:39:38 +0000 (UTC) -Received: by mail-wr1-f65.google.com with SMTP id r1so47270575wrl.7 - for ; Wed, 24 Jul 2019 07:39:38 -0700 (PDT) -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=INTj2ZkmrgCvQnwXSkRkNgGGyv8wKd+4Dp1WiNdZg9A=; - b=Q12tNYAAjgCy4zkzIOEnY6VGsX14oy+bwAD75RZPvG/KwLZEgoIWaH67glrnxVMKCW - lnIUiim0jTu+lUQws/OaHw3Nl55HUaXoZMrKZ50vANqXzk0brozRNLBsZTBmFZGlyrP4 - 1ftizkEJMJr74KxyuZBbSHmN5gMxoEH/r6V8DZ1b8dH5RXr0J4hEuoeDiKT26fxfOpMk - dLXJd/Mx/4t6AVkcdVJIs3jdcw4neuiDThpHeLeNiuZgKEIOy7HHs+Zfz4iTRmu5IrHK - LwIYdSl6UeGnJNPE595PyB1HtUzUwEoUWuyzP062TGzGxfEvMjnFJ5bzm/dV9sOSNBtx - 308g== -X-Gm-Message-State: APjAAAUR5WDXsRNKCCMKSHatakaD4J0JzmZMzF3dOkiIj5/vqS01j3nF - 6aVr6nFQUuBmYJrMYEjaAwJqc6dm -X-Google-Smtp-Source: APXvYqwd9TOCUBNszoD7ZZhvAYwth50GqOLaqpKiC/HlGaXndFYzgPMhMhFr3nL9Gf6MfsBZ5Sho3Q== -X-Received: by 2002:adf:eb0f:: with SMTP id - s15mr12285481wrn.324.1563979177934; - Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.37 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:08 +0100 -Message-Id: <20190724143911.29770-6-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 5/8] ARM: bcm283x: Include definition for - additional emmc clock -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" - -This clock has a different mbox ID so have this included in the relevant -header file. - -Signed-off-by: Andrei Gherzan ---- - arch/arm/mach-bcm283x/include/mach/mbox.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h -index e44c7577da..f2a98acddd 100644 ---- a/arch/arm/mach-bcm283x/include/mach/mbox.h -+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h -@@ -230,6 +230,7 @@ struct bcm2835_mbox_tag_set_power_state { - #define BCM2835_MBOX_CLOCK_ID_SDRAM 8 - #define BCM2835_MBOX_CLOCK_ID_PIXEL 9 - #define BCM2835_MBOX_CLOCK_ID_PWM 10 -+#define BCM2835_MBOX_CLOCK_ID_EMMC2 12 - - struct bcm2835_mbox_tag_get_clock_rate { - struct bcm2835_mbox_tag_hdr tag_hdr; - -From patchwork Wed Jul 24 14:39:09 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136365 -X-Patchwork-Delegate: matthias.bgg@gmail.com -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=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyjV5JXbz9sBF - for ; - Thu, 25 Jul 2019 00:42:06 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 77213C21C27; Wed, 24 Jul 2019 14:40:36 +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=RCVD_IN_MSPIKE_H2 - 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 A24EDC21DB5; - Wed, 24 Jul 2019 14:40:00 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 4193AC21C2F; Wed, 24 Jul 2019 14:39:42 +0000 (UTC) -Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com - [209.85.221.68]) - by lists.denx.de (Postfix) with ESMTPS id AE825C21D4A - for ; Wed, 24 Jul 2019 14:39:39 +0000 (UTC) -Received: by mail-wr1-f68.google.com with SMTP id 31so47329072wrm.1 - for ; Wed, 24 Jul 2019 07:39:39 -0700 (PDT) -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=fpnN0uOMvR4DjRJfxVux4tdvICr5Rjygmvsk8TlIvnA=; - b=MQVZ2YY2EKhWHLLaavQarKM51ls7jOHZ7N8mWZpNRCJNQtRJfYkVDlHw5vbIV2dFXF - W6qAp6fnL+fb9/RHiw786uJCu/L1CZ95P9ksjyGYE62VQLWFE5OxDF2NGkoxZ0HGkqiw - cMAcpX5+Zn+/ZA6Q7OGOz1dZqASEH8mWaPI5TS1afkxMn5E14RKVHN6//bkvXwIpXL7d - 0M7zjoEQGuDlZK3PoRhxESbXrtznvm2PS2xiTdgtH5i9dJ24bbfjQulbBx9EMR++tB8O - e+SLxw9eT3N8XZwF0YD4XJRcFc8kwyiwhKFU2tuNJTC7pIkBSOeLxUUyJGsypxREq54n - 11GA== -X-Gm-Message-State: APjAAAXU6kbWgi4nhW5lhQR6pbZIhBdAkcKNmC1i59gWXdb8lL6dbHqL - Q2Ye3JGmLehlU2z4+7T/uXzHhO+V -X-Google-Smtp-Source: APXvYqyYzkP4kraoV8icuHlxBOcusLrizbOSQSILHq90ieWqGbICGdj7ZQRO5lX7n4DS1rr/nKThUQ== -X-Received: by 2002:adf:ea82:: with SMTP id s2mr82009745wrm.91.1563979179031; - Wed, 24 Jul 2019 07:39:39 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.38 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:38 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:09 +0100 -Message-Id: <20190724143911.29770-7-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 6/8] mmc: bcm283x: Add support for bcm2711 - device in bcm2835_sdhci -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" - -From: Matthias Brugger - -The bcm2711 has two emmc controllers. The difference is the clocks -they use. Add support for the second emmc controller. - -Signed-off-by: Matthias Brugger -Signed-off-by: Andrei Gherzan ---- - drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c -index 08bddd410e..e68dec3be7 100644 ---- a/drivers/mmc/bcm2835_sdhci.c -+++ b/drivers/mmc/bcm2835_sdhci.c -@@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev) - fdt_addr_t base; - int emmc_freq; - int ret; -+ int clock_id = (int)dev_get_driver_data(dev); - - base = devfdt_get_addr(dev); - if (base == FDT_ADDR_T_NONE) - return -EINVAL; - -- ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); -+ ret = bcm2835_get_mmc_clock(clock_id); - if (ret < 0) { - debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); - return ret; -@@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev) - } - - static const struct udevice_id bcm2835_sdhci_match[] = { -- { .compatible = "brcm,bcm2835-sdhci" }, -+ { -+ .compatible = "brcm,bcm2835-sdhci", -+ .data = BCM2835_MBOX_CLOCK_ID_EMMC -+ }, -+ { -+ .compatible = "brcm,bcm2711-emmc2", -+ .data = BCM2835_MBOX_CLOCK_ID_EMMC2 -+ }, - { /* sentinel */ } - }; - - -From patchwork Wed Jul 24 14:39:10 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136369 -X-Patchwork-Delegate: matthias.bgg@gmail.com -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=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyk04V3zz9s3l - for ; - Thu, 25 Jul 2019 00:42:32 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 47E81C21DD3; Wed, 24 Jul 2019 14:41:08 +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=RCVD_IN_MSPIKE_H2 - 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 A7B62C21C93; - Wed, 24 Jul 2019 14:40:30 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 05EE7C21D65; Wed, 24 Jul 2019 14:39:43 +0000 (UTC) -Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com - [209.85.221.67]) - by lists.denx.de (Postfix) with ESMTPS id A0C53C21CB1 - for ; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) -Received: by mail-wr1-f67.google.com with SMTP id p17so47250123wrf.11 - for ; Wed, 24 Jul 2019 07:39:40 -0700 (PDT) -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=vke+aeJLlm+hH0ZbApV2tQXwcQSNthXhQrHw3uTUjCY=; - b=fXeMysXcz5ZFzv+beEbqCcjHVfBZuIIVE7p40QdU2ckI7M3z1jdwMCXENGpwnVdMks - H+k4EDysfUSZmD9YGLyX+rFUMPgHEZm7DcxpQGDoT28zXRKo1I/5BQhEm5VHZYudmzLM - A9Juze34OYZ+qop/80ZSAARNy/grkz+9EL0hz+/cGoKbQM2vnYeK9IhqY1MT+Jnjaqeo - Avmh6DcXZN5MtJOGGt7TsXETUzeCZViAJDpgT+lIy8aFAABW4ZHBF6eZtgzd/aNn0dk7 - RJHyQlXxpKIeZGVzZz6kO+VFwHV++awYsZK1wzhqNDvAA0kGbkvgIWc1qOii+4j351tr - FmfA== -X-Gm-Message-State: APjAAAUddD7/P+xcAGZeEeanF39Kb1CjavSwOjql/I604nDwgzGThPdu - QltkJmJtpo31uSwBMKkalJwi1Xg3 -X-Google-Smtp-Source: APXvYqydROkNjRTwQxNzaMfPcjFShYCgunskcjaWkRPeJsf9HRFmaH/uThvtF9xRw5cFaHtr2ixI2w== -X-Received: by 2002:a5d:668e:: with SMTP id - l14mr31747640wru.156.1563979179920; - Wed, 24 Jul 2019 07:39:39 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.39 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:39 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:10 +0100 -Message-Id: <20190724143911.29770-8-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 7/8] RPI: Add memory map for bcm2838 -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" - -Define the memory map for the BCM2838 based on the dt configuration -available in the Raspberry Pi kernel fork. - -Signed-off-by: Andrei Gherzan ---- - board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++--- - 1 file changed, 24 insertions(+), 3 deletions(-) - -diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index 6d6f1ef39a..1c4fae9166 100644 ---- a/board/raspberrypi/rpi/rpi.c -+++ b/board/raspberrypi/rpi/rpi.c -@@ -249,7 +249,8 @@ static uint32_t rev_type; - static const struct rpi_model *model; - - #ifdef CONFIG_ARM64 --static struct mm_region bcm2837_mem_map[] = { -+#ifndef CONFIG_BCM2838 -+static struct mm_region bcm283x_mem_map[] = { - { - .virt = 0x00000000UL, - .phys = 0x00000000UL, -@@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = { - 0, - } - }; -- --struct mm_region *mem_map = bcm2837_mem_map; -+#else -+static struct mm_region bcm283x_mem_map[] = { -+ { -+ .virt = 0x00000000UL, -+ .phys = 0x00000000UL, -+ .size = 0xfe000000UL, -+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | -+ PTE_BLOCK_INNER_SHARE -+ }, { -+ .virt = 0xfe000000UL, -+ .phys = 0xfe000000UL, -+ .size = 0x01800000UL, -+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | -+ PTE_BLOCK_NON_SHARE | -+ PTE_BLOCK_PXN | PTE_BLOCK_UXN -+ }, { -+ /* List terminator */ -+ 0, -+ } -+}; -+#endif -+struct mm_region *mem_map = bcm283x_mem_map; - #endif - - int dram_init(void) - -From patchwork Wed Jul 24 14:39:11 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136370 -X-Patchwork-Delegate: matthias.bgg@gmail.com -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=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyk61mBqz9s3l - for ; - Thu, 25 Jul 2019 00:42:38 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id EF268C21DA2; Wed, 24 Jul 2019 14:40:21 +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 18B41C21DDC; - Wed, 24 Jul 2019 14:39:52 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id DD62DC21C2F; Wed, 24 Jul 2019 14:39:44 +0000 (UTC) -Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com - [209.85.128.66]) - by lists.denx.de (Postfix) with ESMTPS id 8735EC21DB3 - for ; Wed, 24 Jul 2019 14:39:41 +0000 (UTC) -Received: by mail-wm1-f66.google.com with SMTP id 207so42087264wma.1 - for ; Wed, 24 Jul 2019 07:39:41 -0700 (PDT) -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=Su0sVvS3yD62leuIKZb3pxg8i/NN5tZXXSx8RoqiHBw=; - b=d7yjVaKAs5z1TFruY3Dqyo5v+F+4E+6cfpsthOMt+m9MZeGD4gERwCAslKdO4akkyp - wWRBoQCMMMWzwpoRBvjczC5hM7xQ/pKqEZAJ9KP5gyzmlCmx+CznVjJGkVsbKE/9Mjz8 - 8fTflQbyCszmiwMdPOjMJnLHi5cbT1R0qbiwMeYPNkab9mmWczX7x6u9JfzS51kG3G3A - hD5QehF28N7XODXttdFd1kMGzEC+6xzJPdYrCcGCoGeOBkg3KiHS/dkB8sXp/tvwHQv/ - 4dPZmjtq5exSdZ0Mm2E5RsvISeMK6G8Iqv0PcUXUGYBQryXiw1DDve4wnDR1gw/YJNV0 - 07yQ== -X-Gm-Message-State: APjAAAVxgFnLbdj7oxAR7jyH5MO8StfPsSq/KejdOEq2tDuha3i9EwGn - dS6MsHWnNMhYVuzQdHZwaQ2aOYon -X-Google-Smtp-Source: APXvYqyVLBWemfnQgqJJ6fX0KGAaRRkuU+DwxqsmiT4cxbq4NFvAxBdWRSZ2PrRk7ZhY55qr3+jwcg== -X-Received: by 2002:a1c:a997:: with SMTP id - s145mr72938337wme.106.1563979180848; - Wed, 24 Jul 2019 07:39:40 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.40 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:40 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:11 +0100 -Message-Id: <20190724143911.29770-9-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 8/8] git-mailrc: Add rpi and bcm283x maintainer -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" - -Signed-off-by: Andrei Gherzan -Acked-by: Matthias Brugger ---- - doc/git-mailrc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/doc/git-mailrc b/doc/git-mailrc -index a63b76befc..68110e1963 100644 ---- a/doc/git-mailrc -+++ b/doc/git-mailrc -@@ -35,6 +35,7 @@ alias mariosix Mario Six - alias masahiro Masahiro Yamada - alias mateusz Mateusz Kulikowski - alias maxime Maxime Ripard -+alias mbrugger Matthias Brugger - alias monstr Michal Simek - alias prom Minkyu Kang - alias ptomsich Philipp Tomsich -@@ -74,6 +75,9 @@ alias uniphier uboot, masahiro - alias zynq uboot, monstr - alias rockchip uboot, sjg, kevery, ptomsich - -+alias bcm283x uboot,mbrugger -+alias rpi uboot,mbrugger -+ - alias m68k uboot, alisonwang, angelo_ts - alias coldfire m68k - -From 970baf16d1322d3930a57fc78ddfb15d594d690c Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Thu, 11 Jul 2019 16:56:24 +0200 -Subject: [PATCH] video: arm: rpi: Bail out early if querying video information - fails - -When probing we query for the width and hight of the display. If the -firmware does not report any connected display the system will crash. -See https://github.com/raspberrypi/firmware/issues/1157 for details. - -Signed-off-by: Fabian Vogt -[mb: update commit message] -Signed-off-by: Matthias Brugger -Reviewed-by: Andre Przywara -Tested-by: Andre Przywara - -diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c -index bc41090aed..1d2eda084c 100644 ---- a/drivers/video/bcm2835.c -+++ b/drivers/video/bcm2835.c -@@ -19,13 +19,15 @@ static int bcm2835_video_probe(struct udevice *dev) - - debug("bcm2835: Query resolution...\n"); - ret = bcm2835_get_video_size(&w, &h); -- if (ret) -+ if (ret || w == 0 || h == 0) - return -EIO; - - debug("bcm2835: Setting up display for %d x %d\n", w, h); - ret = bcm2835_set_video_params(&w, &h, 32, BCM2835_MBOX_PIXEL_ORDER_RGB, - BCM2835_MBOX_ALPHA_MODE_IGNORED, - &fb_base, &fb_size, &pitch); -+ if (ret) -+ return -EIO; - - debug("bcm2835: Final resolution is %d x %d\n", w, h); - diff --git a/rock960-Enable-booting-from-eMMC-when-using-SPL.patch b/rock960-Enable-booting-from-eMMC-when-using-SPL.patch deleted file mode 100644 index a34934a..0000000 --- a/rock960-Enable-booting-from-eMMC-when-using-SPL.patch +++ /dev/null @@ -1,262 +0,0 @@ -From patchwork Mon Jul 29 13:52:27 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Manivannan Sadhasivam -X-Patchwork-Id: 1138381 -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=fail (p=none dis=none) header.from=linaro.org -Authentication-Results: ozlabs.org; - dkim=fail reason="signature verification failed" (2048-bit key; - unprotected) header.d=linaro.org header.i=@linaro.org - header.b="WyWxUYr0"; dkim-atps=neutral -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45y1NM4Q0Qz9sBt - for ; - Mon, 29 Jul 2019 23:52:51 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 3FE81C21DCA; Mon, 29 Jul 2019 13:52:48 +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=RCVD_IN_MSPIKE_H3, - RCVD_IN_MSPIKE_WL, - T_DKIM_INVALID 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 744C2C21D56; - Mon, 29 Jul 2019 13:52:45 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 4CD6EC21D56; Mon, 29 Jul 2019 13:52:44 +0000 (UTC) -Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com - [209.85.210.193]) - by lists.denx.de (Postfix) with ESMTPS id A797CC21CB6 - for ; Mon, 29 Jul 2019 13:52:43 +0000 (UTC) -Received: by mail-pf1-f193.google.com with SMTP id i189so28084100pfg.10 - for ; Mon, 29 Jul 2019 06:52:43 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; - h=from:to:cc:subject:date:message-id; - bh=3FPv5tbwMZSlglyfdX7Tp9nk6Cmnwv8xAql9ei/9XMI=; - b=WyWxUYr0OxZM2s1uFdLeSMmcp5oyNnL8MU4JHdEwgNt1lJd7Utgi3AQ3Lzc7gFM0BL - XMcezhoSk3X3IeUtcJhysMP3DP7sbY5roK8NFp1oTVNKPvCneRKiAVtqgHQMXuzVV+nb - 078IoKyU10IHRfQUEtrjZ4p2lwaQPPnC07YzMtENo+uGH6y0Zs76Wxj4Kx0IUhxYZa8O - APPOKpyDCtM0+D1TowK0w39vyWoF5ORjfsn8KHDaq6Xkkgu6Lor0pNA4N1NtrHjid3V4 - l1Qqe+1arhC9hkEp8ZegM8NKpk5z94MRxtSX0M+hcNz0CXCSEE8sfrQ+A/ndY7gvLn3L - Yajg== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id; - bh=3FPv5tbwMZSlglyfdX7Tp9nk6Cmnwv8xAql9ei/9XMI=; - b=kGpw9+JaJZ7VhtOe4HxM/24olmF5cPFaw94JpSXNUxVtSBAx45xFv4eymfEVtCBswg - tqAXbRuIfaOceGoIbtZA5pgcnwnRB1d6Vv0zbF5eoiXCtjjn+3xKx2sbPM0kdIPNtJph - dr+5gKiLRUOqvGCMKEvmBtU/gTqa+3oMGQ3alzpd5QjPnfIj3eYmCWpXjCg1sOSUbvdx - DxKGKqCk2EAYLRBVI+r3RGlea1Ccyrdma6G+KjhwAS1E9KnTw4Pt0ehttBAEHylukS21 - vMVC54pX1tuKHLI5q5Q2hqXBf1I6AaZ0saGg3h5iO+MBUz6CgzSBu6yfHvyuJhR/JdtK - 6w3g== -X-Gm-Message-State: APjAAAXrm30Hcs5qRxqy46mx7q1uHtii+pHCdOM+5yq8fhHcHocjMIJn - A2hlX799KPgmg40gXYkCkQCW -X-Google-Smtp-Source: APXvYqxt2EtMzNxTXZlfwUpo1lD/FyVZHuM5wM5aogloWnIt7GCC/yn8I0XXZ7c9Gx5++D2yLhrvJw== -X-Received: by 2002:a63:1765:: with SMTP id 37mr35777700pgx.447.1564408361779; - Mon, 29 Jul 2019 06:52:41 -0700 (PDT) -Received: from localhost.localdomain ([103.59.133.81]) - by smtp.googlemail.com with ESMTPSA id - i137sm62554902pgc.4.2019.07.29.06.52.38 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Mon, 29 Jul 2019 06:52:41 -0700 (PDT) -From: Manivannan Sadhasivam -To: kever.yang@rock-chips.com, - philipp.tomsich@theobroma-systems.com -Date: Mon, 29 Jul 2019 19:22:27 +0530 -Message-Id: <20190729135228.2878-1-manivannan.sadhasivam@linaro.org> -X-Mailer: git-send-email 2.17.1 -Cc: sahaj.sarup@linaro.org, u-boot@lists.denx.de, - Manivannan Sadhasivam -Subject: [U-Boot] [PATCH v2 1/2] arm: dts: rock960: Enable booting from eMMC - when using SPL -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: , - -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -This commits enables booting from eMMC when using SPL on 96Boards -Rock960 board by adding SDHCI to boot order. Since the SDHCI driver -already has the reloc flag, this works straightaway. While we are at it, -let's also include the common u-boot dtsi for rk3399. - -Signed-off-by: Manivannan Sadhasivam ---- - -Changes in v2: - -* Moved the change to -u-boot.dtsi as spotted by Peter. - - arch/arm/dts/rk3399-rock960-u-boot.dtsi | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi -index 5256f6d3f2..4850debdf0 100644 ---- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi -+++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi -@@ -3,4 +3,11 @@ - * Copyright (C) 2019 Jagan Teki - */ - -+#include "rk3399-u-boot.dtsi" - #include "rk3399-sdram-lpddr3-2GB-1600.dtsi" -+ -+/ { -+ chosen { -+ u-boot,spl-boot-order = &sdhci, &sdmmc; -+ }; -+}; - -From patchwork Mon Jul 29 13:52:28 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Manivannan Sadhasivam -X-Patchwork-Id: 1138382 -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=fail (p=none dis=none) header.from=linaro.org -Authentication-Results: ozlabs.org; - dkim=fail reason="signature verification failed" (2048-bit key; - unprotected) header.d=linaro.org header.i=@linaro.org - header.b="I/oZzIEr"; dkim-atps=neutral -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45y1Ns4wdXz9sBt - for ; - Mon, 29 Jul 2019 23:53:17 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 68C65C21DDC; Mon, 29 Jul 2019 13:53:01 +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=RCVD_IN_MSPIKE_H3, - RCVD_IN_MSPIKE_WL, - T_DKIM_INVALID 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 E09FFC21DB5; - Mon, 29 Jul 2019 13:52:59 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 81FF8C21DFB; Mon, 29 Jul 2019 13:52:51 +0000 (UTC) -Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com - [209.85.215.196]) - by lists.denx.de (Postfix) with ESMTPS id 4A806C21E31 - for ; Mon, 29 Jul 2019 13:52:48 +0000 (UTC) -Received: by mail-pg1-f196.google.com with SMTP id s1so22006632pgr.2 - for ; Mon, 29 Jul 2019 06:52:48 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; - h=from:to:cc:subject:date:message-id:in-reply-to:references; - bh=gt12XFZLAmGoM4GrNfchORnQFKGUVndeEjBMHCG7lcE=; - b=I/oZzIEr7tYSrBDPxym2AlLU8ZdN3EGquuY5N/ry7Vv5U5riF6Q2yHuBCa6xZK4zZS - pIy9wesXLpKQcLxrUvpu6SnZeEh6EKlq//AojFiDGFwINxgC/IYvny7F/9xU0k2EgwQt - FSM859QYUEM22zEtk8tFWFYJjP1k0wKB4mWoXCyK7NP/LkdrAvprlMSKFpmoeV37mvRs - ajFaVQbBwluibDwuST7sH2huCwaP4AuMor4IXlLIXHVA+J27ghX4k7n+6Oj23L8LPc4y - 6bPJnPvAHlx4jUco3/IK1IBAvZwFAylGAM1qEoWSiiV2iLmjYsrcrBRm3XRy1IbZ1cq8 - G6Sw== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references; - bh=gt12XFZLAmGoM4GrNfchORnQFKGUVndeEjBMHCG7lcE=; - b=JfG8sw0VQKGTtXTXhpi8k/WlOzJ4Us5POL/f4501qVIY3emIvOTb5Ce7q49YhIQ+LL - zN84aZJVYIpRlbfoxcXzWpYKlfI87yV/GUkck1PJGVHaK80t76wkie9uL/8GRdCawNgS - b1B5SgBU4hsIsDGd+xV0mExbWNvsy/h6fvZkfrtARhWgjzL49xgnUd841/iWp8teLfw4 - /OqF+dxLcNgPRCQlbRmiFU/i9ywonwEH3NVLaygUqh8lxw1U4o4QhTwOOfzK0mx91Ybp - jWmqLakr4wXO5Ih2tBjdQ1b4e07UBgGR8SzdD5n24WUrvy3fBzSIeqlnAss+70EoOGML - ixYw== -X-Gm-Message-State: APjAAAViCoU69CbeN+RPaNsqwOd6kKu6iQicolMLDsc/nDNpWj8X2pDZ - Q88+Mu1ogtYsvYb63814wt4G -X-Google-Smtp-Source: APXvYqyS8NrywDBj415S/KbF/5oGplbBDQdupMHZ/JrZfmw72r4T5Ifq/+OdJUaph2elH1tzrs99cg== -X-Received: by 2002:a63:a346:: with SMTP id v6mr58285420pgn.57.1564408366723; - Mon, 29 Jul 2019 06:52:46 -0700 (PDT) -Received: from localhost.localdomain ([103.59.133.81]) - by smtp.googlemail.com with ESMTPSA id - i137sm62554902pgc.4.2019.07.29.06.52.43 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Mon, 29 Jul 2019 06:52:46 -0700 (PDT) -From: Manivannan Sadhasivam -To: kever.yang@rock-chips.com, - philipp.tomsich@theobroma-systems.com -Date: Mon, 29 Jul 2019 19:22:28 +0530 -Message-Id: <20190729135228.2878-2-manivannan.sadhasivam@linaro.org> -X-Mailer: git-send-email 2.17.1 -In-Reply-To: <20190729135228.2878-1-manivannan.sadhasivam@linaro.org> -References: <20190729135228.2878-1-manivannan.sadhasivam@linaro.org> -Cc: sahaj.sarup@linaro.org, u-boot@lists.denx.de, - Manivannan Sadhasivam -Subject: [U-Boot] [PATCH v2 2/2] arm: dts: ficus: Enable booting from eMMC - when using SPL -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: , - -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -This commits enables booting from eMMC when using SPL on 96Boards -Ficus board by adding SDHCI to boot order. Since the SDHCI driver -already has the reloc flag, this works straightaway. While we are at it, -let's also include the common u-boot dtsi for rk3399. - -Signed-off-by: Manivannan Sadhasivam ---- - -Changes in v2: - -* Moved the change to -u-boot.dtsi as spotted by Peter. - - arch/arm/dts/rk3399-ficus-u-boot.dtsi | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi -index eab86bdb30..f3f7aa7c45 100644 ---- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi -+++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi -@@ -3,4 +3,11 @@ - * Copyright (C) 2019 Jagan Teki - */ - -+#include "rk3399-u-boot.dtsi" - #include "rk3399-sdram-ddr3-1600.dtsi" -+ -+/ { -+ chosen { -+ u-boot,spl-boot-order = &sdhci, &sdmmc; -+ }; -+}; diff --git a/rockchip-rk3399-Fix-USB3-support.patch b/rockchip-rk3399-Fix-USB3-support.patch deleted file mode 100644 index 792ada6..0000000 --- a/rockchip-rk3399-Fix-USB3-support.patch +++ /dev/null @@ -1,415 +0,0 @@ -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 deleted file mode 100644 index 513e144..0000000 --- a/rockchip-rock960.patch +++ /dev/null @@ -1,799 +0,0 @@ -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 b68a826..e52d8c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2019.07.tar.bz2) = 879abf0c8773bfcdcbe7f28fc68e2b4369bcb74e276d95d510a9b2d1707e63eb01d82e304ba5a6a570552bc18bc593f27ba9b518bafa1d8f8e5bc83cf107c023 +SHA512 (u-boot-2019.10-rc2.tar.bz2) = 5a9173a1bd945736c8e0c1797b4c8fdd9833fc4e04d6b0e562c2018884da9bc10c110231b690450fb2761e19cd19ab24fc8744000c901f416ba2936c8278799e diff --git a/uboot-tools.spec b/uboot-tools.spec index 226bbb6..b2800cd 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -#global candidate rc4 +%global candidate rc2 Name: uboot-tools -Version: 2019.07 -Release: 3%{?candidate:.%{candidate}}%{?dist} +Version: 2019.10 +Release: 0.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,10 +26,6 @@ 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: rockchip-rk3399-Fix-USB3-support.patch -Patch11: rockchip-rock960.patch -Patch12: rock960-Enable-booting-from-eMMC-when-using-SPL.patch -Patch13: Raspberry-Pi-32-64-support.patch BuildRequires: bc BuildRequires: dtc @@ -265,6 +261,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Wed Aug 14 2019 Peter Robinson 2019.10-0.1-rc2 +- 2019.10 RC2 + * Sun Aug 4 2019 Peter Robinson 2019.07-3 - Fixes for Rock960 - Iniital Raspberry Pi 4 support