Skip to content

GitLab

U
u-boot
Commit 89affc6e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed exynos_wdt patch

parent 465412fa
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
u-boot-2021.04-exynos_wdt.patch
View file @ 89affc6e
diff -uNr u-boot-2021.04/arch/arm/dts/exynos5250.dtsi u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos5250.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/exynos5250.dtsi u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos5250.dtsi
--- u-boot-2021.04/arch/arm/dts/exynos5250.dtsi 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/arch/arm/dts/exynos5250.dtsi 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos5250.dtsi 2023-04-13 10:58:58.408061884 +0930 +++ u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos5250.dtsi 2025-09-22 11:47:53.788486037 +0930
@@ -120,6 +120,17 @@ @@ -120,6 +120,17 @@
}; };
}; };
...@@ -21,7 +21,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/exynos5250.dtsi u-boot-2021.04-exynos_wdt/ ...@@ -21,7 +21,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/exynos5250.dtsi u-boot-2021.04-exynos_wdt/
reg = <0x12dd0000 0x100>; reg = <0x12dd0000 0x100>;
diff -uNr u-boot-2021.04/arch/arm/dts/exynos54xx.dtsi u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos54xx.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/exynos54xx.dtsi u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos54xx.dtsi
--- u-boot-2021.04/arch/arm/dts/exynos54xx.dtsi 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/arch/arm/dts/exynos54xx.dtsi 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos54xx.dtsi 2023-04-13 10:58:58.409061886 +0930 +++ u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos54xx.dtsi 2025-09-22 11:47:53.790485997 +0930
@@ -210,6 +210,17 @@ @@ -210,6 +210,17 @@
mem-type = "ddr3"; mem-type = "ddr3";
}; };
...@@ -42,7 +42,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/exynos54xx.dtsi u-boot-2021.04-exynos_wdt/ ...@@ -42,7 +42,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/exynos54xx.dtsi u-boot-2021.04-exynos_wdt/
reg = <0x12dd0000 0x100>; reg = <0x12dd0000 0x100>;
diff -uNr u-boot-2021.04/arch/arm/dts/exynos7420.dtsi u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos7420.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/exynos7420.dtsi u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos7420.dtsi
--- u-boot-2021.04/arch/arm/dts/exynos7420.dtsi 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/arch/arm/dts/exynos7420.dtsi 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos7420.dtsi 2023-04-13 10:58:58.409061886 +0930 +++ u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos7420.dtsi 2025-09-22 11:47:53.791485977 +0930
@@ -79,4 +79,15 @@ @@ -79,4 +79,15 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&serial2_bus>; pinctrl-0 = <&serial2_bus>;
...@@ -61,7 +61,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/exynos7420.dtsi u-boot-2021.04-exynos_wdt/ ...@@ -61,7 +61,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/exynos7420.dtsi u-boot-2021.04-exynos_wdt/
}; };
diff -uNr u-boot-2021.04/board/samsung/common/board.c u-boot-2021.04-exynos_wdt/board/samsung/common/board.c diff -uNr u-boot-2021.04/board/samsung/common/board.c u-boot-2021.04-exynos_wdt/board/samsung/common/board.c
--- u-boot-2021.04/board/samsung/common/board.c 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/board/samsung/common/board.c 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/board/samsung/common/board.c 2023-04-13 10:58:58.409061886 +0930 +++ u-boot-2021.04-exynos_wdt/board/samsung/common/board.c 2025-09-22 11:47:53.793485936 +0930
@@ -37,6 +37,8 @@ @@ -37,6 +37,8 @@
#include <samsung/misc.h> #include <samsung/misc.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
...@@ -94,7 +94,7 @@ diff -uNr u-boot-2021.04/board/samsung/common/board.c u-boot-2021.04-exynos_wdt/ ...@@ -94,7 +94,7 @@ diff -uNr u-boot-2021.04/board/samsung/common/board.c u-boot-2021.04-exynos_wdt/
unsigned int i; unsigned int i;
diff -uNr u-boot-2021.04/drivers/watchdog/exynos_wdt.c u-boot-2021.04-exynos_wdt/drivers/watchdog/exynos_wdt.c diff -uNr u-boot-2021.04/drivers/watchdog/exynos_wdt.c u-boot-2021.04-exynos_wdt/drivers/watchdog/exynos_wdt.c
--- u-boot-2021.04/drivers/watchdog/exynos_wdt.c 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2021.04/drivers/watchdog/exynos_wdt.c 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/drivers/watchdog/exynos_wdt.c 2023-04-13 10:58:58.409061886 +0930 +++ u-boot-2021.04-exynos_wdt/drivers/watchdog/exynos_wdt.c 2025-09-22 11:51:27.801157163 +0930
@@ -0,0 +1,344 @@ @@ -0,0 +1,344 @@
+// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later
+/* +/*
...@@ -419,7 +419,7 @@ diff -uNr u-boot-2021.04/drivers/watchdog/exynos_wdt.c u-boot-2021.04-exynos_wdt ...@@ -419,7 +419,7 @@ diff -uNr u-boot-2021.04/drivers/watchdog/exynos_wdt.c u-boot-2021.04-exynos_wdt
+ return 0; + return 0;
+} +}
+ +
+static int exynos_wdt_ofdata_to_platdata(struct udevice *dev) +static int exynos_wdt_of_to_plat(struct udevice *dev)
+{ +{
+ struct exynos_wdt_priv *priv = dev_get_priv(dev); + struct exynos_wdt_priv *priv = dev_get_priv(dev);
+ +
...@@ -437,12 +437,12 @@ diff -uNr u-boot-2021.04/drivers/watchdog/exynos_wdt.c u-boot-2021.04-exynos_wdt ...@@ -437,12 +437,12 @@ diff -uNr u-boot-2021.04/drivers/watchdog/exynos_wdt.c u-boot-2021.04-exynos_wdt
+ .of_match = exynos_wdt_ids, + .of_match = exynos_wdt_ids,
+ .probe = exynos_wdt_probe, + .probe = exynos_wdt_probe,
+ .ops = &exynos_wdt_ops, + .ops = &exynos_wdt_ops,
+ .priv_auto_alloc_size = sizeof(struct exynos_wdt_priv), + .priv_auto = sizeof(struct exynos_wdt_priv),
+ .ofdata_to_platdata = exynos_wdt_ofdata_to_platdata, + .of_to_plat = exynos_wdt_ofdata_to_platdata,
+}; +};
diff -uNr u-boot-2021.04/drivers/watchdog/Kconfig u-boot-2021.04-exynos_wdt/drivers/watchdog/Kconfig diff -uNr u-boot-2021.04/drivers/watchdog/Kconfig u-boot-2021.04-exynos_wdt/drivers/watchdog/Kconfig
--- u-boot-2021.04/drivers/watchdog/Kconfig 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/drivers/watchdog/Kconfig 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/drivers/watchdog/Kconfig 2023-04-13 11:00:12.647277514 +0930 +++ u-boot-2021.04-exynos_wdt/drivers/watchdog/Kconfig 2025-09-22 11:47:53.796485876 +0930
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
default 128000 if ARCH_MX25 || ARCH_MX31 || ARCH_MX5 || ARCH_MX6 default 128000 if ARCH_MX25 || ARCH_MX31 || ARCH_MX5 || ARCH_MX6
default 128000 if ARCH_MX7 || ARCH_VF610 default 128000 if ARCH_MX7 || ARCH_VF610
...@@ -488,7 +488,7 @@ diff -uNr u-boot-2021.04/drivers/watchdog/Kconfig u-boot-2021.04-exynos_wdt/driv ...@@ -488,7 +488,7 @@ diff -uNr u-boot-2021.04/drivers/watchdog/Kconfig u-boot-2021.04-exynos_wdt/driv
depends on WDT && ARCH_K3 depends on WDT && ARCH_K3
diff -uNr u-boot-2021.04/drivers/watchdog/Makefile u-boot-2021.04-exynos_wdt/drivers/watchdog/Makefile diff -uNr u-boot-2021.04/drivers/watchdog/Makefile u-boot-2021.04-exynos_wdt/drivers/watchdog/Makefile
--- u-boot-2021.04/drivers/watchdog/Makefile 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/drivers/watchdog/Makefile 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/drivers/watchdog/Makefile 2023-04-13 10:58:58.409061886 +0930 +++ u-boot-2021.04-exynos_wdt/drivers/watchdog/Makefile 2025-09-22 11:47:53.797485855 +0930
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
else else
obj-$(CONFIG_IMX_WATCHDOG) += imx_watchdog.o obj-$(CONFIG_IMX_WATCHDOG) += imx_watchdog.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment