| Message ID | 20230412112739.160376-25-angelogioacchino.delregno@collabora.com |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | MediaTek Helio X10 - Mailbox, Display, MMC/SD/SDIO | expand |
On 12/04/2023 13:27, AngeloGioacchino Del Regno wrote: > This smartphone uses the Helio X10 standard MT6331+MT6332 combo PMICs: > include the mt6331 devicetree and add the required interrupt. > > Note that despite there being two interrupts, one for MT6331 and one > for MT6332, in configurations using the companion PMIC, the interrupt > of the latter fires for both events on MT6331 and for ones on MT6332, > while the interrupt for the main PMIC fires only for events of the > main PMIC. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Applied, thanks > --- > arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts b/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts > index a0e01a756f03..debe0f2553d9 100644 > --- a/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts > +++ b/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts > @@ -7,6 +7,7 @@ > /dts-v1/; > #include <dt-bindings/gpio/gpio.h> > #include "mt6795.dtsi" > +#include "mt6331.dtsi" > > / { > model = "Sony Xperia M5"; > @@ -219,6 +220,15 @@ pins-tx { > }; > }; > > +&pmic { > + /* > + * Smartphones, including the Xperia M5, are equipped with a companion > + * MT6332 PMIC: when this is present, the main MT6331 PMIC will fire > + * an interrupt on the companion, so we use the MT6332 IRQ GPIO. > + */ > + interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>; > +}; > + > &uart0 { > status = "okay"; >
diff --git a/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts b/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts index a0e01a756f03..debe0f2553d9 100644 --- a/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts +++ b/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts @@ -7,6 +7,7 @@ /dts-v1/; #include <dt-bindings/gpio/gpio.h> #include "mt6795.dtsi" +#include "mt6331.dtsi" / { model = "Sony Xperia M5"; @@ -219,6 +220,15 @@ pins-tx { }; }; +&pmic { + /* + * Smartphones, including the Xperia M5, are equipped with a companion + * MT6332 PMIC: when this is present, the main MT6331 PMIC will fire + * an interrupt on the companion, so we use the MT6332 IRQ GPIO. + */ + interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>; +}; + &uart0 { status = "okay";
This smartphone uses the Helio X10 standard MT6331+MT6332 combo PMICs: include the mt6331 devicetree and add the required interrupt. Note that despite there being two interrupts, one for MT6331 and one for MT6332, in configurations using the companion PMIC, the interrupt of the latter fires for both events on MT6331 and for ones on MT6332, while the interrupt for the main PMIC fires only for events of the main PMIC. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 10 ++++++++++ 1 file changed, 10 insertions(+)