Skip to content

Commit 33a36b8

Browse files
abajkLinus Walleij
authored andcommitted
pinctrl: xway: drop the deprecated compatible strings
This code are marked as deprecated since kernel 4.5[1]. Downstream OpenWRT and upstream switched to the new string compatible 7 years ago. The old compatible strings can safely be dropped. [1] commit be14811 ("pinctrl/lantiq: introduce new dedicated devicetree bindings") Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl> Link: https://lore.kernel.org/r/20230330212225.10214-1-olek2@wp.pl Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 49cd1dd commit 33a36b8

1 file changed

Lines changed: 0 additions & 252 deletions

File tree

drivers/pinctrl/pinctrl-xway.c

Lines changed: 0 additions & 252 deletions
Original file line numberDiff line numberDiff line change
@@ -107,243 +107,6 @@ enum xway_mux {
107107
XWAY_MUX_NONE = 0xffff,
108108
};
109109

110-
/* --------- DEPRECATED: xr9 related code --------- */
111-
/* ---------- use xrx100/xrx200 instead ---------- */
112-
#define XR9_MAX_PIN 56
113-
114-
static const struct ltq_mfp_pin xway_mfp[] = {
115-
/* pin f0 f1 f2 f3 */
116-
MFP_XWAY(GPIO0, GPIO, EXIN, NONE, TDM),
117-
MFP_XWAY(GPIO1, GPIO, EXIN, NONE, NONE),
118-
MFP_XWAY(GPIO2, GPIO, CGU, EXIN, GPHY),
119-
MFP_XWAY(GPIO3, GPIO, CGU, NONE, PCI),
120-
MFP_XWAY(GPIO4, GPIO, STP, NONE, ASC),
121-
MFP_XWAY(GPIO5, GPIO, STP, GPHY, NONE),
122-
MFP_XWAY(GPIO6, GPIO, STP, GPT, ASC),
123-
MFP_XWAY(GPIO7, GPIO, CGU, PCI, GPHY),
124-
MFP_XWAY(GPIO8, GPIO, CGU, NMI, NONE),
125-
MFP_XWAY(GPIO9, GPIO, ASC, SPI, EXIN),
126-
MFP_XWAY(GPIO10, GPIO, ASC, SPI, NONE),
127-
MFP_XWAY(GPIO11, GPIO, ASC, PCI, SPI),
128-
MFP_XWAY(GPIO12, GPIO, ASC, NONE, NONE),
129-
MFP_XWAY(GPIO13, GPIO, EBU, SPI, NONE),
130-
MFP_XWAY(GPIO14, GPIO, CGU, PCI, NONE),
131-
MFP_XWAY(GPIO15, GPIO, SPI, JTAG, NONE),
132-
MFP_XWAY(GPIO16, GPIO, SPI, NONE, JTAG),
133-
MFP_XWAY(GPIO17, GPIO, SPI, NONE, JTAG),
134-
MFP_XWAY(GPIO18, GPIO, SPI, NONE, JTAG),
135-
MFP_XWAY(GPIO19, GPIO, PCI, NONE, NONE),
136-
MFP_XWAY(GPIO20, GPIO, JTAG, NONE, NONE),
137-
MFP_XWAY(GPIO21, GPIO, PCI, EBU, GPT),
138-
MFP_XWAY(GPIO22, GPIO, SPI, NONE, NONE),
139-
MFP_XWAY(GPIO23, GPIO, EBU, PCI, STP),
140-
MFP_XWAY(GPIO24, GPIO, EBU, TDM, PCI),
141-
MFP_XWAY(GPIO25, GPIO, TDM, NONE, ASC),
142-
MFP_XWAY(GPIO26, GPIO, EBU, NONE, TDM),
143-
MFP_XWAY(GPIO27, GPIO, TDM, NONE, ASC),
144-
MFP_XWAY(GPIO28, GPIO, GPT, NONE, NONE),
145-
MFP_XWAY(GPIO29, GPIO, PCI, NONE, NONE),
146-
MFP_XWAY(GPIO30, GPIO, PCI, NONE, NONE),
147-
MFP_XWAY(GPIO31, GPIO, EBU, PCI, NONE),
148-
MFP_XWAY(GPIO32, GPIO, NONE, NONE, EBU),
149-
MFP_XWAY(GPIO33, GPIO, NONE, NONE, EBU),
150-
MFP_XWAY(GPIO34, GPIO, NONE, NONE, EBU),
151-
MFP_XWAY(GPIO35, GPIO, NONE, NONE, EBU),
152-
MFP_XWAY(GPIO36, GPIO, SIN, NONE, EBU),
153-
MFP_XWAY(GPIO37, GPIO, PCI, NONE, NONE),
154-
MFP_XWAY(GPIO38, GPIO, PCI, NONE, NONE),
155-
MFP_XWAY(GPIO39, GPIO, EXIN, NONE, NONE),
156-
MFP_XWAY(GPIO40, GPIO, NONE, NONE, NONE),
157-
MFP_XWAY(GPIO41, GPIO, NONE, NONE, NONE),
158-
MFP_XWAY(GPIO42, GPIO, MDIO, NONE, NONE),
159-
MFP_XWAY(GPIO43, GPIO, MDIO, NONE, NONE),
160-
MFP_XWAY(GPIO44, GPIO, MII, SIN, GPHY),
161-
MFP_XWAY(GPIO45, GPIO, NONE, GPHY, SIN),
162-
MFP_XWAY(GPIO46, GPIO, NONE, NONE, EXIN),
163-
MFP_XWAY(GPIO47, GPIO, MII, GPHY, SIN),
164-
MFP_XWAY(GPIO48, GPIO, EBU, NONE, NONE),
165-
MFP_XWAY(GPIO49, GPIO, EBU, NONE, NONE),
166-
MFP_XWAY(GPIO50, GPIO, NONE, NONE, NONE),
167-
MFP_XWAY(GPIO51, GPIO, NONE, NONE, NONE),
168-
MFP_XWAY(GPIO52, GPIO, NONE, NONE, NONE),
169-
MFP_XWAY(GPIO53, GPIO, NONE, NONE, NONE),
170-
MFP_XWAY(GPIO54, GPIO, NONE, NONE, NONE),
171-
MFP_XWAY(GPIO55, GPIO, NONE, NONE, NONE),
172-
};
173-
174-
static const unsigned pins_jtag[] = {GPIO15, GPIO16, GPIO17, GPIO19, GPIO35};
175-
static const unsigned pins_asc0[] = {GPIO11, GPIO12};
176-
static const unsigned pins_asc0_cts_rts[] = {GPIO9, GPIO10};
177-
static const unsigned pins_stp[] = {GPIO4, GPIO5, GPIO6};
178-
static const unsigned pins_nmi[] = {GPIO8};
179-
static const unsigned pins_mdio[] = {GPIO42, GPIO43};
180-
181-
static const unsigned pins_gphy0_led0[] = {GPIO5};
182-
static const unsigned pins_gphy0_led1[] = {GPIO7};
183-
static const unsigned pins_gphy0_led2[] = {GPIO2};
184-
static const unsigned pins_gphy1_led0[] = {GPIO44};
185-
static const unsigned pins_gphy1_led1[] = {GPIO45};
186-
static const unsigned pins_gphy1_led2[] = {GPIO47};
187-
188-
static const unsigned pins_ebu_a24[] = {GPIO13};
189-
static const unsigned pins_ebu_clk[] = {GPIO21};
190-
static const unsigned pins_ebu_cs1[] = {GPIO23};
191-
static const unsigned pins_ebu_a23[] = {GPIO24};
192-
static const unsigned pins_ebu_wait[] = {GPIO26};
193-
static const unsigned pins_ebu_a25[] = {GPIO31};
194-
static const unsigned pins_ebu_rdy[] = {GPIO48};
195-
static const unsigned pins_ebu_rd[] = {GPIO49};
196-
197-
static const unsigned pins_nand_ale[] = {GPIO13};
198-
static const unsigned pins_nand_cs1[] = {GPIO23};
199-
static const unsigned pins_nand_cle[] = {GPIO24};
200-
static const unsigned pins_nand_rdy[] = {GPIO48};
201-
static const unsigned pins_nand_rd[] = {GPIO49};
202-
203-
static const unsigned xway_exin_pin_map[] = {GPIO0, GPIO1, GPIO2, GPIO39, GPIO46, GPIO9};
204-
205-
static const unsigned pins_exin0[] = {GPIO0};
206-
static const unsigned pins_exin1[] = {GPIO1};
207-
static const unsigned pins_exin2[] = {GPIO2};
208-
static const unsigned pins_exin3[] = {GPIO39};
209-
static const unsigned pins_exin4[] = {GPIO46};
210-
static const unsigned pins_exin5[] = {GPIO9};
211-
212-
static const unsigned pins_spi[] = {GPIO16, GPIO17, GPIO18};
213-
static const unsigned pins_spi_cs1[] = {GPIO15};
214-
static const unsigned pins_spi_cs2[] = {GPIO22};
215-
static const unsigned pins_spi_cs3[] = {GPIO13};
216-
static const unsigned pins_spi_cs4[] = {GPIO10};
217-
static const unsigned pins_spi_cs5[] = {GPIO9};
218-
static const unsigned pins_spi_cs6[] = {GPIO11};
219-
220-
static const unsigned pins_gpt1[] = {GPIO28};
221-
static const unsigned pins_gpt2[] = {GPIO21};
222-
static const unsigned pins_gpt3[] = {GPIO6};
223-
224-
static const unsigned pins_clkout0[] = {GPIO8};
225-
static const unsigned pins_clkout1[] = {GPIO7};
226-
static const unsigned pins_clkout2[] = {GPIO3};
227-
static const unsigned pins_clkout3[] = {GPIO2};
228-
229-
static const unsigned pins_pci_gnt1[] = {GPIO30};
230-
static const unsigned pins_pci_gnt2[] = {GPIO23};
231-
static const unsigned pins_pci_gnt3[] = {GPIO19};
232-
static const unsigned pins_pci_gnt4[] = {GPIO38};
233-
static const unsigned pins_pci_req1[] = {GPIO29};
234-
static const unsigned pins_pci_req2[] = {GPIO31};
235-
static const unsigned pins_pci_req3[] = {GPIO3};
236-
static const unsigned pins_pci_req4[] = {GPIO37};
237-
238-
static const struct ltq_pin_group xway_grps[] = {
239-
GRP_MUX("exin0", EXIN, pins_exin0),
240-
GRP_MUX("exin1", EXIN, pins_exin1),
241-
GRP_MUX("exin2", EXIN, pins_exin2),
242-
GRP_MUX("jtag", JTAG, pins_jtag),
243-
GRP_MUX("ebu a23", EBU, pins_ebu_a23),
244-
GRP_MUX("ebu a24", EBU, pins_ebu_a24),
245-
GRP_MUX("ebu a25", EBU, pins_ebu_a25),
246-
GRP_MUX("ebu clk", EBU, pins_ebu_clk),
247-
GRP_MUX("ebu cs1", EBU, pins_ebu_cs1),
248-
GRP_MUX("ebu wait", EBU, pins_ebu_wait),
249-
GRP_MUX("nand ale", EBU, pins_nand_ale),
250-
GRP_MUX("nand cs1", EBU, pins_nand_cs1),
251-
GRP_MUX("nand cle", EBU, pins_nand_cle),
252-
GRP_MUX("spi", SPI, pins_spi),
253-
GRP_MUX("spi_cs1", SPI, pins_spi_cs1),
254-
GRP_MUX("spi_cs2", SPI, pins_spi_cs2),
255-
GRP_MUX("spi_cs3", SPI, pins_spi_cs3),
256-
GRP_MUX("spi_cs4", SPI, pins_spi_cs4),
257-
GRP_MUX("spi_cs5", SPI, pins_spi_cs5),
258-
GRP_MUX("spi_cs6", SPI, pins_spi_cs6),
259-
GRP_MUX("asc0", ASC, pins_asc0),
260-
GRP_MUX("asc0 cts rts", ASC, pins_asc0_cts_rts),
261-
GRP_MUX("stp", STP, pins_stp),
262-
GRP_MUX("nmi", NMI, pins_nmi),
263-
GRP_MUX("gpt1", GPT, pins_gpt1),
264-
GRP_MUX("gpt2", GPT, pins_gpt2),
265-
GRP_MUX("gpt3", GPT, pins_gpt3),
266-
GRP_MUX("clkout0", CGU, pins_clkout0),
267-
GRP_MUX("clkout1", CGU, pins_clkout1),
268-
GRP_MUX("clkout2", CGU, pins_clkout2),
269-
GRP_MUX("clkout3", CGU, pins_clkout3),
270-
GRP_MUX("gnt1", PCI, pins_pci_gnt1),
271-
GRP_MUX("gnt2", PCI, pins_pci_gnt2),
272-
GRP_MUX("gnt3", PCI, pins_pci_gnt3),
273-
GRP_MUX("req1", PCI, pins_pci_req1),
274-
GRP_MUX("req2", PCI, pins_pci_req2),
275-
GRP_MUX("req3", PCI, pins_pci_req3),
276-
/* xrx only */
277-
GRP_MUX("nand rdy", EBU, pins_nand_rdy),
278-
GRP_MUX("nand rd", EBU, pins_nand_rd),
279-
GRP_MUX("exin3", EXIN, pins_exin3),
280-
GRP_MUX("exin4", EXIN, pins_exin4),
281-
GRP_MUX("exin5", EXIN, pins_exin5),
282-
GRP_MUX("gnt4", PCI, pins_pci_gnt4),
283-
GRP_MUX("req4", PCI, pins_pci_gnt4),
284-
GRP_MUX("mdio", MDIO, pins_mdio),
285-
GRP_MUX("gphy0 led0", GPHY, pins_gphy0_led0),
286-
GRP_MUX("gphy0 led1", GPHY, pins_gphy0_led1),
287-
GRP_MUX("gphy0 led2", GPHY, pins_gphy0_led2),
288-
GRP_MUX("gphy1 led0", GPHY, pins_gphy1_led0),
289-
GRP_MUX("gphy1 led1", GPHY, pins_gphy1_led1),
290-
GRP_MUX("gphy1 led2", GPHY, pins_gphy1_led2),
291-
};
292-
293-
static const char * const xway_pci_grps[] = {"gnt1", "gnt2",
294-
"gnt3", "req1",
295-
"req2", "req3"};
296-
static const char * const xway_spi_grps[] = {"spi", "spi_cs1",
297-
"spi_cs2", "spi_cs3",
298-
"spi_cs4", "spi_cs5",
299-
"spi_cs6"};
300-
static const char * const xway_cgu_grps[] = {"clkout0", "clkout1",
301-
"clkout2", "clkout3"};
302-
static const char * const xway_ebu_grps[] = {"ebu a23", "ebu a24",
303-
"ebu a25", "ebu cs1",
304-
"ebu wait", "ebu clk",
305-
"nand ale", "nand cs1",
306-
"nand cle"};
307-
static const char * const xway_exin_grps[] = {"exin0", "exin1", "exin2"};
308-
static const char * const xway_gpt_grps[] = {"gpt1", "gpt2", "gpt3"};
309-
static const char * const xway_asc_grps[] = {"asc0", "asc0 cts rts"};
310-
static const char * const xway_jtag_grps[] = {"jtag"};
311-
static const char * const xway_stp_grps[] = {"stp"};
312-
static const char * const xway_nmi_grps[] = {"nmi"};
313-
314-
/* ar9/vr9/gr9 */
315-
static const char * const xrx_mdio_grps[] = {"mdio"};
316-
static const char * const xrx_gphy_grps[] = {"gphy0 led0", "gphy0 led1",
317-
"gphy0 led2", "gphy1 led0",
318-
"gphy1 led1", "gphy1 led2"};
319-
static const char * const xrx_ebu_grps[] = {"ebu a23", "ebu a24",
320-
"ebu a25", "ebu cs1",
321-
"ebu wait", "ebu clk",
322-
"nand ale", "nand cs1",
323-
"nand cle", "nand rdy",
324-
"nand rd"};
325-
static const char * const xrx_exin_grps[] = {"exin0", "exin1", "exin2",
326-
"exin3", "exin4", "exin5"};
327-
static const char * const xrx_pci_grps[] = {"gnt1", "gnt2",
328-
"gnt3", "gnt4",
329-
"req1", "req2",
330-
"req3", "req4"};
331-
332-
static const struct ltq_pmx_func xrx_funcs[] = {
333-
{"spi", ARRAY_AND_SIZE(xway_spi_grps)},
334-
{"asc", ARRAY_AND_SIZE(xway_asc_grps)},
335-
{"cgu", ARRAY_AND_SIZE(xway_cgu_grps)},
336-
{"jtag", ARRAY_AND_SIZE(xway_jtag_grps)},
337-
{"exin", ARRAY_AND_SIZE(xrx_exin_grps)},
338-
{"stp", ARRAY_AND_SIZE(xway_stp_grps)},
339-
{"gpt", ARRAY_AND_SIZE(xway_gpt_grps)},
340-
{"nmi", ARRAY_AND_SIZE(xway_nmi_grps)},
341-
{"pci", ARRAY_AND_SIZE(xrx_pci_grps)},
342-
{"ebu", ARRAY_AND_SIZE(xrx_ebu_grps)},
343-
{"mdio", ARRAY_AND_SIZE(xrx_mdio_grps)},
344-
{"gphy", ARRAY_AND_SIZE(xrx_gphy_grps)},
345-
};
346-
347110
/* --------- ase related code --------- */
348111
#define ASE_MAX_PIN 32
349112

