From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- .../bindings/rtc/atmel,at91rm9200-rtc.txt | 2 ++ .../devicetree/bindings/rtc/dallas,ds1390.txt | 18 ++++++++++++++ .../devicetree/bindings/rtc/haoyu,hym8563.txt | 2 +- .../devicetree/bindings/rtc/isil,isl12057.txt | 10 ++++---- .../devicetree/bindings/rtc/nxp,lpc1788-rtc.txt | 21 ++++++++++++++++ .../devicetree/bindings/rtc/pcf8563.txt | 25 +++++++++++++++++++ .../devicetree/bindings/rtc/rtc-mxc.txt | 26 ++++++++++++++++++++ .../devicetree/bindings/rtc/rtc-omap.txt | 5 ++++ .../devicetree/bindings/rtc/rtc-opal.txt | 5 ++-- .../devicetree/bindings/rtc/rtc-st-lpc.txt | 28 ++++++++++++++++++++++ .../devicetree/bindings/rtc/s3c-rtc.txt | 3 ++- .../devicetree/bindings/rtc/ti,bq32k.txt | 18 ++++++++++++++ .../devicetree/bindings/rtc/xlnx-rtc.txt | 25 +++++++++++++++++++ 13 files changed, 179 insertions(+), 9 deletions(-) create mode 100644 kernel/Documentation/devicetree/bindings/rtc/dallas,ds1390.txt create mode 100644 kernel/Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt create mode 100644 kernel/Documentation/devicetree/bindings/rtc/pcf8563.txt create mode 100644 kernel/Documentation/devicetree/bindings/rtc/rtc-mxc.txt create mode 100644 kernel/Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt create mode 100644 kernel/Documentation/devicetree/bindings/rtc/ti,bq32k.txt create mode 100644 kernel/Documentation/devicetree/bindings/rtc/xlnx-rtc.txt (limited to 'kernel/Documentation/devicetree/bindings/rtc') diff --git a/kernel/Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt b/kernel/Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt index 34c150577..5d3791e78 100644 --- a/kernel/Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt +++ b/kernel/Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt @@ -5,6 +5,7 @@ Required properties: - reg: physical base address of the controller and length of memory mapped region. - interrupts: rtc alarm/event interrupt +- clocks: phandle to input clock. Example: @@ -12,4 +13,5 @@ rtc@fffffe00 { compatible = "atmel,at91rm9200-rtc"; reg = <0xfffffe00 0x100>; interrupts = <1 4 7>; + clocks = <&clk32k>; }; diff --git a/kernel/Documentation/devicetree/bindings/rtc/dallas,ds1390.txt b/kernel/Documentation/devicetree/bindings/rtc/dallas,ds1390.txt new file mode 100644 index 000000000..8e76f2648 --- /dev/null +++ b/kernel/Documentation/devicetree/bindings/rtc/dallas,ds1390.txt @@ -0,0 +1,18 @@ +* Dallas DS1390 SPI Serial Real-Time Clock + +Required properties: +- compatible: Should contain "dallas,ds1390". +- reg: SPI address for chip + +Optional properties: +- trickle-resistor-ohms : Selected resistor for trickle charger + Values usable for ds1390 are 250, 2000, 4000 + Should be given if trickle charger should be enabled +- trickle-diode-disable : Do not use internal trickle charger diode + Should be given if internal trickle charger diode should be disabled +Example: + ds1390: rtc@68 { + compatible = "dallas,ds1390"; + trickle-resistor-ohms = <250>; + reg = <0>; + }; diff --git a/kernel/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt b/kernel/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt index 5c199ee04..a8934fe2a 100644 --- a/kernel/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt +++ b/kernel/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt @@ -6,11 +6,11 @@ as well as a clock output of up to 32kHz. Required properties: - compatible: should be: "haoyu,hym8563" - reg: i2c address -- interrupts: rtc alarm/event interrupt - #clock-cells: the value should be 0 Optional properties: - clock-output-names: From common clock binding +- interrupts: rtc alarm/event interrupt Example: diff --git a/kernel/Documentation/devicetree/bindings/rtc/isil,isl12057.txt b/kernel/Documentation/devicetree/bindings/rtc/isil,isl12057.txt index 501c39cea..cf83e0940 100644 --- a/kernel/Documentation/devicetree/bindings/rtc/isil,isl12057.txt +++ b/kernel/Documentation/devicetree/bindings/rtc/isil,isl12057.txt @@ -5,7 +5,7 @@ consisting of a compatible field, an address and possibly an interrupt line). Nonetheless, it also supports an option boolean property -("isil,irq2-can-wakeup-machine") to handle the specific use-case found +("wakeup-source") to handle the specific use-case found on at least three in-tree users of the chip (NETGEAR ReadyNAS 102, 104 and 2120 ARM-based NAS); On those devices, the IRQ#2 pin of the chip (associated with the alarm supported by the driver) is not connected @@ -22,9 +22,9 @@ Required properties supported by the device: Optional properties: - - "isil,irq2-can-wakeup-machine": mark the chip as a wakeup source, - independently of the availability of an IRQ line connected to the - SoC. + - "wakeup-source": mark the chip as a wakeup source, independently of + the availability of an IRQ line connected to the SoC. + (Legacy property supported: "isil,irq2-can-wakeup-machine") - "interrupt-parent", "interrupts": for passing the interrupt line of the SoC connected to IRQ#2 of the RTC chip. @@ -74,5 +74,5 @@ PMIC, allowing the device to be started based on configured alarm: isl12057: isl12057@68 { compatible = "isil,isl12057"; reg = <0x68>; - isil,irq2-can-wakeup-machine; + wakeup-source; }; diff --git a/kernel/Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt b/kernel/Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt new file mode 100644 index 000000000..3c97bd180 --- /dev/null +++ b/kernel/Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt @@ -0,0 +1,21 @@ +NXP LPC1788 real-time clock + +The LPC1788 RTC provides calendar and clock functionality +together with periodic tick and alarm interrupt support. + +Required properties: +- compatible : must contain "nxp,lpc1788-rtc" +- reg : Specifies base physical address and size of the registers. +- interrupts : A single interrupt specifier. +- clocks : Must contain clock specifiers for rtc and register clock +- clock-names : Must contain "rtc" and "reg" + See ../clocks/clock-bindings.txt for details. + +Example: +rtc: rtc@40046000 { + compatible = "nxp,lpc1788-rtc"; + reg = <0x40046000 0x1000>; + interrupts = <47>; + clocks = <&creg_clk 0>, <&ccu1 CLK_CPU_BUS>; + clock-names = "rtc", "reg"; +}; diff --git a/kernel/Documentation/devicetree/bindings/rtc/pcf8563.txt b/kernel/Documentation/devicetree/bindings/rtc/pcf8563.txt new file mode 100644 index 000000000..72f6d2c96 --- /dev/null +++ b/kernel/Documentation/devicetree/bindings/rtc/pcf8563.txt @@ -0,0 +1,25 @@ +* Philips PCF8563/Epson RTC8564 Real Time Clock + +Philips PCF8563/Epson RTC8564 Real Time Clock + +Required properties: +see: Documentation/devicetree/bindings/i2c/trivial-devices.txt + +Optional property: +- #clock-cells: Should be 0. +- clock-output-names: + overwrite the default clock name "pcf8563-clkout" + +Example: + +pcf8563: pcf8563@51 { + compatible = "nxp,pcf8563"; + reg = <0x51>; + #clock-cells = <0>; +}; + +device { +... + clocks = <&pcf8563>; +... +}; diff --git a/kernel/Documentation/devicetree/bindings/rtc/rtc-mxc.txt b/kernel/Documentation/devicetree/bindings/rtc/rtc-mxc.txt new file mode 100644 index 000000000..5bcd31d99 --- /dev/null +++ b/kernel/Documentation/devicetree/bindings/rtc/rtc-mxc.txt @@ -0,0 +1,26 @@ +* Real Time Clock of the i.MX SoCs + +RTC controller for the i.MX SoCs + +Required properties: +- compatible: Should be "fsl,imx1-rtc" or "fsl,imx21-rtc". +- reg: physical base address of the controller and length of memory mapped + region. +- interrupts: IRQ line for the RTC. +- clocks: should contain two entries: + * one for the input reference + * one for the the SoC RTC +- clock-names: should contain: + * "ref" for the input reference clock + * "ipg" for the SoC RTC clock + +Example: + +rtc@10007000 { + compatible = "fsl,imx21-rtc"; + reg = <0x10007000 0x1000>; + interrupts = <22>; + clocks = <&clks IMX27_CLK_CKIL>, + <&clks IMX27_CLK_RTC_IPG_GATE>; + clock-names = "ref", "ipg"; +}; diff --git a/kernel/Documentation/devicetree/bindings/rtc/rtc-omap.txt b/kernel/Documentation/devicetree/bindings/rtc/rtc-omap.txt index 4ba4dbd34..bf7d11ae9 100644 --- a/kernel/Documentation/devicetree/bindings/rtc/rtc-omap.txt +++ b/kernel/Documentation/devicetree/bindings/rtc/rtc-omap.txt @@ -8,6 +8,7 @@ Required properties: Wakeup generation for event Alarm. It can also be used to control an external PMIC via the pmic_power_en pin. + - "ti,am4372-rtc" - for RTC IP used similar to that on AM437X SoC family. - reg: Address range of rtc register set - interrupts: rtc timer, alarm interrupts in order - interrupt-parent: phandle for the interrupt controller @@ -15,6 +16,8 @@ Required properties: Optional properties: - system-power-controller: whether the rtc is controlling the system power through pmic_power_en +- clocks: Any internal or external clocks feeding in to rtc +- clock-names: Corresponding names of the clocks Example: @@ -25,4 +28,6 @@ rtc@1c23000 { 19>; interrupt-parent = <&intc>; system-power-controller; + clocks = <&clk_32k_rtc>, <&clk_32768_ck>; + clock-names = "ext-clk", "int-clk"; }; diff --git a/kernel/Documentation/devicetree/bindings/rtc/rtc-opal.txt b/kernel/Documentation/devicetree/bindings/rtc/rtc-opal.txt index af87e5eca..a1734e5cb 100644 --- a/kernel/Documentation/devicetree/bindings/rtc/rtc-opal.txt +++ b/kernel/Documentation/devicetree/bindings/rtc/rtc-opal.txt @@ -5,12 +5,13 @@ Required properties: - comapatible: Should be "ibm,opal-rtc" Optional properties: -- has-tpo: Decides if the wakeup is supported or not. +- wakeup-source: Decides if the wakeup is supported or not + (Legacy property supported: "has-tpo") Example: rtc { compatible = "ibm,opal-rtc"; - has-tpo; + wakeup-source; phandle = <0x10000029>; linux,phandle = <0x10000029>; }; diff --git a/kernel/Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt b/kernel/Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt new file mode 100644 index 000000000..daf88265d --- /dev/null +++ b/kernel/Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt @@ -0,0 +1,28 @@ +STMicroelectronics Low Power Controller (LPC) - RTC +=================================================== + +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: "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 = ; + }; diff --git a/kernel/Documentation/devicetree/bindings/rtc/s3c-rtc.txt b/kernel/Documentation/devicetree/bindings/rtc/s3c-rtc.txt index ab757b84d..ac2fcd6ff 100644 --- a/kernel/Documentation/devicetree/bindings/rtc/s3c-rtc.txt +++ b/kernel/Documentation/devicetree/bindings/rtc/s3c-rtc.txt @@ -6,7 +6,8 @@ Required properties: * "samsung,s3c2416-rtc" - for controllers compatible with s3c2416 rtc. * "samsung,s3c2443-rtc" - for controllers compatible with s3c2443 rtc. * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc. - * "samsung,exynos3250-rtc" - for controllers compatible with exynos3250 rtc. + * "samsung,exynos3250-rtc" - (deprecated) for controllers compatible with + exynos3250 rtc (use "samsung,s3c6410-rtc"). - reg: physical base address of the controller and length of memory mapped region. - interrupts: Two interrupt numbers to the cpu should be specified. First diff --git a/kernel/Documentation/devicetree/bindings/rtc/ti,bq32k.txt b/kernel/Documentation/devicetree/bindings/rtc/ti,bq32k.txt new file mode 100644 index 000000000..e204906b9 --- /dev/null +++ b/kernel/Documentation/devicetree/bindings/rtc/ti,bq32k.txt @@ -0,0 +1,18 @@ +* TI BQ32000 I2C Serial Real-Time Clock + +Required properties: +- compatible: Should contain "ti,bq32000". +- reg: I2C address for chip + +Optional properties: +- trickle-resistor-ohms : Selected resistor for trickle charger + Values usable are 1120 and 20180 + Should be given if trickle charger should be enabled +- trickle-diode-disable : Do not use internal trickle charger diode + Should be given if internal trickle charger diode should be disabled +Example: + bq32000: rtc@68 { + compatible = "ti,bq32000"; + trickle-resistor-ohms = <1120>; + reg = <0x68>; + }; diff --git a/kernel/Documentation/devicetree/bindings/rtc/xlnx-rtc.txt b/kernel/Documentation/devicetree/bindings/rtc/xlnx-rtc.txt new file mode 100644 index 000000000..0df6f016b --- /dev/null +++ b/kernel/Documentation/devicetree/bindings/rtc/xlnx-rtc.txt @@ -0,0 +1,25 @@ +* Xilinx Zynq Ultrascale+ MPSoC Real Time Clock + +RTC controller for the Xilinx Zynq MPSoC Real Time Clock +Separate IRQ lines for seconds and alarm + +Required properties: +- compatible: Should be "xlnx,zynqmp-rtc" +- reg: Physical base address of the controller and length + of memory mapped region. +- interrupts: IRQ lines for the RTC. +- interrupt-names: interrupt line names eg. "sec" "alarm" + +Optional: +- calibration: calibration value for 1 sec period which will + be programmed directly to calibration register + +Example: +rtc: rtc@ffa60000 { + compatible = "xlnx,zynqmp-rtc"; + reg = <0x0 0xffa60000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 26 4>, <0 27 4>; + interrupt-names = "alarm", "sec"; + calibration = <0x198233>; +}; -- cgit 1.2.3-korg