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

Commit 2bf73dd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC late cleanups from Arnd Bergmann:
 "These could not be part of the first cleanup branch, because they
  either came too late in the cycle, or they have dependencies on other
  branches.  Important changes are:

   - The integrator platform is almost multiplatform capable after some
     reorganization (Linus Walleij)
   - Minor cleanups on Zynq (Michal Simek)
   - Lots of changes for Exynos and other Samsung platforms, including
     further preparations for multiplatform support and the clocks
     bindings are rearranged"

* tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  devicetree: fix newly added exynos sata bindings
  ARM: EXYNOS: Fix compilation error in cpuidle.c
  ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h
  ARM: EXYNOS: Remove hardware.h file
  ARM: SAMSUNG: Remove hardware.h inclusion
  ARM: S3C24XX: Remove invalid code from hardware.h
  dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock
  ARM: dts: Keep some essential LDOs enabled for arndale-octa board
  ARM: dts: Disable MDMA1 node for arndale-octa board
  ARM: S3C64XX: Fix build for implicit serial_s3c.h inclusion
  serial: s3c: Fix build of header without serial_core.h preinclusion
  ARM: EXYNOS: Allow wake-up using GIC interrupts
  ARM: EXYNOS: Stop using legacy Samsung PM code
  ARM: EXYNOS: Remove PM initcalls and useless indirection
  ARM: EXYNOS: Fix abuse of CONFIG_PM
  ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h
  ARM: SAMSUNG: Move common save/restore helpers to separate file
  ARM: SAMSUNG: Move Samsung PM debug code into separate file
  ARM: SAMSUNG: Consolidate PM debug functions
  ARM: SAMSUNG: Use debug_ll_addr() to get UART base address
  ...
parents d2b150d0 9dfbff16

Documentation/devicetree/bindings/ata/exynos-sata-phy.txt

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
* Samsung SATA PHY Controller



SATA PHY nodes are defined to describe on-chip SATA Physical layer controllers.

Each SATA PHY controller should have its own node.



Required properties:

- compatible        : compatible list, contains "samsung,exynos5-sata-phy"

- reg               : <registers mapping>



Example:

        sata@ffe07000 {

                compatible = "samsung,exynos5-sata-phy";

                reg = <0xffe07000 0x1000>;

        };

Documentation/devicetree/bindings/ata/exynos-sata.txt

+22 −9
Original line number Diff line number Diff line
@@ -8,10 +8,23 @@ Required properties: 
- interrupts		: <interrupt mapping for SATA IRQ>

- reg			: <registers mapping>

- samsung,sata-freq	: <frequency in MHz>

- phys			: Must contain exactly one entry as specified

			  in phy-bindings.txt

- phy-names		: Must be "sata-phy"



Optional properties:

- clocks		: Must contain an entry for each entry in clock-names.

- clock-names		: Shall be "sata" for the external SATA bus clock,

			  and "sclk_sata" for the internal controller clock.



Example:

        sata@ffe08000 {

                compatible = "samsung,exynos5-sata";

                reg = <0xffe08000 0x1000>;

                interrupts = <115>;

	sata@122f0000 {

		compatible = "snps,dwc-ahci";

		samsung,sata-freq = <66>;

		reg = <0x122f0000 0x1ff>;

		interrupts = <0 115 0>;

		clocks = <&clock 277>, <&clock 143>;

		clock-names = "sata", "sclk_sata";

		phys = <&sata_phy>;

		phy-names = "sata-phy";

	};

Documentation/devicetree/bindings/clock/zynq-7000.txt

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ for all clock consumers of PS clocks. 
Required properties:

 - #clock-cells : Must be 1

 - compatible : "xlnx,ps7-clkc"

 - reg : SLCR offset and size taken via syscon < 0x100 0x100 >

 - ps-clk-frequency : Frequency of the oscillator providing ps_clk in HZ

		      (usually 33 MHz oscillators are used for Zynq platforms)

 - clock-output-names : List of strings used to name the clock outputs. Shall be
@@ -87,10 +88,11 @@ Clock outputs: 
 47: dbg_apb



Example:

	clkc: clkc {

	clkc: clkc@100 {

		#clock-cells = <1>;

		compatible = "xlnx,ps7-clkc";

		ps-clk-frequency = <33333333>;

		reg = <0x100 0x100>;

		clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x",

				"cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x",

				"dci", "lqspi", "smc", "pcap", "gem0", "gem1",

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

+40 −0
Original line number Diff line number Diff line
@@ -74,3 +74,43 @@ phy-consumer@12340000 { 


Refer to DT bindings documentation of particular PHY consumer devices for more

information about required PHYs and the way of specification.



Samsung SATA PHY Controller

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



SATA PHY nodes are defined to describe on-chip SATA Physical layer controllers.

Each SATA PHY controller should have its own node.



Required properties:

- compatible        : compatible list, contains "samsung,exynos5250-sata-phy"

- reg : offset and length of the SATA PHY register set;

- #phy-cells : must be zero

- clocks : must be exactly one entry

- clock-names : must be "sata_phyctrl"

- samsung,exynos-sataphy-i2c-phandle : a phandle to the I2C device, no arguments

- samsung,syscon-phandle : a phandle to the PMU system controller, no arguments



Example:

	sata_phy: sata-phy@12170000 {

		compatible = "samsung,exynos5250-sata-phy";

		reg = <0x12170000 0x1ff>;

		clocks = <&clock 287>;

		clock-names = "sata_phyctrl";

		#phy-cells = <0>;

		samsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>;

		samsung,syscon-phandle = <&pmu_syscon>;

	};



Device-Tree bindings for sataphy i2c client driver

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



Required properties:

compatible: Should be "samsung,exynos-sataphy-i2c"

- reg: I2C address of the sataphy i2c device.



Example:



	sata_phy_i2c:sata-phy@38 {

		compatible = "samsung,exynos-sataphy-i2c";

		reg = <0x38>;

	};

arch/arm/Kconfig.debug

+2 −2
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ config DEBUG_UART_8250_FLOW_CONTROL 


config DEBUG_UNCOMPRESS

	bool

	depends on ARCH_MULTIPLATFORM || ARCH_MSM || ARCH_EXYNOS

	depends on ARCH_MULTIPLATFORM || ARCH_MSM || PLAT_SAMSUNG

	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \

		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)

	help
@@ -1158,7 +1158,7 @@ config DEBUG_UNCOMPRESS 
config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \

					ARCH_EXYNOS || ARCH_EFM32

					PLAT_SAMSUNG || ARCH_EFM32

	default "mach/uncompress.h"



config EARLY_PRINTK