Hi,
The last MFD/syscon patch depends on the previous ones to avoid
dt_binding_check warnings.
I propose to take entire set via Rob's DT tree.
Best regards,
Krzysztof
Krzysztof Kozlowski (4):
dt-bindings: phy: hisilicon,hi3660-usb3: simplify example
dt-bindings: phy: hisilicon,hi3670-usb3: simplify example
dt-bindings: remoteproc: qcom,pil-info: add missing imem compatible
dt-bindings: mfd: syscon: require specific compatible also for
simple-mfd
.../devicetree/bindings/mfd/syscon.yaml | 14 +++++++++-
.../bindings/phy/hisilicon,hi3660-usb3.yaml | 22 +++++-----------
.../bindings/phy/hisilicon,hi3670-usb3.yaml | 26 ++++++-------------
.../bindings/remoteproc/qcom,pil-info.yaml | 2 +-
4 files changed, 28 insertions(+), 36 deletions(-)
--
2.34.1
syscon and simple-mfd cannot be used without device specific compatible,
so simplify the example to fix this.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../bindings/phy/hisilicon,hi3660-usb3.yaml | 22 +++++--------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml b/Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
index c2e073e26190..20b79e2e8b82 100644
--- a/Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
+++ b/Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
@@ -41,20 +41,10 @@ additionalProperties: false
examples:
- |
- bus {
- #address-cells = <2>;
- #size-cells = <2>;
-
- usb3_otg_bc: usb3_otg_bc@ff200000 {
- compatible = "syscon", "simple-mfd";
- reg = <0x0 0xff200000 0x0 0x1000>;
-
- usb-phy {
- compatible = "hisilicon,hi3660-usb-phy";
- #phy-cells = <0>;
- hisilicon,pericrg-syscon = <&crg_ctrl>;
- hisilicon,pctrl-syscon = <&pctrl>;
- hisilicon,eye-diagram-param = <0x22466e4>;
- };
- };
+ usb-phy {
+ compatible = "hisilicon,hi3660-usb-phy";
+ #phy-cells = <0>;
+ hisilicon,pericrg-syscon = <&crg_ctrl>;
+ hisilicon,pctrl-syscon = <&pctrl>;
+ hisilicon,eye-diagram-param = <0x22466e4>;
};
--
2.34.1
syscon and simple-mfd cannot be used without device specific compatible.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml
index 9282837d64ba..a7711e3c998c 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml
@@ -30,7 +30,7 @@ additionalProperties: false
examples:
- |
imem@146bf000 {
- compatible = "syscon", "simple-mfd";
+ compatible = "qcom,sdm630-imem", "syscon", "simple-mfd";
reg = <0x146bf000 0x1000>;
#address-cells = <1>;
--
2.34.1
The syscon bindings require a device specific compatible, beside the
"syscon". However schema counts "simple-mfd" as such, which allows
simple-mfd+syscon to sneak in.
Adjust the match to be sure simple-mfd also comes with a device specific
compatible.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
Documentation/devicetree/bindings/mfd/syscon.yaml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mfd/syscon.yaml b/Documentation/devicetree/bindings/mfd/syscon.yaml
index c958086a5fc3..a64c7a71e6fe 100644
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@ -72,7 +72,7 @@ properties:
- contains:
const: syscon
minItems: 2
- maxItems: 4 # Should be enough
+ maxItems: 5 # Should be enough
reg:
maxItems: 1
@@ -93,6 +93,18 @@ required:
- compatible
- reg
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: simple-mfd
+ then:
+ properties:
+ compatible:
+ minItems: 3
+ maxItems: 5
+
additionalProperties: true
examples:
--
2.34.1
syscon and simple-mfd cannot be used without device specific compatible,
so simplify the example to fix this.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../bindings/phy/hisilicon,hi3670-usb3.yaml | 26 ++++++-------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml b/Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
index ebd78acfe2de..1cb00dbcd4c5 100644
--- a/Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
+++ b/Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
@@ -52,22 +52,12 @@ additionalProperties: false
examples:
- |
- bus {
- #address-cells = <2>;
- #size-cells = <2>;
-
- usb3_otg_bc: usb3_otg_bc@ff200000 {
- compatible = "syscon", "simple-mfd";
- reg = <0x0 0xff200000 0x0 0x1000>;
-
- usb_phy {
- compatible = "hisilicon,hi3670-usb-phy";
- #phy-cells = <0>;
- hisilicon,pericrg-syscon = <&crg_ctrl>;
- hisilicon,pctrl-syscon = <&pctrl>;
- hisilicon,sctrl-syscon = <&sctrl>;
- hisilicon,eye-diagram-param = <0xfdfee4>;
- hisilicon,tx-vboost-lvl = <0x5>;
- };
- };
+ usb-phy {
+ compatible = "hisilicon,hi3670-usb-phy";
+ #phy-cells = <0>;
+ hisilicon,pericrg-syscon = <&crg_ctrl>;
+ hisilicon,pctrl-syscon = <&pctrl>;
+ hisilicon,sctrl-syscon = <&sctrl>;
+ hisilicon,eye-diagram-param = <0xfdfee4>;
+ hisilicon,tx-vboost-lvl = <0x5>;
};
--
2.34.1
On 17-08-22, 17:22, Krzysztof Kozlowski wrote:
> syscon and simple-mfd cannot be used without device specific compatible,
> so simplify the example to fix this.
Acked-By: Vinod Koul <[email protected]>
--
~Vinod
On 17-08-22, 17:22, Krzysztof Kozlowski wrote:
> syscon and simple-mfd cannot be used without device specific compatible,
> so simplify the example to fix this.
Acked-By: Vinod Koul <[email protected]>
--
~Vinod
Em Wed, 17 Aug 2022 17:22:43 +0300
Krzysztof Kozlowski <[email protected]> escreveu:
> syscon and simple-mfd cannot be used without device specific compatible,
> so simplify the example to fix this.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../bindings/phy/hisilicon,hi3660-usb3.yaml | 22 +++++--------------
> 1 file changed, 6 insertions(+), 16 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml b/Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
> index c2e073e26190..20b79e2e8b82 100644
> --- a/Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
> +++ b/Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
> @@ -41,20 +41,10 @@ additionalProperties: false
>
> examples:
> - |
> - bus {
> - #address-cells = <2>;
> - #size-cells = <2>;
> -
> - usb3_otg_bc: usb3_otg_bc@ff200000 {
> - compatible = "syscon", "simple-mfd";
> - reg = <0x0 0xff200000 0x0 0x1000>;
> -
> - usb-phy {
> - compatible = "hisilicon,hi3660-usb-phy";
> - #phy-cells = <0>;
> - hisilicon,pericrg-syscon = <&crg_ctrl>;
> - hisilicon,pctrl-syscon = <&pctrl>;
> - hisilicon,eye-diagram-param = <0x22466e4>;
> - };
> - };
> + usb-phy {
> + compatible = "hisilicon,hi3660-usb-phy";
> + #phy-cells = <0>;
> + hisilicon,pericrg-syscon = <&crg_ctrl>;
> + hisilicon,pctrl-syscon = <&pctrl>;
> + hisilicon,eye-diagram-param = <0x22466e4>;
> };
Acked-by: Mauro Carvalho Chehab <[email protected]>
Thanks,
Mauro
Em Wed, 17 Aug 2022 17:22:44 +0300
Krzysztof Kozlowski <[email protected]> escreveu:
> syscon and simple-mfd cannot be used without device specific compatible,
> so simplify the example to fix this.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../bindings/phy/hisilicon,hi3670-usb3.yaml | 26 ++++++-------------
> 1 file changed, 8 insertions(+), 18 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml b/Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
> index ebd78acfe2de..1cb00dbcd4c5 100644
> --- a/Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
> +++ b/Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
> @@ -52,22 +52,12 @@ additionalProperties: false
>
> examples:
> - |
> - bus {
> - #address-cells = <2>;
> - #size-cells = <2>;
> -
> - usb3_otg_bc: usb3_otg_bc@ff200000 {
> - compatible = "syscon", "simple-mfd";
> - reg = <0x0 0xff200000 0x0 0x1000>;
> -
> - usb_phy {
> - compatible = "hisilicon,hi3670-usb-phy";
> - #phy-cells = <0>;
> - hisilicon,pericrg-syscon = <&crg_ctrl>;
> - hisilicon,pctrl-syscon = <&pctrl>;
> - hisilicon,sctrl-syscon = <&sctrl>;
> - hisilicon,eye-diagram-param = <0xfdfee4>;
> - hisilicon,tx-vboost-lvl = <0x5>;
> - };
> - };
> + usb-phy {
> + compatible = "hisilicon,hi3670-usb-phy";
> + #phy-cells = <0>;
> + hisilicon,pericrg-syscon = <&crg_ctrl>;
> + hisilicon,pctrl-syscon = <&pctrl>;
> + hisilicon,sctrl-syscon = <&sctrl>;
> + hisilicon,eye-diagram-param = <0xfdfee4>;
> + hisilicon,tx-vboost-lvl = <0x5>;
> };
Acked-by: Mauro Carvalho Chehab <[email protected]>
Thanks,
Mauro
On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote:
> The syscon bindings require a device specific compatible, beside the
> "syscon". However schema counts "simple-mfd" as such, which allows
> simple-mfd+syscon to sneak in.
>
> Adjust the match to be sure simple-mfd also comes with a device specific
> compatible.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> Documentation/devicetree/bindings/mfd/syscon.yaml | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
Applied, thanks.
--
Lee Jones [李琼斯]
On Wed, 17 Aug 2022 17:22:42 +0300, Krzysztof Kozlowski wrote:
> Hi,
>
> The last MFD/syscon patch depends on the previous ones to avoid
> dt_binding_check warnings.
>
> I propose to take entire set via Rob's DT tree.
This may have been in the window where PW server moved and stopped
getting patches, so I missed it until patch 4 got applied and broke
linux-next...
>
> Best regards,
> Krzysztof
>
> Krzysztof Kozlowski (4):
> dt-bindings: phy: hisilicon,hi3660-usb3: simplify example
> dt-bindings: phy: hisilicon,hi3670-usb3: simplify example
> dt-bindings: remoteproc: qcom,pil-info: add missing imem compatible
> dt-bindings: mfd: syscon: require specific compatible also for
> simple-mfd
I applied patches 1-3, thanks!
Rob