From 6d9ac63c0d98a35095b2cc101122bb289b5770cb Mon Sep 17 00:00:00 2001 From: Jonathan Tinkham Date: Sat, 11 Apr 2020 19:22:59 -0600 Subject: [PATCH] Change aon block reg-name to "control" --- bsp/qemu-sifive-e31/core.dts | 2 +- bsp/qemu-sifive-e31/design.svd | 2 +- bsp/qemu-sifive-e31/metal.h | 2 +- bsp/qemu-sifive-s51/core.dts | 2 +- bsp/qemu-sifive-s51/design.svd | 2 +- bsp/qemu-sifive-s51/metal.h | 2 +- bsp/sifive-hifive1-revb/core.dts | 2 +- bsp/sifive-hifive1-revb/design.svd | 2 +- bsp/sifive-hifive1-revb/metal.h | 4 ++-- bsp/sifive-hifive1/core.dts | 2 +- bsp/sifive-hifive1/design.svd | 2 +- bsp/sifive-hifive1/metal.h | 2 +- freedom-devicetree-tools | 2 +- scripts/cmsis-svd-generator | 2 +- wit-manifest.json | 8 ++++---- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bsp/qemu-sifive-e31/core.dts b/bsp/qemu-sifive-e31/core.dts index fcae60339..8f741fac2 100644 --- a/bsp/qemu-sifive-e31/core.dts +++ b/bsp/qemu-sifive-e31/core.dts @@ -86,7 +86,7 @@ aon: aon@10000000 { compatible = "sifive,aon0"; reg = <0x10000000 0x8000>; - reg-names = "mem"; + reg-names = "control"; }; prci: prci@10008000 { compatible = "sifive,fe310-g000,prci"; diff --git a/bsp/qemu-sifive-e31/design.svd b/bsp/qemu-sifive-e31/design.svd index f3218da3a..1c4ff7b65 100644 --- a/bsp/qemu-sifive-e31/design.svd +++ b/bsp/qemu-sifive-e31/design.svd @@ -41,7 +41,7 @@ sifive_aon0_0 - From sifive,aon0,mem peripheral generator + From sifive,aon0,control peripheral generator 0x10000000 0 diff --git a/bsp/qemu-sifive-e31/metal.h b/bsp/qemu-sifive-e31/metal.h index 5e4730d8f..662a88b99 100644 --- a/bsp/qemu-sifive-e31/metal.h +++ b/bsp/qemu-sifive-e31/metal.h @@ -1095,7 +1095,7 @@ static __inline__ struct metal_clock * __metal_driver_sifive_fe310_g000_lfrosc_p static __inline__ unsigned long int __metal_driver_sifive_fe310_g000_lfrosc_config_reg(const struct metal_clock *clock) { if ((uintptr_t)clock == (uintptr_t)&__metal_dt_clock_6) { - return 112; + return 268435568; } else { return 0; diff --git a/bsp/qemu-sifive-s51/core.dts b/bsp/qemu-sifive-s51/core.dts index 08045bf46..e7dea7d45 100644 --- a/bsp/qemu-sifive-s51/core.dts +++ b/bsp/qemu-sifive-s51/core.dts @@ -89,7 +89,7 @@ aon: aon@10000000 { compatible = "sifive,aon0"; reg = <0x10000000 0x8000>; - reg-names = "mem"; + reg-names = "control"; }; prci: prci@10008000 { diff --git a/bsp/qemu-sifive-s51/design.svd b/bsp/qemu-sifive-s51/design.svd index 1dc8ef276..e72247aad 100644 --- a/bsp/qemu-sifive-s51/design.svd +++ b/bsp/qemu-sifive-s51/design.svd @@ -41,7 +41,7 @@ sifive_aon0_0 - From sifive,aon0,mem peripheral generator + From sifive,aon0,control peripheral generator 0x10000000 0 diff --git a/bsp/qemu-sifive-s51/metal.h b/bsp/qemu-sifive-s51/metal.h index 594e7142e..fdb511ef6 100644 --- a/bsp/qemu-sifive-s51/metal.h +++ b/bsp/qemu-sifive-s51/metal.h @@ -1095,7 +1095,7 @@ static __inline__ struct metal_clock * __metal_driver_sifive_fe310_g000_lfrosc_p static __inline__ unsigned long int __metal_driver_sifive_fe310_g000_lfrosc_config_reg(const struct metal_clock *clock) { if ((uintptr_t)clock == (uintptr_t)&__metal_dt_clock_6) { - return 112; + return 268435568; } else { return 0; diff --git a/bsp/sifive-hifive1-revb/core.dts b/bsp/sifive-hifive1-revb/core.dts index f68e58441..e1adb7a29 100644 --- a/bsp/sifive-hifive1-revb/core.dts +++ b/bsp/sifive-hifive1-revb/core.dts @@ -123,7 +123,7 @@ aon: aon@10000000 { compatible = "sifive,aon0"; reg = <0x10000000 0x8000>; - reg-names = "mem"; + reg-names = "control"; interrupt-parent = <&plic>; interrupts = <1 2>; clocks = <&lfclk>; diff --git a/bsp/sifive-hifive1-revb/design.svd b/bsp/sifive-hifive1-revb/design.svd index 3ad2768bd..9aea4c324 100644 --- a/bsp/sifive-hifive1-revb/design.svd +++ b/bsp/sifive-hifive1-revb/design.svd @@ -341,7 +341,7 @@ sifive_aon0_0 - From sifive,aon0,mem peripheral generator + From sifive,aon0,control peripheral generator 0x10000000 0 diff --git a/bsp/sifive-hifive1-revb/metal.h b/bsp/sifive-hifive1-revb/metal.h index 07734b28f..19a46ef25 100644 --- a/bsp/sifive-hifive1-revb/metal.h +++ b/bsp/sifive-hifive1-revb/metal.h @@ -1300,7 +1300,7 @@ static __inline__ struct metal_clock * __metal_driver_sifive_fe310_g000_lfrosc_p static __inline__ unsigned long int __metal_driver_sifive_fe310_g000_lfrosc_config_reg(const struct metal_clock *clock) { if ((uintptr_t)clock == (uintptr_t)&__metal_dt_clock_7) { - return 112; + return 268435568; } else { return 0; @@ -1310,7 +1310,7 @@ static __inline__ unsigned long int __metal_driver_sifive_fe310_g000_lfrosc_conf static __inline__ unsigned long int __metal_driver_sifive_fe310_g000_lfrosc_mux_reg(const struct metal_clock *clock) { if ((uintptr_t)clock == (uintptr_t)&__metal_dt_clock_7) { - return 124; + return 268435580; } else { return 0; diff --git a/bsp/sifive-hifive1/core.dts b/bsp/sifive-hifive1/core.dts index b65a80396..eadcaa05c 100644 --- a/bsp/sifive-hifive1/core.dts +++ b/bsp/sifive-hifive1/core.dts @@ -85,7 +85,7 @@ aon: aon@10000000 { compatible = "sifive,aon0"; reg = <0x10000000 0x8000>; - reg-names = "mem"; + reg-names = "control"; }; prci: prci@10008000 { diff --git a/bsp/sifive-hifive1/design.svd b/bsp/sifive-hifive1/design.svd index ea312e1ec..c3f529827 100644 --- a/bsp/sifive-hifive1/design.svd +++ b/bsp/sifive-hifive1/design.svd @@ -10,7 +10,7 @@ sifive_aon0_0 - From sifive,aon0,mem peripheral generator + From sifive,aon0,control peripheral generator 0x10000000 0 diff --git a/bsp/sifive-hifive1/metal.h b/bsp/sifive-hifive1/metal.h index 071ffe1f6..81a9d486e 100644 --- a/bsp/sifive-hifive1/metal.h +++ b/bsp/sifive-hifive1/metal.h @@ -1159,7 +1159,7 @@ static __inline__ struct metal_clock * __metal_driver_sifive_fe310_g000_lfrosc_p static __inline__ unsigned long int __metal_driver_sifive_fe310_g000_lfrosc_config_reg(const struct metal_clock *clock) { if ((uintptr_t)clock == (uintptr_t)&__metal_dt_clock_6) { - return 112; + return 268435568; } else { return 0; diff --git a/freedom-devicetree-tools b/freedom-devicetree-tools index 25b6abe2c..1a18125bc 160000 --- a/freedom-devicetree-tools +++ b/freedom-devicetree-tools @@ -1 +1 @@ -Subproject commit 25b6abe2c925248e57958d60f9c95e258df7af4d +Subproject commit 1a18125bca36f177caaebaa0ae5e98dcfbb7f977 diff --git a/scripts/cmsis-svd-generator b/scripts/cmsis-svd-generator index c13d2fc23..9761b662d 160000 --- a/scripts/cmsis-svd-generator +++ b/scripts/cmsis-svd-generator @@ -1 +1 @@ -Subproject commit c13d2fc23383cdbef08f4c7e070a5d775eaada71 +Subproject commit 9761b662d963067a1eaea9f0dbe1fbac332591c2 diff --git a/wit-manifest.json b/wit-manifest.json index be667d3e4..64fb4ea11 100644 --- a/wit-manifest.json +++ b/wit-manifest.json @@ -1,8 +1,8 @@ [ { - "commit": "25b6abe2c925248e57958d60f9c95e258df7af4d", + "commit": "1a18125bca36f177caaebaa0ae5e98dcfbb7f977", "name": "freedom-devicetree-tools", - "source": "git@github.com:sifive/freedom-devicetree-tools.git" + "source": "git@github.com:sctincman/freedom-devicetree-tools.git" }, { "commit": "6fd4b0a4e1c12b9ab159aea42fbe5ff7e6f7e81f", @@ -25,9 +25,9 @@ "source": "git@github.com:sifive/ldscript-generator.git" }, { - "commit": "c13d2fc23383cdbef08f4c7e070a5d775eaada71", + "commit": "9761b662d963067a1eaea9f0dbe1fbac332591c2", "name": "cmsis-svd-generator", - "source": "git@github.com:sifive/cmsis-svd-generator.git" + "source": "git@github.com:sctincman/cmsis-svd-generator.git" }, { "commit": "b766f5cd74f6ab0980079dfded145144189e4325",