Commit 3166c3dd authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-soc-5.5' of... 

Merge tag 'samsung-soc-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung mach/soc changes for v5.5

1. Minor cleanups in S3C platforms,
2. Enable newly added EXYNOS_ASV (Adaptive Supply Voltage) driver.

* tag 'samsung-soc-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos: Enable exynos-asv driver for ARCH_EXYNOS
  ARM: s3c: Rename s5p_usb_phy functions
  ARM: s3c: Rename s3c64xx_spi_setname() function

Link: https://lore.kernel.org/r/20191104175902.12224-2-krzk@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f5ed5010 4134b762

arch/arm/mach-exynos/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ menuconfig ARCH_EXYNOS 
	select ARM_AMBA

	select ARM_GIC

	select COMMON_CLK_SAMSUNG

	select EXYNOS_ASV

	select EXYNOS_CHIPID

	select EXYNOS_THERMAL

	select EXYNOS_PMU

arch/arm/mach-s3c24xx/s3c2416.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ void __init s3c2416_map_io(void) 
	/* initialize device information early */

	s3c2416_default_sdhci0();

	s3c2416_default_sdhci1();

	s3c64xx_spi_setname("s3c2443-spi");

	s3c24xx_spi_setname("s3c2443-spi");



	iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc));

}

arch/arm/mach-s3c24xx/s3c2443.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ void __init s3c2443_map_io(void) 
	s3c24xx_gpiocfg_default.get_pull = s3c2443_gpio_getpull;



	/* initialize device information early */

	s3c64xx_spi_setname("s3c2443-spi");

	s3c24xx_spi_setname("s3c2443-spi");



	iotable_init(s3c2443_iodesc, ARRAY_SIZE(s3c2443_iodesc));

}

arch/arm/mach-s3c24xx/spi-core.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */



/* re-define device name depending on support. */

static inline void s3c64xx_spi_setname(char *name)

static inline void s3c24xx_spi_setname(char *name)

{

#ifdef CONFIG_S3C64XX_DEV_SPI0

	s3c64xx_device_spi0.name = name;

arch/arm/mach-s3c64xx/setup-usb-phy.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int s3c_usb_otgphy_exit(struct platform_device *pdev) 
	return 0;

}



int s5p_usb_phy_init(struct platform_device *pdev, int type)

int s3c_usb_phy_init(struct platform_device *pdev, int type)

{

	if (type == USB_PHY_TYPE_DEVICE)

		return s3c_usb_otgphy_init(pdev);
@@ -81,7 +81,7 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type) 
	return -EINVAL;

}



int s5p_usb_phy_exit(struct platform_device *pdev, int type)

int s3c_usb_phy_exit(struct platform_device *pdev, int type)

{

	if (type == USB_PHY_TYPE_DEVICE)

		return s3c_usb_otgphy_exit(pdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE