| Message ID | 20210726105719.15793-3-chun-jie.chen@mediatek.com |
|---|---|
| State | Accepted |
| Commit | d18eb76bbd6998d57ca647bb0561e10afa404eef |
| Headers | show |
| Series | Mediatek MT8192 clock support | expand |
Quoting Chun-Jie Chen (2021-07-26 03:57:00) > This patch adds the mmsys document binding for MT8192 SoC. > > Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com> > Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> > Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > Acked-by: Rob Herring <robh@kernel.org> > --- Applied to clk-next
Hi Chun-Jie and Stephen, Missatge de Stephen Boyd <sboyd@kernel.org> del dia dt., 27 de jul. 2021 a les 19:54: > > Quoting Chun-Jie Chen (2021-07-26 03:57:00) > > This patch adds the mmsys document binding for MT8192 SoC. > > > > Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com> > > Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> > > Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > > Acked-by: Rob Herring <robh@kernel.org> > > --- > > Applied to clk-next > This will conflict in linux-next as the binding was already converted to yaml. See https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml?id=63e1125e6bb8eae3cd20292f6a10ee421dd574ae Thanks, Enric > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
On Wed, 2021-07-28 at 10:47 +0200, Enric Balletbo Serra wrote: > Hi Chun-Jie and Stephen, > > Missatge de Stephen Boyd <sboyd@kernel.org> del dia dt., 27 de jul. > 2021 a les 19:54: > > > > Quoting Chun-Jie Chen (2021-07-26 03:57:00) > > > This patch adds the mmsys document binding for MT8192 SoC. > > > > > > Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com> > > > Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> > > > Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > > > Acked-by: Rob Herring <robh@kernel.org> > > > --- > > > > Applied to clk-next > > > > This will conflict in linux-next as the binding was already converted > to yaml. See > > https://urldefense.com/v3/__https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml?id=63e1125e6bb8eae3cd20292f6a10ee421dd574ae__;!!CTRNKA9wMg0ARbw!1l9IyuzzydUJmGaERPLcaL2pSdzbuBStMR4_jqW1aVyVwBGdUU_g22jyDhqbClx4DaNT$ > > > Thanks, > Enric > I will resend mmsys binding document singly based on [1]. [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=485165 Best Regards, Chun-Jie > > _______________________________________________ > > Linux-mediatek mailing list > > Linux-mediatek@lists.infradead.org > > https://urldefense.com/v3/__http://lists.infradead.org/mailman/listinfo/linux-mediatek__;!!CTRNKA9wMg0ARbw!1l9IyuzzydUJmGaERPLcaL2pSdzbuBStMR4_jqW1aVyVwBGdUU_g22jyDhqbCpKYlq6I$ > >
Quoting Enric Balletbo Serra (2021-07-28 01:47:21) > Hi Chun-Jie and Stephen, > > Missatge de Stephen Boyd <sboyd@kernel.org> del dia dt., 27 de jul. > 2021 a les 19:54: > > > > Quoting Chun-Jie Chen (2021-07-26 03:57:00) > > > This patch adds the mmsys document binding for MT8192 SoC. > > > > > > Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com> > > > Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> > > > Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > > > Acked-by: Rob Herring <robh@kernel.org> > > > --- > > > > Applied to clk-next > > > > This will conflict in linux-next as the binding was already converted > to yaml. See > > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml?id=63e1125e6bb8eae3cd20292f6a10ee421dd574ae > Looks like it has been resolved in linux-next. Is there anything to do?
On 27/07/2021 19:53, Stephen Boyd wrote: > Quoting Chun-Jie Chen (2021-07-26 03:57:00) >> This patch adds the mmsys document binding for MT8192 SoC. >> >> Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com> >> Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> >> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> >> Acked-by: Rob Herring <robh@kernel.org> >> --- > > Applied to clk-next > Please drop this patch. The mmsys binding will change to yaml in this merge window and this will create a merge conflict. Thanks, Matthias
Quoting Matthias Brugger (2021-08-05 08:35:09) > > > On 27/07/2021 19:53, Stephen Boyd wrote: > > Quoting Chun-Jie Chen (2021-07-26 03:57:00) > >> This patch adds the mmsys document binding for MT8192 SoC. > >> > >> Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com> > >> Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> > >> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > >> Acked-by: Rob Herring <robh@kernel.org> > >> --- > > > > Applied to clk-next > > > > Please drop this patch. The mmsys binding will change to yaml in this merge > window and this will create a merge conflict. > It is particularly difficult to resolve? linux-next maintainers seem to have resolved it so I'm not very concerned. https://lore.kernel.org/r/20210728124304.1199-1-broonie@kernel.org
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt index 78c50733985c..9712a6831fab 100644 --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt @@ -16,6 +16,7 @@ Required Properties: - "mediatek,mt8167-mmsys", "syscon" - "mediatek,mt8173-mmsys", "syscon" - "mediatek,mt8183-mmsys", "syscon" + - "mediatek,mt8192-mmsys", "syscon" - #clock-cells: Must be 1 For the clock control, the mmsys controller uses the common clk binding from