ARM: dts: imx6sx: Add DISPLAY power domain support
Subsystems (2)
PATCH RESEND 1/1 ARM: dts: imx6sx: Add DISPLAY power domain support
This was implemented in the driver but not actually defined and referenced in dts. This makes it always on.
From reference manual in section "10.4.1.4.1 Power Distribution":
"Display domain - The DISPLAY domain contains GIS, CSI, PXP, LCDIF, PCIe, DCIC, and LDB. It is supplied by internal regulator."
The current pd_pcie is actually only for PCIE_PHY, the PCIE ip block is actually inside the DISPLAY domain. Handle this by adding the pcie node in both power domains.
--- arch/arm/boot/dts/imx6sx.dtsi | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
This is the last part of a series which was previously accepted, it was delayed because it depends on PCI multi-pd support. All driver dependencies have landed in 5.0-rc1, resending for 5.1 as discussed:
https://lore.kernel.org/patchwork/patch/996812/#1190746
Only change is a minor conflict with removing a pxp clk.
arch/arm/boot/dts/imx6sx.dtsi +18 -1
@@ -783,10 +783,22 @@ #power-domain-cells = <0>; power-supply = <®_soc>; clocks = <&clks IMX6SX_CLK_GPU>; }; + pd_disp: power-domain@2 { + reg = <2>; + #power-domain-cells = <0>; + clocks = <&clks IMX6SX_CLK_PXP_AXI>, + <&clks IMX6SX_CLK_DISPLAY_AXI>, + <&clks IMX6SX_CLK_LCDIF1_PIX>, + <&clks IMX6SX_CLK_LCDIF_APB>, + <&clks IMX6SX_CLK_LCDIF2_PIX>, + <&clks IMX6SX_CLK_CSI>, + <&clks IMX6SX_CLK_VADC>; + }; + pd_pci: power-domain@3 { reg = <3>; #power-domain-cells = <0>; power-supply = <®_pcie>; };
@@ -1203,10 +1215,11 @@ compatible = "fsl,imx6sx-pxp", "fsl,imx6ull-pxp"; reg = <0x02218000 0x4000>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SX_CLK_PXP_AXI>; clock-names = "axi"; + power-domains = <&pd_disp>; status = "disabled"; }; csi2: csi@221c000 { reg = <0x0221c000 0x4000>;
@@ -1224,10 +1237,11 @@ interrupts = <GIC_SPI 5 IRQ_TYPE_EDGE_RISING>; clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>, <&clks IMX6SX_CLK_LCDIF_APB>, <&clks IMX6SX_CLK_DISPLAY_AXI>; clock-names = "pix", "axi", "disp_axi"; + power-domains = <&pd_disp>; status = "disabled"; }; lcdif2: lcdif@2224000 { compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
@@ -1235,19 +1249,21 @@ interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>; clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>, <&clks IMX6SX_CLK_LCDIF_APB>, <&clks IMX6SX_CLK_DISPLAY_AXI>; clock-names = "pix", "axi", "disp_axi"; + power-domains = <&pd_disp>; status = "disabled"; }; vadc: vadc@2228000 { reg = <0x02228000 0x4000>, <0x0222c000 0x4000>; reg-names = "vadc-vafe", "vadc-vdec"; clocks = <&clks IMX6SX_CLK_VADC>, <&clks IMX6SX_CLK_CSI>; clock-names = "vadc", "csi"; + power-domains = <&pd_disp>; status = "disabled"; }; }; adc1: adc@2280000 {
@@ -1368,10 +1384,11 @@ clocks = <&clks IMX6SX_CLK_PCIE_AXI>, <&clks IMX6SX_CLK_LVDS1_OUT>, <&clks IMX6SX_CLK_PCIE_REF_125M>, <&clks IMX6SX_CLK_DISPLAY_AXI>; clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_inbound_axi"; - power-domains = <&pd_pci>; + power-domains = <&pd_disp>, <&pd_pci>; + power-domain-names = "pcie", "pcie_phy"; status = "disabled"; }; }; };
Signature · 1 line
2.17.1
Am Montag, den 07.01.2019, 13:28 +0000 schrieb Leonard Crestez:
Quoted 5 lines
This was implemented in the driver but not actually defined and referenced in dts. This makes it always on.
From reference manual in section "10.4.1.4.1 Power Distribution":
Quoted 8 lines
"Display domain - The DISPLAY domain contains GIS, CSI, PXP, LCDIF, PCIe, DCIC, and LDB. It is supplied by internal regulator."
The current
pd_pcieis actually only forPCIE_PHY, the PCIE ip block is actually inside the DISPLAY domain. Handle this by adding the pcie node in both power domains.Signed-off-by Leonard Crestez <[email protected]>
Quoted 98 lines
---
arch/arm/boot/dts/imx6sx.dtsi | 19 ++++++++++++++++++-1 file changed, 18 insertions(+), 1 deletion(-)This is the last part of a series which was previously accepted, it was delayed because it depends on PCI multi-pd support. All driver dependencies have landed in 5.0-rc1, resending for 5.1 as discussed:
https://lore.kernel.org/patchwork/patch/996812/#1190746Only change is a minor conflict with removing a pxp clk.
arch/arm/boot/dts/imx6sx.dtsi +0
-0@@ -783,10 +783,22 @@ > #power-domain-cells = <0>; > power-supply = <®_soc>; > clocks = <&clks IMX6SX_CLK_GPU>; > };arch/arm/boot/dts/imx6sx.dtsi line 798
Quoted 11 lines
Quoted 1 line
arch/arm/boot/dts/imx6sx.dtsi +1
-0+ pd_disp: power-domain@2 {arch/arm/boot/dts/imx6sx.dtsi +10
-0+ reg = <2>; + #power-domain-cells = <0>; + clocks = <&clks IMX6SX_CLK_PXP_AXI>, + <&clks IMX6SX_CLK_DISPLAY_AXI>, + <&clks IMX6SX_CLK_LCDIF1_PIX>, + <&clks IMX6SX_CLK_LCDIF_APB>, + <&clks IMX6SX_CLK_LCDIF2_PIX>, + <&clks IMX6SX_CLK_CSI>, + <&clks IMX6SX_CLK_VADC>; + };+
Quoted 5 lines
Quoted 1 line
pd_pci: power-domain@3 {reg = <3>; #power-domain-cells = <0>; power-supply = <
®_pcie>; };arch/arm/boot/dts/imx6sx.dtsi +0
-0@@ -1203,10 +1215,11 @@ > compatible = "fsl,imx6sx-pxp", "fsl,imx6ull-pxp"; > reg = <0x02218000 0x4000>; > interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&clks IMX6SX_CLK_PXP_AXI>; > clock-names = "axi"; > + power-domains = <&pd_disp>; > status = "disabled"; > };Quoted 2 lines
Quoted 1 line
csi2: csi@221c000 {
reg = <
0x0221c0000x4000>;arch/arm/boot/dts/imx6sx.dtsi +0
-0@@ -1224,10 +1237,11 @@ > interrupts = <GIC_SPI 5 IRQ_TYPE_EDGE_RISING>; > clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>, > <&clks IMX6SX_CLK_LCDIF_APB>, > <&clks IMX6SX_CLK_DISPLAY_AXI>; > clock-names = "pix", "axi", "disp_axi"; > + power-domains = <&pd_disp>; > status = "disabled"; > };Quoted 2 lines
Quoted 1 line
lcdif2: lcdif@2224000 {
compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
arch/arm/boot/dts/imx6sx.dtsi +0
-0@@ -1235,19 +1249,21 @@ > interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>; > clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>, > <&clks IMX6SX_CLK_LCDIF_APB>, > <&clks IMX6SX_CLK_DISPLAY_AXI>; > clock-names = "pix", "axi", "disp_axi"; > + power-domains = <&pd_disp>; > status = "disabled"; > };Quoted 10 lines
Quoted 1 line
vadc: vadc@2228000 {
reg = <
0x022280000x4000>, <0x0222c0000x4000>; reg-names = "vadc-vafe", "vadc-vdec"; clocks = <&clksIMX6SX_CLK_VADC>, <&clksIMX6SX_CLK_CSI>; clock-names = "vadc", "csi";(quoted diff) +1
-0+ power-domains = <&pd_disp>;status = "disabled"; };
};Quoted 1 line
Quoted 1 line
adc1: adc@2280000 {
arch/arm/boot/dts/imx6sx.dtsi +0
-0@@ -1368,10 +1384,11 @@ > clocks = <&clks IMX6SX_CLK_PCIE_AXI>, > <&clks IMX6SX_CLK_LVDS1_OUT>, > <&clks IMX6SX_CLK_PCIE_REF_125M>, > <&clks IMX6SX_CLK_DISPLAY_AXI>; > clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_inbound_axi"; > - power-domains = <&pd_pci>; > + power-domains = <&pd_disp>, <&pd_pci>; > + power-domain-names = "pcie", "pcie_phy"; > status = "disabled"; > };Quoted 1 line
};
};
Shawn Guo
AppliedQuoted 5 lines · Leonard Crestez
This was implemented in the driver but not actually defined and referenced in dts. This makes it always on.
From reference manual in section "10.4.1.4.1 Power Distribution":
Quoted 8 lines
"Display domain - The DISPLAY domain contains GIS, CSI, PXP, LCDIF, PCIe, DCIC, and LDB. It is supplied by internal regulator."
The current
pd_pcieis actually only forPCIE_PHY, the PCIE ip block is actually inside the DISPLAY domain. Handle this by adding the pcie node in both power domains.Signed-off-by Leonard Crestez <[email protected]>
Applied, thanks.