| Message ID | 20220606160421.1641778-1-luca@z3ntu.xyz |
|---|---|
| State | Accepted |
| Commit | 03110b46c99bb0c712f46bec660b1c3f674ce100 |
| Headers | show |
| Series | [1/2] ARM: dts: qcom: msm8974: re-add missing pinctrl | expand |
On Mon 06 Jun 11:04 CDT 2022, Luca Weiss wrote: > As part of a recent cleanup commit, the remoteproc supplies for adsp and > modem were removed from msm8974.dtsi and now need to be set in the > device dts. Do so. > > Fixes: f300826d27be ("ARM: dts: qcom-msm8974: Sort and clean up nodes") > Signed-off-by: Luca Weiss <luca@z3ntu.xyz> > --- > Bjorn, could you please pick this up for -fixes so it lands in an > upcoming 5.19-rc? > As reported by lkp, this doesn't build. Am I missing something? Regards, Bjorn
On Mon, 6 Jun 2022 18:04:21 +0200, Luca Weiss wrote: > As part of a recent cleanup commit, the pinctrl for a few uart and i2c > nodes was removed. Adjust the names and/or add it back and assign it to > the uart and i2c nodes. > > Applied, thanks! [1/2] ARM: dts: qcom: msm8974: re-add missing pinctrl commit: 03110b46c99bb0c712f46bec660b1c3f674ce100 [2/2] ARM: dts: qcom: msm8974-*: re-add remoteproc supplies (no commit info) Best regards,
Hi Bjorn, On Freitag, 1. Juli 2022 05:15:05 CEST Bjorn Andersson wrote: > On Mon 06 Jun 11:04 CDT 2022, Luca Weiss wrote: > > As part of a recent cleanup commit, the remoteproc supplies for adsp and > > modem were removed from msm8974.dtsi and now need to be set in the > > device dts. Do so. > > > > Fixes: f300826d27be ("ARM: dts: qcom-msm8974: Sort and clean up nodes") > > Signed-off-by: Luca Weiss <luca@z3ntu.xyz> > > --- > > Bjorn, could you please pick this up for -fixes so it lands in an > > upcoming 5.19-rc? > > As reported by lkp, this doesn't build. Am I missing something? I briefly mentioned in IRC, maybe you missed it. Castor is actually still missing pm8841 regulators upstream. I'll send this old (rebased) commit from you to add them, is that ok with you? https://github.com/msm8974-mainline/linux/commit/ d01e20807a00e78570abf3dd91bea555dff06fa9 Otherwise we can just keep castor out of this patch for now and add it later, I don't really mind either way. Regards Luca > > Regards, > Bjorn
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 814ad0b46232..c3b8a6d63027 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -506,6 +506,8 @@ blsp1_uart2: serial@f991e000 { interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clock-names = "core", "iface"; + pinctrl-names = "default"; + pinctrl-0 = <&blsp1_uart2_default>; status = "disabled"; }; @@ -581,6 +583,9 @@ blsp2_uart1: serial@f995d000 { interrupts = <GIC_SPI 113 IRQ_TYPE_NONE>; clocks = <&gcc GCC_BLSP2_UART1_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>; clock-names = "core", "iface"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&blsp2_uart1_default>; + pinctrl-1 = <&blsp2_uart1_sleep>; status = "disabled"; }; @@ -599,6 +604,8 @@ blsp2_uart4: serial@f9960000 { interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_BLSP2_UART4_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>; clock-names = "core", "iface"; + pinctrl-names = "default"; + pinctrl-0 = <&blsp2_uart4_default>; status = "disabled"; }; @@ -639,6 +646,9 @@ blsp2_i2c6: i2c@f9968000 { interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_BLSP2_QUP6_I2C_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>; clock-names = "core", "iface"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&blsp2_i2c6_default>; + pinctrl-1 = <&blsp2_i2c6_sleep>; #address-cells = <1>; #size-cells = <0>; }; @@ -1256,7 +1266,7 @@ cd { }; }; - blsp1_uart2_active: blsp1-uart2-active { + blsp1_uart2_default: blsp1-uart2-default { rx { pins = "gpio5"; function = "blsp_uart2"; @@ -1272,7 +1282,7 @@ tx { }; }; - blsp2_uart1_active: blsp2-uart1-active { + blsp2_uart1_default: blsp2-uart1-default { tx-rts { pins = "gpio41", "gpio44"; function = "blsp_uart7"; @@ -1295,7 +1305,7 @@ blsp2_uart1_sleep: blsp2-uart1-sleep { bias-pull-down; }; - blsp2_uart4_active: blsp2-uart4-active { + blsp2_uart4_default: blsp2-uart4-default { tx-rts { pins = "gpio53", "gpio56"; function = "blsp_uart10"; @@ -1406,7 +1416,19 @@ blsp2_i2c5_sleep: blsp2-i2c5-sleep { bias-pull-up; }; - /* BLSP2_I2C6 info is missing - nobody uses it though? */ + blsp2_i2c6_default: blsp2-i2c6-default { + pins = "gpio87", "gpio88"; + function = "blsp_i2c12"; + drive-strength = <2>; + bias-disable; + }; + + blsp2_i2c6_sleep: blsp2-i2c6-sleep { + pins = "gpio87", "gpio88"; + function = "blsp_i2c12"; + drive-strength = <2>; + bias-pull-up; + }; spi8_default: spi8_default { mosi {
As part of a recent cleanup commit, the pinctrl for a few uart and i2c nodes was removed. Adjust the names and/or add it back and assign it to the uart and i2c nodes. Fixes: 1dfe967ec7cf ("ARM: dts: qcom-msm8974*: Consolidate I2C/UART/SDHCI") Signed-off-by: Luca Weiss <luca@z3ntu.xyz> --- Bjorn, could you please pick this up for -fixes so it lands in an upcoming 5.19-rc? arch/arm/boot/dts/qcom-msm8974.dtsi | 30 +++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)