Skip to content

Commit

Permalink
Merge tag 'at24-4.16-updates-for-wolfram' of git://git.kernel.org/pub…
Browse files Browse the repository at this point in the history 
…/scm/linux/kernel/git/brgl/linux into i2c/for-4.16

"AT24 updates for 4.16 merge window

The driver has been converted to using regmap instead of raw i2c and
smbus calls which shrank the code significantly.

Device tree binding document has been cleaned up. Device tree support in
the driver has been improved and we now support all at24 models as well
as two new DT properties (no-read-rollover and wp-gpios).

We no longer user unreadable magic values for driver data as the way it
was implemented caused problems for some EEPROM models - we switched to
regular structs.

Aside from that, there's a bunch of coding style fixes and minor
improvements all over the place."
  • Loading branch information
Wolfram Sang committed Jan 3, 2018
2 parents 639136d + 0f30aca commit fddfa22
Show file tree
Hide file tree
Showing 1,661 changed files with 18,207 additions and 11,313 deletions.
1 change: 1 addition & 0 deletions Documentation/admin-guide/kernel-parameters.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ parameter is applicable::
IPV6 IPv6 support is enabled.
ISAPNP ISA PnP code is enabled.
ISDN Appropriate ISDN support is enabled.
ISOL CPU Isolation is enabled.
JOY Appropriate joystick support is enabled.
KGDB Kernel debugger support is enabled.
KVM Kernel Virtual Machine support is enabled.
Expand Down
18 changes: 15 additions & 3 deletions Documentation/admin-guide/kernel-parameters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,15 @@
not play well with APC CPU idle - disable it if you have
APC and your system crashes randomly.

apic= [APIC,X86-32] Advanced Programmable Interrupt Controller
apic= [APIC,X86] Advanced Programmable Interrupt Controller
Change the output verbosity whilst booting
Format: { quiet (default) | verbose | debug }
Change the amount of debugging information output
when initialising the APIC and IO-APIC components.
For X86-32, this can also be used to specify an APIC
driver name.
Format: apic=driver_name
Examples: apic=bigsmp

apic_extnmi= [APIC,X86] External NMI delivery setting
Format: { bsp (default) | all | none }
Expand Down Expand Up @@ -1737,7 +1741,7 @@
isapnp= [ISAPNP]
Format: <RDP>,<reset>,<pci_scan>,<verbosity>

isolcpus= [KNL,SMP] Isolate a given set of CPUs from disturbance.
isolcpus= [KNL,SMP,ISOL] Isolate a given set of CPUs from disturbance.
[Deprecated - use cpusets instead]
Format: [flag-list,]<cpu-list>

Expand Down Expand Up @@ -2662,7 +2666,7 @@
Valid arguments: on, off
Default: on

nohz_full= [KNL,BOOT]
nohz_full= [KNL,BOOT,SMP,ISOL]
The argument is a cpu list, as described above.
In kernels built with CONFIG_NO_HZ_FULL=y, set
the specified list of CPUs whose tick will be stopped
Expand Down Expand Up @@ -2708,6 +2712,8 @@
steal time is computed, but won't influence scheduler
behaviour

nopti [X86-64] Disable kernel page table isolation

nolapic [X86-32,APIC] Do not enable or use the local APIC.

nolapic_timer [X86-32,APIC] Do not use the local APIC timer.
Expand Down Expand Up @@ -3282,6 +3288,12 @@
pt. [PARIDE]
See Documentation/blockdev/paride.txt.

pti= [X86_64]
Control user/kernel address space isolation:
on - enable
off - disable
auto - default setting

pty.legacy_count=
[KNL] Number of legacy pty's. Overwrites compiled-in
default number.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/admin-guide/thunderbolt.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ If supported by your machine this will be exposed by the WMI bus with
a sysfs attribute called "force_power".

For example the intel-wmi-thunderbolt driver exposes this attribute in:
/sys/devices/platform/PNP0C14:00/wmi_bus/wmi_bus-PNP0C14:00/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power
/sys/bus/wmi/devices/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power

To force the power to on, write 1 to this attribute file.
To disable force power, write 0 to this attribute file.
Expand Down
1 change: 1 addition & 0 deletions Documentation/arm64/silicon-errata.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,4 @@ stable kernels.
| Qualcomm Tech. | Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 |
| Qualcomm Tech. | Falkor v1 | E1009 | QCOM_FALKOR_ERRATUM_1009 |
| Qualcomm Tech. | QDF2400 ITS | E0065 | QCOM_QDF2400_ERRATUM_0065 |
| Qualcomm Tech. | Falkor v{1,2} | E1041 | QCOM_FALKOR_ERRATUM_1041 |
7 changes: 7 additions & 0 deletions Documentation/cgroup-v2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,13 @@ controller implements weight and absolute bandwidth limit models for
normal scheduling policy and absolute bandwidth allocation model for
realtime scheduling policy.

