From 8c704ea3a88d0787481f27081a0d4ba2505c721b Mon Sep 17 00:00:00 2001 From: Raveendra Padasalagi Date: Thu, 25 Feb 2021 10:53:46 +0530 Subject: [PATCH] soc: viper: update registers and interrupt numbers Update register addresses and NVIC/GIC interrupt numbers according to the latest viper RTL version. Signed-off-by: Raveendra Padasalagi Signed-off-by: Abhishek Shah --- dts/arm/broadcom/viper-a72.dtsi | 8 +++++++- dts/arm/broadcom/viper-m7.dtsi | 6 +++--- soc/arm/bcm_vk/viper/soc.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dts/arm/broadcom/viper-a72.dtsi b/dts/arm/broadcom/viper-a72.dtsi index 68a9097e6c6..1815c9e8fd1 100644 --- a/dts/arm/broadcom/viper-a72.dtsi +++ b/dts/arm/broadcom/viper-a72.dtsi @@ -56,6 +56,12 @@ &uart1 { interrupt-parent = <&gic>; - interrupts = ; }; + +&paxdma { + interrupt-parent = <&gic>; + interrupts = ; +}; diff --git a/dts/arm/broadcom/viper-m7.dtsi b/dts/arm/broadcom/viper-m7.dtsi index fd374ba3886..2c0e7e3b25d 100644 --- a/dts/arm/broadcom/viper-m7.dtsi +++ b/dts/arm/broadcom/viper-m7.dtsi @@ -38,17 +38,17 @@ }; &uart1 { - interrupts = <197 3>; + interrupts = <203 3>; }; &pcie0_ep { interrupt-parent = <&nvic>; - interrupts = <44 3>, <46 3>, <98 3>, <123 3>, <215 3>; + interrupts = <44 3>, <46 3>, <98 3>, <99 3>, <215 3>; interrupt-names = "perst", "perst_inband", "flr", "snoop_irq1", "pcie_pmon_lite"; }; &paxdma { interrupt-parent = <&nvic>; - interrupts = <226 3>; + interrupts = <228 3>; }; diff --git a/soc/arm/bcm_vk/viper/soc.h b/soc/arm/bcm_vk/viper/soc.h index 254e18aa520..691ff182d26 100644 --- a/soc/arm/bcm_vk/viper/soc.h +++ b/soc/arm/bcm_vk/viper/soc.h @@ -299,7 +299,7 @@ typedef enum IRQn { #define LS_ICFG_PMON_LITE_CLK_CTRL 0x482f00bc #define PCIE_PMON_LITE_CLK_ENABLE (BIT(0) | BIT(2)) -#define LS_ICFG_PMON_LITE_SW_RESETN 0x482f011c +#define LS_ICFG_PMON_LITE_SW_RESETN 0x482f0120 #define PCIE_PMON_LITE_SW_RESETN BIT(0) #endif