diff options
author | Tony Lindgren <tony@atomide.com> | 2021-07-27 10:25:08 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2021-07-27 10:25:08 +0200 |
commit | 353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5 (patch) | |
tree | 081200957b3d8925cbe913020d45a4e3ba61a7a3 /drivers/bus/ti-sysc.c | |
parent | bus: ti-sysc: Fix gpt12 system timer issue with reserved status (diff) | |
parent | omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator (diff) | |
download | linux-353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5.tar.xz linux-353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5.zip |
Merge branch 'fixes-v5.14' into fixes
Diffstat (limited to 'drivers/bus/ti-sysc.c')
-rw-r--r-- | drivers/bus/ti-sysc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 188cdb0a394e..0ef98e3ba341 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -2953,6 +2953,8 @@ static int sysc_init_soc(struct sysc *ddata) case SOC_3430 ... SOC_3630: sysc_add_disabled(0x48304000); /* timer12 */ break; + case SOC_AM3: + sysc_add_disabled(0x48310000); /* rng */ default: break; } |