WARNING: cgroup2 doesn't yet support control of realtime processes and
the cpu controller can only be enabled when all RT processes are in
the root cgroup. Be aware that system management software may already
have placed RT processes into nonroot cgroups during the system boot
process, and these processes may need to be moved to the root cgroup
before the cpu controller can be enabled.


CPU Interface Files
~~~~~~~~~~~~~~~~~~~
Expand Down
16 changes: 8 additions & 8 deletions Documentation/core-api/genericirq.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@ interrupts.

The following control flow is implemented (simplified excerpt)::

:c:func:`desc->irq_data.chip->irq_mask_ack`;
desc->irq_data.chip->irq_mask_ack();
handle_irq_event(desc->action);
:c:func:`desc->irq_data.chip->irq_unmask`;
desc->irq_data.chip->irq_unmask();


Default Fast EOI IRQ flow handler
Expand All @@ -239,7 +239,7 @@ which only need an EOI at the end of the handler.
The following control flow is implemented (simplified excerpt)::

handle_irq_event(desc->action);
:c:func:`desc->irq_data.chip->irq_eoi`;
desc->irq_data.chip->irq_eoi();


Default Edge IRQ flow handler
Expand All @@ -251,15 +251,15 @@ interrupts.
The following control flow is implemented (simplified excerpt)::

if (desc->status & running) {
:c:func:`desc->irq_data.chip->irq_mask_ack`;
desc->irq_data.chip->irq_mask_ack();
desc->status |= pending | masked;
return;
}
:c:func:`desc->irq_data.chip->irq_ack`;
desc->irq_data.chip->irq_ack();
desc->status |= running;
do {
if (desc->status & masked)
:c:func:`desc->irq_data.chip->irq_unmask`;
desc->irq_data.chip->irq_unmask();
desc->status &= ~pending;
handle_irq_event(desc->action);
} while (status & pending);
Expand Down Expand Up @@ -293,10 +293,10 @@ simplified version without locking.
The following control flow is implemented (simplified excerpt)::

if (desc->irq_data.chip->irq_ack)
:c:func:`desc->irq_data.chip->irq_ack`;
desc->irq_data.chip->irq_ack();
handle_irq_event(desc->action);
if (desc->irq_data.chip->irq_eoi)
:c:func:`desc->irq_data.chip->irq_eoi`;
desc->irq_data.chip->irq_eoi();


EOI Edge IRQ flow handler
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/ccn.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Required properties:

Example:

