Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49774d86 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-drivers-4.17' of... 

Merge tag 'samsung-drivers-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers

Pull "Samsung soc drivers changes for v4.17" from Krzysztof Kozłowski:

1. Add SPDX license identifiers.
2. Populate children syscon nodes in PMU driver to properly model HW in
   DeviceTree.

* tag 'samsung-drivers-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  soc: samsung: pmu: Populate children syscon nodes
  soc: samsung: Add SPDX license identifiers to headers
  memory: samsung: Add SPDX license identifiers
parents a7e66ff9 7353c546

Documentation/devicetree/bindings/arm/samsung/pmu.txt

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ following properties: 
- interrupt-parent: a phandle indicating which interrupt controller

  this PMU signals interrupts to.





Optional nodes:



- nodes defining the restart and poweroff syscon children





Example :

pmu_system_controller: system-controller@10040000 {

	compatible = "samsung,exynos5250-pmu", "syscon";

drivers/memory/samsung/Kconfig

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config SAMSUNG_MC

	bool "Samsung Exynos Memory Controller support" if COMPILE_TEST

	help

drivers/memory/samsung/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_EXYNOS_SROM)	+= exynos-srom.o

drivers/memory/samsung/exynos-srom.c

+7 −11
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015 Samsung Electronics Co., Ltd.

 *	      http://www.samsung.com/

 *

 * EXYNOS - SROM Controller support

 * Author: Pankaj Dubey <pankaj.dubey@samsung.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

// SPDX-License-Identifier: GPL-2.0

//

// Copyright (c) 2015 Samsung Electronics Co., Ltd.

//	      http://www.samsung.com/

//

// EXYNOS - SROM Controller support

// Author: Pankaj Dubey <pankaj.dubey@samsung.com>



#include <linux/io.h>

#include <linux/init.h>

drivers/memory/samsung/exynos-srom.h

+2 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2015 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Exynos SROMC register definitions

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __EXYNOS_SROM_H