| Message ID | 20201016165602.55720-2-zhouyanjie@wanyeetech.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | Add macro definition for the upcoming new OST driver. | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 19 lines checked |
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 19 lines checked |
On Sat, Oct 17, 2020 at 12:56:02AM +0800, 周琰杰 (Zhou Yanjie) wrote: > The new OST has one global timer and two or four percpu timers, so there > will be three combinations in the upcoming new OST driver: the original > GLOBAL_TIMER + PERCPU_TIMER, the new GLOBAL_TIMER + PERCPU_TIMER0/1 and > GLOBAL_TIMER + PERCPU_TIMER0/1/2/3, For this, add the macro definition > about OST_CLK_PERCPU_TIMER0/1/2/3. And in order to ensure that all the > combinations work normally, the original ABI values of OST_CLK_PERCPU_TIMER > and OST_CLK_GLOBAL_TIMER need to be exchanged to ensure that in any > combinations, the clock can be registered (by calling clk_hw_register()) > from index 0. You need to state why breaking the ABI is okay. > > Tested-by: 周正 (Zhou Zheng) <sernia.zhou@foxmail.com> > Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com> > --- > > Notes: > v1->v2: > Rewrite the commit message so that each line is less than 80 characters. > > include/dt-bindings/clock/ingenic,sysost.h | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/include/dt-bindings/clock/ingenic,sysost.h b/include/dt-bindings/clock/ingenic,sysost.h > index 9ac88e90babf..063791b01ab3 100644 > --- a/include/dt-bindings/clock/ingenic,sysost.h > +++ b/include/dt-bindings/clock/ingenic,sysost.h > @@ -1,12 +1,16 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* > - * This header provides clock numbers for the ingenic,tcu DT binding. > + * This header provides clock numbers for the Ingenic OST DT binding. > */ > > #ifndef __DT_BINDINGS_CLOCK_INGENIC_OST_H__ > #define __DT_BINDINGS_CLOCK_INGENIC_OST_H__ > > -#define OST_CLK_PERCPU_TIMER 0 > -#define OST_CLK_GLOBAL_TIMER 1 > +#define OST_CLK_PERCPU_TIMER 1 > +#define OST_CLK_GLOBAL_TIMER 0 > +#define OST_CLK_PERCPU_TIMER0 1 > +#define OST_CLK_PERCPU_TIMER1 2 > +#define OST_CLK_PERCPU_TIMER2 3 > +#define OST_CLK_PERCPU_TIMER3 4 > > #endif /* __DT_BINDINGS_CLOCK_INGENIC_OST_H__ */ > -- > 2.11.0 >
Hi Rob, 在 2020/10/26 下午9:13, Rob Herring 写道: > On Sat, Oct 17, 2020 at 12:56:02AM +0800, 周琰杰 (Zhou Yanjie) wrote: >> The new OST has one global timer and two or four percpu timers, so there >> will be three combinations in the upcoming new OST driver: the original >> GLOBAL_TIMER + PERCPU_TIMER, the new GLOBAL_TIMER + PERCPU_TIMER0/1 and >> GLOBAL_TIMER + PERCPU_TIMER0/1/2/3, For this, add the macro definition >> about OST_CLK_PERCPU_TIMER0/1/2/3. And in order to ensure that all the >> combinations work normally, the original ABI values of OST_CLK_PERCPU_TIMER >> and OST_CLK_GLOBAL_TIMER need to be exchanged to ensure that in any >> combinations, the clock can be registered (by calling clk_hw_register()) >> from index 0. > You need to state why breaking the ABI is okay. Sorry, I did not understand correctly before, I will add it to the commit message in the next version. Thanks and best regards! >> Tested-by: 周正 (Zhou Zheng) <sernia.zhou@foxmail.com> >> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com> >> --- >> >> Notes: >> v1->v2: >> Rewrite the commit message so that each line is less than 80 characters. >> >> include/dt-bindings/clock/ingenic,sysost.h | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/include/dt-bindings/clock/ingenic,sysost.h b/include/dt-bindings/clock/ingenic,sysost.h >> index 9ac88e90babf..063791b01ab3 100644 >> --- a/include/dt-bindings/clock/ingenic,sysost.h >> +++ b/include/dt-bindings/clock/ingenic,sysost.h >> @@ -1,12 +1,16 @@ >> /* SPDX-License-Identifier: GPL-2.0 */ >> /* >> - * This header provides clock numbers for the ingenic,tcu DT binding. >> + * This header provides clock numbers for the Ingenic OST DT binding. >> */ >> >> #ifndef __DT_BINDINGS_CLOCK_INGENIC_OST_H__ >> #define __DT_BINDINGS_CLOCK_INGENIC_OST_H__ >> >> -#define OST_CLK_PERCPU_TIMER 0 >> -#define OST_CLK_GLOBAL_TIMER 1 >> +#define OST_CLK_PERCPU_TIMER 1 >> +#define OST_CLK_GLOBAL_TIMER 0 >> +#define OST_CLK_PERCPU_TIMER0 1 >> +#define OST_CLK_PERCPU_TIMER1 2 >> +#define OST_CLK_PERCPU_TIMER2 3 >> +#define OST_CLK_PERCPU_TIMER3 4 >> >> #endif /* __DT_BINDINGS_CLOCK_INGENIC_OST_H__ */ >> -- >> 2.11.0 >>
diff --git a/include/dt-bindings/clock/ingenic,sysost.h b/include/dt-bindings/clock/ingenic,sysost.h index 9ac88e90babf..063791b01ab3 100644 --- a/include/dt-bindings/clock/ingenic,sysost.h +++ b/include/dt-bindings/clock/ingenic,sysost.h @@ -1,12 +1,16 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * This header provides clock numbers for the ingenic,tcu DT binding. + * This header provides clock numbers for the Ingenic OST DT binding. */ #ifndef __DT_BINDINGS_CLOCK_INGENIC_OST_H__ #define __DT_BINDINGS_CLOCK_INGENIC_OST_H__ -#define OST_CLK_PERCPU_TIMER 0 -#define OST_CLK_GLOBAL_TIMER 1 +#define OST_CLK_PERCPU_TIMER 1 +#define OST_CLK_GLOBAL_TIMER 0 +#define OST_CLK_PERCPU_TIMER0 1 +#define OST_CLK_PERCPU_TIMER1 2 +#define OST_CLK_PERCPU_TIMER2 3 +#define OST_CLK_PERCPU_TIMER3 4 #endif /* __DT_BINDINGS_CLOCK_INGENIC_OST_H__ */