mfd: add basic sun6i A31 PRCM support
Subsystems (8)
v4 cover mfd: add basic sun6i A31 PRCM support
Hello,
This patch series adds support for some functions provided by the PRCM (Power/Reset/Clock Management) unit:
- AR100, AHB0 and APB0 clocks
- APB0 reset controller
Best Regards,
Boris
Changes since v3:
- split clk drivers into 3 different drivers: ar100, apb0 and apb0_gates
- fix indentation
- add comments to the clk drivers
- select the MFD_SUN6I_PRCM when compiling for SUN6I arch
Changes since v2:
- use devm_ioremap_resource instead of devm_request_and_ioremap
- remove unnecessary header inclusions
- remove info trace when the probe succeed
- rename apb0_timer01 clk into apb0_timer
Changes since v1:
- fix prcm and prcm-clks DT documentation
- remove unneeded iounmap and kfree calls from sunxi_reset_remove function
- rework the AR100 clk implementation
Boris BREZILLON (7):
reset: sunxi: document sunxi's reset controllers bindings
reset: sunxi: allow MFD subdevices probe
mfd: add support for sun6i PRCM (Power/Reset/Clock Management) unit
mfd: sun6i-prcm: document DT bindings
clk: sunxi: add PRCM (Power/Reset/Clock Management) clks support
clk: sunxi: document PRCM clock compatible strings
ARM: sunxi: dt: add PRCM clk and reset controller subdevices
Documentation/devicetree/bindings/clock/sunxi.txt | 3 + .../devicetree/bindings/mfd/sun6i-prcm.txt | 59 ++++++ .../bindings/reset/allwinner,sunxi-clock-reset.txt | 21 ++ arch/arm/boot/dts/sun6i-a31.dtsi | 38 ++++ arch/arm/mach-sunxi/Kconfig | 1 + drivers/clk/sunxi/Makefile | 2 + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 99 +++++++++ drivers/clk/sunxi/clk-sun6i-apb0.c | 77 +++++++ drivers/clk/sunxi/clk-sun6i-ar100.c | 233 +++++++++++++++++++++ drivers/mfd/Kconfig | 8 + drivers/mfd/Makefile | 1 + drivers/mfd/sun6i-prcm.c | 134 ++++++++++++ drivers/reset/reset-sunxi.c | 21 +- 13 files changed, 694 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/sun6i-prcm.txt create mode 100644 Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt create mode 100644 drivers/clk/sunxi/clk-sun6i-apb0-gates.c create mode 100644 drivers/clk/sunxi/clk-sun6i-apb0.c create mode 100644 drivers/clk/sunxi/clk-sun6i-ar100.c create mode 100644 drivers/mfd/sun6i-prcm.c
Signature · 1 line
1.8.3.2
PATCH v4 1/7 reset: sunxi: document sunxi's reset controllers bindings
Add DT bindings documentation for sunxi's reset controllers.
--- .../bindings/reset/allwinner,sunxi-clock-reset.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt
Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt new file +21 -0
@@ -0,0 +1,21 @@ +Allwinner sunxi Peripheral Reset Controller +=========================================== + +Please also refer to reset.txt in this directory for common reset +controller binding usage. + +Required properties: +- compatible: Should be one of the following: + "allwinner,sun6i-a31-ahb1-reset" + "allwinner,sun6i-a31-clock-reset" +- reg: should be register base and length as documented in the + datasheet +- #reset-cells: 1, see below + +example: + +ahb1_rst: reset at 01c202c0 { + #reset-cells = <1>; + compatible = "allwinner,sun6i-a31-ahb1-reset"; + reg = <0x01c202c0 0xc>; +};
Signature · 1 line
1.8.3.2
Philipp Zabel
maintainerPATCH v4 1/7 reset: sunxi: document sunxi's reset controllers bindings
Am Mittwoch, den 14.05.2014, 14:38 +0200 schrieb Boris BREZILLON:
Quoted 4 lines
Add DT bindings documentation for sunxi's reset controllers.
Signed-off-by Boris BREZILLON <[email protected]>Acked-by Maxime Ripard <[email protected]>
Quoted 32 lines
--- .../bindings/reset/allwinner,sunxi-clock-reset.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txtDocumentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt new file +21
-0@@ -0,0 +1,21 @@ +Allwinner sunxi Peripheral Reset Controller +=========================================== + +Please also refer to reset.txt in this directory for common reset +controller binding usage. + +Required properties: +- compatible: Should be one of the following: + "allwinner,sun6i-a31-ahb1-reset" + "allwinner,sun6i-a31-clock-reset" +- reg: should be register base and length as documented in the + datasheet +- #reset-cells: 1, see below + +example: + +ahb1_rst: reset at 01c202c0 { + #reset-cells = <1>; + compatible = "allwinner,sun6i-a31-ahb1-reset"; + reg = <0x01c202c0 0xc>; +};
PATCH v4 2/7 reset: sunxi: allow MFD subdevices probe
In reply to Boris BREZILLONThe current implementation uses sunxi_reset_init function for both early init and platform device probe.
The sunxi_reset_init function uses DT to retrieve device resources, which will be an issue if reset controllers are registered from an MFD device that define resources from mfd_cell definition.
Moreover, we can make of devm functions when we're in the probe context.
--- drivers/reset/reset-sunxi.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/reset/reset-sunxi.c +18 -3
@@ -145,7 +145,24 @@ MODULE_DEVICE_TABLE(of, sunxi_reset_dt_ids);static int sunxi_reset_probe (struct platform_device *pdev) { -return sunxi_reset_init (pdev->dev.of_node); +struct sunxi_reset_data *data; +struct resource *res; + + data =devm_kzalloc (&pdev->dev,sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + data->membase =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (data->membase)) +return PTR_ERR (data->membase); + + data->rcdev.owner =THIS_MODULE ; + data->rcdev.nr_resets =resource_size (res) *32 ; + data->rcdev.ops = &sunxi_reset_ops; + data->rcdev.of_node = pdev->dev.of_node; + +return reset_controller_register (&data->rcdev); }static int sunxi_reset_remove (struct platform_device *pdev)
@@ -153,8 +170,6 @@ static int sunxi_reset_remove(struct platform_device *pdev)struct sunxi_reset_data *data =platform_get_drvdata (pdev);reset_controller_unregister (&data->rcdev); -iounmap (data->membase); -kfree (data);return 0 ; }
Signature · 1 line
1.8.3.2
Philipp Zabel
maintainerPATCH v4 2/7 reset: sunxi: allow MFD subdevices probe
Am Mittwoch, den 14.05.2014, 14:38 +0200 schrieb Boris BREZILLON:
Quoted 11 lines
The current implementation uses
sunxi_reset_initfunction for both early init and platform device probe.The
sunxi_reset_initfunction uses DT to retrieve device resources, which will be an issue if reset controllers are registered from an MFD device that define resources frommfd_celldefinition.Moreover, we can make of devm functions when we're in the probe context.
Signed-off-by Boris BREZILLON <[email protected]>Acked-by Maxime Ripard <[email protected]>
Quoted 43 lines
--- drivers/reset/reset-sunxi.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)drivers/reset/reset-sunxi.c +18
-3@@ -145,7 +145,24 @@ MODULE_DEVICE_TABLE(of, sunxi_reset_dt_ids);static int sunxi_reset_probe (struct platform_device *pdev) { -return sunxi_reset_init (pdev->dev.of_node); +struct sunxi_reset_data *data; +struct resource *res; + + data =devm_kzalloc (&pdev->dev,sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + data->membase =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (data->membase)) +return PTR_ERR (data->membase); + + data->rcdev.owner =THIS_MODULE ; + data->rcdev.nr_resets =resource_size (res) *32 ; + data->rcdev.ops = &sunxi_reset_ops; + data->rcdev.of_node = pdev->dev.of_node; + +return reset_controller_register (&data->rcdev); }static int sunxi_reset_remove (struct platform_device *pdev)@@ -153,8 +170,6 @@ static int sunxi_reset_remove(struct platform_device *pdev)struct sunxi_reset_data *data =platform_get_drvdata (pdev);reset_controller_unregister (&data->rcdev); -iounmap (data->membase); -kfree (data);return 0 ; }
PATCH v4 3/7 mfd: add support for sun6i PRCM (Power/Reset/Clock Management) unit
In reply to Boris BREZILLONThe PRCM (Power/Reset/Clock Management) block exposes several subdevices in different subsystems (clk, reset ...)
Add basic support for the PRCM unit with clk (AR100, AHB0, and APB0 clks) and reset controller subdevices.
Other subdevices might be added later (if needed).
--- drivers/mfd/Kconfig | 8 +++ drivers/mfd/Makefile | 1 + drivers/mfd/sun6i-prcm.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 drivers/mfd/sun6i-prcm.c
drivers/mfd/Kconfig +8 -0
@@ -731,6 +731,14 @@ config MFD_STA2X11 select MFD_CORE select REGMAP_MMIO +config MFD_SUN6I_PRCM + bool "Allwinner A31 PRCM controller" + depends on ARCH_SUNXI + select MFD_CORE + help + Support for the PRCM (Power/Reset/Clock Management) unit available + in A31 SoC. + config MFD_SYSCON bool "System Controller Register R/W Based on Regmap" select REGMAP_MMIO
drivers/mfd/Makefile +1 -0
@@ -29,6 +29,7 @@ obj-$(CONFIG_MFD_STA2X11) += sta2x11-mfd.o obj-$(CONFIG_MFD_STMPE) += stmpe.o obj-$(CONFIG_STMPE_I2C) += stmpe-i2c.o obj-$(CONFIG_STMPE_SPI) += stmpe-spi.o +obj-$(CONFIG_MFD_SUN6I_PRCM) += sun6i-prcm.o obj-$(CONFIG_MFD_TC3589X) += tc3589x.o obj-$(CONFIG_MFD_T7L66XB) += t7l66xb.o tmio_core.o obj-$(CONFIG_MFD_TC6387XB) += tc6387xb.o tmio_core.o
drivers/mfd/sun6i-prcm.c new file +134 -0
134 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH v4 4/7 mfd: sun6i-prcm: document DT bindings
In reply to Boris BREZILLONDocument DT bindings of the PRCM (Power/Reset/Clock Management) unit.
--- .../devicetree/bindings/mfd/sun6i-prcm.txt | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/sun6i-prcm.txt
Documentation/devicetree/bindings/mfd/sun6i-prcm.txt new file +59 -0
@@ -0,0 +1,59 @@ +* Allwinner PRCM (Power/Reset/Clock Management) Multi-Functional Device + +PRCM is an MFD device exposing several Power Management related devices +(like clks and reset controllers). + +Required properties: + - compatible: "allwinner,sun6i-a31-prcm" + - reg: The PRCM registers range + +The prcm node may contain several subdevices definitions: + - see Documentation/devicetree/clk/sunxi.txt for clock devices + - see Documentation/devicetree/reset/allwinner,sunxi-clock-reset.txt for reset + controller devices + + +Example: + + prcm: prcm at 01f01400 { + compatible = "allwinner,sun6i-a31-prcm"; + reg = <0x01f01400 0x200>; + + /* Put subdevices here */ + ar100: ar100_clk { + compatible = "allwinner,sun6i-a31-ar100-clk"; + #clock-cells = <0>; + clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; + }; + + ahb0: ahb0_clk { + compatible = "fixed-factor-clock"; + #clock-cells = <0>; + clock-div = <1>; + clock-mult = <1>; + clocks = <&ar100_div>; + clock-output-names = "ahb0"; + }; + + apb0: apb0_clk { + compatible = "allwinner,sun6i-a31-apb0-clk"; + #clock-cells = <0>; + clocks = <&ahb0>; + clock-output-names = "apb0"; + }; + + apb0_gates: apb0_gates_clk { + compatible = "allwinner,sun6i-a31-apb0-gates-clk"; + #clock-cells = <1>; + clocks = <&apb0>; + clock-output-names = "apb0_pio", "apb0_ir", + "apb0_timer01", "apb0_p2wi", + "apb0_uart", "apb0_1wire", + "apb0_i2c"; + }; + + apb0_rst: apb0_rst { + compatible = "allwinner,sun6i-a31-clock-reset"; + #reset-cells = <1>; + }; + };
Signature · 1 line
1.8.3.2
PATCH v4 5/7 clk: sunxi: add PRCM (Power/Reset/Clock Management) clks support
In reply to Boris BREZILLONThe PRCM (Power/Reset/Clock Management) unit provides several clock devices:
- AR100 clk: used to clock the Power Management co-processor
- AHB0 clk: used to clock the AHB0 bus
- APB0 clk and gates: used to clk peripherals connected to the APB0 bus
Add support for these clks in a separate driver so that they can be probed as platform devices instead of registered during early init. This is needed to be able to probe PRCM MFD subdevices.
--- arch/arm/mach-sunxi/Kconfig | 1 + drivers/clk/sunxi/Makefile | 2 + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 99 +++++++++++++ drivers/clk/sunxi/clk-sun6i-apb0.c | 77 ++++++++++ drivers/clk/sunxi/clk-sun6i-ar100.c | 233 +++++++++++++++++++++++++++++++ 5 files changed, 412 insertions(+) create mode 100644 drivers/clk/sunxi/clk-sun6i-apb0-gates.c create mode 100644 drivers/clk/sunxi/clk-sun6i-apb0.c create mode 100644 drivers/clk/sunxi/clk-sun6i-ar100.c
arch/arm/mach-sunxi/Kconfig +1 -0
@@ -23,6 +23,7 @@ config MACH_SUN6I default ARCH_SUNXI select ARCH_HAS_RESET_CONTROLLER select ARM_GIC + select MFD_SUN6I_PRCM select RESET_CONTROLLER select SUN5I_HSTIMER
drivers/clk/sunxi/Makefile +2 -0
@@ -3,3 +3,5 @@ # obj-y += clk-sunxi.o clk-factors.o + +obj-$(CONFIG_MFD_SUN6I_PRCM) += clk-sun6i-ar100.o clk-sun6i-apb0.o clk-sun6i-apb0-gates.o
drivers/clk/sunxi/clk-sun6i-apb0-gates.c new file +99 -0
99 lines not on this page · raw message
drivers/clk/sunxi/clk-sun6i-apb0.c new file +77 -0
77 lines not on this page · raw message
drivers/clk/sunxi/clk-sun6i-ar100.c new file +233 -0
233 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH v4 6/7 clk: sunxi: document PRCM clock compatible strings
In reply to Boris BREZILLONDocument new compatible strings for clock provided by the PRCM (Power/Reset/Clock Management) unit.
--- Documentation/devicetree/bindings/clock/sunxi.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/clock/sunxi.txt +3 -0
@@ -20,12 +20,15 @@ Required properties: "allwinner,sun5i-a13-ahb-gates-clk" - for the AHB gates on A13 "allwinner,sun5i-a10s-ahb-gates-clk" - for the AHB gates on A10s "allwinner,sun7i-a20-ahb-gates-clk" - for the AHB gates on A20 + "allwinner,sun6i-a31-ar100-clk" - for the AR100 on A31 "allwinner,sun6i-a31-ahb1-mux-clk" - for the AHB1 multiplexer on A31 "allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31 "allwinner,sun4i-a10-apb0-clk" - for the APB0 clock + "allwinner,sun6i-a31-apb0-clk" - for the APB0 clock on A31 "allwinner,sun4i-a10-apb0-gates-clk" - for the APB0 gates on A10 "allwinner,sun5i-a13-apb0-gates-clk" - for the APB0 gates on A13 "allwinner,sun5i-a10s-apb0-gates-clk" - for the APB0 gates on A10s + "allwinner,sun6i-a31-apb0-gates-clk" - for the APB0 gates on A31 "allwinner,sun7i-a20-apb0-gates-clk" - for the APB0 gates on A20 "allwinner,sun4i-a10-apb1-clk" - for the APB1 clock "allwinner,sun4i-a10-apb1-mux-clk" - for the APB1 clock muxing
Signature · 1 line
1.8.3.2
PATCH v4 7/7 ARM: sunxi: dt: add PRCM clk and reset controller subdevices
In reply to Boris BREZILLONAdd DT definitions for PRCM (Power/Reset/Clock Management) clock and reset controller subdevices.
--- arch/arm/boot/dts/sun6i-a31.dtsi | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
arch/arm/boot/dts/sun6i-a31.dtsi +38 -0
@@ -602,6 +602,44 @@ prcm at 01f01400 { compatible = "allwinner,sun6i-a31-prcm"; reg = <0x01f01400 0x200>; + + ar100: ar100_clk { + compatible = "allwinner,sun6i-a31-ar100-clk"; + #clock-cells = <0>; + clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>; + clock-output-names = "ar100"; + }; + + ahb0: ahb0_clk { + compatible = "fixed-factor-clock"; + #clock-cells = <0>; + clock-div = <1>; + clock-mult = <1>; + clocks = <&ar100>; + clock-output-names = "ahb0"; + }; + + apb0: apb0_clk { + compatible = "allwinner,sun6i-a31-apb0-clk"; + #clock-cells = <0>; + clocks = <&ahb0>; + clock-output-names = "apb0"; + }; + + apb0_gates: apb0_gates_clk { + compatible = "allwinner,sun6i-a31-apb0-gates-clk"; + #clock-cells = <1>; + clocks = <&apb0>; + clock-output-names = "apb0_pio", "apb0_ir", + "apb0_timer", "apb0_p2wi", + "apb0_uart", "apb0_1wire", + "apb0_i2c"; + }; + + apb0_rst: apb0_rst { + compatible = "allwinner,sun6i-a31-clock-reset"; + #reset-cells = <1>; + }; }; cpucfg at 01f01c00 {
Signature · 1 line
1.8.3.2
v4 cover mfd: add basic sun6i A31 PRCM support
In reply to Boris BREZILLONHi,
Quoted 6 lines · Boris BREZILLON
Hello,
This patch series adds support for some functions provided by the PRCM (Power/Reset/Clock Management) unit:
- AR100, AHB0 and APB0 clocks
- APB0 reset controller
Merged patches 1 and 2 with Philipp's Acked-by in sunxi/drivers-for-3.16, and patch 7 in sunxi/dt-for-3.16.
Thanks!
Maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140515/19d790ce/attachment.sig>