kernel: bump 5.4 to 5.4.48
[oweals/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0705-overlays-Make-use-of-intra-overlay-fragments.patch
1 From 31bebbef0cce2ae68c25a2b0cbfc040f938791e9 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Mon, 4 May 2020 15:13:24 +0100
4 Subject: [PATCH] overlays: Make use of intra-overlay fragments
5
6 The firmware and runtime overlay support has recently been updated to
7 correctly process fragments that target other fragments within the
8 overlay. Make use of that ability and avoid the use of the awkward
9 target-path = "<alias>/..." workaround and for better readability.
10
11 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
12 ---
13  arch/arm/boot/dts/overlays/ads1015-overlay.dts | 8 ++++----
14  arch/arm/boot/dts/overlays/ads1115-overlay.dts | 8 ++++----
15  2 files changed, 8 insertions(+), 8 deletions(-)
16
17 --- a/arch/arm/boot/dts/overlays/ads1015-overlay.dts
18 +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
19 @@ -24,7 +24,7 @@
20      };
21  
22      fragment@1 {
23 -        target-path = "i2c_arm/ads1015";
24 +        target = <&ads1015>;
25          __overlay__ {
26              #address-cells = <1>;
27              #size-cells = <0>;
28 @@ -37,7 +37,7 @@
29      };
30  
31      fragment@2 {
32 -        target-path = "i2c_arm/ads1015";
33 +        target = <&ads1015>;
34          __dormant__ {
35              #address-cells = <1>;
36              #size-cells = <0>;
37 @@ -50,7 +50,7 @@
38      };
39  
40      fragment@3 {
41 -        target-path = "i2c_arm/ads1015";
42 +        target = <&ads1015>;
43          __dormant__ {
44              #address-cells = <1>;
45              #size-cells = <0>;
46 @@ -63,7 +63,7 @@
47      };
48  
49      fragment@4 {
50 -        target-path = "i2c_arm/ads1015";
51 +        target = <&ads1015>;
52          __dormant__ {
53              #address-cells = <1>;
54              #size-cells = <0>;
55 --- a/arch/arm/boot/dts/overlays/ads1115-overlay.dts
56 +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
57 @@ -26,7 +26,7 @@
58         };
59  
60         fragment@1 {
61 -               target-path = "i2c_arm/ads1115";
62 +               target = <&ads1115>;
63                 __dormant__ {
64                         #address-cells = <1>;
65                         #size-cells = <0>;
66 @@ -40,7 +40,7 @@
67         };
68  
69         fragment@2 {
70 -               target-path = "i2c_arm/ads1115";
71 +               target = <&ads1115>;
72                 __dormant__ {
73                         #address-cells = <1>;
74                         #size-cells = <0>;
75 @@ -54,7 +54,7 @@
76         };
77  
78         fragment@3 {
79 -               target-path = "i2c_arm/ads1115";
80 +               target = <&ads1115>;
81                 __dormant__ {
82                         #address-cells = <1>;
83                         #size-cells = <0>;
84 @@ -68,7 +68,7 @@
85         };
86  
87         fragment@4 {
88 -               target-path = "i2c_arm/ads1115";
89 +               target = <&ads1115>;
90                 __dormant__ {
91                         #address-cells = <1>;
92                         #size-cells = <0>;