Skip to content

Commit f0ceedd

Browse files
committed
dt-bindings: xilinx: Deprecate header with firmware constants
Firmware contants do not fit the purpose of bindings because they are not independent IDs for abstractions. They are more or less just contants which better to wire via header with DT which is using it. That's why add deprecated message to dt binding header and also update existing dt bindings not to use macros from the header and replace them by it's value. Actually value is not relevant because it is only example. The similar changes have been done by commit 9d92925 ("dt-bindings: pinctrl: samsung: deprecate header with register constants"). Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Acked-by: Vinod Koul <vkoul@kernel.org> Acked-by: Conor Dooley <conor.dooley@microchip.com> Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/2a6f0229522327939e6893565e540b75f854a37b.1738600745.git.michal.simek@amd.com
1 parent 01a8603 commit f0ceedd

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,19 +163,17 @@ additionalProperties: false
163163

164164
examples:
165165
- |
166-
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
167166
#include <dt-bindings/interrupt-controller/irq.h>
168167
#include <dt-bindings/power/xlnx-zynqmp-power.h>
169168
#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
170-
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
171169
#include <dt-bindings/phy/phy.h>
172170
173171
sata: ahci@fd0c0000 {
174172
compatible = "ceva,ahci-1v84";
175173
reg = <0xfd0c0000 0x200>;
176174
interrupt-parent = <&gic>;
177175
interrupts = <0 133 IRQ_TYPE_LEVEL_HIGH>;
178-
clocks = <&zynqmp_clk SATA_REF>;
176+
clocks = <&zynqmp_clk 22>;
179177
ceva,p0-cominit-params = /bits/ 8 <0x0F 0x25 0x18 0x29>;
180178
ceva,p0-comwake-params = /bits/ 8 <0x04 0x0B 0x08 0x0F>;
181179
ceva,p0-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;

Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ additionalProperties: false
7575

7676
examples:
7777
- |
78-
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
7978
8079
fpd_dma_chan1: dma-controller@fd500000 {
8180
compatible = "xlnx,zynqmp-dma-1.0";
@@ -84,7 +83,7 @@ examples:
8483
interrupts = <0 117 0x4>;
8584
#dma-cells = <1>;
8685
clock-names = "clk_main", "clk_apb";
87-
clocks = <&zynqmp_clk GDMA_REF>, <&zynqmp_clk LPD_LSBUS>;
86+
clocks = <&zynqmp_clk 19>, <&zynqmp_clk 31>;
8887
xlnx,bus-width = <128>;
8988
dma-coherent;
9089
};

Documentation/devicetree/bindings/iio/adc/xlnx,zynqmp-ams.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ additionalProperties: false
193193

194194
examples:
195195
- |
196-
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
197196
198197
bus {
199198
#address-cells = <2>;
@@ -204,7 +203,7 @@ examples:
204203
interrupt-parent = <&gic>;
205204
interrupts = <0 56 4>;
206205
reg = <0x0 0xffa50000 0x0 0x800>;
207-
clocks = <&zynqmp_clk AMS_REF>;
206+
clocks = <&zynqmp_clk 70>;
208207
#address-cells = <1>;
209208
#size-cells = <1>;
210209
#io-channel-cells = <1>;

Documentation/devicetree/bindings/net/cdns,macb.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ examples:
197197
};
198198
199199
- |
200-
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
201200
#include <dt-bindings/power/xlnx-zynqmp-power.h>
202201
#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
203202
#include <dt-bindings/phy/phy.h>
@@ -210,9 +209,9 @@ examples:
210209
interrupt-parent = <&gic>;
211210
interrupts = <0 59 4>, <0 59 4>;
212211
reg = <0x0 0xff0c0000 0x0 0x1000>;
213-
clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM1_REF>,
214-
<&zynqmp_clk GEM1_TX>, <&zynqmp_clk GEM1_RX>,
215-
<&zynqmp_clk GEM_TSU>;
212+
clocks = <&zynqmp_clk 31>, <&zynqmp_clk 105>,
213+
<&zynqmp_clk 51>, <&zynqmp_clk 50>,
214+
<&zynqmp_clk 44>;
216215
clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
217216
#address-cells = <1>;
218217
#size-cells = <0>;

Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,13 @@ allOf:
6565

6666
examples:
6767
- |
68-
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
6968
soc {
7069
#address-cells = <2>;
7170
#size-cells = <2>;
7271
7372
qspi: spi@ff0f0000 {
7473
compatible = "xlnx,zynqmp-qspi-1.0";
75-
clocks = <&zynqmp_clk QSPI_REF>, <&zynqmp_clk LPD_LSBUS>;
74+
clocks = <&zynqmp_clk 53>, <&zynqmp_clk 82>;
7675
clock-names = "ref_clk", "pclk";
7776
interrupts = <0 15 4>;
7877
interrupt-parent = <&gic>;

Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ examples:
101101
#include <dt-bindings/dma/xlnx-zynqmp-dpdma.h>
102102
#include <dt-bindings/power/xlnx-zynqmp-power.h>
103103
#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
104-
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
105104
#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
106105
#include <dt-bindings/phy/phy.h>
107106
axi {
@@ -113,7 +112,7 @@ examples:
113112
#size-cells = <0x2>;
114113
compatible = "xlnx,zynqmp-dwc3";
115114
reg = <0x0 0xff9d0000 0x0 0x100>;
116-
clocks = <&zynqmp_clk USB0_BUS_REF>, <&zynqmp_clk USB3_DUAL_REF>;
115+
clocks = <&zynqmp_clk 32>, <&zynqmp_clk 34>;
117116
clock-names = "bus_clk", "ref_clk";
118117
power-domains = <&zynqmp_firmware PD_USB_0>;
119118
resets = <&zynqmp_reset ZYNQMP_RESET_USB1_CORERESET>,

include/dt-bindings/clock/xlnx-zynqmp-clk.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
#ifndef _DT_BINDINGS_CLK_ZYNQMP_H
1010
#define _DT_BINDINGS_CLK_ZYNQMP_H
1111

12+
/*
13+
* These bindings are deprecated, because they do not match the actual
14+
* concept of bindings but rather contain pure firmware values.
15+
* Instead include the header in the DTS source directory.
16+
*/
17+
#warning "These bindings are deprecated. Instead use the header in the DTS source directory."
18+
1219
#define IOPLL 0
1320
#define RPLL 1
1421
#define APLL 2

0 commit comments

Comments
 (0)