hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmC3LIERHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXNxnRAA2Sivq3pGG05XbTYSJ+Q5UD86l7bxrp7O
 6nsS0WHUr3TgvHOnxuIwBzGAFO7MRkv7gCRj3vBHspiDen38sjpwtk+t7RpnygPA
 1SccXMdau0a4zYu8s3GMGPEs+ojy0gpmXEXq16hxToKGwfyMMGZl0coMpru8yw6A
 AqukqpFBzFVNHFPZKBvEHiL+wZ+fz8u3parX2kfJzlBFYa8y5RduRobEgyON2w7o
 8S2B1LFrNkNGz+UzOiHVdfHzqHlXkrfpLvttxMNpSweiYgQwZf9do0Q70oz0TTOB
 1DJMYoQptkp0g0o2p2is+QRbj5yuTBEqXfCyoJeiWoXZF9MwDp5A82PseBn01arc
 eKw2uwM91Hw6mk3dWx5dl2dg9s8m8KSW68jpPgP73WJodl+sXTasfIeRBiTAIpFx
 lY+aG+TrM5ab3nV0pIEa6VaC0q6XpfJej4EY9LSgxQi8/+nTTpO8q2wfsoWrjTyf
 Ze5Wf7f0vZWO3AxzQOhIXUlDB0c+/CN4XXN8sVy/m8lRaSPe9CRt4z2m9njXXwC/
 jB2GpF82rT+VRdafmnxAgT1PznaP5LPTviuSj8dAPVXMZZKC49x89xHpa10kwQFd
 QOO7V7+2l8g0YNwb6ILHaL+sZIwxIAIcMnE3p55k3XkgbCeZEZvHyc3Hqrk+pgg4
 D8Z173aLVHI=
 =8/VK
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2021-06-12 08:32:34 -07:00
parent c4681547bc d61f263495
commit 8639a12370
6 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MAINTAINERS
View File

@ -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>

12
arch/arm/mach-omap1/Kconfig
View File

@ -65,14 +65,14 @@ config MACH_OMAP_INNOVATOR
config MACH_OMAP_H2
bool "TI H2 Support"
depends on ARCH_OMAP16XX
help
help
TI OMAP 1610/1611B H2 board support. Say Y here if you have such
a board.
config MACH_OMAP_H3
bool "TI H3 Support"
depends on ARCH_OMAP16XX
help
help
TI OMAP 1710 H3 board support. Say Y here if you have such
a board.
@ -85,14 +85,14 @@ config MACH_HERALD
config MACH_OMAP_OSK
bool "TI OSK Support"
depends on ARCH_OMAP16XX
help
help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
if you have such a board.
config OMAP_OSK_MISTRAL
bool "Mistral QVGA board Support"
depends on MACH_OMAP_OSK
help
help
The OSK supports an optional add-on board with a Quarter-VGA
touchscreen, PDA-ish buttons, a resume button, bicolor LED,
and camera connector. Say Y here if you have this board.
@ -100,14 +100,14 @@ config OMAP_OSK_MISTRAL
config MACH_OMAP_PERSEUS2
bool "TI Perseus2"
depends on ARCH_OMAP730
help
help
Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
a board.
config MACH_OMAP_FSAMPLE
bool "TI F-Sample"
depends on ARCH_OMAP730
help
help
Support for TI OMAP 850 F-Sample board. Say Y here if you have such
a board.

1
arch/arm/mach-omap2/cm.h
View File

@ -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
/*

13
arch/arm/mach-omap2/cm_common.c
View File

@ -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

5
arch/arm/mach-omap2/control.c
View File

@ -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;

1
arch/arm/mach-omap2/control.h
View File

@ -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