| Message ID | 15d718a2d696d29b48668b9ab5531369c537a1e6.1677089171.git.daniel@makrotopia.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | clk: mediatek: de-duplicate MT798x drivers | expand |
On 22/02/2023 19:09, Daniel Golle wrote: > Rename dt-bindings header file mt7986-clk.h to mediatek,mt7986-clk.h, > propagate this change also to mt7986a.dtsi which is the only user. > > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > --- > arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 2 +- > drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +- > drivers/clk/mediatek/clk-mt7986-topckgen.c | 2 +- > .../dt-bindings/clock/{mt7986-clk.h => mediatek,mt7986-clk.h} | 0 You cannot have bindings and DTS and drivers mixed together. Which points to fact - you cannot make such change... Also your commit msg does not justify "why" you are doing it. Best regards, Krzysztof
On Thu, Feb 23, 2023 at 11:18:37AM +0100, Krzysztof Kozlowski wrote: > On 22/02/2023 19:09, Daniel Golle wrote: > > Rename dt-bindings header file mt7986-clk.h to mediatek,mt7986-clk.h, > > propagate this change also to mt7986a.dtsi which is the only user. > > > > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > > --- > > arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 2 +- > > drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +- > > drivers/clk/mediatek/clk-mt7986-topckgen.c | 2 +- > > .../dt-bindings/clock/{mt7986-clk.h => mediatek,mt7986-clk.h} | 0 > > You cannot have bindings and DTS and drivers mixed together. Which > points to fact - you cannot make such change... Also your commit msg > does not justify "why" you are doing it. The reason is simply consistency with most other SoCs. So to make such a change possible, I should do it in three steps, right? Step 1: dt-bindings: copy mt7986-clk.h to mediatek,mt7986-clk.h Step 2: changes in drivers Step 3: dt-bindings: remove mt7986-clk.h Would this change be acceptable if carried out in 3 commits? And using the same strategy also the other changes suggested in the series? Thank you! Best regards Daniel
On 24/02/2023 22:06, Daniel Golle wrote: > On Thu, Feb 23, 2023 at 11:18:37AM +0100, Krzysztof Kozlowski wrote: >> On 22/02/2023 19:09, Daniel Golle wrote: >>> Rename dt-bindings header file mt7986-clk.h to mediatek,mt7986-clk.h, >>> propagate this change also to mt7986a.dtsi which is the only user. >>> >>> Signed-off-by: Daniel Golle <daniel@makrotopia.org> >>> --- >>> arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 2 +- >>> drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +- >>> drivers/clk/mediatek/clk-mt7986-topckgen.c | 2 +- >>> .../dt-bindings/clock/{mt7986-clk.h => mediatek,mt7986-clk.h} | 0 >> >> You cannot have bindings and DTS and drivers mixed together. Which >> points to fact - you cannot make such change... Also your commit msg >> does not justify "why" you are doing it. > > The reason is simply consistency with most other SoCs. > > So to make such a change possible, I should do it in three steps, right? > Step 1: dt-bindings: copy mt7986-clk.h to mediatek,mt7986-clk.h > Step 2: changes in drivers > Step 3: dt-bindings: remove mt7986-clk.h > > Would this change be acceptable if carried out in 3 commits? For new code - it would have to be in three commits. For existing code, how you are going to achieve it with keeping full bisectability? Remember that each commits goes to different branch and/or tree! It's probably doable within two Linux releases with some header wrappers... but is it worth the effort just for "consistency"? > And using the same strategy also the other changes suggested in the > series? All of them have the same bisectability problems... Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi index 0d9800c51cc9b..a53993fe457ca 100644 --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi @@ -6,7 +6,7 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/clock/mt7986-clk.h> +#include <dt-bindings/clock/mediatek,mt7986-clk.h> #include <dt-bindings/reset/mt7986-resets.h> #include <dt-bindings/phy/phy.h> #include <dt-bindings/thermal/thermal.h> diff --git a/drivers/clk/mediatek/clk-mt7986-infracfg.c b/drivers/clk/mediatek/clk-mt7986-infracfg.c index b7efa70c2d6c2..e3363d700243d 100644 --- a/drivers/clk/mediatek/clk-mt7986-infracfg.c +++ b/drivers/clk/mediatek/clk-mt7986-infracfg.c @@ -14,7 +14,7 @@ #include "clk-gate.h" #include "clk-mux.h" -#include <dt-bindings/clock/mt7986-clk.h> +#include <dt-bindings/clock/mediatek,mt7986-clk.h> #include <linux/clk.h> static DEFINE_SPINLOCK(mt7986_clk_lock); diff --git a/drivers/clk/mediatek/clk-mt7986-topckgen.c b/drivers/clk/mediatek/clk-mt7986-topckgen.c index fbca3feded8f0..971b5259186a6 100644 --- a/drivers/clk/mediatek/clk-mt7986-topckgen.c +++ b/drivers/clk/mediatek/clk-mt7986-topckgen.c @@ -14,7 +14,7 @@ #include "clk-gate.h" #include "clk-mux.h" -#include <dt-bindings/clock/mt7986-clk.h> +#include <dt-bindings/clock/mediatek,mt7986-clk.h> #include <linux/clk.h> static DEFINE_SPINLOCK(mt7986_clk_lock); diff --git a/include/dt-bindings/clock/mt7986-clk.h b/include/dt-bindings/clock/mediatek,mt7986-clk.h similarity index 100% rename from include/dt-bindings/clock/mt7986-clk.h rename to include/dt-bindings/clock/mediatek,mt7986-clk.h
Rename dt-bindings header file mt7986-clk.h to mediatek,mt7986-clk.h, propagate this change also to mt7986a.dtsi which is the only user. Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 2 +- drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +- drivers/clk/mediatek/clk-mt7986-topckgen.c | 2 +- .../dt-bindings/clock/{mt7986-clk.h => mediatek,mt7986-clk.h} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename include/dt-bindings/clock/{mt7986-clk.h => mediatek,mt7986-clk.h} (100%)