Unverified Commit 3b5529ae authored by Linus Walleij's avatar Linus Walleij Committed by Mark Brown
Browse files

spi: s3c64xx: Drop custom gpio setup argument 



The SPI0 platform population function was taking a custom
gpio setup callback but the only user pass NULL as
argument so drop this argument.

Cc: linux-samsung-soc@vger.kernel.org
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Cc: Sylwester Nawrocki <snawrocki@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Reviewed-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
Link: https://lore.kernel.org/r/20220118230915.157797-2-linus.walleij@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f1ba938e

arch/arm/mach-s3c/devs.c

+2 −3
Original line number Diff line number Diff line
@@ -1107,8 +1107,7 @@ struct platform_device s3c64xx_device_spi0 = { 
	},

};



void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,

						int num_cs)

void __init s3c64xx_spi0_set_platdata(int src_clk_nr, int num_cs)

{

	struct s3c64xx_spi_info pd;
@@ -1120,7 +1119,7 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr, 


	pd.num_cs = num_cs;

	pd.src_clk_nr = src_clk_nr;

	pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio;

	pd.cfg_gpio = s3c64xx_spi0_cfg_gpio;



	s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi0);

}

arch/arm/mach-s3c/mach-crag6410.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static void __init crag6410_machine_init(void) 
	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));



	samsung_keypad_set_platdata(&crag6410_keypad_data);

	s3c64xx_spi0_set_platdata(NULL, 0, 2);

	s3c64xx_spi0_set_platdata(0, 2);



	pwm_add_table(crag6410_pwm_lookup, ARRAY_SIZE(crag6410_pwm_lookup));

	platform_add_devices(crag6410_devices, ARRAY_SIZE(crag6410_devices));

include/linux/platform_data/spi-s3c64xx.h

+1 −3
Original line number Diff line number Diff line
@@ -43,15 +43,13 @@ struct s3c64xx_spi_info { 
/**

 * s3c64xx_spi_set_platdata - SPI Controller configure callback by the board

 *				initialization code.

 * @cfg_gpio: Pointer to gpio setup function.

 * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks.

 * @num_cs: Number of elements in the 'cs' array.

 *

 * Call this from machine init code for each SPI Controller that

 * has some chips attached to it.

 */

extern void s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,

						int num_cs);

extern void s3c64xx_spi0_set_platdata(int src_clk_nr, int num_cs);



/* defined by architecture to configure gpio */

extern int s3c64xx_spi0_cfg_gpio(void);