| Message ID | c1080afa34dcd9f6661007e5b6b455b4b23a0d22.1605010575.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 6004db972d04e419e7b36e10bdee1bbafd339ad6 |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | arm64: zynqmp: Get rid of unused macros | expand |
út 10. 11. 2020 v 13:16 odesílatel Michal Simek <michal.simek@xilinx.com> napsal: > > There is no reason to have these macros. But record offsets of missing > register in the structure for future use. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > arch/arm/mach-zynqmp/include/mach/hardware.h | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h > index c5ba42124b04..b328837c694f 100644 > --- a/arch/arm/mach-zynqmp/include/mach/hardware.h > +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h > @@ -134,7 +134,8 @@ struct apu_regs { > struct csu_regs { > u32 reserved0[4]; > u32 multi_boot; > - u32 reserved1[12]; > + u32 reserved1[11]; > + u32 idcode; > u32 version; > }; > > @@ -149,7 +150,4 @@ struct pmu_regs { > > #define pmu_base ((struct pmu_regs *)ZYNQMP_PMU_BASEADDR) > > -#define ZYNQMP_CSU_IDCODE_ADDR 0xFFCA0040 > -#define ZYNQMP_CSU_VER_ADDR 0xFFCA0044 > - > #endif /* _ASM_ARCH_HARDWARE_H */ > -- > 2.29.2 > Applied. M
diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h index c5ba42124b04..b328837c694f 100644 --- a/arch/arm/mach-zynqmp/include/mach/hardware.h +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h @@ -134,7 +134,8 @@ struct apu_regs { struct csu_regs { u32 reserved0[4]; u32 multi_boot; - u32 reserved1[12]; + u32 reserved1[11]; + u32 idcode; u32 version; }; @@ -149,7 +150,4 @@ struct pmu_regs { #define pmu_base ((struct pmu_regs *)ZYNQMP_PMU_BASEADDR) -#define ZYNQMP_CSU_IDCODE_ADDR 0xFFCA0040 -#define ZYNQMP_CSU_VER_ADDR 0xFFCA0044 - #endif /* _ASM_ARCH_HARDWARE_H */
There is no reason to have these macros. But record offsets of missing register in the structure for future use. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- arch/arm/mach-zynqmp/include/mach/hardware.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)