@@ -1611,18 +1374,6 @@ struct pinctrl_xway_soc {
16111374
unsigned int num_exin;
16121375
};
16131376

1614-
/* xway xr9 series (DEPRECATED: Use XWAY xRX100/xRX200 Family) */
1615-
static struct pinctrl_xway_soc xr9_pinctrl = {
1616-
.pin_count = XR9_MAX_PIN,
1617-
.mfp = xway_mfp,
1618-
.grps = xway_grps,
1619-
.num_grps = ARRAY_SIZE(xway_grps),
1620-
.funcs = xrx_funcs,
1621-
.num_funcs = ARRAY_SIZE(xrx_funcs),
1622-
.exin = xway_exin_pin_map,
1623-
.num_exin = 6
1624-
};
1625-
16261377
/* XWAY AMAZON Family */
16271378
static struct pinctrl_xway_soc ase_pinctrl = {
16281379
.pin_count = ASE_MAX_PIN,
@@ -1689,9 +1440,6 @@ static struct pinctrl_gpio_range xway_gpio_range = {
16891440
};
16901441

16911442
static const struct of_device_id xway_match[] = {
1692-
{ .compatible = "lantiq,pinctrl-xway", .data = &danube_pinctrl}, /*DEPRECATED*/
1693-
{ .compatible = "lantiq,pinctrl-xr9", .data = &xr9_pinctrl}, /*DEPRECATED*/
1694-
{ .compatible = "lantiq,pinctrl-ase", .data = &ase_pinctrl}, /*DEPRECATED*/
16951443
{ .compatible = "lantiq,ase-pinctrl", .data = &ase_pinctrl},
16961444
{ .compatible = "lantiq,danube-pinctrl", .data = &danube_pinctrl},
16971445
{ .compatible = "lantiq,xrx100-pinctrl", .data = &xrx100_pinctrl},

0 commit comments

Comments
 (0)