Skip to contentSkip to conversation

Samsung-clk patches for 3.15

DISCUSSION Tomasz Figa 3 participants 6 messages Jan 24, 2014 – Feb 14, 2014 Arm Samsung Exynos

lore
Share & tools
lore
#0 lore raw

Hi,

Linux 3.14 is going to include Andrzej Hajda's patches converting Samsung clock drivers to use clock ID defines in include/dt-bindings, instead of local enums, but to avoid unnecessary merge conflicts we have converted only the clock driver, leaving DTS files unchanged yet.

We intend to complete the conversion in 3.15, by replacing magic numbers in DTS files with respective preprocessor macros, but to reduce potential conflicts we need help of you, Samsung clock patches authors :).

I'd like to ask anybody who already has patches for DTS files adding any clock-related contents still using numeric IDs, e.g. clock properties in nodes or full nodes containing clock properties, to make sure that the patches are merged before Andrzej sends the conversion patches. Then Andrzej's script will generate patches updating all clock properties, leaving no numeric IDs in DTS files.

If you are just starting your work on a patch that introduces changes as mentioned above, please make sure to already use clock macros, not numeric IDs. Otherwise you risk having needless rebases with a lot of conflicts. You have been warned ;).

Best regards,
Tomasz

#1 lore raw

[Forgot to Cc Mike...]

Quoted 30 lines · Tomasz Figa

Hi,

Linux 3.14 is going to include Andrzej Hajda's patches converting Samsung clock drivers to use clock ID defines in include/dt-bindings, instead of local enums, but to avoid unnecessary merge conflicts we have converted only the clock driver, leaving DTS files unchanged yet.

We intend to complete the conversion in 3.15, by replacing magic numbers in DTS files with respective preprocessor macros, but to reduce potential conflicts we need help of you, Samsung clock patches authors :).

I'd like to ask anybody who already has patches for DTS files adding any clock-related contents still using numeric IDs, e.g. clock properties in nodes or full nodes containing clock properties, to make sure that the patches are merged before Andrzej sends the conversion patches. Then Andrzej's script will generate patches updating all clock properties, leaving no numeric IDs in DTS files.

If you are just starting your work on a patch that introduces changes as mentioned above, please make sure to already use clock macros, not numeric IDs. Otherwise you risk having needless rebases with a lot of conflicts. You have been warned ;).

Best regards,
Tomasz

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#2 lore raw
Quoted 6 lines · Tomasz Figa

[Forgot to Cc Mike...]

Quoted 2 lines · Tomasz Figa

Hi,

Hi,

Quoted 5 lines
Quoted 5 lines

Linux 3.14 is going to include Andrzej Hajda's patches converting Samsung clock drivers to use clock ID defines in include/dt-bindings, instead of local enums, but to avoid unnecessary merge conflicts we have converted only the clock driver, leaving DTS files unchanged yet.

Quoted 12 lines
Quoted 3 lines

We intend to complete the conversion in 3.15, by replacing magic numbers in DTS files with respective preprocessor macros, but to reduce potential conflicts we need help of you, Samsung clock patches

authors :).

Quoted 8 lines

I'd like to ask anybody who already has patches for DTS files adding any clock-related contents still using numeric IDs, e.g. clock properties in nodes or full nodes containing clock properties, to make sure that the patches are merged before Andrzej sends the conversion patches. Then Andrzej's script will generate patches updating all clock properties, leaving no numeric IDs in DTS files.

There are several DTS patches in v3.14-drop/soc-exynos-2 branch of my tree for 3.15 and it will be merged after done of multiplatform, I need to rebase them based on v3.14-rc1 though...So I think, would be better if we could update DTS with using Andrzej's script after merging it into arm-soc...

Quoted 5 lines
Quoted 5 lines

If you are just starting your work on a patch that introduces changes as mentioned above, please make sure to already use clock macros, not numeric IDs. Otherwise you risk having needless rebases with a lot of conflicts. You have been warned ;).

Thanks,
Kukjin

#3 lore raw
Quoted 28 lines · Kukjin Kim
Quoted 6 lines · Tomasz Figa

[Forgot to Cc Mike...]

Quoted 2 lines · Tomasz Figa

Hi,

Hi,

Quoted 5 lines
Quoted 5 lines

Linux 3.14 is going to include Andrzej Hajda's patches converting Samsung clock drivers to use clock ID defines in include/dt-bindings, instead of local enums, but to avoid unnecessary merge conflicts we have converted only the clock driver, leaving DTS files unchanged yet.

Quoted 12 lines
Quoted 3 lines

We intend to complete the conversion in 3.15, by replacing magic numbers in DTS files with respective preprocessor macros, but to reduce potential conflicts we need help of you, Samsung clock patches

authors :).

Quoted 8 lines

I'd like to ask anybody who already has patches for DTS files adding any clock-related contents still using numeric IDs, e.g. clock properties in nodes or full nodes containing clock properties, to make sure that the patches are merged before Andrzej sends the conversion patches. Then Andrzej's script will generate patches updating all clock properties, leaving no numeric IDs in DTS files.

Quoted 4 lines

