Commit eef119dd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-5.4-3' of... 

Merge tag 'samsung-soc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/late

Samsung mach/soc changes for v5.4, part 2

1. Fix system restart on S3C6410 due to missing match of watchdog,
2. Enable suppor for ARM architected timers on Exynos.

* tag 'samsung-soc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos: Enable support for ARM architected timers
  ARM: samsung: Fix system restart on S3C6410
  MAINTAINERS: Extend patterns for Samsung SoC, Security Subsystem and clock drivers
  ARM: s3c64xx: squash samsung_usb_phy.h into setup-usb-phy.c
  ARM: exynos: Enable exynos-chipid driver
  ARM: samsung: Include GPIO driver header

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 548d52bc 13aeb3fe

MAINTAINERS

+7 −2
Original line number Diff line number Diff line
@@ -2231,8 +2231,9 @@ F: drivers/*/*s3c24* 
F:	drivers/*/*/*s3c24*

F:	drivers/*/*s3c64xx*

F:	drivers/*/*s5pv210*

F:	drivers/memory/samsung/*

F:	drivers/soc/samsung/*

F:	drivers/memory/samsung/

F:	drivers/soc/samsung/

F:	include/linux/soc/samsung/

F:	Documentation/arm/samsung/

F:	Documentation/devicetree/bindings/arm/samsung/

F:	Documentation/devicetree/bindings/sram/samsung-sram.txt
@@ -14149,6 +14150,8 @@ M: Kamil Konieczny <k.konieczny@partner.samsung.com> 
L:	linux-crypto@vger.kernel.org

L:	linux-samsung-soc@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/crypto/samsung-slimsss.txt

F:	Documentation/devicetree/bindings/crypto/samsung-sss.txt

F:	drivers/crypto/s5p-sss.c



SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
@@ -14169,6 +14172,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git 
F:	drivers/clk/samsung/

F:	include/dt-bindings/clock/exynos*.h

F:	Documentation/devicetree/bindings/clock/exynos*.txt

F:	Documentation/devicetree/bindings/clock/samsung,s3c*

F:	Documentation/devicetree/bindings/clock/samsung,s5p*



SAMSUNG SPI DRIVERS

M:	Kukjin Kim <kgene@kernel.org>

arch/arm/mach-exynos/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -13,11 +13,13 @@ menuconfig ARCH_EXYNOS 
	select ARM_AMBA

	select ARM_GIC

	select COMMON_CLK_SAMSUNG

	select EXYNOS_CHIPID

	select EXYNOS_THERMAL

	select EXYNOS_PMU

	select EXYNOS_SROM

	select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS

	select GPIOLIB

	select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5 && VIRTUALIZATION

	select HAVE_ARM_SCU if SMP

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

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

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ 
#include "regs-sys.h"

#include "regs-usb-hsotg-phy.h"



enum samsung_usb_phy_type {

	USB_PHY_TYPE_DEVICE,

	USB_PHY_TYPE_HOST,

};



static int s3c_usb_otgphy_init(struct platform_device *pdev)

{

	struct clk *xusbxti;

arch/arm/plat-samsung/include/plat/gpio-core.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


/* Bring in machine-local definitions, especially S3C_GPIO_END */

#include <mach/gpio-samsung.h>

#include <linux/gpio/driver.h>



#define GPIOCON_OFF	(0x00)

#define GPIODAT_OFF	(0x04)

arch/arm/plat-samsung/include/plat/usb-phy.h

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
#ifndef __PLAT_SAMSUNG_USB_PHY_H

#define __PLAT_SAMSUNG_USB_PHY_H __FILE__



#include <linux/usb/samsung_usb_phy.h>



extern int s5p_usb_phy_init(struct platform_device *pdev, int type);

extern int s5p_usb_phy_exit(struct platform_device *pdev, int type);

CRA Git | Maintained and supported by SUSTech CRA and CCSE