leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
1. Fix system restart on S3C6410 due to missing match of watchdog,
 2. Enable suppor for ARM architected timers on Exynos.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAl15PRoQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD18BID/4iuQKm0llif+hT3/0LHxGoklFAePvSyGUw
 d2lzJCJu6GJuJAJT7yqJXGdk/yXICATAjA01/YFT0gC4EQ/9YtwAQvwMJB4+P9Yc
 7Eh65/sCwuxUpptvbWnCpi4v0aum6ibqrnVVx3L7vqED21t3zfXcTBizeCSVbZTc
 IGv92rrIXE4JK7/qSqDnPE0AEE/mRHOYUdWDLzy0COnd1AaDSNb1Yk21u3Gm16h6
 9veskmoE4SJIpGdJgqW8qXRMJ6e+A+jnLQSc0QbbwzzVb474L+XeCs0YqbZFEsFb
 rXWwQt0RhR+ojcJhgXHrK/UXVm74bmZWJ5NIKQ0ItZIlAtncmVFGoa28fV+Ns14w
 wyk4Cg9T4G+cc/X5E8DnAaApJ91Of0AjON1/MMm4Y/U4a+5lf9bTm2gmYA8T21V9
 Hu2TbLLvOXWHMvTBdvhoxi7Fp7p1VJCN22Zt8MVOg+tIGEuacdoZk6hHnWRodj9o
 l5TnKFWvge/Qva2ukiYI9y5ZCwVBSrSRMz6RcgADL4aTgfI6GaNV7qcusC7LKPB7
 KKjl/96caEjUVw2/7qBwLZCbhvbeAMOGqUMv6Ugc46EZ3aPt8Zg+FBKz0kUGOI81
 mDm6UFsWdQrX4PV4c1y2PlEAYa5j4VahI5MOir0e1078fIpVcMxrDHKDFUCat7FI
 vVYO7NZFZQ==
 =fBvu
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-11 23:08:16 +02:00
commit eef119dd47
7 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MAINTAINERS
View File

@ -2231,8 +2231,9 @@ F: drivers/*/*s3c24*
F: drivers/*/*/*s3c24* F: drivers/*/*/*s3c24*
F: drivers/*/*s3c64xx* F: drivers/*/*s3c64xx*
F: drivers/*/*s5pv210* F: drivers/*/*s5pv210*
F: drivers/memory/samsung/* F: drivers/memory/samsung/
F: drivers/soc/samsung/* F: drivers/soc/samsung/
F: include/linux/soc/samsung/
F: Documentation/arm/samsung/ F: Documentation/arm/samsung/
F: Documentation/devicetree/bindings/arm/samsung/ F: Documentation/devicetree/bindings/arm/samsung/
F: Documentation/devicetree/bindings/sram/samsung-sram.txt 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-crypto@vger.kernel.org
L: linux-samsung-soc@vger.kernel.org L: linux-samsung-soc@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/crypto/samsung-slimsss.txt
F: Documentation/devicetree/bindings/crypto/samsung-sss.txt
F: drivers/crypto/s5p-sss.c F: drivers/crypto/s5p-sss.c
SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS 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: drivers/clk/samsung/
F: include/dt-bindings/clock/exynos*.h F: include/dt-bindings/clock/exynos*.h
F: Documentation/devicetree/bindings/clock/exynos*.txt F: Documentation/devicetree/bindings/clock/exynos*.txt
F: Documentation/devicetree/bindings/clock/samsung,s3c*
F: Documentation/devicetree/bindings/clock/samsung,s5p*
SAMSUNG SPI DRIVERS SAMSUNG SPI DRIVERS
M: Kukjin Kim <kgene@kernel.org> M: Kukjin Kim <kgene@kernel.org>

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

@ -13,11 +13,13 @@ menuconfig ARCH_EXYNOS
select ARM_AMBA select ARM_AMBA
select ARM_GIC select ARM_GIC
select COMMON_CLK_SAMSUNG select COMMON_CLK_SAMSUNG
select EXYNOS_CHIPID
select EXYNOS_THERMAL select EXYNOS_THERMAL
select EXYNOS_PMU select EXYNOS_PMU
select EXYNOS_SROM select EXYNOS_SROM
select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
select GPIOLIB select GPIOLIB
select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5 && VIRTUALIZATION
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_S3C2410_WATCHDOG if WATCHDOG

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

@ -15,6 +15,11 @@
#include "regs-sys.h" #include "regs-sys.h"
#include "regs-usb-hsotg-phy.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) static int s3c_usb_otgphy_init(struct platform_device *pdev)
{ {
struct clk *xusbxti; struct clk *xusbxti;

1
arch/arm/plat-samsung/include/plat/gpio-core.h
View File

@ -12,6 +12,7 @@
/* Bring in machine-local definitions, especially S3C_GPIO_END */ /* Bring in machine-local definitions, especially S3C_GPIO_END */
#include <mach/gpio-samsung.h> #include <mach/gpio-samsung.h>
#include <linux/gpio/driver.h>
#define GPIOCON_OFF (0x00) #define GPIOCON_OFF (0x00)
#define GPIODAT_OFF (0x04) #define GPIODAT_OFF (0x04)

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

@ -7,8 +7,6 @@
#ifndef __PLAT_SAMSUNG_USB_PHY_H #ifndef __PLAT_SAMSUNG_USB_PHY_H
#define __PLAT_SAMSUNG_USB_PHY_H __FILE__ #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_init(struct platform_device *pdev, int type);
extern int s5p_usb_phy_exit(struct platform_device *pdev, int type); extern int s5p_usb_phy_exit(struct platform_device *pdev, int type);

1
arch/arm/plat-samsung/watchdog-reset.c
View File

@ -62,6 +62,7 @@ void samsung_wdt_reset(void)
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id s3c2410_wdt_match[] = { static const struct of_device_id s3c2410_wdt_match[] = {
{ .compatible = "samsung,s3c2410-wdt" }, { .compatible = "samsung,s3c2410-wdt" },
{ .compatible = "samsung,s3c6410-wdt" },
{}, {},
}; };

17
include/linux/usb/samsung_usb_phy.h
View File

@ -1,17 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2012 Samsung Electronics Co.Ltd
* http://www.samsung.com/
*
* Defines phy types for samsung usb phy controllers - HOST or DEIVCE.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
enum samsung_usb_phy_type {
USB_PHY_TYPE_DEVICE,
USB_PHY_TYPE_HOST,
};