* [PATCH v1 1/3] timer MediaTek use upstream compatible
@ 2020-04-25 23:17 matthias.bgg at kernel.org
2020-04-25 23:17 ` [PATCH v1 2/3] watchdog MediaTek add " matthias.bgg at kernel.org
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: matthias.bgg at kernel.org @ 2020-04-25 23:17 UTC (permalink / raw)
To: u-boot
From: Matthias Brugger <mbrugger@suse.com>
The timers compatible string in upstream is called
mt6577-timer. Add this compatible to the driver.
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
drivers/timer/mtk_timer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c
index b5e76bd358..e99135e5be 100644
--- a/drivers/timer/mtk_timer.c
+++ b/drivers/timer/mtk_timer.c
@@ -71,6 +71,7 @@ static const struct timer_ops mtk_timer_ops = {
static const struct udevice_id mtk_timer_ids[] = {
{ .compatible = "mediatek,timer" },
+ { .compatible = "mediatek,mt6577-timer" },
{ }
};
--
2.26.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v1 2/3] watchdog MediaTek add upstream compatible
2020-04-25 23:17 [PATCH v1 1/3] timer MediaTek use upstream compatible matthias.bgg at kernel.org
@ 2020-04-25 23:17 ` matthias.bgg at kernel.org
2020-05-01 21:56 ` Tom Rini
2020-04-25 23:17 ` [PATCH v1 3/3] arm: enable distro boot for bananapi-r2 matthias.bgg at kernel.org
2020-05-01 21:56 ` [PATCH v1 1/3] timer MediaTek use upstream compatible Tom Rini
2 siblings, 1 reply; 6+ messages in thread
From: matthias.bgg at kernel.org @ 2020-04-25 23:17 UTC (permalink / raw)
To: u-boot
From: Matthias Brugger <mbrugger@suse.com>
The upstream compatible is called mt6589-wdt.
Add this compatible to the driver.
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
drivers/watchdog/mtk_wdt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 669a32320d..b3c597e1d0 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -143,6 +143,7 @@ static const struct wdt_ops mtk_wdt_ops = {
static const struct udevice_id mtk_wdt_ids[] = {
{ .compatible = "mediatek,wdt"},
+ { .compatible = "mediatek,mt6589-wdt"},
{}
};
--
2.26.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v1 3/3] arm: enable distro boot for bananapi-r2
2020-04-25 23:17 [PATCH v1 1/3] timer MediaTek use upstream compatible matthias.bgg at kernel.org
2020-04-25 23:17 ` [PATCH v1 2/3] watchdog MediaTek add " matthias.bgg at kernel.org
@ 2020-04-25 23:17 ` matthias.bgg at kernel.org
2020-05-01 21:56 ` Tom Rini
2020-05-01 21:56 ` [PATCH v1 1/3] timer MediaTek use upstream compatible Tom Rini
2 siblings, 1 reply; 6+ messages in thread
From: matthias.bgg at kernel.org @ 2020-04-25 23:17 UTC (permalink / raw)
To: u-boot
From: Matthias Brugger <mbrugger@suse.com>
This patch enables distro boot for the bananapi-r2, based on
a MediaTek mt7623n.
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
configs/mt7623n_bpir2_defconfig | 3 ++-
include/configs/mt7623.h | 24 ++++++++++++++++++++----
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig
index 07ddade76a..fe28f37b9e 100644
--- a/configs/mt7623n_bpir2_defconfig
+++ b/configs/mt7623n_bpir2_defconfig
@@ -7,6 +7,7 @@ CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x100000
CONFIG_TARGET_MT7623=y
CONFIG_NR_DRAM_BANKS=1
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_BOOTDELAY=3
@@ -56,4 +57,4 @@ CONFIG_TIMER=y
CONFIG_MTK_TIMER=y
CONFIG_WDT_MTK=y
CONFIG_LZMA=y
-# CONFIG_EFI_LOADER is not set
+CONFIG_EFI_LOADER=y
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index faab0913fc..fe436cca38 100644
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -45,11 +45,13 @@
#define CONFIG_SYS_SDRAM_BASE 0x80000000
/* This is needed for kernel booting */
-#define FDT_HIGH "fdt_high=0xac000000\0"
+#define FDT_HIGH "0xac000000"
-/* Extra environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- FDT_HIGH
+#define ENV_MEM_LAYOUT_SETTINGS \
+ "fdt_high=" FDT_HIGH "\0" \
+ "kernel_addr_r=0x84000000\0" \
+ "fdt_addr_r=" FDT_HIGH "\0" \
+ "fdtfile=mt7623n-bananapi-bpi-r2.dtb" "\0"
/* Ethernet */
#define CONFIG_IPADDR 192.168.1.1
@@ -57,4 +59,18 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
+#ifdef CONFIG_DISTRO_DEFAULTS
+
+#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 1)
+
+#include <config_distro_bootcmd.h>
+
+/* Extra environment variables */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ ENV_MEM_LAYOUT_SETTINGS \
+ BOOTENV
+
+#endif /* ifdef CONFIG_DISTRO_DEFAULTS*/
+
#endif
--
2.26.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v1 1/3] timer MediaTek use upstream compatible
2020-04-25 23:17 [PATCH v1 1/3] timer MediaTek use upstream compatible matthias.bgg at kernel.org
2020-04-25 23:17 ` [PATCH v1 2/3] watchdog MediaTek add " matthias.bgg at kernel.org
2020-04-25 23:17 ` [PATCH v1 3/3] arm: enable distro boot for bananapi-r2 matthias.bgg at kernel.org
@ 2020-05-01 21:56 ` Tom Rini
2 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2020-05-01 21:56 UTC (permalink / raw)
To: u-boot
On Sun, Apr 26, 2020 at 01:17:44AM +0200, matthias.bgg at kernel.org wrote:
> From: Matthias Brugger <mbrugger@suse.com>
>
> The timers compatible string in upstream is called
> mt6577-timer. Add this compatible to the driver.
>
> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200501/dddb45f5/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-01 21:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-25 23:17 [PATCH v1 1/3] timer MediaTek use upstream compatible matthias.bgg at kernel.org
2020-04-25 23:17 ` [PATCH v1 2/3] watchdog MediaTek add " matthias.bgg at kernel.org
2020-05-01 21:56 ` Tom Rini
2020-04-25 23:17 ` [PATCH v1 3/3] arm: enable distro boot for bananapi-r2 matthias.bgg at kernel.org
2020-05-01 21:56 ` Tom Rini
2020-05-01 21:56 ` [PATCH v1 1/3] timer MediaTek use upstream compatible Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.