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

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

Merge branches 'samsung/cleanup' and 'samsung/s5p-cleanup-v2', tag 'v3.16-rc6' into next/soc 



The following samsung branches are based on these cleanups,
which are already in mainline before this branch gets pulled.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0081b77d 9a3c4145 fce9e5bb f86e0add

Documentation/acpi/enumeration.txt

+0 −6
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ If the driver needs to perform more complex initialization like getting and 
configuring GPIOs it can get its ACPI handle and extract this information

from ACPI tables.



Currently the kernel is not able to automatically determine from which ACPI

device it should make the corresponding platform device so we need to add

the ACPI device explicitly to acpi_platform_device_ids list defined in

drivers/acpi/acpi_platform.c. This limitation is only for the platform

devices, SPI and I2C devices are created automatically as described below.



DMA support

~~~~~~~~~~~

DMA controllers enumerated via ACPI should be registered in the system to

Documentation/arm/Samsung/Overview.txt

+0 −11
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ Introduction 


  - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list

  - S3C64XX: S3C6400 and S3C6410

  - S5P6440

  - S5PC100

  - S5PC110 / S5PV210
@@ -34,8 +32,6 @@ Configuration 
  A number of configurations are supplied, as there is no current way of

  unifying all the SoCs into one kernel.



  s5p6440_defconfig - S5P6440 specific default configuration

  s5pc100_defconfig - S5PC100 specific default configuration

  s5pc110_defconfig - S5PC110 specific default configuration

  s5pv210_defconfig - S5PV210 specific default configuration
@@ -67,13 +63,6 @@ Layout changes 
  where to simplify the include and dependency issues involved with having

  so many different platform directories.



  It was decided to remove plat-s5pc1xx as some of the support was already

  in plat-s5p or plat-samsung, with the S5PC110 support added with S5PV210

  the only user was the S5PC100. The S5PC100 specific items where moved to

  arch/arm/mach-s5pc100.









Port Contributors

-----------------

Documentation/arm/Samsung/clksrc-change-registers.awk

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ BEGIN { 


    while (getline line < ARGV[1] > 0) {

	if (line ~ /\#define.*_MASK/ &&

	    !(line ~ /S5PC100_EPLL_MASK/) &&

	    !(line ~ /USB_SIG_MASK/)) {

	    splitdefine(line, fields)

	    name = fields[0]

Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt

+4 −2
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ Both required and optional properties listed below must be defined 
under node /cpus/cpu@0.



Required properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt

  for details

- None



Optional properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt for

  details. OPPs *must* be supplied either via DT, i.e. this property, or

  populated at runtime.

- clock-latency: Specify the possible maximum transition latency for clock,

  in unit of nanoseconds.

- voltage-tolerance: Specify the CPU voltage tolerance in percentage.

Documentation/devicetree/bindings/spi/spi-samsung.txt

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ Required SoC Specific Properties: 
- compatible: should be one of the following.

    - samsung,s3c2443-spi: for s3c2443, s3c2416 and s3c2450 platforms

    - samsung,s3c6410-spi: for s3c6410 platforms

    - samsung,s5p6440-spi: for s5p6440 and s5p6450 platforms

    - samsung,s5pv210-spi: for s5pv210 and s5pc110 platforms

    - samsung,exynos4210-spi: for exynos4 and exynos5 platforms