On 08/15/2018 08:23 PM, Oliver Hartkopp wrote: > have you seen this? No. > Is it relevant for linux-can? Don't think so: in "7cb0f17f5252 dt-bindings: can: xilinx_can: add Xilinx CAN FD bindings" the "CAN FD" has been added to list and newlines were added: > - interrupt-parent : Must be core interrupt controller > -- clock-names : List of input clock names - "can_clk", "pclk" > - (For CANPS), "can_clk" , "s_axi_aclk"(For AXI CAN) > +- clock-names : List of input clock names > + - "can_clk", "pclk" (For CANPS), > + - "can_clk", "s_axi_aclk" (For AXI CAN and CAN FD). > This is a small conflict in > Documentation/devicetree/bindings/net/can/xilinx_can.txt, > the resolution is simple: > > ==================== > -- interrupt-parent : Must be core interrupt controller > + - clock-names : List of input clock names > + - "can_clk", "pclk" (For CANPS), > + - "can_clk", "s_axi_aclk" (For AXI CAN and CAN FD). > ==================== > > That is, remove interrupt-parent, and take the net-next copy of the > clock-names stuff. ... and it seems in some other tree the interrupt-parent has been removed. Thanks for the heads up. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature
