iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/include: Declare mpc8xx_immr in 8xx_immap.h

Browse Source 
Do the same as for cmp2_immr : declare it at the same place
as its type immap_t, that is in 8xx_immap.h instead of fs_pd.h

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/62d490b65899c2f2667ca7045c5f0fad9cbda458.1691474658.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2023-08-08 08:04:39 +02:00 committed by Michael Ellerman
parent 60bc069c43
commit e6e077cb2a
5 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/8xx_immap.h
View File

@ -560,5 +560,7 @@ typedef struct immap {
cpm8xx_t im_cpm; /* Communication processor */
} immap_t;
extern immap_t __iomem *mpc8xx_immr;
#endif /* __IMMAP_8XX__ */
#endif /* __KERNEL__ */

2
arch/powerpc/include/asm/fs_pd.h
View File

@ -29,8 +29,6 @@
#ifdef CONFIG_PPC_8xx
#include <asm/8xx_immap.h>
extern immap_t __iomem *mpc8xx_immr;
#define immr_map(member) (&mpc8xx_immr->member)
#define immr_map_size(member, size) (&mpc8xx_immr->member)
#define immr_unmap(addr) do {} while (0)

2
arch/powerpc/platforms/8xx/adder875.c
View File

@ -13,7 +13,7 @@
#include <asm/time.h>
#include <asm/machdep.h>
#include <asm/cpm1.h>
#include <asm/fs_pd.h>
#include <asm/8xx_immap.h>
#include <asm/udbg.h>
#include "mpc8xx.h"

1
arch/powerpc/platforms/8xx/mpc86xads_setup.c
View File

@ -24,7 +24,6 @@
#include <asm/time.h>
#include <asm/8xx_immap.h>
#include <asm/cpm1.h>
#include <asm/fs_pd.h>
#include <asm/udbg.h>
#include "mpc86xads.h"

1
arch/powerpc/platforms/8xx/mpc885ads_setup.c
View File

@ -37,7 +37,6 @@
#include <asm/time.h>
#include <asm/8xx_immap.h>
#include <asm/cpm1.h>
#include <asm/fs_pd.h>
#include <asm/udbg.h>
#include "mpc885ads.h"