| Message ID | 20201203120212.1105-1-thunder.leizhen@huawei.com |
|---|---|
| Headers | show |
| Series | dt-bindings: reset: convert Hisilicon reset controller bindings to json-schema | expand |
On Thu, 2020-12-03 at 20:02 +0800, Zhen Lei wrote: > The vendor prefix of "Hisilicon Limited" is "hisilicon", it is clearly > stated in "vendor-prefixes.yaml". > > Fixes: 1527058736fa ("reset: hisilicon: add reset-hi3660") > Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> > Cc: Zhangfei Gao <zhangfei.gao@linaro.org> > --- > drivers/reset/hisilicon/reset-hi3660.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/reset/hisilicon/reset-hi3660.c b/drivers/reset/hisilicon/reset-hi3660.c > index a7d4445924e558c..8f1953159a65b31 100644 > --- a/drivers/reset/hisilicon/reset-hi3660.c > +++ b/drivers/reset/hisilicon/reset-hi3660.c > @@ -83,7 +83,7 @@ static int hi3660_reset_probe(struct platform_device *pdev) > if (!rc) > return -ENOMEM; > > - rc->map = syscon_regmap_lookup_by_phandle(np, "hisi,rst-syscon"); > + rc->map = syscon_regmap_lookup_by_phandle(np, "hisilicon,rst-syscon"); What about those that don't upgrade kernel and DT in lock-step? It would be easy to fall back to the old compatible if the new one fails. regards Philipp
On 2020/12/3 20:54, Philipp Zabel wrote: > On Thu, 2020-12-03 at 20:02 +0800, Zhen Lei wrote: >> The vendor prefix of "Hisilicon Limited" is "hisilicon", it is clearly >> stated in "vendor-prefixes.yaml". >> >> Fixes: 1527058736fa ("reset: hisilicon: add reset-hi3660") >> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >> Cc: Zhangfei Gao <zhangfei.gao@linaro.org> >> --- >> drivers/reset/hisilicon/reset-hi3660.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/reset/hisilicon/reset-hi3660.c b/drivers/reset/hisilicon/reset-hi3660.c >> index a7d4445924e558c..8f1953159a65b31 100644 >> --- a/drivers/reset/hisilicon/reset-hi3660.c >> +++ b/drivers/reset/hisilicon/reset-hi3660.c >> @@ -83,7 +83,7 @@ static int hi3660_reset_probe(struct platform_device *pdev) >> if (!rc) >> return -ENOMEM; >> >> - rc->map = syscon_regmap_lookup_by_phandle(np, "hisi,rst-syscon"); >> + rc->map = syscon_regmap_lookup_by_phandle(np, "hisilicon,rst-syscon"); > > What about those that don't upgrade kernel and DT in lock-step? > It would be easy to fall back to the old compatible if the new one > fails. All right, I'll combine them. I thought they belonged to different maintainers, and I had to break them apart. > > regards > Philipp > > . >
Patch 1-3 change the vendor prefix from "hisi" to "hisilicon", to eliminate below warnings: crg_rst_controller: 'hisi,rst-syscon' does not match any of the regexes: '^#.*', ... , '^hisilicon,.*', ... From schema: /root/leizhen/linux-next/Documentation/devicetree/bindings/vendor-prefixes.yaml Patch 4 does the json-schema conversion. Zhen Lei (4): reset: hisilicon: correct vendor prefix arm64: dts: correct vendor prefix hisi to hisilicon dt-bindings: reset: correct vendor prefix hisi to hisilicon dt-bindings: reset: convert Hisilicon reset controller bindings to json-schema .../bindings/reset/hisilicon,hi3660-reset.txt | 44 ------------- .../bindings/reset/hisilicon,hi3660-reset.yaml | 77 ++++++++++++++++++++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 +- arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 2 +- drivers/reset/hisilicon/reset-hi3660.c | 2 +- 5 files changed, 81 insertions(+), 48 deletions(-) delete mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt create mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.yaml