stm32mp1: syscon: remove stgen

Reduce difference with kernel Linux device tree.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/arch/arm/dts/stm32mp157-u-boot.dtsi b/arch/arm/dts/stm32mp157-u-boot.dtsi
index 09560e2d915474e890500039558912c2fe6bd092..c9f534e4ea47261078f9fd801392858c427734e3 100644 (file)
--- a/arch/arm/dts/stm32mp157-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157-u-boot.dtsi
@@ -31,13 +31,6 @@
 
        soc {
                u-boot,dm-pre-reloc;
-
-               stgen: stgen@5C008000 {
-                       compatible = "st,stm32-stgen";
-                       reg = <0x5C008000 0x1000>;
-                       status = "okay";
-                       u-boot,dm-pre-reloc;
-               };
        };
 };
 

diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h
index 1e3299a16dc8f5d043b87c9dbf65e49439cb4072..1d4b5482acc1add895fd8dd9207083ce356c7580 100644 (file)
--- a/arch/arm/mach-stm32mp/include/mach/stm32.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32.h
@@ -15,6 +15,7 @@
 #define STM32_DBGMCU_BASE              0x50081000
 #define STM32_TZC_BASE                 0x5C006000
 #define STM32_ETZPC_BASE               0x5C007000
+#define STM32_STGEN_BASE               0x5C008000
 #define STM32_TAMP_BASE                        0x5C00A000
 
 #define STM32_USART1_BASE              0x5C000000
@@ -37,7 +38,6 @@
 enum {
        STM32MP_SYSCON_UNKNOWN,
        STM32MP_SYSCON_PWR,
-       STM32MP_SYSCON_STGEN,
        STM32MP_SYSCON_SYSCFG,
 };
 

diff --git a/arch/arm/mach-stm32mp/syscon.c b/arch/arm/mach-stm32mp/syscon.c
index e10c42eb136a6db6b6d48901f4be955e37f90f21..6070837bf01bce14f6baabbd4e81891e1153f2c9 100644 (file)
--- a/arch/arm/mach-stm32mp/syscon.c
+++ b/arch/arm/mach-stm32mp/syscon.c
@@ -10,7 +10,6 @@
 
 static const struct udevice_id stm32mp_syscon_ids[] = {
        { .compatible = "st,stm32mp1-pwr", .data = STM32MP_SYSCON_PWR },
-       { .compatible = "st,stm32-stgen", .data = STM32MP_SYSCON_STGEN },
        { .compatible = "st,stm32mp157-syscfg",
          .data = STM32MP_SYSCON_SYSCFG },
        { }

diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index f295e4864b396a770e2dc91887ad486faafd8681..5f1585311498c65ea46b7f959d7f9b1af16ae1eb 100644 (file)
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -1542,8 +1542,7 @@ static void stgen_config(struct stm32mp1_clk_priv *priv)
        u32 stgenc, cntfid0;
        ulong rate;
 
-       stgenc = (u32)syscon_get_first_range(STM32MP_SYSCON_STGEN);
-
+       stgenc = STM32_STGEN_BASE;
        cntfid0 = readl(stgenc + STGENC_CNTFID0);
        p = stm32mp1_clk_get_parent(priv, STGEN_K);
        rate = stm32mp1_clk_get(priv, p);