github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 05:55:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM: OMAP1/2: misc SoC updates for v6.12

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmbY9nMACgkQWTcYmtP7
 xmWwDQ/9HP7y444tT7u3BRfVitZRs8axEZzyCMnkxkDYqYI7ROLPDfLqmNvq6PCM
 Rk3+JE55WerR5yNqb4RPYy+nEJ+yB9cBokMH+fA7IAIz8LNw/M7efh7bd4Kr/iQn
 PxsdUQyYd5KOj3X+Ge13YMqkw0FJin5O0w1pNy8JU1Uo383BAjcuX/977utjCcqn
 xeArSGxvZ5v/LLmcAOXF+OtI6Yf/XxMtYUc4f6S0/qE9kAV6pN4MxfaIaspB2d6j
 oZrWr2vpHrPa8sRjz3TUgjS6aQneVjGW7kr8PEPdvFZ69eTI5N6Bo0HC6s3IjFT+
 BkBULF7v3D7QK8DXtBrLrCJG+63ZGD1yexcaB3Hd07mRsc8tsJuPad2PF6yQLhRV
 GMfbf80Ny3Ld2PMCofDzv+BN34LHru0sag3lN9F7kTD2JDCPouXGTebhTuwQy7op
 jRo4uaHSo6pHeHLVQb/jrk2Z1jBU4noAQVHCWsjy5ouGdvDux9NNCtn0rpVbW3NM
 iDXbv02DwDcj3UXvSUtPNO5KSXDf9D9iN4edt+4EVq3udGBtxnBxw4i+qigZcrxj
 1BMbByK6Z/rhWYtDOthBV6m7aBQSZuP0nNqYnXjkE8Znr1SZGEoPfxfORkLrjqyl
 fSbhqknwxmisWavdOLs3fCHjIMtWsBK0bO9u+KX026/S6gBAX58=
 =UfU/
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmbZgmgACgkQYKtH/8kJ
 UicDihAA36vNrq7yUvIwx9W8K9rCIDJOcJ1K0sRp+csefIHe1ZDN0Y009ZWU5FNP
 bbEk3FBY2xH8FWgEhs/VUSUKk2nyGDa2sMuym3Yk2hN0i/u+7fql0ePAIYgMQzn3
 l1t8wGr2Muey6QnSNymZ+t0qTDO43nCz9qFM37KFsc2RYUpJVcnhCi+3CCMHbSy2
 ibdAQ6xMHCkfZfgXskCXIvPbg8TCOM1qX6yptj6O/Klc8517whlnbibBLLqoMVJr
 Gr2TWht9LLKP6ZY+qQ6GXEJMDtEcJsO8NNapdQZcc8DY+gDtAvqNWS8tWHZ/ijpJ
 Y6iTfqMwyhDTnPKGRiOl+OYoy534rDZPu0nsWrKc78OOeLWgUDwkLsnU6eR3bVvr
 swLDOmY3fHR8dyuuQszyO1sKbun6vfxPwRrUaHpR6QPIClHzVCOtuCd5ckfTyFUI
 DOeDt6fck0pn9Au6gxRhS5zN9ffzhbNomXeMmX/NDPWNVNYPs4QfnwKfnv47wv64
 k2XhtK8ky+UNJslFRMxDdtFMlf0OpLPW4sBZkQ6ZrLSpbZ9n7byghSMa15d+Joyt
 JTaQ+NnhB3f7hhgTnnUkpQG9ixWfE7qw0Yudns2Roqvr2sEzFazDl55CkqSX3FHA
 HAExCBzLJv9ggc5cqNtQkym7sJuq7MsTFsk2iljPJXUxBBHp1xA=
 =sItP
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v6.12/soc-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/arm

ARM: OMAP1/2: misc SoC updates for v6.12

* tag 'omap-for-v6.12/soc-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
  ARM: OMAP1: Remove unused declarations in arch/arm/mach-omap1/pm.h
  ARM: omap2: Switch to use kmemdup_array()
  ARM: omap1: Remove unused struct 'dma_link_info'

Link: https://lore.kernel.org/r/7h8qw7arhe.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-09-05 10:05:20 +00:00
commit d4c3179671
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/mach-omap1/omap-dma.c
View File

@ -59,19 +59,6 @@ static struct omap_dma_dev_attr *d;
static int enable_1510_mode;
static u32 errata;
struct dma_link_info {
int *linked_dmach_q;
int no_of_lchs_linked;
int q_count;
int q_tail;
int q_head;
int chain_state;
int chain_mode;
};
static int dma_lch_count;
static int dma_chan_count;
static int omap_dma_reserve_channels;

4
arch/arm/mach-omap1/pm.h
View File

@ -114,13 +114,9 @@ extern void omap1_pm_suspend(void);
extern void omap1510_cpu_suspend(unsigned long, unsigned long);
extern void omap1610_cpu_suspend(unsigned long, unsigned long);
extern void omap1510_idle_loop_suspend(void);
extern void omap1610_idle_loop_suspend(void);
extern unsigned int omap1510_cpu_suspend_sz;
extern unsigned int omap1610_cpu_suspend_sz;
extern unsigned int omap1510_idle_loop_suspend_sz;
extern unsigned int omap1610_idle_loop_suspend_sz;
#ifdef CONFIG_OMAP_SERIAL_WAKE
extern void omap_serial_wake_trigger(int enable);

2
arch/arm/mach-omap2/omap_device.c
View File

@ -315,7 +315,7 @@ static struct omap_device *omap_device_alloc(struct platform_device *pdev,
od->hwmods_cnt = oh_cnt;
hwmods = kmemdup(ohs, sizeof(struct omap_hwmod *) * oh_cnt, GFP_KERNEL);
hwmods = kmemdup_array(ohs, oh_cnt, sizeof(*hwmods), GFP_KERNEL);
if (!hwmods)
goto oda_exit2;