On 10/31/2018 06:44 AM, Simon Goldschmidt wrote:
> On Tue, Oct 30, 2018 at 11:02 PM Marek Vasut <ma...@denx.de> wrote:
>>
>> On 10/29/2018 08:25 PM, Simon Goldschmidt wrote:
>>> Linux uses "cdns,qspi-nor" as compatible string for the cadence
>>> qspi driver. To support Linux device trees, add this compatible
>>> to the U-Boot driver while keeping the old "cadence,qspi" for
>>> backwards compatibility for U-Boot device trees until all are
>>> fixed.
>>>
>>> Also update the binding docs accordingly.
>>>
>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com>
>>> ---
>>>
>>> doc/device-tree-bindings/spi/spi-cadence.txt | 3 ++-
>>> drivers/spi/cadence_qspi.c | 3 ++-
>>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/doc/device-tree-bindings/spi/spi-cadence.txt
>>> b/doc/device-tree-bindings/spi/spi-cadence.txt
>>> index 74c82080fc..d7b30d5cff 100644
>>> --- a/doc/device-tree-bindings/spi/spi-cadence.txt
>>> +++ b/doc/device-tree-bindings/spi/spi-cadence.txt
>>> @@ -2,7 +2,8 @@ Cadence QSPI controller device tree bindings
>>> --------------------------------------------
>>>
>>> Required properties:
>>> -- compatible : should be "cadence,qspi".
>>> +- compatible : should be "cdns,qspi-nor" ("cadence,qspi" is
>>> supported
>>> + for compatibility to older U-Boot devicetrees only)
>>> - reg : 1.Physical base address and size of SPI
>>> registers map.
>>> 2. Physical base address & size of NOR Flash.
>>> - clocks : Clock phandles (see clock bindings for details).
>>> diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
>>> index 29db6fa368..fef740beaa 100644
>>> --- a/drivers/spi/cadence_qspi.c
>>> +++ b/drivers/spi/cadence_qspi.c
>>> @@ -329,7 +329,8 @@ static const struct dm_spi_ops cadence_spi_ops = {
>>> };
>>>
>>> static const struct udevice_id cadence_spi_ids[] = {
>>> - { .compatible = "cadence,qspi" },
>>> + { .compatible = "cdns,qspi-nor" },
>>> + { .compatible = "cadence,qspi" }, /* U-Boot specific */
>>
>> Just drop this, this binding is unused in current U-Boot source , right?
>> We don't really care about non-upstream custom DTs thus far.
>
> No, but it's still used in:
> - socfpga_arria10.dtsi (but I can add removing that to the patch)
> - keystone-k2g.dtsi
> - stv0991.dts
> (whatever the 2 latter are).
>
> Plus I'll have to merge this patch into the devicetree patch to keep
> git bisect working, right?
> I can do that, and change the above dts files as well, if you want?
Please update the DTs, yes.
--
Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
