UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Samsung mach/soc changes for v5.4 

1. Minor fixup in plat and mach code (S3C platforms),
 2. Enable exynos-chipid driver to provide SoC related information,
 3. Extend the patterns for Samsung maintainer entries to cover all
    important files.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAl1v9dkQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD157/D/9+CFtxnIzEOBUwkyEpHQYBINj8+Y1zGrSW
 xKDWSSQ0oGAt/0wnCz/7g08YMKy0XPP9fsUOGK6iqNmKQfw9Q3dIGxftLjnK1Pbl
 iiV81Xx2sJdOWhd0QEjcfjboSSZK622XnmdEdnCuRYnP5HUMvL0gK6QF9GCrhGUI
 KmpBbDk4DF/31gDvwLOoASo4hNhgm0hLK7uEKdzLHpA48jlN8lEq3Vc6c11ARdHj
 J0Mnfdq1bBO1XQh0nk3yE/GXrJrGv6mb9bNkZGE7AJM8bENdTiLqe60vfomqHoCP
 XDyRbcgp9lHvE1wm7U5/U9UWOJNBUmFOpZ4RRalmUn2qol2hfU6NxTHeEwfgKiHj
 vYU/dDgJ17BHqrjLBDYnTHVhBStuNZvtPW0CZwSvuoP1pMT/pmHMskj3ZBHwJALb
 uaW0JxmlLNaMw9WSfvHhZHRV7ZFM52n6IEWtzkH1JcOHWJJPkeLYK0FcCyYPgeSt
 Y4Upc7lcxk5YMn0iGRcNYSWK5KFXItyRD9oBHJ4Oeubh0UEhEqfI+TEEIOfGYyXX
 VOiOqOuekW5l2OOQvEhG0lK9rbxRfFR5d8qhQSin0AN/sW5h9GepHSqU3WavPV1T
 5DtWVZVx/U5fXkqd6om71/b5mNjSfGL1Pq3peXNmQy0AA1UXYIjG6PnGUfY9YNuI
 mzQq6ufXcg==
 =S0YI
 -----END PGP SIGNATURE-----

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

Samsung mach/soc changes for v5.4

1. Minor fixup in plat and mach code (S3C platforms),
2. Enable exynos-chipid driver to provide SoC related information,
3. Extend the patterns for Samsung maintainer entries to cover all
   important files.

* tag 'samsung-soc-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  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/20190904175002.10487-5-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-04 22:33:50 +02:00
parent cc1770a65e c663d542bf
commit 504e6bee72
6 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MAINTAINERS
View File

@ -2189,8 +2189,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
@ -14071,6 +14072,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
@ -14091,6 +14094,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>

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_CHIPID
select EXYNOS_THERMAL
select EXYNOS_PMU
select EXYNOS_SROM

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

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

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 */
#include <mach/gpio-samsung.h>
#include <linux/gpio/driver.h>
#define GPIOCON_OFF (0x00)
#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
#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);

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,
};