Commit eec64928 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'samsung-mach-1' of... 

Merge tag 'samsung-mach-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

Samsung updates for v4.2

- add failure(exception) handling
  : of_iomap(), of_find_device_by_node() and kstrdup()

- add common poweroff to use PS_HOLD based for all of exynos SoCs
- add exnos_get/set_boot_addr() helper
- constify platform_device_id and irq_domain_ops
- get current parent clock for power domain on/off
- use core_initcall to register power domain driver
- make exynos_core_restart() less verbose

- add support coupled CPUidle for exynos3250

- fix exynos_boot_secondary() return value on timeout
- fix clk_enable() in s3c24xx adc
- fix missing of_node_put() for power domains

* tag 'samsung-mach-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (301 commits)
  ARM: EXYNOS: register power domain driver from core_initcall
  ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs
  ARM: SAMSUNG: Constify platform_device_id
  ARM: EXYNOS: Constify irq_domain_ops
  ARM: EXYNOS: add coupled cpuidle support for Exynos3250
  ARM: EXYNOS: add exynos_get_boot_addr() helper
  ARM: EXYNOS: add exynos_set_boot_addr() helper
  ARM: EXYNOS: make exynos_core_restart() less verbose
  ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout
  ARM: EXYNOS: Get current parent clock for power domain on/off
  ARM: SAMSUNG: fix clk_enable() WARNing in S3C24XX ADC
  ARM: EXYNOS: Add missing of_node_put() when parsing power domains
  ARM: EXYNOS: Handle of_find_device_by_node() and kstrdup() failures
  ARM: EXYNOS: Handle of of_iomap() failure
  Linux 4.1-rc4
  ....
parents d50bfa47 2be2a3ff

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

+4 −3
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ Optional Properties: 
	domains.

- clock-names: The following clocks can be specified:

	- oscclk: Oscillator clock.

	- pclkN, clkN: Pairs of parent of input clock and input clock to the

		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)

		are supported currently.

	- clkN: Input clocks to the devices in this power domain. These clocks

		will be reparented to oscclk before swithing power domain off.

		Their original parent will be brought back after turning on

		the domain. Maximum of 4 clocks (N = 0 to 3) are supported.

	- asbN: Clocks required by asynchronous bridges (ASB) present in

		the power domain. These clock should be enabled during power

		domain on/off operations.

Documentation/devicetree/bindings/mtd/m25p80.txt→Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

+3 −3
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ Required properties: 
               is not Linux-only, but in case of Linux, see the "m25p_ids"

               table in drivers/mtd/devices/m25p80.c for the list of supported

               chips.

               Must also include "nor-jedec" for any SPI NOR flash that can be

               identified by the JEDEC READ ID opcode (0x9F).

               Must also include "jedec,spi-nor" for any SPI NOR flash that can

               be identified by the JEDEC READ ID opcode (0x9F).

- reg : Chip-Select number

- spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at
@@ -25,7 +25,7 @@ Example: 
	flash: m25p80@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,m25p80", "nor-jedec";

		compatible = "spansion,m25p80", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <40000000>;

		m25p,fast-read;

Documentation/serial/tty.txt

+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ TTY_IO_ERROR If set, causes all subsequent userspace read/write 


TTY_OTHER_CLOSED	Device is a pty and the other side has closed.



TTY_OTHER_DONE		Device is a pty and the other side has closed and

			all pending input processing has been completed.



TTY_NO_WRITE_SPLIT	Prevent driver from splitting up writes into

			smaller chunks.

MAINTAINERS

+35 −15
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ S: Maintained 
ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE

M:	Hans Ulli Kroll <ulli.kroll@googlemail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.berlios.de/gemini-board

T:	git git://github.com/ulli-kroll/linux.git

S:	Maintained

F:	arch/arm/mach-gemini/
@@ -1201,7 +1201,7 @@ ARM/MAGICIAN MACHINE SUPPORT 
M:	Philipp Zabel <philipp.zabel@gmail.com>

S:	Maintained



ARM/Marvell Armada 370 and Armada XP SOC support

ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Gregory Clement <gregory.clement@free-electrons.com>
@@ -1210,12 +1210,17 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm/mach-mvebu/

F:	drivers/rtc/rtc-armada38x.c

F:	arch/arm/boot/dts/armada*

F:	arch/arm/boot/dts/kirkwood*





ARM/Marvell Berlin SoC support

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-berlin/

F:	arch/arm/boot/dts/berlin*





ARM/Marvell Dove/MV78xx0/Orion SOC support

