Skip to contentSkip to conversation

PM / AVS: rockchip-io: depend on CONFIG_POWER_AVS

PATCH RESEND In review Heiko Stübner 3 participants 4 messages Aug 4, 2015 – Aug 8, 2015

Subsystems (2)
Device tree bindings Arm Rockchip
lore
Share & tools
lore

Heiko Stübner

author maintainer
#0 lore raw

PATCH RESEND 1/2 PM / AVS: rockchip-io: depend on CONFIG_POWER_AVS

The rockchip io-domain driver currently only depends on ARCH_ROCKCHIP itself. This makes it possible to select the power-domain driver, but not the POWER_AVS class and results in the iodomain-driver not getting build in this case.

So add the additional dependency, which also results in the driver config option now being placed nicely into the AVS submenu.

Fixes 662a958638bd ("PM / AVS: rockchip-io: add driver handling Rockchip io domains")
Signed-off-by Heiko Stuebner <[email protected]>
Acked-by Kevin Hilman <[email protected]>

---
Kevin wrote when he Acked the patch: "Rafael, feel free to queue this up as a fix. I don't have any other drivers/power/avs stuff queued up."

Although I don't know if this is the case anymore.

 drivers/power/avs/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/avs/Kconfig +1 -1
index 7f3d389..a67eeac 100644
@@ -13,7 +13,7 @@ menuconfig POWER_AVS
 
 config ROCKCHIP_IODOMAIN
         tristate "Rockchip IO domain support"
-        depends on ARCH_ROCKCHIP && OF
+        depends on POWER_AVS && ARCH_ROCKCHIP && OF
         help
           Say y here to enable support io domains on Rockchip SoCs. It is
           necessary for the io domain setting of the SoC to match the
Signature · 1 line
2.1.4
author maintainer
#1 lore raw

PATCH 2/2 PM / AVS: rockchip-io: add io selectors and supplies for rk3368

This adds the necessary data for handling io voltage domains on the rk3368. As interesting tidbit, the rk3368 contains two separate iodomain areas. One in the regular General Register Files (GRF) and one in PMUGRF in the pmu power domain.

Signed-off-by Heiko Stuebner <[email protected]>
---
 .../bindings/power/rockchip-io-domain.txt          | 14 +++++
 drivers/power/avs/rockchip-io-domain.c             | 59 ++++++++++++++++++++++
 2 files changed, 73 insertions(+)
Documentation/devicetree/bindings/power/rockchip-io-domain.txt +14 -0
index 8b70db1..b8627e7 100644
@@ -33,6 +33,8 @@ Required properties:
 - compatible: should be one of:
   - "rockchip,rk3188-io-voltage-domain" for rk3188
   - "rockchip,rk3288-io-voltage-domain" for rk3288
+  - "rockchip,rk3368-io-voltage-domain" for rk3368
+  - "rockchip,rk3368-pmu-io-voltage-domain" for rk3368 pmu-domains
 - rockchip,grf: phandle to the syscon managing the "general register files"
 
 

@@ -64,6 +66,18 @@ Possible supplies for rk3288:
 - sdcard-supply: The supply connected to SDMMC0_VDD.
 - wifi-supply:   The supply connected to APIO3_VDD.  Also known as SDIO0.
 
+Possible supplies for rk3368:
+- audio-supply:  The supply connected to APIO3_VDD.
+- dvp-supply:    The supply connected to DVPIO_VDD.
+- flash0-supply: The supply connected to FLASH0_VDD.  Typically for eMMC
+- gpio30-supply: The supply connected to APIO1_VDD.
+- gpio1830       The supply connected to APIO4_VDD.
+- sdcard-supply: The supply connected to SDMMC0_VDD.
+- wifi-supply:   The supply connected to APIO2_VDD.  Also known as SDIO0.
+
+Possible supplies for rk3368 pmu-domains:
+- pmu-supply:    The supply connected to PMUIO_VDD.
+- vop-supply:    The supply connected to LCDC_VDD.
 
 Example:
drivers/power/avs/rockchip-io-domain.c +59 -0

83 lines not on this page · raw message

Signature · 1 line
2.1.4
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] PM / AVS: rockchip-io: add io selectors and supplies for rk3368

Quoted 6 lines · Heiko Stübner

This adds the necessary data for handling io voltage domains on the rk3368. As interesting tidbit, the rk3368 contains two separate iodomain areas. One in the regular General Register Files (GRF) and one in PMUGRF in the pmu power domain.

Signed-off-by Heiko Stuebner <[email protected]>
Acked-by Kevin Hilman <[email protected]>

Rafael, feel free to take this series directly, or let me know if you want a pull request. I don't have anything other AVS stuff queued up for v4.3.

Kevin

#3 lore raw

Re: [PATCH 2/2] PM / AVS: rockchip-io: add io selectors and supplies for rk3368

Quoted 7 lines · Kevin Hilman
Quoted 5 lines · Heiko Stübner

This adds the necessary data for handling io voltage domains on the rk3368. As interesting tidbit, the rk3368 contains two separate iodomain areas. One in the regular General Register Files (GRF) and one in PMUGRF in the pmu power domain.

Quoted 7 lines
Quoted 1 line
Signed-off-by Heiko Stuebner <[email protected]>
Acked-by Kevin Hilman <[email protected]>

Rafael, feel free to take this series directly, or let me know if you want a pull request. I don't have anything other AVS stuff queued up for v4.3.

I'll take it directly, thanks!

Rafael