[PATCH v3 1/8] dt-bindings: clock: rename at91.h to at91-pmc-status.h
Eugen Hristev
eugen.hristev at linaro.org
Fri Mar 7 14:19:39 CET 2025
On 3/6/25 12:39, Manikandan.M at microchip.com wrote:
> Hi Sumit,
>
> On 06/03/25 12:30 pm, Sumit Garg wrote:
>> [Some people who received this message don't often get email from sumit.garg at kernel.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>>
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> Hi Manikandan,
>>
>> On Wed, Mar 05, 2025 at 11:37:04AM +0530, Manikandan Muralidharan wrote:
>>> Rename the include at91.h to at91-pmc-status.h to avoid conflicts with
>>> the upstream bindings that has the same file and update the
>>> relevant legacy SoC Device Trees to reflect this change.
>>> This is useful while compiling the DT and driver of the new SoC files with
>>> OF_UPSTREAM enabled.
>>>
>>> Signed-off-by: Manikandan Muralidharan <manikandan.m at microchip.com>
>>> ---
>>> MAINTAINERS | 2 +-
>>> arch/arm/dts/at91-sama7g5ek-u-boot.dtsi | 2 +-
>>> arch/arm/dts/at91sam9260.dtsi | 2 +-
>>> arch/arm/dts/at91sam9261.dtsi | 2 +-
>>> arch/arm/dts/at91sam9263.dtsi | 2 +-
>>> arch/arm/dts/at91sam9g45.dtsi | 2 +-
>>> arch/arm/dts/at91sam9n12.dtsi | 2 +-
>>> arch/arm/dts/at91sam9rl.dtsi | 2 +-
>>> arch/arm/dts/at91sam9x5.dtsi | 2 +-
>>> arch/arm/dts/sama5d3.dtsi | 2 +-
>>> arch/arm/dts/sama5d3_mci2.dtsi | 2 +-
>>> arch/arm/dts/sama5d3_tcb1.dtsi | 2 +-
>>> arch/arm/dts/sama5d3_uart.dtsi | 2 +-
>>> arch/arm/dts/sama5d4.dtsi | 2 +-
>>> include/dt-bindings/clock/{at91.h => at91-pmc-status.h} | 0
>>> 15 files changed, 14 insertions(+), 14 deletions(-)
>>> rename include/dt-bindings/clock/{at91.h => at91-pmc-status.h} (100%)
>>>
>>
>> AFAICS, include/dt-bindings/clock/at91.h is just a subset of
>> dts/upstream/include/dt-bindings/clock/at91.h. If that's true then we
>> should just be able to drop local include/dt-bindings/clock/at91.h from
>> U-Boot tree. Won't that just work fine?
>
>
> Yes, you're right. It's a subset of the upstream at91.h. However, we
> must retain it due to dependencies with legacy SoC files that haven't
> yet been migrated to OF_UPSTREAM. I believe migrating those files now
> would introduce a significant number of changes w.r.t Device Tree files."
>
What kind of dependencies ? If current at91.h is a subset of upstream
at91.h, then you could include the upstream at91.h, which would only
bring extra defines which would be unused.
Are there more problems other than just being a subset ? From what I
remember, some defines were different versus upstream, and this could
cause problems.
Eugen
>>
>> -Sumit
>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index 10f7f1fd180..d50841a4a41 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -464,7 +464,7 @@ F: drivers/memory/atmel-ebi.c
>>> F: drivers/misc/microchip_flexcom.c
>>> F: drivers/timer/atmel_tcb_timer.c
>>> F: include/dt-bindings/clk/at91.h
>>> -F: include/dt-bindings/clock/at91.h
>>> +F: include/dt-bindings/clock/at91-pmc-status.h
>>> F: include/dt-bindings/dma/at91.h
>>> F: include/dt-bindings/mfd/at91-usart.h
>>> F: include/dt-bindings/mfd/atmel-flexcom.h
>>> diff --git a/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi b/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi
>>> index 8b2e990de72..6e5ca0fb4ce 100644
>>> --- a/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi
>>> +++ b/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi
>>> @@ -12,7 +12,7 @@
>>>
>>> #include "sama7g5-pinfunc.h"
>>> #include <dt-bindings/reset/sama7g5-reset.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> chosen {
>>> diff --git a/arch/arm/dts/at91sam9260.dtsi b/arch/arm/dts/at91sam9260.dtsi
>>> index 8d496205523..4ccfe2b9e4b 100644
>>> --- a/arch/arm/dts/at91sam9260.dtsi
>>> +++ b/arch/arm/dts/at91sam9260.dtsi
>>> @@ -12,7 +12,7 @@
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> #include <dt-bindings/gpio/gpio.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> model = "Atmel AT91SAM9260 family SoC";
>>> diff --git a/arch/arm/dts/at91sam9261.dtsi b/arch/arm/dts/at91sam9261.dtsi
>>> index 65e0e4f0de0..0c7485bff98 100644
>>> --- a/arch/arm/dts/at91sam9261.dtsi
>>> +++ b/arch/arm/dts/at91sam9261.dtsi
>>> @@ -10,7 +10,7 @@
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> #include <dt-bindings/gpio/gpio.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> model = "Atmel AT91SAM9261 family SoC";
>>> diff --git a/arch/arm/dts/at91sam9263.dtsi b/arch/arm/dts/at91sam9263.dtsi
>>> index 55b79667564..e5d1cc04f5c 100644
>>> --- a/arch/arm/dts/at91sam9263.dtsi
>>> +++ b/arch/arm/dts/at91sam9263.dtsi
>>> @@ -10,7 +10,7 @@
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> #include <dt-bindings/gpio/gpio.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> model = "Atmel AT91SAM9263 family SoC";
>>> diff --git a/arch/arm/dts/at91sam9g45.dtsi b/arch/arm/dts/at91sam9g45.dtsi
>>> index 63a061354e4..5c79f33f48d 100644
>>> --- a/arch/arm/dts/at91sam9g45.dtsi
>>> +++ b/arch/arm/dts/at91sam9g45.dtsi
>>> @@ -14,7 +14,7 @@
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> #include <dt-bindings/gpio/gpio.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> model = "Atmel AT91SAM9G45 family SoC";
>>> diff --git a/arch/arm/dts/at91sam9n12.dtsi b/arch/arm/dts/at91sam9n12.dtsi
>>> index 84089837013..5034db0b617 100644
>>> --- a/arch/arm/dts/at91sam9n12.dtsi
>>> +++ b/arch/arm/dts/at91sam9n12.dtsi
>>> @@ -12,7 +12,7 @@
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> #include <dt-bindings/gpio/gpio.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> model = "Atmel AT91SAM9N12 SoC";
>>> diff --git a/arch/arm/dts/at91sam9rl.dtsi b/arch/arm/dts/at91sam9rl.dtsi
>>> index 3b99de21058..8fa8067709c 100644
>>> --- a/arch/arm/dts/at91sam9rl.dtsi
>>> +++ b/arch/arm/dts/at91sam9rl.dtsi
>>> @@ -8,7 +8,7 @@
>>>
>>> #include "skeleton.dtsi"
>>> #include <dt-bindings/pinctrl/at91.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> #include <dt-bindings/gpio/gpio.h>
>>> #include <dt-bindings/pwm/pwm.h>
>>> diff --git a/arch/arm/dts/at91sam9x5.dtsi b/arch/arm/dts/at91sam9x5.dtsi
>>> index 4c6d8b9bb65..1922c5f03e0 100644
>>> --- a/arch/arm/dts/at91sam9x5.dtsi
>>> +++ b/arch/arm/dts/at91sam9x5.dtsi
>>> @@ -14,7 +14,7 @@
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> #include <dt-bindings/gpio/gpio.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> model = "Atmel AT91SAM9x5 family SoC";
>>> diff --git a/arch/arm/dts/sama5d3.dtsi b/arch/arm/dts/sama5d3.dtsi
>>> index 10d6e74586d..bb9290fba57 100644
>>> --- a/arch/arm/dts/sama5d3.dtsi
>>> +++ b/arch/arm/dts/sama5d3.dtsi
>>> @@ -13,7 +13,7 @@
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> #include <dt-bindings/gpio/gpio.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> model = "Atmel SAMA5D3 family SoC";
>>> diff --git a/arch/arm/dts/sama5d3_mci2.dtsi b/arch/arm/dts/sama5d3_mci2.dtsi
>>> index 2d289ed7be8..05753edeb0f 100644
>>> --- a/arch/arm/dts/sama5d3_mci2.dtsi
>>> +++ b/arch/arm/dts/sama5d3_mci2.dtsi
>>> @@ -9,7 +9,7 @@
>>>
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> ahb {
>>> diff --git a/arch/arm/dts/sama5d3_tcb1.dtsi b/arch/arm/dts/sama5d3_tcb1.dtsi
>>> index 5be60b4f8b1..0d96fe77723 100644
>>> --- a/arch/arm/dts/sama5d3_tcb1.dtsi
>>> +++ b/arch/arm/dts/sama5d3_tcb1.dtsi
>>> @@ -9,7 +9,7 @@
>>>
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> aliases {
>>> diff --git a/arch/arm/dts/sama5d3_uart.dtsi b/arch/arm/dts/sama5d3_uart.dtsi
>>> index 6a547fdadcc..10f36eb3ac2 100644
>>> --- a/arch/arm/dts/sama5d3_uart.dtsi
>>> +++ b/arch/arm/dts/sama5d3_uart.dtsi
>>> @@ -9,7 +9,7 @@
>>>
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>>
>>> / {
>>> aliases {
>>> diff --git a/arch/arm/dts/sama5d4.dtsi b/arch/arm/dts/sama5d4.dtsi
>>> index 482cf03e61b..af5e9bd6dba 100644
>>> --- a/arch/arm/dts/sama5d4.dtsi
>>> +++ b/arch/arm/dts/sama5d4.dtsi
>>> @@ -44,7 +44,7 @@
>>> */
>>>
>>> #include "skeleton.dtsi"
>>> -#include <dt-bindings/clock/at91.h>
>>> +#include <dt-bindings/clock/at91-pmc-status.h>
>>> #include <dt-bindings/dma/at91.h>
>>> #include <dt-bindings/pinctrl/at91.h>
>>> #include <dt-bindings/interrupt-controller/irq.h>
>>> diff --git a/include/dt-bindings/clock/at91.h b/include/dt-bindings/clock/at91-pmc-status.h
>>> similarity index 100%
>>> rename from include/dt-bindings/clock/at91.h
>>> rename to include/dt-bindings/clock/at91-pmc-status.h
>>> --
>>> 2.25.1
>>>
>
More information about the U-Boot
mailing list