M:	Jason Cooper <jason@lakedaemon.net>
@@ -1228,6 +1233,9 @@ F: arch/arm/mach-dove/ 
F:	arch/arm/mach-mv78xx0/

F:	arch/arm/mach-orion5x/

F:	arch/arm/plat-orion/

F:	arch/arm/boot/dts/dove*

F:	arch/arm/boot/dts/orion5x*





ARM/Orion SoC/Technologic Systems TS-78xx platform support

M:	Alexander Clouter <alex@digriz.org.uk>
@@ -1379,6 +1387,7 @@ N: rockchip 


ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained
@@ -1967,7 +1976,7 @@ S: Maintained 
F:	drivers/net/wireless/b43legacy/



BACKLIGHT CLASS/SUBSYSTEM

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

M:	Lee Jones <lee.jones@linaro.org>

S:	Maintained

F:	drivers/video/backlight/
@@ -3951,7 +3960,7 @@ F: drivers/extcon/ 
F:	Documentation/extcon/



EXYNOS DP DRIVER

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

F:	drivers/gpu/drm/exynos/exynos_dp*
@@ -4410,11 +4419,10 @@ F: fs/gfs2/ 
F:	include/uapi/linux/gfs2_ondisk.h



GIGASET ISDN DRIVERS

M:	Hansjoerg Lipp <hjlipp@web.de>

M:	Tilman Schmidt <tilman@imap.cc>

M:	Paul Bolle <pebolle@tiscali.nl>

L:	gigaset307x-common@lists.sourceforge.net

W:	http://gigaset307x.sourceforge.net/

S:	Maintained

S:	Odd Fixes

F:	Documentation/isdn/README.gigaset

F:	drivers/isdn/gigaset/

F:	include/uapi/linux/gigaset_dev.h
@@ -5087,7 +5095,7 @@ M: Hal Rosenstock <hal.rosenstock@gmail.com> 
L:	linux-rdma@vger.kernel.org

W:	http://www.openfabrics.org/

Q:	http://patchwork.kernel.org/project/linux-rdma/list/

T:	git git://github.com/dledford/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git

S:	Supported

F:	Documentation/infiniband/

F:	drivers/infiniband/
@@ -6992,6 +7000,17 @@ T: git git://git.rocketboards.org/linux-socfpga-next.git 
S:	Maintained

F:	arch/nios2/



NOKIA N900 POWER SUPPLY DRIVERS

M:	Pali Rohár <pali.rohar@gmail.com>

S:	Maintained

F:	include/linux/power/bq2415x_charger.h

F:	include/linux/power/bq27x00_battery.h

F:	include/linux/power/isp1704_charger.h

F:	drivers/power/bq2415x_charger.c

F:	drivers/power/bq27x00_battery.c

F:	drivers/power/isp1704_charger.c

F:	drivers/power/rx51_battery.c



NTB DRIVER

M:	Jon Mason <jdmason@kudzu.us>

M:	Dave Jiang <dave.jiang@intel.com>
@@ -7580,7 +7599,7 @@ S: Maintained 
F:	drivers/pci/host/*rcar*



PCI DRIVER FOR SAMSUNG EXYNOS

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
@@ -7588,7 +7607,7 @@ S: Maintained 
F:	drivers/pci/host/pci-exynos.c



PCI DRIVER FOR SYNOPSIS DESIGNWARE

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	drivers/pci/host/*designware*
@@ -8544,7 +8563,7 @@ S: Supported 
F:	sound/soc/samsung/



SAMSUNG FRAMEBUFFER DRIVER

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/fbdev/s3c-fb.c
@@ -8849,10 +8868,11 @@ W: http://www.emulex.com 
S:	Supported

F:	drivers/scsi/be2iscsi/



SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER

M:	Sathya Perla <sathya.perla@emulex.com>

M:	Subbu Seetharaman <subbu.seetharaman@emulex.com>

M:	Ajit Khaparde <ajit.khaparde@emulex.com>

Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER

M:	Sathya Perla <sathya.perla@avagotech.com>

M:	Ajit Khaparde <ajit.khaparde@avagotech.com>

M:	Padmanabh Ratnakar <padmanabh.ratnakar@avagotech.com>

M:	Sriharsha Basavapatna <sriharsha.basavapatna@avagotech.com>

L:	netdev@vger.kernel.org

W:	http://www.emulex.com

S:	Supported

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 1

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

CRA Git | Maintained and supported by SUSTech CRA and CCSE