[PATCH v3 01/11] Revert "dt-bindings: mfd: syscon: Add qcom,apq8064-mmss-sfpb"

Lee Jones lee at kernel.org
Wed Apr 30 02:07:38 PDT 2025


On Fri, 25 Apr 2025, Dmitry Baryshkov wrote:

> For some reason Lee has mis-squashed two commits, picking up one chunk
> from the first patch and one chunk from the second one. Rather than
> trying to fix it, revert commit 2c8de7df7418 ("dt-bindings: mfd: syscon:
> Add qcom,apq8064-mmss-sfpb").

Ah yes.  Looks like I took patch 5 before patch 4, then fudged the
conflict resolution.  No need to submit a revert, I have removed the
patch.

> Fixes: 2c8de7df7418 ("dt-bindings: mfd: syscon: Add qcom,apq8064-mmss-sfpb")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at oss.qualcomm.com>
> ---
>  Documentation/devicetree/bindings/mfd/syscon.yaml | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mfd/syscon.yaml b/Documentation/devicetree/bindings/mfd/syscon.yaml
> index 71741f06d2fddd2d4fb6b69c1cfd2d449ce73f64..c6bbb19c3e3e2245b4a823df06e7f361da311000 100644
> --- a/Documentation/devicetree/bindings/mfd/syscon.yaml
> +++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
> @@ -98,7 +98,6 @@ select:
>            - mstar,msc313-pmsleep
>            - nuvoton,ma35d1-sys
>            - nuvoton,wpcm450-shm
> -          - qcom,apq8064-mmss-sfpb
>            - rockchip,px30-qos
>            - rockchip,rk3036-qos
>            - rockchip,rk3066-qos
> @@ -202,7 +201,6 @@ properties:
>            - mstar,msc313-pmsleep
>            - nuvoton,ma35d1-sys
>            - nuvoton,wpcm450-shm
> -          - qcom,apq8064-sps-sic
>            - rockchip,px30-qos
>            - rockchip,rk3036-qos
>            - rockchip,rk3066-qos
> 
> -- 
> 2.39.5
> 

-- 
Lee Jones [李琼斯]



More information about the linux-arm-kernel mailing list