Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-08 14:23:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mvebu arm for 6.12 (part 1)

Browse Source 
Fix a few warning error with W=1
 Switch orion5x to new sys-off handler API
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCZtoLwQAKCRALBhiOFHI7
 1Z1BAJ983XmHm0gJzrIuV/gXRWCgxr/8NQCfScSB37TV2FASnpWmYpLW8tqtyYI=
 =L8t/
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-arm-6.12-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/arm

mvebu arm for 6.12 (part 1)

Fix a few warning error with W=1
Switch orion5x to new sys-off handler API

* tag 'mvebu-arm-6.12-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: dove: Drop a write-only variable
  ARM: orion5x: Switch to new sys-off handler API
  ARM: mvebu: Warn about memory chunks too small for DDR training

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-09-10 16:32:14 +00:00
commit e494548a15
10 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-dove/common.c
View File

@ -82,7 +82,7 @@ static void __init dove_clk_init(void)
{ {
struct clk *usb0, *usb1, *sata, *pex0, *pex1, *sdio0, *sdio1; struct clk *usb0, *usb1, *sata, *pex0, *pex1, *sdio0, *sdio1;
struct clk *nand, *camera, *i2s0, *i2s1, *crypto, *ac97, *pdma; struct clk *nand, *camera, *i2s0, *i2s1, *crypto, *ac97, *pdma;
struct clk *xor0, *xor1, *ge, *gephy; struct clk *xor0, *xor1, *ge;
tclk = clk_register_fixed_rate(NULL, "tclk", NULL, 0, dove_tclk); tclk = clk_register_fixed_rate(NULL, "tclk", NULL, 0, dove_tclk);
@ -102,7 +102,7 @@ static void __init dove_clk_init(void)
pdma = dove_register_gate("pdma", "tclk", CLOCK_GATING_BIT_PDMA); pdma = dove_register_gate("pdma", "tclk", CLOCK_GATING_BIT_PDMA);
xor0 = dove_register_gate("xor0", "tclk", CLOCK_GATING_BIT_XOR0); xor0 = dove_register_gate("xor0", "tclk", CLOCK_GATING_BIT_XOR0);
xor1 = dove_register_gate("xor1", "tclk", CLOCK_GATING_BIT_XOR1); xor1 = dove_register_gate("xor1", "tclk", CLOCK_GATING_BIT_XOR1);
gephy = dove_register_gate("gephy", "tclk", CLOCK_GATING_BIT_GIGA_PHY); dove_register_gate("gephy", "tclk", CLOCK_GATING_BIT_GIGA_PHY);
ge = dove_register_gate("ge", "gephy", CLOCK_GATING_BIT_GBE); ge = dove_register_gate("ge", "gephy", CLOCK_GATING_BIT_GBE);
orion_clkdev_add(NULL, "orion_spi.0", tclk); orion_clkdev_add(NULL, "orion_spi.0", tclk);

3
arch/arm/mach-mvebu/board-v7.c
View File

@ -86,6 +86,9 @@ static int __init mvebu_scan_mem(unsigned long node, const char *uname,
base = dt_mem_next_cell(dt_root_addr_cells, &reg); base = dt_mem_next_cell(dt_root_addr_cells, &reg);
size = dt_mem_next_cell(dt_root_size_cells, &reg); size = dt_mem_next_cell(dt_root_size_cells, &reg);
if (size < MVEBU_DDR_TRAINING_AREA_SZ)
pr_warn("Too little memory to reserve for DDR training\n");
memblock_reserve(base, MVEBU_DDR_TRAINING_AREA_SZ); memblock_reserve(base, MVEBU_DDR_TRAINING_AREA_SZ);
} }

2
arch/arm/mach-orion5x/board-mss2.c
View File

@ -82,5 +82,5 @@ static void mss2_power_off(void)
void __init mss2_init(void) void __init mss2_init(void)
{ {
/* register mss2 specific power-off method */ /* register mss2 specific power-off method */
pm_power_off = mss2_power_off; register_platform_power_off(mss2_power_off);
} }

6
arch/arm/mach-orion5x/dns323-setup.c
View File

@ -700,7 +700,7 @@ static void __init dns323_init(void)
if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 || if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 ||
gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0) gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0)
pr_err("DNS-323: failed to setup power-off GPIO\n"); pr_err("DNS-323: failed to setup power-off GPIO\n");
pm_power_off = dns323a_power_off; register_platform_power_off(dns323a_power_off);
break; break;
case DNS323_REV_B1: case DNS323_REV_B1:
/* 5182 built-in SATA init */ /* 5182 built-in SATA init */
@ -717,7 +717,7 @@ static void __init dns323_init(void)
if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 || if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 ||
gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0) gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0)
pr_err("DNS-323: failed to setup power-off GPIO\n"); pr_err("DNS-323: failed to setup power-off GPIO\n");
pm_power_off = dns323b_power_off; register_platform_power_off(dns323b_power_off);
break; break;
case DNS323_REV_C1: case DNS323_REV_C1:
/* 5182 built-in SATA init */ /* 5182 built-in SATA init */
@ -727,7 +727,7 @@ static void __init dns323_init(void)
if (gpio_request(DNS323C_GPIO_POWER_OFF, "POWEROFF") != 0 || if (gpio_request(DNS323C_GPIO_POWER_OFF, "POWEROFF") != 0 ||
gpio_direction_output(DNS323C_GPIO_POWER_OFF, 0) != 0) gpio_direction_output(DNS323C_GPIO_POWER_OFF, 0) != 0)
pr_err("DNS-323: failed to setup power-off GPIO\n"); pr_err("DNS-323: failed to setup power-off GPIO\n");
pm_power_off = dns323c_power_off; register_platform_power_off(dns323c_power_off);
/* Now, -this- should theoretically be done by the sata_mv driver /* Now, -this- should theoretically be done by the sata_mv driver
* once I figure out what's going on there. Maybe the behaviour * once I figure out what's going on there. Maybe the behaviour

2
arch/arm/mach-orion5x/kurobox_pro-setup.c
View File

@ -373,7 +373,7 @@ static void __init kurobox_pro_init(void)
i2c_register_board_info(0, &kurobox_pro_i2c_rtc, 1); i2c_register_board_info(0, &kurobox_pro_i2c_rtc, 1);
/* register Kurobox Pro specific power-off method */ /* register Kurobox Pro specific power-off method */
pm_power_off = kurobox_pro_power_off; register_platform_power_off(kurobox_pro_power_off);
} }
#ifdef CONFIG_MACH_KUROBOX_PRO #ifdef CONFIG_MACH_KUROBOX_PRO

