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

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

Merge tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu into next/drivers 

Merge "mvebu drivers for v3.15" from Jason Cooper:

pull request #1:

 - mvebu mbus
    - use of_find_matching_node_and_match

 - rtc
    - use PTR_ERR_OR_ZERO in isl12057
    - work around issue in mv where date returned is 2038

 - kirkwood -> mach-mvebu
    - various Kconfig oneliners to allow building kirkwood in -mvebu/

pull request #2:

 - reset
    - re-use qnap-poweroff driver for Synology NASs

* tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu

:
  Power: Reset: Generalize qnap-poweroff to work on Synology devices.
  drivers: Enable building of Kirkwood drivers for mach-mvebu
  rtc: mv: reset date if after year 2038
  rtc: isl12057: use PTR_ERR_OR_ZERO to fix coccinelle warnings
  bus: mvebu-mbus: make use of of_find_matching_node_and_match

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents de65ded4 200c0a3e

Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt

+4 −1
Original line number Diff line number Diff line
@@ -6,8 +6,11 @@ Orion5x SoCs. Sending the character 'A', at 19200 baud, tells the 
microcontroller to turn the power off. This driver adds a handler to

pm_power_off which is called to turn the power off.



Synology NAS devices use a similar scheme, but a different baud rate,

9600, and a different character, '1'.



Required Properties:

- compatible: Should be "qnap,power-off"

- compatible: Should be "qnap,power-off" or "synology,power-off"



- reg: Address and length of the register set for UART1

- clocks: tclk clock

drivers/bus/mvebu-mbus.c

+1 −2
Original line number Diff line number Diff line
@@ -890,13 +890,12 @@ int __init mvebu_mbus_dt_init(void) 
	const __be32 *prop;

	int ret;



	np = of_find_matching_node(NULL, of_mvebu_mbus_ids);

	np = of_find_matching_node_and_match(NULL, of_mvebu_mbus_ids, &of_id);

	if (!np) {

		pr_err("could not find a matching SoC family\n");

		return -ENODEV;

	}



	of_id = of_match_node(of_mvebu_mbus_ids, np);

	mbus_state.soc = of_id->data;



	prop = of_get_property(np, "controller", NULL);

drivers/cpufreq/Kconfig.arm

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ config ARM_INTEGRATOR 
	  If in doubt, say Y.



config ARM_KIRKWOOD_CPUFREQ

	def_bool ARCH_KIRKWOOD && OF

	def_bool MACH_KIRKWOOD

	help

	  This adds the CPUFreq driver for Marvell Kirkwood

	  SoCs.

drivers/cpuidle/Kconfig.arm

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ config ARM_HIGHBANK_CPUIDLE 


config ARM_KIRKWOOD_CPUIDLE

	bool "CPU Idle Driver for Marvell Kirkwood SoCs"

	depends on ARCH_KIRKWOOD

	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD

	help

	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.

drivers/leds/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ config LEDS_MC13783 
config LEDS_NS2

	tristate "LED support for Network Space v2 GPIO LEDs"

	depends on LEDS_CLASS

	depends on ARCH_KIRKWOOD

	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD

	default y

	help

	  This option enable support for the dual-GPIO LED found on the
@@ -431,7 +431,7 @@ config LEDS_NS2 
config LEDS_NETXBIG

	tristate "LED support for Big Network series LEDs"

	depends on LEDS_CLASS

	depends on ARCH_KIRKWOOD

	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD

	default y

	help

	  This option enable support for LEDs found on the LaCie 2Big