Commit d548ca43 authored by Lee Jones's avatar Lee Jones
Browse files

Merge branches 'ib-mfd-base-acpi-dma-4.3',... 

Merge branches 'ib-mfd-base-acpi-dma-4.3', 'ib-mfd-clocksource-rtc-watchdog-4.3' and 'ib-mfd-i2c-x86-watchdog-4.3' into ibs-for-mfd-merged
parents 4b45efe8 82805d1b 2a7a0e9b

Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt

+9 −6
Original line number Diff line number Diff line 
STMicroelectronics Low Power Controller (LPC) - RTC

===================================================



LPC currently supports Watchdog OR Real Time Clock functionality.

LPC currently supports Watchdog OR Real Time Clock OR Clocksource

functionality.



[See: ../watchdog/st_lpc_wdt.txt for Watchdog options]

[See: ../timer/st,stih407-lpc for Clocksource options]



Required properties



- compatible 	: Must be one of: "st,stih407-lpc" "st,stih416-lpc"

				  "st,stih415-lpc" "st,stid127-lpc"

- compatible 	: Must be: "st,stih407-lpc"

- reg		: LPC registers base address + size

- interrupts    : LPC interrupt line number and associated flags

- clocks	: Clock used by LPC device (See: ../clock/clock-bindings.txt)

- st,lpc-mode	: The LPC can run either one of two modes ST_LPC_MODE_RTC [0] or

		  ST_LPC_MODE_WDT [1].  One (and only one) mode must be

		  selected.

- st,lpc-mode	: The LPC can run either one of three modes:

                  ST_LPC_MODE_RTC    [0]

                  ST_LPC_MODE_WDT    [1]

                  ST_LPC_MODE_CLKSRC [2]

		 One (and only one) mode must be selected.



Example:

	lpc@fde05000 {

Documentation/devicetree/bindings/timer/st,stih407-lpc

0 → 100644
+28 −0
Original line number Diff line number Diff line 
STMicroelectronics Low Power Controller (LPC) - Clocksource

===========================================================



LPC currently supports Watchdog OR Real Time Clock OR Clocksource

functionality.



[See: ../watchdog/st_lpc_wdt.txt for Watchdog options]

[See: ../rtc/rtc-st-lpc.txt for RTC options]



Required properties



- compatible   : Must be: "st,stih407-lpc"

- reg          : LPC registers base address + size

- interrupts   : LPC interrupt line number and associated flags

- clocks       : Clock used by LPC device (See: ../clock/clock-bindings.txt)

- st,lpc-mode  : The LPC can run either one of three modes:

                  ST_LPC_MODE_RTC    [0]

                  ST_LPC_MODE_WDT    [1]

                  ST_LPC_MODE_CLKSRC [2]

		 One (and only one) mode must be selected.



Example:

       lpc@fde05000 {

               compatible      = "st,stih407-lpc";

               reg             = <0xfde05000 0x1000>;

               clocks          = <&clk_s_d3_flexgen CLK_LPC_0>;

               st,lpc-mode     = <ST_LPC_MODE_CLKSRC>;

       };

Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt

+8 −4
Original line number Diff line number Diff line 
STMicroelectronics Low Power Controller (LPC) - Watchdog

========================================================



LPC currently supports Watchdog OR Real Time Clock functionality.

LPC currently supports Watchdog OR Real Time Clock OR Clocksource

functionality.



[See: ../rtc/rtc-st-lpc.txt for RTC options]

[See: ../timer/st,stih407-lpc for Clocksource options]



Required properties
@@ -12,9 +14,11 @@ Required properties 
- reg		: LPC registers base address + size

- interrupts    : LPC interrupt line number and associated flags

- clocks	: Clock used by LPC device (See: ../clock/clock-bindings.txt)

- st,lpc-mode	: The LPC can run either one of two modes ST_LPC_MODE_RTC [0] or

		  ST_LPC_MODE_WDT [1].  One (and only one) mode must be

		  selected.

- st,lpc-mode	: The LPC can run either one of three modes:

                  ST_LPC_MODE_RTC    [0]

                  ST_LPC_MODE_WDT    [1]

                  ST_LPC_MODE_CLKSRC [2]

		 One (and only one) mode must be selected.



Required properties [watchdog mode]

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1503,6 +1503,7 @@ S: Maintained 
F:	arch/arm/mach-sti/

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

F:	drivers/clocksource/arm_global_timer.c

F:	drivers/clocksource/clksrc_st_lpc.c

F:	drivers/i2c/busses/i2c-st.c

F:	drivers/media/rc/st_rc.c

F:	drivers/mmc/host/sdhci-st.c

drivers/clocksource/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -293,4 +293,12 @@ config CLKSRC_IMX_GPT 
	depends on ARM && CLKDEV_LOOKUP

	select CLKSRC_MMIO



config CLKSRC_ST_LPC

	bool

	depends on ARCH_STI

	select CLKSRC_OF if OF

	help

	  Enable this option to use the Low Power controller timer

	  as clocksource.



endmenu