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

Commit 974b3358 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "People are back from the holiday breaks, and it shows.  Here are a
  bunch of fixes for a number of platforms:
   - A couple of small fixes for Nomadik
   - A larger set of changes for kirkwood/mvebu
     - uart driver selection, dt clocks, gpio-poweroff fixups, a few
       __init annotation fixes and some error handling improvement in
       their xor dma driver.
   - i.MX had a couple of minor fixes (and a critical one for flexcan2
     clock setup)
   - MXS has a small board fix and a framebuffer bugfix
   - A set of fixes for Samsung Exynos, fixing default bootargs and some
     Exynos5440 clock issues
   - A set of OMAP changes including PM fixes and a few sparse warning
     fixups

  All in all a bit more positive code delta than we'd ideally want to
  see here, mostly from the OMAP PM changes, but nothing overly crazy."

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  pinctrl: mvebu: make pdma clock on dove mandatory
  ARM: Dove: Add pinctrl clock to DT
  dma: mv_xor: fix error handling for clocks
  dma: mv_xor: fix error handling of mv_xor_channel_add()
  arm: mvebu: Add missing ; for cpu node.
  arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
  arm: mvebu: Armada XP MV78230 has two cores, not one
  clk: mvebu: Remove inappropriate __init tagging
  ARM: Kirkwood: Use fixed-regulator instead of board gpio call
  ARM: Kirkwood: Fix missing sdio clock
  ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
  ...
parents ca5c8a4c 434fec16

Documentation/devicetree/bindings/clock/imx23-clock.txt

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ clks: clkctrl@80040000 { 
	compatible = "fsl,imx23-clkctrl";

	reg = <0x80040000 0x2000>;

	#clock-cells = <1>;

	clock-output-names =

		...

		"uart",		/* 32 */

		...

		"end_of_list";

};



auart0: serial@8006c000 {

Documentation/devicetree/bindings/clock/imx25-clock.txt

+0 −4
Original line number Diff line number Diff line
@@ -146,10 +146,6 @@ clks: ccm@53f80000 { 
	compatible = "fsl,imx25-ccm";

	reg = <0x53f80000 0x4000>;

	interrupts = <31>;

	clock-output-names = ...

			"uart_ipg",

			"uart_serial",

			...;

};



uart1: serial@43f90000 {

Documentation/devicetree/bindings/clock/imx28-clock.txt

+0 −5
Original line number Diff line number Diff line
@@ -83,11 +83,6 @@ clks: clkctrl@80040000 { 
	compatible = "fsl,imx28-clkctrl";

	reg = <0x80040000 0x2000>;

	#clock-cells = <1>;

	clock-output-names =

		...

		"uart",		/* 45 */

		...

		"end_of_list";

};



auart0: serial@8006a000 {

Documentation/devicetree/bindings/clock/imx6q-clock.txt

+0 −4
Original line number Diff line number Diff line
@@ -211,10 +211,6 @@ clks: ccm@020c4000 { 
	reg = <0x020c4000 0x4000>;

	interrupts = <0 87 0x04 0 88 0x04>;

	#clock-cells = <1>;

	clock-output-names = ...

			     "uart_ipg",

			     "uart_serial",

			     ...;

};



uart1: serial@02020000 {

Documentation/devicetree/bindings/gpio/gpio-poweroff.txt

+17 −3
Original line number Diff line number Diff line 
GPIO line that should be set high/low to power off a device

Driver a GPIO line that can be used to turn the power off.



The driver supports both level triggered and edge triggered power off.

At driver load time, the driver will request the given gpio line and

install a pm_power_off handler. If the optional properties 'input' is

not found, the GPIO line will be driven in the inactive

state. Otherwise its configured as an input.



When the pm_power_off is called, the gpio is configured as an output,

and drive active, so triggering a level triggered power off

condition. This will also cause an inactive->active edge condition, so

triggering positive edge triggered power off. After a delay of 100ms,

the GPIO is set to inactive, thus causing an active->inactive edge,

triggering negative edge triggered power off. After another 100ms

delay the GPIO is driver active again. If the power is still on and

the CPU still running after a 3000ms delay, a WARN_ON(1) is emitted.



Required properties:

- compatible : should be "gpio-poweroff".
@@ -13,10 +28,9 @@ Optional properties: 
  property is not specified, the GPIO is initialized as an output in its

  inactive state.





Examples:



gpio-poweroff {

	compatible = "gpio-poweroff";

	gpios = <&gpio 4 0>; /* GPIO 4 Active Low */

	gpios = <&gpio 4 0>;

};