For 3.7, Tegra will switch to the common clock framework. I think
this patch would then disable that. How should we resolve this -
rebase the Tegra common-clk tree on top of any branch containing
this patch in order to remove that select statement?

I'd expect this to be applied on a separate branch so you should be able
to rebase your conversion on top of it or merge it into your branch
which should deal with things well enough I think?