diff options
Diffstat (limited to 'Documentation')
3 files changed, 92 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/power/omap-core-dvfs.txt b/Documentation/devicetree/bindings/power/omap-core-dvfs.txt new file mode 100644 index 00000000000..aed56ec062d --- /dev/null +++ b/Documentation/devicetree/bindings/power/omap-core-dvfs.txt @@ -0,0 +1,48 @@ +Core dynamic voltage and frequency scaling driver for Texas Instruments OMAP SoC +It allows to save power during active system state by changing core voltage and +frequency based on CPU performance. + +Required Properties: +- compatible: Should be "ti,omap-core-dvfs" +- l3_clkname: An clock name of core L3 interconnect clock +- dpll_clkname: An clock name of DPLL output clock +- core_dvfs-supply: An reference node of core voltage regulator +- operating-points: An array of 2-tuples items, and each item consists + of frequency and voltage like <freq-kHz vol-uV>. Physical frequency value + my be different from value in this array becasue of rounding to closest + possible value based on integer divider. For example if DPLL output clock + value is 332Mhz and value in array is 200Mhz then physical frequency will + be 166Mhz because divider is integer. You have to use frequency values, + which are multiple of DPLL output frequency to avoid rounding. +- map: An array of 2-tuples items, and each item consists + of CPU frequency and matching core frequency in kHz. + CPU frequency values should be used from CPU operating-points array + +Optional Properties: +- voltage-tolerance: percent value, which voltage in operating-points array + may deviate from its value + +Example: + dvfs { + compatible = "simple-bus"; + + core_dvfs: core_dvfs { + compatible = "ti,omap-core-dvfs"; + + l3_clkname = "l3_ick"; + dpll_clkname = "dpll3_m2_ck"; + core_dvfs-supply = <&omap_tps65912_dcdc4>; + + operating-points = < + /* kHz uV */ + 100000 950000 + 200000 1150000 + >; + map = < + /* cpu freq, core freq*/ + 300000 100000 + 600000 200000 + 800000 200000 + >; + }; + }; diff --git a/Documentation/devicetree/bindings/power_supply/max17042_battery.txt b/Documentation/devicetree/bindings/power_supply/max17042_battery.txt index 1f2ba1991ec..785a5d214ae 100644 --- a/Documentation/devicetree/bindings/power_supply/max17042_battery.txt +++ b/Documentation/devicetree/bindings/power_supply/max17042_battery.txt @@ -26,6 +26,11 @@ Optional subnodes: - maxim,configuration : Contains configuraiton data for POR initialization of the device defined in Maxim appnote. This data is either specific to how the host device is used or battery specific characteristic. + Optionally can be defrined as "maxim,configuration-<batt-id>" where batt-id + is set in /chosen path of yoru respective device tree. As a result, the driver + will load maxim,configuration-<batt-id> you specified. This will allow us + to use multiple battery suppliers within the same software binary. + NOTE: the length of this node should be less or equal to 64 bytes. - maxim,temp-conv : Contains a table to convert a value from Temperature register to a "real" temp value. This conversion table should be used when @@ -33,6 +38,8 @@ Optional subnodes: measurements. Required "maxim,configuration" node properties : + - version: version of the configuration data. Update revision to force + device being reprogramed without POR event. - config : CONFIG register value (u16) specific to the device application. - full_soc_thresh : FullSOCThr register value (u16). The appnote has a recommended value. @@ -110,6 +117,15 @@ Example: tgain = /bits/ 16 <0xE71C>; toff = /bits/ 16 <0x251A>; } + + /* optional you can define additional maxim,configuration-<batt-id> */ + /* the total length of the node name should not be bigger than 64 */ + /* bytes including null termination character. */ + /* maxim,configuration-SNN5951A { */ + ... + ... + } + maxim,temp-conv { start = /bits/ 16 <(-20)>; /* in degrees C */ result = /bits/ 16 < /* in 1/10 degrees C */ diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 3458d6343e0..6e5c7c7333b 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -22,6 +22,15 @@ ip_no_pmtu_disc - BOOLEAN min_pmtu - INTEGER default 552 - minimum discovered Path MTU +fwmark_reflect - BOOLEAN + Controls the fwmark of kernel-generated IPv4 reply packets that are not + associated with a socket for example, TCP RSTs or ICMP echo replies). + If unset, these packets have a fwmark of zero. If set, they have the + fwmark of the packet they are replying to. Similarly affects the fwmark + used by internal routing lookups triggered by incoming packets, such as + the ones used for Path MTU Discovery. + Default: 0 + route/max_size - INTEGER Maximum number of routes allowed in the kernel. Increase this when using large numbers of interfaces and/or routes. @@ -468,6 +477,16 @@ tcp_fastopen - INTEGER See include/net/tcp.h and the code for more details. +tcp_fwmark_accept - BOOLEAN + If set, incoming connections to listening sockets that do not have a + socket mark will set the mark of the accepting socket to the fwmark of + the incoming SYN packet. This will cause all packets on that connection + (starting from the first SYNACK) to be sent with that fwmark. The + listening socket's mark is unchanged. Listening sockets that already + have a fwmark set via setsockopt(SOL_SOCKET, SO_MARK, ...) are + unaffected. + Default: 0 + tcp_syn_retries - INTEGER Number of times initial SYNs for an active TCP connection attempt will be retransmitted. Should not be higher than 255. Default value @@ -1087,6 +1106,15 @@ conf/all/forwarding - BOOLEAN proxy_ndp - BOOLEAN Do proxy ndp. +fwmark_reflect - BOOLEAN + Controls the fwmark of kernel-generated IPv6 reply packets that are not + associated with a socket for example, TCP RSTs or ICMPv6 echo replies). + If unset, these packets have a fwmark of zero. If set, they have the + fwmark of the packet they are replying to. Similarly affects the fwmark + used by internal routing lookups triggered by incoming packets, such as + the ones used for Path MTU Discovery. + Default: 0 + conf/interface/*: Change special settings per interface. |