On 21.05.2023 22:38, Dmitry Baryshkov wrote:
> Change the UFS QMP PHY to use newer style of QMP PHY bindings (single
> resource region, no per-PHY subnodes).
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> arch/arm64/boot/dts/qcom/sm8150.dtsi | 20 ++++++--------------
> 1 file changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
> index e2e210e10475..98fd356e87e4 100644
> --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
> @@ -2019,7 +2019,7 @@ ufs_mem_hc: ufshc@1d84000 {
> <0 0x01d90000 0 0x8000>;
> reg-names = "std", "ice";
> interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
> - phys = <&ufs_mem_phy_lanes>;
> + phys = <&ufs_mem_phy>;
> phy-names = "ufsphy";
> lanes-per-direction = <2>;
> #reset-cells = <1>;
> @@ -2064,10 +2064,8 @@ ufs_mem_hc: ufshc@1d84000 {
>
> ufs_mem_phy: phy@1d87000 {
> compatible = "qcom,sm8150-qmp-ufs-phy";
> - reg = <0 0x01d87000 0 0x1c0>;
> - #address-cells = <2>;
> - #size-cells = <2>;
> - ranges;
> + reg = <0 0x01d87000 0 0x1000>;
> +
> clock-names = "ref",
> "ref_aux";
> clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>,
> @@ -2077,16 +2075,10 @@ ufs_mem_phy: phy@1d87000 {
>
> resets = <&ufs_mem_hc 0>;
> reset-names = "ufsphy";
> - status = "disabled";
>
> - ufs_mem_phy_lanes: phy@1d87400 {
> - reg = <0 0x01d87400 0 0x16c>,
> - <0 0x01d87600 0 0x200>,
> - <0 0x01d87c00 0 0x200>,
> - <0 0x01d87800 0 0x16c>,
> - <0 0x01d87a00 0 0x200>;
> - #phy-cells = <0>;
> - };
> + #phy-cells = <0>;
> +
> + status = "disabled";
> };
>
> tcsr_mutex: hwlock@1f40000 {