2
arch/arm/mach-orion5x/mv2120-setup.c
View File

@ -238,7 +238,7 @@ static void __init mv2120_init(void)
if (gpio_request(MV2120_GPIO_POWER_OFF, "POWEROFF") != 0 || if (gpio_request(MV2120_GPIO_POWER_OFF, "POWEROFF") != 0 ||
gpio_direction_output(MV2120_GPIO_POWER_OFF, 1) != 0) gpio_direction_output(MV2120_GPIO_POWER_OFF, 1) != 0)
pr_err("mv2120: failed to setup power-off GPIO\n"); pr_err("mv2120: failed to setup power-off GPIO\n");
pm_power_off = mv2120_power_off; register_platform_power_off(mv2120_power_off);
} }
/* Warning: HP uses a wrong mach-type (=526) in their bootloader */ /* Warning: HP uses a wrong mach-type (=526) in their bootloader */

2
arch/arm/mach-orion5x/net2big-setup.c
View File

@ -423,7 +423,7 @@ static void __init net2big_init(void)
if (gpio_request(NET2BIG_GPIO_POWER_OFF, "power-off") == 0 && if (gpio_request(NET2BIG_GPIO_POWER_OFF, "power-off") == 0 &&
gpio_direction_output(NET2BIG_GPIO_POWER_OFF, 0) == 0) gpio_direction_output(NET2BIG_GPIO_POWER_OFF, 0) == 0)
pm_power_off = net2big_power_off; register_platform_power_off(net2big_power_off);
else else
pr_err("net2big: failed to configure power-off GPIO\n"); pr_err("net2big: failed to configure power-off GPIO\n");

2
arch/arm/mach-orion5x/terastation_pro2-setup.c
View File

@ -349,7 +349,7 @@ static void __init tsp2_init(void)
i2c_register_board_info(0, &tsp2_i2c_rtc, 1); i2c_register_board_info(0, &tsp2_i2c_rtc, 1);
/* register Terastation Pro II specific power-off method */ /* register Terastation Pro II specific power-off method */
pm_power_off = tsp2_power_off; register_platform_power_off(tsp2_power_off);
} }
MACHINE_START(TERASTATION_PRO2, "Buffalo Terastation Pro II/Live") MACHINE_START(TERASTATION_PRO2, "Buffalo Terastation Pro II/Live")

2
arch/arm/mach-orion5x/ts209-setup.c
View File

@ -314,7 +314,7 @@ static void __init qnap_ts209_init(void)
i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1); i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1);
/* register tsx09 specific power-off method */ /* register tsx09 specific power-off method */
pm_power_off = qnap_tsx09_power_off; register_platform_power_off(qnap_tsx09_power_off);
} }
MACHINE_START(TS209, "QNAP TS-109/TS-209") MACHINE_START(TS209, "QNAP TS-109/TS-209")

2
arch/arm/mach-orion5x/ts409-setup.c
View File

@ -312,7 +312,7 @@ static void __init qnap_ts409_init(void)
platform_device_register(&ts409_leds); platform_device_register(&ts409_leds);
/* register tsx09 specific power-off method */ /* register tsx09 specific power-off method */
pm_power_off = qnap_tsx09_power_off; register_platform_power_off(qnap_tsx09_power_off);
} }
MACHINE_START(TS409, "QNAP TS-409") MACHINE_START(TS409, "QNAP TS-409")