openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Samsung mach/soc changes for v5.5 

1. Minor cleanups in S3C platforms,
 2. Enable newly added EXYNOS_ASV (Adaptive Supply Voltage) driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAl3AYJAQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD15s5D/4rK1Q+BTwMzn0suEI+kmLAsfFOJjfn8zhN
 01dCscd7L7ZJV6CEVh0AXgdDFAUnwJkYdM7QFudN3Q5c0M49cPFti63kEhUvM7Fp
 3mKNXJ8RxmFpvglVlzeEJCg6va7LEex18NYETauulSZ/yeLr68sjM25wKRZ8jzuS
 pCkxJXIrnJD1EoCLg0PZWTYAP3iUyLn6Ob7mMQ5XVhThRY6tqXgHDo3FdHSF1kzR
 jnIpeG8ptaGvNsyjnKDRoSf7+f9OBFEKGJ/LgIoa1LF2ZNIKvT/BNhWPnNJOlkiO
 rMviYQk7Rsqmp88rP3FXlH/XUPu/ARh+W/vw5dOI4jJR6cGgaEbMjJgnsJoyqajf
 yFgB8Cqy0P/rdUP3fI9AnpDxucc4vrNAl/tDnD5+t3g4vxVIav4zpEe29J8HJGsu
 bBocr/Wz22uj9pY1zKQ9UgT1JTVp8SxPwfpxiul2tUxt6DtEz9aormanFj8S5Hvh
 qzPGqWmWc0UF4QOu+XxnuyXUo8WAjGaR11KHrY27KZMAdeEO5tMyIHiREjoQuhVf
 Xoe6990aNB+Fx9cznB/soBL+kFCFBYHA2WjPt74cPeJhq07hpj5A4S14BjuLCMOq
 /mhTzW7N7FzDdON/hv1dKIf+KlvMV0blimIXcdX4El84Wk8W4vMoLdmWPC4m6RdJ
 xa7M2QI2/Q==
 =wb0r
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-11-06 07:45:28 -08:00
parent f5ed5010df 4134b762eb
commit 3166c3dd4c
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-exynos/Kconfig
View File

@ -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

2
arch/arm/mach-s3c24xx/s3c2416.c
View File

@ -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));
}

2
arch/arm/mach-s3c24xx/s3c2443.c
View File

@ -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));
}

2
arch/arm/mach-s3c24xx/spi-core.h
View File

@ -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;

4
arch/arm/mach-s3c64xx/setup-usb-phy.c
View File

@ -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);

4
arch/arm/plat-samsung/devs.c
View File

@ -1010,9 +1010,9 @@ void __init dwc2_hsotg_set_platdata(struct dwc2_hsotg_plat *pd)
npd = s3c_set_platdata(pd, sizeof(*npd), &s3c_device_usb_hsotg);
if (!npd->phy_init)
npd->phy_init = s5p_usb_phy_init;
npd->phy_init = s3c_usb_phy_init;
if (!npd->phy_exit)
npd->phy_exit = s5p_usb_phy_exit;
npd->phy_exit = s3c_usb_phy_exit;
}
#endif /* CONFIG_S3C_DEV_USB_HSOTG */

4
arch/arm/plat-samsung/include/plat/usb-phy.h
View File

@ -7,7 +7,7 @@
#ifndef __PLAT_SAMSUNG_USB_PHY_H
#define __PLAT_SAMSUNG_USB_PHY_H __FILE__
extern int s5p_usb_phy_init(struct platform_device *pdev, int type);
extern int s5p_usb_phy_exit(struct platform_device *pdev, int type);
extern int s3c_usb_phy_init(struct platform_device *pdev, int type);
extern int s3c_usb_phy_exit(struct platform_device *pdev, int type);
#endif /* __PLAT_SAMSUNG_USB_PHY_H */