| Message ID | 20220909124128.16471-1-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | b120519d7655a9fb134f1c71148c1f0b96b1192e |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | arm: mvebu: Mark constant data with const keyword | expand |
On 09.09.22 14:41, Pali Rohár wrote: > Signed-off-by: Pali Rohár <pali@kernel.org> Nitpicking: At least one sentence with a short description should be included in the commit text. Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > arch/arm/mach-kirkwood/cpu.c | 2 +- > arch/arm/mach-kirkwood/include/mach/cpu.h | 2 +- > arch/arm/mach-mvebu/cpu.c | 2 +- > arch/arm/mach-mvebu/include/mach/cpu.h | 2 +- > arch/arm/mach-mvebu/mbus.c | 2 +- > arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c | 2 +- > arch/arm/mach-mvebu/system-controller.c | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c > index 80f893ab369a..df3e8f11782a 100644 > --- a/arch/arm/mach-kirkwood/cpu.c > +++ b/arch/arm/mach-kirkwood/cpu.c > @@ -52,7 +52,7 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval) > return (0x0000ffff & j); > } > > -static struct mbus_win windows[] = { > +static const struct mbus_win windows[] = { > /* Window 0: PCIE MEM address space */ > { KW_DEFADR_PCI_MEM, KW_DEFADR_PCI_MEM_SIZE, > KWCPU_TARGET_PCIE, KWCPU_ATTR_PCIE_MEM }, > diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h > index d8639c60352b..9eec786fe8fc 100644 > --- a/arch/arm/mach-kirkwood/include/mach/cpu.h > +++ b/arch/arm/mach-kirkwood/include/mach/cpu.h > @@ -150,7 +150,7 @@ struct kwgpio_registers { > unsigned int mvebu_sdram_bar(enum memory_bank bank); > unsigned int mvebu_sdram_bs(enum memory_bank bank); > void mvebu_sdram_size_adjust(enum memory_bank bank); > -int mvebu_mbus_probe(struct mbus_win windows[], int count); > +int mvebu_mbus_probe(const struct mbus_win windows[], int count); > void mvebu_config_gpio(unsigned int gpp0_oe_val, unsigned int gpp1_oe_val, > unsigned int gpp0_oe, unsigned int gpp1_oe); > int kw_config_mpp(unsigned int mpp0_7, unsigned int mpp8_15, > diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c > index 9a80440d1a9e..1f8cdf8744e6 100644 > --- a/arch/arm/mach-mvebu/cpu.c > +++ b/arch/arm/mach-mvebu/cpu.c > @@ -20,7 +20,7 @@ > #define DDR_BASE_CS_OFF(n) (0x0000 + ((n) << 3)) > #define DDR_SIZE_CS_OFF(n) (0x0004 + ((n) << 3)) > > -static struct mbus_win windows[] = { > +static const struct mbus_win windows[] = { > /* SPI */ > { MBUS_SPI_BASE, MBUS_SPI_SIZE, > CPU_TARGET_DEVICEBUS_BOOTROM_SPI, CPU_ATTR_SPIFLASH }, > diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h > index 3de10de745ef..574a9264172c 100644 > --- a/arch/arm/mach-mvebu/include/mach/cpu.h > +++ b/arch/arm/mach-mvebu/include/mach/cpu.h > @@ -139,7 +139,7 @@ extern u8 serdes_pex_pulse_width[]; > unsigned int mvebu_sdram_bar(enum memory_bank bank); > unsigned int mvebu_sdram_bs(enum memory_bank bank); > void mvebu_sdram_size_adjust(enum memory_bank bank); > -int mvebu_mbus_probe(struct mbus_win windows[], int count); > +int mvebu_mbus_probe(const struct mbus_win windows[], int count); > u32 mvebu_get_nand_clock(void); > > void __noreturn return_to_bootrom(void); > diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c > index 7092f6cc10c2..959ca8e92602 100644 > --- a/arch/arm/mach-mvebu/mbus.c > +++ b/arch/arm/mach-mvebu/mbus.c > @@ -469,7 +469,7 @@ int mbus_dt_setup_win(u32 base, u32 size, u8 target, u8 attr) > return 0; > } > > -int mvebu_mbus_probe(struct mbus_win windows[], int count) > +int mvebu_mbus_probe(const struct mbus_win windows[], int count) > { > int win; > int ret; > diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c > index 4a4f93ccf93f..ac98dee2993d 100644 > --- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c > +++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c > @@ -108,7 +108,7 @@ struct serdes_unit_data { > u8 serdes_unit_num; > }; > > -static struct serdes_unit_data serdes_type_to_unit_info[] = { > +static const struct serdes_unit_data serdes_type_to_unit_info[] = { > {PEX_UNIT_ID, 0,}, > {PEX_UNIT_ID, 1,}, > {PEX_UNIT_ID, 2,}, > diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c > index ea858b269e82..e90aff0c3379 100644 > --- a/arch/arm/mach-mvebu/system-controller.c > +++ b/arch/arm/mach-mvebu/system-controller.c > @@ -86,7 +86,7 @@ static const struct udevice_id mvebu_reset_of_match[] = { > { }, > }; > > -static struct reset_ops mvebu_reset_ops = { > +static const struct reset_ops mvebu_reset_ops = { > .of_xlate = mvebu_reset_of_xlate, > .request = mvebu_reset_request, > .rfree = mvebu_reset_free, Viele Grüße, Stefan Roese
On 09.09.22 14:41, Pali Rohár wrote: > Signed-off-by: Pali Rohár <pali@kernel.org> Applied to u-boot-marvell/master Thanks, Stefan > --- > arch/arm/mach-kirkwood/cpu.c | 2 +- > arch/arm/mach-kirkwood/include/mach/cpu.h | 2 +- > arch/arm/mach-mvebu/cpu.c | 2 +- > arch/arm/mach-mvebu/include/mach/cpu.h | 2 +- > arch/arm/mach-mvebu/mbus.c | 2 +- > arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c | 2 +- > arch/arm/mach-mvebu/system-controller.c | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c > index 80f893ab369a..df3e8f11782a 100644 > --- a/arch/arm/mach-kirkwood/cpu.c > +++ b/arch/arm/mach-kirkwood/cpu.c > @@ -52,7 +52,7 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval) > return (0x0000ffff & j); > } > > -static struct mbus_win windows[] = { > +static const struct mbus_win windows[] = { > /* Window 0: PCIE MEM address space */ > { KW_DEFADR_PCI_MEM, KW_DEFADR_PCI_MEM_SIZE, > KWCPU_TARGET_PCIE, KWCPU_ATTR_PCIE_MEM }, > diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h > index d8639c60352b..9eec786fe8fc 100644 > --- a/arch/arm/mach-kirkwood/include/mach/cpu.h > +++ b/arch/arm/mach-kirkwood/include/mach/cpu.h > @@ -150,7 +150,7 @@ struct kwgpio_registers { > unsigned int mvebu_sdram_bar(enum memory_bank bank); > unsigned int mvebu_sdram_bs(enum memory_bank bank); > void mvebu_sdram_size_adjust(enum memory_bank bank); > -int mvebu_mbus_probe(struct mbus_win windows[], int count); > +int mvebu_mbus_probe(const struct mbus_win windows[], int count); > void mvebu_config_gpio(unsigned int gpp0_oe_val, unsigned int gpp1_oe_val, > unsigned int gpp0_oe, unsigned int gpp1_oe); > int kw_config_mpp(unsigned int mpp0_7, unsigned int mpp8_15, > diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c > index 9a80440d1a9e..1f8cdf8744e6 100644 > --- a/arch/arm/mach-mvebu/cpu.c > +++ b/arch/arm/mach-mvebu/cpu.c > @@ -20,7 +20,7 @@ > #define DDR_BASE_CS_OFF(n) (0x0000 + ((n) << 3)) > #define DDR_SIZE_CS_OFF(n) (0x0004 + ((n) << 3)) > > -static struct mbus_win windows[] = { > +static const struct mbus_win windows[] = { > /* SPI */ > { MBUS_SPI_BASE, MBUS_SPI_SIZE, > CPU_TARGET_DEVICEBUS_BOOTROM_SPI, CPU_ATTR_SPIFLASH }, > diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h > index 3de10de745ef..574a9264172c 100644 > --- a/arch/arm/mach-mvebu/include/mach/cpu.h > +++ b/arch/arm/mach-mvebu/include/mach/cpu.h > @@ -139,7 +139,7 @@ extern u8 serdes_pex_pulse_width[]; > unsigned int mvebu_sdram_bar(enum memory_bank bank); > unsigned int mvebu_sdram_bs(enum memory_bank bank); > void mvebu_sdram_size_adjust(enum memory_bank bank); > -int mvebu_mbus_probe(struct mbus_win windows[], int count); > +int mvebu_mbus_probe(const struct mbus_win windows[], int count); > u32 mvebu_get_nand_clock(void); > > void __noreturn return_to_bootrom(void); > diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c > index 7092f6cc10c2..959ca8e92602 100644 > --- a/arch/arm/mach-mvebu/mbus.c > +++ b/arch/arm/mach-mvebu/mbus.c > @@ -469,7 +469,7 @@ int mbus_dt_setup_win(u32 base, u32 size, u8 target, u8 attr) > return 0; > } > > -int mvebu_mbus_probe(struct mbus_win windows[], int count) > +int mvebu_mbus_probe(const struct mbus_win windows[], int count) > { > int win; > int ret; > diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c > index 4a4f93ccf93f..ac98dee2993d 100644 > --- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c > +++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c > @@ -108,7 +108,7 @@ struct serdes_unit_data { > u8 serdes_unit_num; > }; > > -static struct serdes_unit_data serdes_type_to_unit_info[] = { > +static const struct serdes_unit_data serdes_type_to_unit_info[] = { > {PEX_UNIT_ID, 0,}, > {PEX_UNIT_ID, 1,}, > {PEX_UNIT_ID, 2,}, > diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c > index ea858b269e82..e90aff0c3379 100644 > --- a/arch/arm/mach-mvebu/system-controller.c > +++ b/arch/arm/mach-mvebu/system-controller.c > @@ -86,7 +86,7 @@ static const struct udevice_id mvebu_reset_of_match[] = { > { }, > }; > > -static struct reset_ops mvebu_reset_ops = { > +static const struct reset_ops mvebu_reset_ops = { > .of_xlate = mvebu_reset_of_xlate, > .request = mvebu_reset_request, > .rfree = mvebu_reset_free, Viele Grüße, Stefan Roese
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index 80f893ab369a..df3e8f11782a 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -52,7 +52,7 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval) return (0x0000ffff & j); } -static struct mbus_win windows[] = { +static const struct mbus_win windows[] = { /* Window 0: PCIE MEM address space */ { KW_DEFADR_PCI_MEM, KW_DEFADR_PCI_MEM_SIZE, KWCPU_TARGET_PCIE, KWCPU_ATTR_PCIE_MEM }, diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h index d8639c60352b..9eec786fe8fc 100644 --- a/arch/arm/mach-kirkwood/include/mach/cpu.h +++ b/arch/arm/mach-kirkwood/include/mach/cpu.h @@ -150,7 +150,7 @@ struct kwgpio_registers { unsigned int mvebu_sdram_bar(enum memory_bank bank); unsigned int mvebu_sdram_bs(enum memory_bank bank); void mvebu_sdram_size_adjust(enum memory_bank bank); -int mvebu_mbus_probe(struct mbus_win windows[], int count); +int mvebu_mbus_probe(const struct mbus_win windows[], int count); void mvebu_config_gpio(unsigned int gpp0_oe_val, unsigned int gpp1_oe_val, unsigned int gpp0_oe, unsigned int gpp1_oe); int kw_config_mpp(unsigned int mpp0_7, unsigned int mpp8_15, diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 9a80440d1a9e..1f8cdf8744e6 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -20,7 +20,7 @@ #define DDR_BASE_CS_OFF(n) (0x0000 + ((n) << 3)) #define DDR_SIZE_CS_OFF(n) (0x0004 + ((n) << 3)) -static struct mbus_win windows[] = { +static const struct mbus_win windows[] = { /* SPI */ { MBUS_SPI_BASE, MBUS_SPI_SIZE, CPU_TARGET_DEVICEBUS_BOOTROM_SPI, CPU_ATTR_SPIFLASH }, diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h index 3de10de745ef..574a9264172c 100644 --- a/arch/arm/mach-mvebu/include/mach/cpu.h +++ b/arch/arm/mach-mvebu/include/mach/cpu.h @@ -139,7 +139,7 @@ extern u8 serdes_pex_pulse_width[]; unsigned int mvebu_sdram_bar(enum memory_bank bank); unsigned int mvebu_sdram_bs(enum memory_bank bank); void mvebu_sdram_size_adjust(enum memory_bank bank); -int mvebu_mbus_probe(struct mbus_win windows[], int count); +int mvebu_mbus_probe(const struct mbus_win windows[], int count); u32 mvebu_get_nand_clock(void); void __noreturn return_to_bootrom(void); diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c index 7092f6cc10c2..959ca8e92602 100644 --- a/arch/arm/mach-mvebu/mbus.c +++ b/arch/arm/mach-mvebu/mbus.c @@ -469,7 +469,7 @@ int mbus_dt_setup_win(u32 base, u32 size, u8 target, u8 attr) return 0; } -int mvebu_mbus_probe(struct mbus_win windows[], int count) +int mvebu_mbus_probe(const struct mbus_win windows[], int count) { int win; int ret; diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c index 4a4f93ccf93f..ac98dee2993d 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c +++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c @@ -108,7 +108,7 @@ struct serdes_unit_data { u8 serdes_unit_num; }; -static struct serdes_unit_data serdes_type_to_unit_info[] = { +static const struct serdes_unit_data serdes_type_to_unit_info[] = { {PEX_UNIT_ID, 0,}, {PEX_UNIT_ID, 1,}, {PEX_UNIT_ID, 2,}, diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c index ea858b269e82..e90aff0c3379 100644 --- a/arch/arm/mach-mvebu/system-controller.c +++ b/arch/arm/mach-mvebu/system-controller.c @@ -86,7 +86,7 @@ static const struct udevice_id mvebu_reset_of_match[] = { { }, }; -static struct reset_ops mvebu_reset_ops = { +static const struct reset_ops mvebu_reset_ops = { .of_xlate = mvebu_reset_of_xlate, .request = mvebu_reset_request, .rfree = mvebu_reset_free,
Signed-off-by: Pali Rohár <pali@kernel.org> --- arch/arm/mach-kirkwood/cpu.c | 2 +- arch/arm/mach-kirkwood/include/mach/cpu.h | 2 +- arch/arm/mach-mvebu/cpu.c | 2 +- arch/arm/mach-mvebu/include/mach/cpu.h | 2 +- arch/arm/mach-mvebu/mbus.c | 2 +- arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c | 2 +- arch/arm/mach-mvebu/system-controller.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)