| Message ID | 20230401220810.3563708-8-dmitry.baryshkov@linaro.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | arm64: dts: qcom: remove duplication in PMIC declarations | expand |
On 2.04.2023 00:07, Dmitry Baryshkov wrote: > sc8280xp-pmics.dtsi contains a copy of pmk8350 with one extra device, > nvram (sdam). Port its definition from sc8280xp-pmics.dtsi into main > pmk8350.dtsi file. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Downstream uses the name `pmk8350_sdam_22` for this reg and sdam_1 corresponds to 0x7000, with 0x100 increments. Was the sc8280xp definition wrong wrt this, or do they differ? Konrad > arch/arm64/boot/dts/qcom/pmk8350.dtsi | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi > index 455ffffb5f5c..26e40dbfc173 100644 > --- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi > +++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi > @@ -66,6 +66,15 @@ pmk8350_rtc: rtc@6100 { > status = "disabled"; > }; > > + pmk8350_sdam_6: nvram@8500 { > + compatible = "qcom,spmi-sdam"; > + reg = <0x8500>; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges = <0 0x8500 0x100>; > + status = "disabled"; > + }; > + > pmk8350_gpios: gpio@b000 { > compatible = "qcom,pmk8350-gpio", "qcom,spmi-gpio"; > reg = <0xb000>;
diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi index 455ffffb5f5c..26e40dbfc173 100644 --- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi +++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi @@ -66,6 +66,15 @@ pmk8350_rtc: rtc@6100 { status = "disabled"; }; + pmk8350_sdam_6: nvram@8500 { + compatible = "qcom,spmi-sdam"; + reg = <0x8500>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x8500 0x100>; + status = "disabled"; + }; + pmk8350_gpios: gpio@b000 { compatible = "qcom,pmk8350-gpio", "qcom,spmi-gpio"; reg = <0xb000>;
sc8280xp-pmics.dtsi contains a copy of pmk8350 with one extra device, nvram (sdam). Port its definition from sc8280xp-pmics.dtsi into main pmk8350.dtsi file. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm64/boot/dts/qcom/pmk8350.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)