From bee14e0f869eb44c5b8d14679792d5ada823dcc6 Mon Sep 17 00:00:00 2001 From: Christian Taedcke Date: Thu, 7 Jan 2021 12:32:25 +0100 Subject: [PATCH 1/2] dts: silabs: Fix invalid nodes in gpio node The watchdog and rng nodes were a sub-node of the gpio node. This commits corrects this issue for the relevant socs. Signed-off-by: Christian Taedcke --- dts/arm/silabs/efm32_jg_pg_12b.dtsi | 46 ++++++++++++++--------------- dts/arm/silabs/efm32gg11b.dtsi | 15 +++++----- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dts/arm/silabs/efm32_jg_pg_12b.dtsi b/dts/arm/silabs/efm32_jg_pg_12b.dtsi index 689e27bfa4a9b..1804a3d28f68f 100644 --- a/dts/arm/silabs/efm32_jg_pg_12b.dtsi +++ b/dts/arm/silabs/efm32_jg_pg_12b.dtsi @@ -225,32 +225,32 @@ #gpio-cells = <2>; status = "disabled"; }; + }; - wdog0: wdog@40052000 { - compatible = "silabs,gecko-wdog"; - reg = <0x40052000 0x2C>; - peripheral-id = <0>; - label = "WDOG0"; - interrupts = <2 0>; - status = "disabled"; - }; + wdog0: wdog@40052000 { + compatible = "silabs,gecko-wdog"; + reg = <0x40052000 0x2C>; + peripheral-id = <0>; + label = "WDOG0"; + interrupts = <2 0>; + status = "disabled"; + }; - wdog1: wdog@40052400 { - compatible = "silabs,gecko-wdog"; - reg = <0x40052400 0x2C>; - peripheral-id = <1>; - label = "WDOG1"; - interrupts = <3 0>; - status = "disabled"; - }; + wdog1: wdog@40052400 { + compatible = "silabs,gecko-wdog"; + reg = <0x40052400 0x2C>; + peripheral-id = <1>; + label = "WDOG1"; + interrupts = <3 0>; + status = "disabled"; + }; - trng0: trng@4001d000 { - compatible = "silabs,gecko-trng"; - reg = <0x4001d000 0x400>; - interrupts = <49 0>; - label = "TRNG0"; - status = "disabled"; - }; + trng0: trng@4001d000 { + compatible = "silabs,gecko-trng"; + reg = <0x4001d000 0x400>; + interrupts = <49 0>; + label = "TRNG0"; + status = "disabled"; }; }; }; diff --git a/dts/arm/silabs/efm32gg11b.dtsi b/dts/arm/silabs/efm32gg11b.dtsi index f6026920b35e9..ed3c4377618a7 100644 --- a/dts/arm/silabs/efm32gg11b.dtsi +++ b/dts/arm/silabs/efm32gg11b.dtsi @@ -289,15 +289,14 @@ #gpio-cells = <2>; status = "disabled"; }; + }; - - trng0: trng@4001d000 { - compatible = "silabs,gecko-trng"; - reg = <0x4001d000 0x400>; - interrupts = <66 0>; - label = "TRNG0"; - status = "disabled"; - }; + trng0: trng@4001d000 { + compatible = "silabs,gecko-trng"; + reg = <0x4001d000 0x400>; + interrupts = <66 0>; + label = "TRNG0"; + status = "disabled"; }; wdog0: wdog@40052000 { From 8a80eb99620cd60bba232087ab40c11cc688d4b6 Mon Sep 17 00:00:00 2001 From: Christian Taedcke Date: Thu, 7 Jan 2021 12:43:56 +0100 Subject: [PATCH 2/2] dts: silabs: Fix wrong gpio interrupt numbers The interrupt numbers for two socs for the gpio peripheral was wrong. This commits corrects this issue for the relevant socs. Signed-off-by: Christian Taedcke --- dts/arm/silabs/efm32_jg_pg_12b.dtsi | 2 +- dts/arm/silabs/efr32mg.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dts/arm/silabs/efm32_jg_pg_12b.dtsi b/dts/arm/silabs/efm32_jg_pg_12b.dtsi index 1804a3d28f68f..9f4b498f1f979 100644 --- a/dts/arm/silabs/efm32_jg_pg_12b.dtsi +++ b/dts/arm/silabs/efm32_jg_pg_12b.dtsi @@ -128,7 +128,7 @@ gpio: gpio@4000a400 { compatible = "silabs,gecko-gpio"; reg = <0x4000a400 0xf00>; - interrupts = <1 2 11 2>; + interrupts = <10 2 18 2>; interrupt-names = "GPIO_EVEN", "GPIO_ODD"; label = "GPIO"; diff --git a/dts/arm/silabs/efr32mg.dtsi b/dts/arm/silabs/efr32mg.dtsi index 24206a3b174a9..2cb94c5913589 100644 --- a/dts/arm/silabs/efr32mg.dtsi +++ b/dts/arm/silabs/efr32mg.dtsi @@ -127,7 +127,7 @@ gpio: gpio@4000a400 { compatible = "silabs,gecko-gpio"; reg = <0x4000a400 0xc00>; - interrupts = <9 2 17 2>; + interrupts = <10 2 18 2>; interrupt-names = "GPIO_EVEN", "GPIO_ODD"; label = "GPIO";