Skip to content

Commit 78d9b04

Browse files
committed
Merge tag 'devicetree-fixes-for-4.15-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring: "Another set of DT fixes: - Fixes from overlay code rework. A trifecta of fixes to the locking, an out of bounds access, and a memory leak in of_overlay_apply() - Clean-up at25 eeprom binding document - Remove leading '0x' in unit-addresses from binding docs" * tag 'devicetree-fixes-for-4.15-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: of: overlay: Make node skipping in init_overlay_changeset() clearer of: overlay: Fix out-of-bounds write in init_overlay_changeset() of: overlay: Fix (un)locking in of_overlay_apply() of: overlay: Fix memory leak in of_overlay_apply() error path dt-bindings: eeprom: at25: Document device-specific compatible values dt-bindings: eeprom: at25: Grammar s/are can/can/ dt-bindings: Remove leading 0x from bindings notation of: overlay: Remove else after goto of: Spelling s/changset/changeset/ of: unittest: Remove bogus overlay mutex release from overlay_data_add()
2 parents 900add2 + 589b754 commit 78d9b04

File tree

77 files changed

+149
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+149
-151
lines changed

Documentation/devicetree/bindings/arm/ccn.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Required properties:
1515

1616
Example:
1717

18-
ccn@0x2000000000 {
18+
ccn@2000000000 {
1919
compatible = "arm,ccn-504";
2020
reg = <0x20 0x00000000 0 0x1000000>;
2121
interrupts = <0 181 4>;

Documentation/devicetree/bindings/arm/omap/crossbar.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ An interrupt consumer on an SoC using crossbar will use:
4949
interrupts = <GIC_SPI request_number interrupt_level>
5050

5151
Example:
52-
device_x@0x4a023000 {
52+
device_x@4a023000 {
5353
/* Crossbar 8 used */
5454
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
5555
...

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Required properties:
88
- interrupts : Should contain MC General interrupt.
99

1010
Example:
11-
memory-controller@0x7000f000 {
11+
memory-controller@7000f000 {
1212
compatible = "nvidia,tegra20-mc";
1313
reg = <0x7000f000 0x024
1414
0x7000f03c 0x3c4>;

Documentation/devicetree/bindings/clock/axi-clkgen.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Optional properties:
1717
- clock-output-names : From common clock binding.
1818

1919
Example:
20-
clock@0xff000000 {
20+
clock@ff000000 {
2121
compatible = "adi,axi-clkgen";
2222
#clock-cells = <0>;
2323
reg = <0xff000000 0x1000>;

Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Example:
2323
clocks = <&clk_osc>;
2424
};
2525

26-
aux: aux@0x7e215004 {
26+
aux: aux@7e215004 {
2727
compatible = "brcm,bcm2835-aux";
2828
#clock-cells = <1>;
2929
reg = <0x7e215000 0x8>;

Documentation/devicetree/bindings/clock/exynos4-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tree sources.
2424

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

27-
clock: clock-controller@0x10030000 {
27+
clock: clock-controller@10030000 {
2828
compatible = "samsung,exynos4210-clock";
2929
reg = <0x10030000 0x20000>;
3030
#clock-cells = <1>;

Documentation/devicetree/bindings/clock/exynos5250-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ tree sources.
2222

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

25-
clock: clock-controller@0x10010000 {
25+
clock: clock-controller@10010000 {
2626
compatible = "samsung,exynos5250-clock";
2727
reg = <0x10010000 0x30000>;
2828
#clock-cells = <1>;

Documentation/devicetree/bindings/clock/exynos5410-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Example 1: An example of a clock controller node is listed below.
3030
#clock-cells = <0>;
3131
};
3232

33-
clock: clock-controller@0x10010000 {
33+
clock: clock-controller@10010000 {
3434
compatible = "samsung,exynos5410-clock";
3535
reg = <0x10010000 0x30000>;
3636
#clock-cells = <1>;

Documentation/devicetree/bindings/clock/exynos5420-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tree sources.
2323

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

26-
clock: clock-controller@0x10010000 {
26+
clock: clock-controller@10010000 {
2727
compatible = "samsung,exynos5420-clock";
2828
reg = <0x10010000 0x30000>;
2929
#clock-cells = <1>;

Documentation/devicetree/bindings/clock/exynos5440-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ tree sources.
2121

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

24-
clock: clock-controller@0x10010000 {
24+
clock: clock-controller@10010000 {
2525
compatible = "samsung,exynos5440-clock";
2626
reg = <0x160000 0x10000>;
2727
#clock-cells = <1>;

0 commit comments

Comments
 (0)