There are several DTS patches in v3.14-drop/soc-exynos-2 branch of my tree for 3.15 and it will be merged after done of multiplatform, I need to rebase them based on v3.14-rc1 though...So I think, would be better if we could update DTS with using Andrzej's script after merging it into arm-soc...

Basically my intention is to:

1) Have any existing patches using clock numbers merged in reasonable period of time (to not miss the merge window with DTS conversion patches).

2) Stop accepting such patches anymore.

3) Rerun Andrzej's script and convert all device tree sources to use clock macros.

Andrzej's patches for DTSes should go through your tree anyway (as any Samsung DTS patches by default), so it shouldn't be a problem, regardless of merging anything into arm-soc.

Best regards,
Tomasz

#4 lore raw
Quoted 43 lines · Tomasz Figa
Quoted 28 lines · Kukjin Kim
Quoted 6 lines · Tomasz Figa

[Forgot to Cc Mike...]

Quoted 2 lines · Tomasz Figa

Hi,

Hi,

Quoted 5 lines
Quoted 5 lines

Linux 3.14 is going to include Andrzej Hajda's patches converting Samsung clock drivers to use clock ID defines in include/dt-bindings, instead of local enums, but to avoid unnecessary merge conflicts we have converted only the clock driver, leaving DTS files unchanged yet.

Quoted 12 lines
Quoted 3 lines

We intend to complete the conversion in 3.15, by replacing magic numbers in DTS files with respective preprocessor macros, but to reduce potential conflicts we need help of you, Samsung clock patches

authors :).

Quoted 8 lines

I'd like to ask anybody who already has patches for DTS files adding any clock-related contents still using numeric IDs, e.g. clock properties in nodes or full nodes containing clock properties, to make sure that the patches are merged before Andrzej sends the conversion patches. Then Andrzej's script will generate patches updating all clock properties, leaving no numeric IDs in DTS files.

Quoted 6 lines

There are several DTS patches in v3.14-drop/soc-exynos-2 branch of my tree
for 3.15 and it will be merged after done of multiplatform, I need to rebase
them based on v3.14-rc1 though...So I think, would be better if we could update DTS with using Andrzej's script after merging it into arm-soc...

Basically my intention is to:

1) Have any existing patches using clock numbers merged in reasonable period of time (to not miss the merge window with DTS conversion patches).

Quoted 9 lines

2) Stop accepting such patches anymore.

3) Rerun Andrzej's script and convert all device tree sources to use clock macros.

Andrzej's patches for DTSes should go through your tree anyway (as any Samsung DTS patches by default), so it shouldn't be a problem, regardless of merging anything into arm-soc.

Makes sense, OK. I agreed. I'll apply Andrzej's "[PATCH RESEND v2 00/12] clk/exynos convert clock IDs to macros" and every exynos dt should be posted based on that from now on.

Thanks,
- Kukjin

#5 lore raw
Quoted 50 lines · Kukjin Kim
Quoted 49 lines · Tomasz Figa
Quoted 28 lines · Kukjin Kim
Quoted 6 lines · Tomasz Figa

[Forgot to Cc Mike...]

Quoted 2 lines · Tomasz Figa

Hi,

Hi,

Quoted 5 lines
Quoted 5 lines

Linux 3.14 is going to include Andrzej Hajda's patches converting Samsung clock drivers to use clock ID defines in include/dt-bindings, instead of local enums, but to avoid unnecessary merge conflicts we have converted only the clock driver, leaving DTS files unchanged yet.

Quoted 12 lines
Quoted 3 lines

We intend to complete the conversion in 3.15, by replacing magic numbers in DTS files with respective preprocessor macros, but to reduce potential conflicts we need help of you, Samsung clock patches

authors :).

Quoted 8 lines

I'd like to ask anybody who already has patches for DTS files adding any clock-related contents still using numeric IDs, e.g. clock properties in nodes or full nodes containing clock properties, to make sure that the patches are merged before Andrzej sends the conversion patches. Then Andrzej's script will generate patches updating all clock properties, leaving no numeric IDs in DTS files.

Quoted 6 lines

There are several DTS patches in v3.14-drop/soc-exynos-2 branch of my tree
for 3.15 and it will be merged after done of multiplatform, I need to rebase
them based on v3.14-rc1 though...So I think, would be better if we could update DTS with using Andrzej's script after merging it into arm-soc...

Basically my intention is to:

1) Have any existing patches using clock numbers merged in reasonable period of time (to not miss the merge window with DTS conversion patches).

2) Stop accepting such patches anymore.

3) Rerun Andrzej's script and convert all device tree sources to use clock macros.

Quoted 9 lines
Quoted 4 lines

Andrzej's patches for DTSes should go through your tree anyway (as any Samsung DTS patches by default), so it shouldn't be a problem, regardless of merging anything into arm-soc.

Makes sense, OK. I agreed. I'll apply Andrzej's "[PATCH RESEND v2 00/12] clk/exynos convert clock IDs to macros" and every exynos dt should be posted based on that from now on.

Tomasz, I've applied Andrej's regarding dt patches into samsung tree.

Thanks,
Kukjin