Commit 8639a123 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.14/cleanup-signed' of... 

Merge tag 'omap-for-v5.14/cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

Clean up changes for omaps for v5.14 merge window

With the recent changes to drop legacy platform data for
am3/4, omap4/5, and dra7, we can drop the related unused
code. There is also a patch to remove leading spaces from
the Kconfig file.

* tag 'omap-for-v5.14/cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: remove omap2_set_globals_control()
  ARM: OMAP2+: CM: remove omap2_set_globals_cm()
  ARM: OMAP1: Remove leading spaces in Kconfig
  MAINTAINERS: remove obsolete OMAP HWMOD DATA FOR OMAP4-BASED DEVICES

Link: https://lore.kernel.org/r/pull-1622618286-677305@atomide.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c4681547 d61f2634

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -13347,12 +13347,6 @@ L: linux-omap@vger.kernel.org 
S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod*data*









OMAP HWMOD DATA FOR OMAP4-BASED DEVICES









M:	Benoît Cousson <bcousson@baylibre.com>









L:	linux-omap@vger.kernel.org









S:	Maintained









F:	arch/arm/mach-omap2/omap_hwmod_44xx_data.c

















OMAP HWMOD SUPPORT









M:	Benoît Cousson <bcousson@baylibre.com>









M:	Paul Walmsley <paul@pwsan.com>
































arch/arm/mach-omap2/cm.h



+0
−1






























Original line number
Diff line number
Diff line







@@ -26,7 +26,6 @@

















extern struct omap_domain_base cm_base;









extern struct omap_domain_base cm2_base;









extern void omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2);









# endif



















/*
































arch/arm/mach-omap2/cm_common.c



+0
−13






























Original line number
Diff line number
Diff line







@@ -37,19 +37,6 @@ struct omap_domain_base cm2_base;







#define CM_NO_CLOCKS		0x1









#define CM_SINGLE_INSTANCE	0x2



















/**









 * omap2_set_globals_cm - set the CM/CM2 base addresses (for early use)









 * @cm: CM base virtual address









 * @cm2: CM2 base virtual address (if present on the booted SoC)









 *









 * XXX Will be replaced when the PRM/CM drivers are completed.









 */









void __init omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2)









{









	cm_base.va = cm;









	cm2_base.va = cm2;









}



















/**









 * cm_split_idlest_reg - split CM_IDLEST reg addr into its components









 * @idlest_reg: CM_IDLEST* virtual address
































arch/arm/mach-omap2/control.c



+0
−5






























Original line number
Diff line number
Diff line







@@ -136,11 +136,6 @@ struct omap3_control_regs {







static struct omap3_control_regs control_context;









#endif /* CONFIG_ARCH_OMAP3 && CONFIG_PM */



















void __init omap2_set_globals_control(void __iomem *ctrl)









{









	omap2_ctrl_base = ctrl;









}



















u8 omap_ctrl_readb(u16 offset)









{









	u32 val;
































arch/arm/mach-omap2/control.h



+0
−1






























Original line number
Diff line number
Diff line







@@ -528,7 +528,6 @@ extern int omap3_ctrl_save_padconf(void);







void omap3_ctrl_init(void);









int omap2_control_base_init(void);









int omap_control_init(void);









void omap2_set_globals_control(void __iomem *ctrl);









void __init omap3_control_legacy_iomap_init(void);









#else









#define omap_ctrl_readb(x)		0
































arch/arm/mach-omap1/Kconfig



+6
−6




























File changed.
Contains only whitespace changes.