GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stm32mp1: syscon: remove stgen

Browse source 
Reduce difference with kernel Linux device tree.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay 2019-07-05 17:20:11 +02:00
parent 72d18583a1
commit dfda7d4c83
4 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/dts/stm32mp157-u-boot.dtsi
View file

@ -31,13 +31,6 @@
soc { soc {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
stgen: stgen@5C008000 {
compatible = "st,stm32-stgen";
reg = <0x5C008000 0x1000>;
status = "okay";
u-boot,dm-pre-reloc;
};
}; };
}; };

2
arch/arm/mach-stm32mp/include/mach/stm32.h
View file

@ -15,6 +15,7 @@
#define STM32_DBGMCU_BASE 0x50081000 #define STM32_DBGMCU_BASE 0x50081000
#define STM32_TZC_BASE 0x5C006000 #define STM32_TZC_BASE 0x5C006000
#define STM32_ETZPC_BASE 0x5C007000 #define STM32_ETZPC_BASE 0x5C007000
#define STM32_STGEN_BASE 0x5C008000
#define STM32_TAMP_BASE 0x5C00A000 #define STM32_TAMP_BASE 0x5C00A000
#define STM32_USART1_BASE 0x5C000000 #define STM32_USART1_BASE 0x5C000000
@ -37,7 +38,6 @@
enum { enum {
STM32MP_SYSCON_UNKNOWN, STM32MP_SYSCON_UNKNOWN,
STM32MP_SYSCON_PWR, STM32MP_SYSCON_PWR,
STM32MP_SYSCON_STGEN,
STM32MP_SYSCON_SYSCFG, STM32MP_SYSCON_SYSCFG,
}; };

1
arch/arm/mach-stm32mp/syscon.c
View file

@ -10,7 +10,6 @@
static const struct udevice_id stm32mp_syscon_ids[] = { static const struct udevice_id stm32mp_syscon_ids[] = {
{ .compatible = "st,stm32mp1-pwr", .data = STM32MP_SYSCON_PWR }, { .compatible = "st,stm32mp1-pwr", .data = STM32MP_SYSCON_PWR },
{ .compatible = "st,stm32-stgen", .data = STM32MP_SYSCON_STGEN },
{ .compatible = "st,stm32mp157-syscfg", { .compatible = "st,stm32mp157-syscfg",
.data = STM32MP_SYSCON_SYSCFG }, .data = STM32MP_SYSCON_SYSCFG },
{ } { }

3
drivers/clk/clk_stm32mp1.c
View file

@ -1542,8 +1542,7 @@ static void stgen_config(struct stm32mp1_clk_priv *priv)
u32 stgenc, cntfid0; u32 stgenc, cntfid0;
ulong rate; ulong rate;
stgenc = (u32)syscon_get_first_range(STM32MP_SYSCON_STGEN); stgenc = STM32_STGEN_BASE;
cntfid0 = readl(stgenc + STGENC_CNTFID0); cntfid0 = readl(stgenc + STGENC_CNTFID0);
p = stm32mp1_clk_get_parent(priv, STGEN_K); p = stm32mp1_clk_get_parent(priv, STGEN_K);
rate = stm32mp1_clk_get(priv, p); rate = stm32mp1_clk_get(priv, p);