ccn@0x2000000000 {
ccn@2000000000 {
compatible = "arm,ccn-504";
reg = <0x20 0x00000000 0 0x1000000>;
interrupts = <0 181 4>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/omap/crossbar.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ An interrupt consumer on an SoC using crossbar will use:
interrupts = <GIC_SPI request_number interrupt_level>

Example:
device_x@0x4a023000 {
device_x@4a023000 {
/* Crossbar 8 used */
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
...
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Required properties:
- interrupts : Should contain MC General interrupt.

Example:
memory-controller@0x7000f000 {
memory-controller@7000f000 {
compatible = "nvidia,tegra20-mc";
reg = <0x7000f000 0x024
0x7000f03c 0x3c4>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/axi-clkgen.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Optional properties:
- clock-output-names : From common clock binding.

Example:
clock@0xff000000 {
clock@ff000000 {
compatible = "adi,axi-clkgen";
#clock-cells = <0>;
reg = <0xff000000 0x1000>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Example:
clocks = <&clk_osc>;
};

aux: aux@0x7e215004 {
aux: aux@7e215004 {
compatible = "brcm,bcm2835-aux";
#clock-cells = <1>;
reg = <0x7e215000 0x8>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/exynos4-clock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tree sources.

Example 1: An example of a clock controller node is listed below.

clock: clock-controller@0x10030000 {
clock: clock-controller@10030000 {
compatible = "samsung,exynos4210-clock";
reg = <0x10030000 0x20000>;
#clock-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/exynos5250-clock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tree sources.

Example 1: An example of a clock controller node is listed below.

clock: clock-controller@0x10010000 {
clock: clock-controller@10010000 {
compatible = "samsung,exynos5250-clock";
reg = <0x10010000 0x30000>;
#clock-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/exynos5410-clock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Example 1: An example of a clock controller node is listed below.
#clock-cells = <0>;
};

clock: clock-controller@0x10010000 {
clock: clock-controller@10010000 {
compatible = "samsung,exynos5410-clock";
reg = <0x10010000 0x30000>;
#clock-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/exynos5420-clock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tree sources.

Example 1: An example of a clock controller node is listed below.

clock: clock-controller@0x10010000 {
clock: clock-controller@10010000 {
compatible = "samsung,exynos5420-clock";
reg = <0x10010000 0x30000>;
#clock-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/exynos5440-clock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tree sources.

Example: An example of a clock controller node is listed below.

clock: clock-controller@0x10010000 {
clock: clock-controller@10010000 {
compatible = "samsung,exynos5440-clock";
reg = <0x160000 0x10000>;
#clock-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/clock/ti-keystone-pllctrl.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Required properties:

Example:

pllctrl: pll-controller@0x02310000 {
pllctrl: pll-controller@02310000 {
compatible = "ti,keystone-pllctrl", "syscon";
reg = <0x02310000 0x200>;
};
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/clock/zx296702-clk.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ ID in its "clocks" phandle cell. See include/dt-bindings/clock/zx296702-clock.h
for the full list of zx296702 clock IDs.


topclk: topcrm@0x09800000 {
topclk: topcrm@09800000 {
compatible = "zte,zx296702-topcrm-clk";
reg = <0x09800000 0x1000>;
#clock-cells = <1>;
};

uart0: serial@0x09405000 {
uart0: serial@09405000 {
compatible = "zte,zx296702-uart";
reg = <0x09405000 0x1000>;
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/crypto/fsl-sec4.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ System ON/OFF key driver
Definition: this is phandle to the register map node.

EXAMPLE:
snvs-pwrkey@0x020cc000 {
snvs-pwrkey@020cc000 {
compatible = "fsl,sec-v4.0-pwrkey";
regmap = <&snvs>;
interrupts = <0 4 0x4>
Expand Down Expand Up @@ -545,7 +545,7 @@ FULL EXAMPLE
interrupts = <93 2>;
};

snvs-pwrkey@0x020cc000 {
snvs-pwrkey@020cc000 {
compatible = "fsl,sec-v4.0-pwrkey";
regmap = <&sec_mon>;
interrupts = <0 4 0x4>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Required properties:
- clock-names : the name of clock used by the DFI, must be "pclk_ddr_mon";

Example:
dfi: dfi@0xff630000 {
dfi: dfi@ff630000 {
compatible = "rockchip,rk3399-dfi";
reg = <0x00 0xff630000 0x00 0x4000>;
rockchip,pmu = <&pmugrf>;
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/display/atmel,lcdc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Optional properties:

Example:

fb0: fb@0x00500000 {
fb0: fb@00500000 {
compatible = "atmel,at91sam9g45-lcdc";
reg = <0x00500000 0x1000>;
interrupts = <23 3 0>;
Expand All @@ -41,7 +41,7 @@ Example:

Example for fixed framebuffer memory:

fb0: fb@0x00500000 {
fb0: fb@00500000 {
compatible = "atmel,at91sam9263-lcdc";
reg = <0x00700000 0x1000 0x70000000 0x200000>;
[...]
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Hypervisor OS configuration:
max-read-transactions = <31>;
channel-reset-timeout-cycles = <0x500>;

hidma_24: dma-controller@0x5c050000 {
hidma_24: dma-controller@5c050000 {
compatible = "qcom,hidma-1.0";
reg = <0 0x5c050000 0x0 0x1000>,
<0 0x5c0b0000 0x0 0x1000>;
Expand All @@ -85,7 +85,7 @@ Hypervisor OS configuration:

Guest OS configuration:

hidma_24: dma-controller@0x5c050000 {
hidma_24: dma-controller@5c050000 {
compatible = "qcom,hidma-1.0";
reg = <0 0x5c050000 0x0 0x1000>,
<0 0x5c0b0000 0x0 0x1000>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/dma/zxdma.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Required properties:
Example:

Controller:
dma: dma-controller@0x09c00000{
dma: dma-controller@09c00000{
compatible = "zte,zx296702-dma";
reg = <0x09c00000 0x1000>;
clocks = <&topclk ZX296702_DMA_ACLK>;
Expand Down
Loading

0 comments on commit fddfa22

Please sign in to comment.