ARM: Add Rockchip RV1126 support
Subsystems (6)
v3 cover ARM: Add Rockchip RV1126 support
RV1126 is a high-performance vision processor SoC for IPC/CVR, especially for AI related application.
It is based on quad-core ARM Cortex-A7 32-bit core which integrates NEON and FPU. There is a 32KB I-cache and 32KB D-cache for each core and 512KB unified L2 cache. It has build-in NPU supports INT8/INT16 hybrid operation and computing power is up to 2.0TOPs.
This patch series add basic core support for Rockchip RV1126 and v2 for the series can be found at [2].
Tested in Edgeble AI Edge Compute Module 0.
Anyone interested, please have a look on this repo [1]
[2] https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/
[1] https://github.com/edgeble/linux-next/commits/ecm0-v4
Any inputs?
Jagan.
Elaine Zhang (1):
clk: rockchip: Add MUXTBL variant
Jagan Teki (17):
dt-bindings: power: Add power-domain header for RV1126
dt-bindings: power: rockchip: Document RV1126 power-controller
soc: rockchip: power-domain: Add RV1126 power domains
dt-bindings: power: rockchip: Document RV1126 PMU IO domains
dt-bindings: pinctrl: rockchip: Document RV1126 pinctrl
pinctrl: rockchip: Add RV1126 pinctrl support
clk: rockchip: Add dt-binding header for RV1126
dt-bindings: clock: rockchip: Document RV1126 CRU
Add clock controller support for RV1126 SoC.
dt-bindings: soc: rockchip: Document RV1126 grf
dt-bindings: soc: rockchip: Document RV1126 pmugrf
ARM: dts: rockchip: Add Rockchip RV1126 pinctrl
ARM: dts: rockchip: Add Rockchip RV1126 SoC
dt-bindings: vendor-prefixes: Add Edgeble AI Technologies Pvt. Ltd.
dt-bindings: arm: rockchip: Add Edgeble AI Edge Compute Module 0 Carrier
ARM: dts: rockchip: rv1126: Add Edgeble AI Edge Compute Module 0
ARM: dts: rockchip: rv1126: Add Edgeble AI Edge Compute Module 0 Carrier
Jianqun Xu (1):
soc: rockchip: io-domain: Add RV1126 IO domains
.../devicetree/bindings/arm/rockchip.yaml | 6 + .../bindings/clock/rockchip,rv1126-cru.yaml | 62 + .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 + .../power/rockchip,power-controller.yaml | 2 + .../bindings/power/rockchip-io-domain.yaml | 30 + .../devicetree/bindings/soc/rockchip/grf.yaml | 2 + .../devicetree/bindings/vendor-prefixes.yaml | 2 + MAINTAINERS | 2 +- arch/arm/boot/dts/Makefile | 1 + .../boot/dts/rv1126-edgeble-ecm0-carrier.dts | 38 + .../rv1126-edgeble-edge-compute-module-0.dtsi | 353 ++++++ arch/arm/boot/dts/rv1126-pinctrl.dtsi | 302 +++++ arch/arm/boot/dts/rv1126.dtsi | 500 ++++++++ drivers/clk/rockchip/Kconfig | 7 + drivers/clk/rockchip/Makefile | 1 + drivers/clk/rockchip/clk-rv1126.c | 1107 +++++++++++++++++ drivers/clk/rockchip/clk.c | 27 +- drivers/clk/rockchip/clk.h | 36 + drivers/pinctrl/pinctrl-rockchip.c | 333 ++++- drivers/pinctrl/pinctrl-rockchip.h | 1 + drivers/soc/rockchip/io-domain.c | 20 + drivers/soc/rockchip/pm_domains.c | 29 + .../dt-bindings/clock/rockchip,rv1126-cru.h | 632 ++++++++++ .../dt-bindings/power/rockchip,rv1126-power.h | 35 + 24 files changed, 3515 insertions(+), 14 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml create mode 100644 arch/arm/boot/dts/rv1126-edgeble-ecm0-carrier.dts create mode 100644 arch/arm/boot/dts/rv1126-edgeble-edge-compute-module-0.dtsi create mode 100644 arch/arm/boot/dts/rv1126-pinctrl.dtsi create mode 100644 arch/arm/boot/dts/rv1126.dtsi create mode 100644 drivers/clk/rockchip/clk-rv1126.c create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h create mode 100644 include/dt-bindings/power/rockchip,rv1126-power.h
Signature · 1 line
2.25.1
PATCH v3 1/19 dt-bindings: power: Add power-domain header for RV1126
Add power-domain header for RV1126 SoC from description in TRM.
---
Changes for v3:
- rename the header
Changes for v2:
- add blank line
.../dt-bindings/power/rockchip,rv1126-power.h | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 include/dt-bindings/power/rockchip,rv1126-power.h
include/dt-bindings/power/rockchip,rv1126-power.h new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __DT_BINDINGS_POWER_RV1126_POWER_H__ +#define __DT_BINDINGS_POWER_RV1126_POWER_H__ + +/* VD_CORE */ +#define RV1126_PD_CPU_0 0 +#define RV1126_PD_CPU_1 1 +#define RV1126_PD_CPU_2 2 +#define RV1126_PD_CPU_3 3 +#define RV1126_PD_CORE_ALIVE 4 + +/* VD_PMU */ +#define RV1126_PD_PMU 5 +#define RV1126_PD_PMU_ALIVE 6 + +/* VD_NPU */ +#define RV1126_PD_NPU 7 + +/* VD_VEPU */ +#define RV1126_PD_VEPU 8 + +/* VD_LOGIC */ +#define RV1126_PD_VI 9 +#define RV1126_PD_VO 10 +#define RV1126_PD_ISPP 11 +#define RV1126_PD_VDPU 12 +#define RV1126_PD_CRYPTO 13 +#define RV1126_PD_DDR 14 +#define RV1126_PD_NVM 15 +#define RV1126_PD_SDIO 16 +#define RV1126_PD_USB 17 +#define RV1126_PD_LOGIC_ALIVE 18 + +#endif
Signature · 1 line
2.25.1
Re: [PATCH v3 01/19] dt-bindings: power: Add power-domain header for RV1126
Quoted 4 lines · Jagan Teki
Add power-domain header for RV1126 SoC from description in TRM.
Signed-off-by Elaine Zhang <[email protected]>Signed-off-by Jagan Teki <[email protected]>
Best regards,
Krzysztof
PATCH v3 2/19 dt-bindings: power: rockchip: Document RV1126 power-controller
In reply to Jagan TekiDocument dt-bindings for RV1126 power-controller.
---
Changes for v3:
- update the header file
Changes for v2:
- collect Krzysztof ack
.../devicetree/bindings/power/rockchip,power-controller.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/power/rockchip,power-controller.yaml +2 -0
@@ -41,6 +41,7 @@ properties: - rockchip,rk3368-power-controller - rockchip,rk3399-power-controller - rockchip,rk3568-power-controller + - rockchip,rv1126-power-controller "#power-domain-cells": const: 1
@@ -119,6 +120,7 @@ $defs: "include/dt-bindings/power/rk3368-power.h" "include/dt-bindings/power/rk3399-power.h" "include/dt-bindings/power/rk3568-power.h" + "include/dt-bindings/power/rockchip,rv1126-power.h" clocks: minItems: 1
Signature · 1 line
2.25.1
PATCH v3 3/19 soc: rockchip: power-domain: Add RV1126 power domains
In reply to Jagan TekiAdd power domains support for RV1126 SoC.
Cypto, VO and NPU domains will add it future patches.
---
Changes for v3:
- update the header
Changes for v2:
- none
drivers/soc/rockchip/pm_domains.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/soc/rockchip/pm_domains.c +29 -0
@@ -19,6 +19,7 @@#include <linux/mfd/syscon.h> #include <soc/rockchip/pm_domains.h> #include <dt-bindings/power/px30-power.h> +#include <dt-bindings/power/rockchip,rv1126-power.h> #include <dt-bindings/power/rk3036-power.h> #include <dt-bindings/power/rk3066-power.h> #include <dt-bindings/power/rk3128-power.h>
@@ -126,6 +127,9 @@ struct rockchip_pmu {#define DOMAIN_PX30 (name, pwr, status, req, wakeup) \ DOMAIN_M(name, pwr, status, req, (req) << 16, req, wakeup) +#define DOMAIN_RV1126 (name, pwr, req, idle, wakeup) \ + DOMAIN_M(name, pwr, pwr, req, idle, idle, wakeup) +#define DOMAIN_RK3288 (name, pwr, status, req, wakeup) \ DOMAIN(name, pwr, status, req, req, (req) << 16, wakeup)
@@ -855,6 +859,16 @@ static const struct rockchip_domain_info px30_pm_domains[] = { [PX30_PD_GPU] = DOMAIN_PX30("gpu", BIT(15), BIT(15), BIT(2), false), }; +static const struct rockchip_domain_info rv1126_pm_domains[] = { + [RV1126_PD_VEPU ] =DOMAIN_RV1126 ("vepu" ,BIT (2 ),BIT (9 ),BIT (9 ), false), + [RV1126_PD_VI ] =DOMAIN_RV1126 ("vi" ,BIT (4 ),BIT (6 ),BIT (6 ), false), + [RV1126_PD_ISPP ] =DOMAIN_RV1126 ("ispp" ,BIT (1 ),BIT (8 ),BIT (8 ), false), + [RV1126_PD_VDPU ] =DOMAIN_RV1126 ("vdpu" ,BIT (3 ),BIT (10 ),BIT (10 ), false), + [RV1126_PD_NVM ] =DOMAIN_RV1126 ("nvm" ,BIT (7 ),BIT (11 ),BIT (11 ), false), + [RV1126_PD_SDIO ] =DOMAIN_RV1126 ("sdio" ,BIT (8 ),BIT (13 ),BIT (13 ), false), + [RV1126_PD_USB ] =DOMAIN_RV1126 ("usb" ,BIT (9 ),BIT (15 ),BIT (15 ), false), +}; +static const struct rockchip_domain_info rk3036_pm_domains[] = { [RK3036_PD_MSCH ] =DOMAIN_RK3036 ("msch" ,BIT (14 ),BIT (23 ),BIT (30 ), true), [RK3036_PD_CORE ] =DOMAIN_RK3036 ("core" ,BIT (13 ),BIT (17 ),BIT (24 ), false),
@@ -1128,6 +1142,17 @@ static const struct rockchip_pmu_info rk3568_pmu = { .domain_info = rk3568_pm_domains, }; +static const struct rockchip_pmu_info rv1126_pmu = { + .pwr_offset =0x110 , + .status_offset =0x108 , + .req_offset =0xc0 , + .idle_offset =0xd8 , + .ack_offset =0xd0 , + + .num_domains =ARRAY_SIZE (rv1126_pm_domains), + .domain_info = rv1126_pm_domains, +}; +static const struct of_device_id rockchip_pm_domain_dt_match[] = { { .compatible ="rockchip,px30-power-controller" ,
@@ -1177,6 +1202,10 @@ static const struct of_device_id rockchip_pm_domain_dt_match[] = { .compatible = "rockchip,rk3568-power-controller", .data = (void *)&rk3568_pmu, }, + { + .compatible = "rockchip,rv1126-power-controller", + .data = (void *)&rv1126_pmu, + }, { /* sentinel */ }, };
Signature · 1 line
2.25.1
PATCH v3 4/19 dt-bindings: power: rockchip: Document RV1126 PMU IO domains
In reply to Jagan TekiDocument dt-bindings for RV1126 PMU IO domains.
---
Changes for v3:
- none
Changes for v2:
- collect Krzysztof review-tag
.../bindings/power/rockchip-io-domain.yaml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+)
Documentation/devicetree/bindings/power/rockchip-io-domain.yaml +30 -0
@@ -58,6 +58,7 @@ properties: - rockchip,rk3568-pmu-io-voltage-domain - rockchip,rv1108-io-voltage-domain - rockchip,rv1108-pmu-io-voltage-domain + - rockchip,rv1126-pmu-io-voltage-domain required: - compatible
@@ -78,6 +79,7 @@ allOf: - $ref: "#/$defs/rk3568-pmu" - $ref: "#/$defs/rv1108" - $ref: "#/$defs/rv1108-pmu" + - $ref: "#/$defs/rv1126-pmu" $defs: px30:
@@ -344,6 +346,34 @@ $defs: pmu-supply: description: The supply connected to PMUIO_VDD. + rv1126-pmu: + if: + properties: + compatible: + contains: + const: rockchip,rv1126-pmu-io-voltage-domain + + then: + properties: + vccio1-supply: + description: The supply connected to VCCIO1. + vccio2-supply: + description: The supply connected to VCCIO2. + vccio3-supply: + description: The supply connected to VCCIO3. + vccio4-supply: + description: The supply connected to VCCIO4. + vccio5-supply: + description: The supply connected to VCCIO5. + vccio6-supply: + description: The supply connected to VCCIO6. + vccio7-supply: + description: The supply connected to VCCIO7. + pmuio0-supply: + description: The supply connected to PMUIO0. + pmuio1-supply: + description: The supply connected to PMUIO1. + examples: - | io-domains {
Signature · 1 line
2.25.1
PATCH v3 5/19 soc: rockchip: io-domain: Add RV1126 IO domains
In reply to Jagan TekiFrom: Jianqun Xu <[email protected]>
Add IO domains support for RV1126 SoC.
---
Changes for v3, v2:
- none
drivers/soc/rockchip/io-domain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/soc/rockchip/io-domain.c +20 -0
@@ -491,6 +491,22 @@ static const struct rockchip_iodomain_soc_data soc_data_rv1108_pmu = { }, }; +static const struct rockchip_iodomain_soc_data soc_data_rv1126_pmu = { + .grf_offset =0x140 , + .supply_names = { +NULL , +"vccio1" , +"vccio2" , +"vccio3" , +"vccio4" , +"vccio5" , +"vccio6" , +"vccio7" , +"pmuio0" , +"pmuio1" , + }, +}; +static const struct of_device_id rockchip_iodomain_match[] = { { .compatible ="rockchip,px30-io-voltage-domain" ,
@@ -544,6 +560,10 @@ static const struct of_device_id rockchip_iodomain_match[] = { .compatible = "rockchip,rv1108-pmu-io-voltage-domain", .data = &soc_data_rv1108_pmu }, + { + .compatible = "rockchip,rv1126-pmu-io-voltage-domain", + .data = &soc_data_rv1126_pmu + }, { /* sentinel */ }, };MODULE_DEVICE_TABLE (of, rockchip_iodomain_match);
Signature · 1 line
2.25.1
PATCH v3 6/19 dt-bindings: pinctrl: rockchip: Document RV1126 pinctrl
In reply to Jagan TekiDocument dt-bindings for RV1126 SoC pinctrl support.
---
Changes for v3:
- none
Changes for v2:
- collect Krzysztof ack
Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.yaml +1 -0
@@ -47,6 +47,7 @@ properties: - rockchip,rk3568-pinctrl - rockchip,rk3588-pinctrl - rockchip,rv1108-pinctrl + - rockchip,rv1126-pinctrl rockchip,grf: $ref: "/schemas/types.yaml#/definitions/phandle"
Signature · 1 line
2.25.1
Re: [PATCH v3 06/19] dt-bindings: pinctrl: rockchip: Document RV1126 pinctrl
Quoted 9 lines · Jagan Teki
Document dt-bindings for RV1126 SoC pinctrl support.
Cc Linus Walleij <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
Changes for v3:
- none
This patch applied to the pinctrl tree for v6.1.
Yours,
Linus Walleij
PATCH v3 7/19 pinctrl: rockchip: Add RV1126 pinctrl support
In reply to Jagan TekiRV1126 has five GPIOs groups - GPIO0 in PD_MMU and GPIO1-4 in PD_BUS.
In GPIO0, up to Lower C group GPIO0_C[3:0] is part of PMU but rest of the groups from there are part of GRF.
Added pinctrl support for RV1126 and the pull, drv and schmitt calculations are inferred from [1] authored by Jianqun Xu.
[1] https://github.com/rockchip-linux/kernel/blob/develop-4.19/drivers/pinctrl/pinctrl-rockchip.c
---
Changes for v3, v2:
- none
drivers/pinctrl/pinctrl-rockchip.c | 333 ++++++++++++++++++++++++++++- drivers/pinctrl/pinctrl-rockchip.h | 1 + 2 files changed, 327 insertions(+), 7 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +326 -7
@@ -57,6 +57,7 @@#define IOMUX_UNROUTED BIT(3)#define IOMUX_WIDTH_3BIT BIT(4)#define IOMUX_WIDTH_2BIT BIT(5) +#define IOMUX_L_SOURCE_PMU BIT(6)#define PIN_BANK (id, pins, label) \ { \
@@ -147,6 +148,21 @@ .pull_type[3] = pull3, \ } +#define PIN_BANK_IOMUX_FLAGS_OFFSET (id, pins, label, iom0, iom1, iom2, \ + iom3, offset0, offset1, offset2, \ + offset3) \ + { \ + .bank_num = id, \ + .nr_pins = pins, \ + .name = label, \ + .iomux = { \ + { .type = iom0, .offset = offset0 }, \ + { .type = iom1, .offset = offset1 }, \ + { .type = iom2, .offset = offset2 }, \ + { .type = iom3, .offset = offset3 }, \ + }, \ + } + #define PIN_BANK_IOMUX_DRV_FLAGS_OFFSET(id, pins, label, iom0, iom1, \ iom2, iom3, drv0, drv1, drv2, \ drv3, offset0, offset1, \
@@ -443,6 +459,37 @@ static struct rockchip_mux_recalced_data rv1108_mux_recalced_data[] = { }, }; +static struct rockchip_mux_recalced_data rv1126_mux_recalced_data[] = { + { + .num =0 , + .pin =20 , + .reg =0x10000 , + .bit =0 , + .mask =0xf + }, + { + .num =0 , + .pin =21 , + .reg =0x10000 , + .bit =4 , + .mask =0xf + }, + { + .num =0 , + .pin =22 , + .reg =0x10000 , + .bit =8 , + .mask =0xf + }, + { + .num =0 , + .pin =23 , + .reg =0x10000 , + .bit =12 , + .mask =0xf + }, +}; +static struct rockchip_mux_recalced_data rk3128_mux_recalced_data[] = { { .num =2 ,
@@ -642,6 +689,103 @@ static struct rockchip_mux_route_data px30_mux_route_data[] = { RK_MUXROUTE_SAME(1, RK_PB7, 2, 0x184, BIT(16 + 9) | BIT(9)), /* uart3-rxm1 */ }; +static struct rockchip_mux_route_data rv1126_mux_route_data[] = { +RK_MUXROUTE_GRF (3 ,RK_PD2 ,1 ,0x10260 ,WRITE_MASK_VAL (0 ,0 ,0 )),/* I2S0_MCLK_M0 */ +RK_MUXROUTE_GRF (3 ,RK_PB0 ,3 ,0x10260 ,WRITE_MASK_VAL (0 ,0 ,1 )),/* I2S0_MCLK_M1 */ + +RK_MUXROUTE_GRF (0 ,RK_PD4 ,4 ,0x10260 ,WRITE_MASK_VAL (3 ,2 ,0 )),/* I2S1_MCLK_M0 */ +RK_MUXROUTE_GRF (1 ,RK_PD5 ,2 ,0x10260 ,WRITE_MASK_VAL (3 ,2 ,1 )),/* I2S1_MCLK_M1 */ +RK_MUXROUTE_GRF (2 ,RK_PC7 ,6 ,0x10260 ,WRITE_MASK_VAL (3 ,2 ,2 )),/* I2S1_MCLK_M2 */ + +RK_MUXROUTE_GRF (1 ,RK_PD0 ,1 ,0x10260 ,WRITE_MASK_VAL (4 ,4 ,0 )),/* I2S2_MCLK_M0 */ +RK_MUXROUTE_GRF (2 ,RK_PB3 ,2 ,0x10260 ,WRITE_MASK_VAL (4 ,4 ,1 )),/* I2S2_MCLK_M1 */ + +RK_MUXROUTE_GRF (3 ,RK_PD4 ,2 ,0x10260 ,WRITE_MASK_VAL (12 ,12 ,0 )),/* PDM_CLK0_M0 */ +RK_MUXROUTE_GRF (3 ,RK_PC0 ,3 ,0x10260 ,WRITE_MASK_VAL (12 ,12 ,1 )),/* PDM_CLK0_M1 */ + +RK_MUXROUTE_GRF (3 ,RK_PC6 ,1 ,0x10264 ,WRITE_MASK_VAL (0 ,0 ,0 )),/* CIF_CLKOUT_M0 */ +RK_MUXROUTE_GRF (2 ,RK_PD1 ,3 ,0x10264 ,WRITE_MASK_VAL (0 ,0 ,1 )),/* CIF_CLKOUT_M1 */ + +RK_MUXROUTE_GRF (3 ,RK_PA4 ,5 ,0x10264 ,WRITE_MASK_VAL (5 ,4 ,0 )),/* I2C3_SCL_M0 */ +RK_MUXROUTE_GRF (2 ,RK_PD4 ,7 ,0x10264 ,WRITE_MASK_VAL (5 ,4 ,1 )),/* I2C3_SCL_M1 */ +RK_MUXROUTE_GRF (1 ,RK_PD6 ,3 ,0x10264 ,WRITE_MASK_VAL (5 ,4 ,2 )),/* I2C3_SCL_M2 */ + +RK_MUXROUTE_GRF (3 ,RK_PA0 ,7 ,0x10264 ,WRITE_MASK_VAL (6 ,6 ,0 )),/* I2C4_SCL_M0 */ +RK_MUXROUTE_GRF (4 ,RK_PA0 ,4 ,0x10264 ,WRITE_MASK_VAL (6 ,6 ,1 )),/* I2C4_SCL_M1 */ + +RK_MUXROUTE_GRF (2 ,RK_PA5 ,7 ,0x10264 ,WRITE_MASK_VAL (9 ,8 ,0 )),/* I2C5_SCL_M0 */ +RK_MUXROUTE_GRF (3 ,RK_PB0 ,5 ,0x10264 ,WRITE_MASK_VAL (9 ,8 ,1 )),/* I2C5_SCL_M1 */ +RK_MUXROUTE_GRF (1 ,RK_PD0 ,4 ,0x10264 ,WRITE_MASK_VAL (9 ,8 ,2 )),/* I2C5_SCL_M2 */ + +RK_MUXROUTE_GRF (3 ,RK_PC0 ,5 ,0x10264 ,WRITE_MASK_VAL (11 ,10 ,0 )),/* SPI1_CLK_M0 */ +RK_MUXROUTE_GRF (1 ,RK_PC6 ,3 ,0x10264 ,WRITE_MASK_VAL (11 ,10 ,1 )),/* SPI1_CLK_M1 */ +RK_MUXROUTE_GRF (2 ,RK_PD5 ,6 ,0x10264 ,WRITE_MASK_VAL (11 ,10 ,2 )),/* SPI1_CLK_M2 */ + +RK_MUXROUTE_GRF (3 ,RK_PC0 ,2 ,0x10264 ,WRITE_MASK_VAL (12 ,12 ,0 )),/* RGMII_CLK_M0 */ +RK_MUXROUTE_GRF (2 ,RK_PB7 ,2 ,0x10264 ,WRITE_MASK_VAL (12 ,12 ,1 )),/* RGMII_CLK_M1 */ + +RK_MUXROUTE_GRF (3 ,RK_PA1 ,3 ,0x10264 ,WRITE_MASK_VAL (13 ,13 ,0 )),/* CAN_TXD_M0 */ +RK_MUXROUTE_GRF (3 ,RK_PA7 ,5 ,0x10264 ,WRITE_MASK_VAL (13 ,13 ,1 )),/* CAN_TXD_M1 */ + +RK_MUXROUTE_GRF (3 ,RK_PA4 ,6 ,0x10268 ,WRITE_MASK_VAL (0 ,0 ,0 )),/* PWM8_M0 */ +RK_MUXROUTE_GRF (2 ,RK_PD7 ,5 ,0x10268 ,WRITE_MASK_VAL (0 ,0 ,1 )),/* PWM8_M1 */ + +RK_MUXROUTE_GRF (3 ,RK_PA5 ,6 ,0x10268 ,WRITE_MASK_VAL (2 ,2 ,0 )),/* PWM9_M0 */ +RK_MUXROUTE_GRF (2 ,RK_PD6 ,5 ,0x10268 ,WRITE_MASK_VAL (2 ,2 ,1 )),/* PWM9_M1 */ + +RK_MUXROUTE_GRF (3 ,RK_PA6 ,6 ,0x10268 ,WRITE_MASK_VAL (4 ,4 ,0 )),/* PWM10_M0 */ +RK_MUXROUTE_GRF (2 ,RK_PD5 ,5 ,0x10268 ,WRITE_MASK_VAL (4 ,4 ,1 )),/* PWM10_M1 */ + +RK_MUXROUTE_GRF (3 ,RK_PA7 ,6 ,0x10268 ,WRITE_MASK_VAL (6 ,6 ,0 )),/* PWM11_IR_M0 */ +RK_MUXROUTE_GRF (3 ,RK_PA1 ,5 ,0x10268 ,WRITE_MASK_VAL (6 ,6 ,1 )),/* PWM11_IR_M1 */ + +RK_MUXROUTE_GRF (1 ,RK_PA5 ,3 ,0x10268 ,WRITE_MASK_VAL (8 ,8 ,0 )),/* UART2_TX_M0 */ +RK_MUXROUTE_GRF (3 ,RK_PA2 ,1 ,0x10268 ,WRITE_MASK_VAL (8 ,8 ,1 )),/* UART2_TX_M1 */ + +RK_MUXROUTE_GRF (3 ,RK_PC6 ,3 ,0x10268 ,WRITE_MASK_VAL (11 ,10 ,0 )),/* UART3_TX_M0 */ +RK_MUXROUTE_GRF (1 ,RK_PA7 ,2 ,0x10268 ,WRITE_MASK_VAL (11 ,10 ,1 )),/* UART3_TX_M1 */ +RK_MUXROUTE_GRF (3 ,RK_PA0 ,4 ,0x10268 ,WRITE_MASK_VAL (11 ,10 ,2 )),/* UART3_TX_M2 */ + +RK_MUXROUTE_GRF (3 ,RK_PA4 ,4 ,0x10268 ,WRITE_MASK_VAL (13 ,12 ,0 )),/* UART4_TX_M0 */ +RK_MUXROUTE_GRF (2 ,RK_PA6 ,4 ,0x10268 ,WRITE_MASK_VAL (13 ,12 ,1 )),/* UART4_TX_M1 */ +RK_MUXROUTE_GRF (1 ,RK_PD5 ,3 ,0x10268 ,WRITE_MASK_VAL (13 ,12 ,2 )),/* UART4_TX_M2 */ + +RK_MUXROUTE_GRF (3 ,RK_PA6 ,4 ,0x10268 ,WRITE_MASK_VAL (15 ,14 ,0 )),/* UART5_TX_M0 */ +RK_MUXROUTE_GRF (2 ,RK_PB0 ,4 ,0x10268 ,WRITE_MASK_VAL (15 ,14 ,1 )),/* UART5_TX_M1 */ +RK_MUXROUTE_GRF (2 ,RK_PA0 ,3 ,0x10268 ,WRITE_MASK_VAL (15 ,14 ,2 )),/* UART5_TX_M2 */ + +RK_MUXROUTE_PMU (0 ,RK_PB6 ,3 ,0x0114 ,WRITE_MASK_VAL (0 ,0 ,0 )),/* PWM0_M0 */ +RK_MUXROUTE_PMU (2 ,RK_PB3 ,5 ,0x0114 ,WRITE_MASK_VAL (0 ,0 ,1 )),/* PWM0_M1 */ + +RK_MUXROUTE_PMU (0 ,RK_PB7 ,3 ,0x0114 ,WRITE_MASK_VAL (2 ,2 ,0 )),/* PWM1_M0 */ +RK_MUXROUTE_PMU (2 ,RK_PB2 ,5 ,0x0114 ,WRITE_MASK_VAL (2 ,2 ,1 )),/* PWM1_M1 */ + +RK_MUXROUTE_PMU (0 ,RK_PC0 ,3 ,0x0114 ,WRITE_MASK_VAL (4 ,4 ,0 )),/* PWM2_M0 */ +RK_MUXROUTE_PMU (2 ,RK_PB1 ,5 ,0x0114 ,WRITE_MASK_VAL (4 ,4 ,1 )),/* PWM2_M1 */ + +RK_MUXROUTE_PMU (0 ,RK_PC1 ,3 ,0x0114 ,WRITE_MASK_VAL (6 ,6 ,0 )),/* PWM3_IR_M0 */ +RK_MUXROUTE_PMU (2 ,RK_PB0 ,5 ,0x0114 ,WRITE_MASK_VAL (6 ,6 ,1 )),/* PWM3_IR_M1 */ + +RK_MUXROUTE_PMU (0 ,RK_PC2 ,3 ,0x0114 ,WRITE_MASK_VAL (8 ,8 ,0 )),/* PWM4_M0 */ +RK_MUXROUTE_PMU (2 ,RK_PA7 ,5 ,0x0114 ,WRITE_MASK_VAL (8 ,8 ,1 )),/* PWM4_M1 */ + +RK_MUXROUTE_PMU (0 ,RK_PC3 ,3 ,0x0114 ,WRITE_MASK_VAL (10 ,10 ,0 )),/* PWM5_M0 */ +RK_MUXROUTE_PMU (2 ,RK_PA6 ,5 ,0x0114 ,WRITE_MASK_VAL (10 ,10 ,1 )),/* PWM5_M1 */ + +RK_MUXROUTE_PMU (0 ,RK_PB2 ,3 ,0x0114 ,WRITE_MASK_VAL (12 ,12 ,0 )),/* PWM6_M0 */ +RK_MUXROUTE_PMU (2 ,RK_PD4 ,5 ,0x0114 ,WRITE_MASK_VAL (12 ,12 ,1 )),/* PWM6_M1 */ + +RK_MUXROUTE_PMU (0 ,RK_PB1 ,3 ,0x0114 ,WRITE_MASK_VAL (14 ,14 ,0 )),/* PWM7_IR_M0 */ +RK_MUXROUTE_PMU (3 ,RK_PA0 ,5 ,0x0114 ,WRITE_MASK_VAL (14 ,14 ,1 )),/* PWM7_IR_M1 */ + +RK_MUXROUTE_PMU (0 ,RK_PB0 ,1 ,0x0118 ,WRITE_MASK_VAL (1 ,0 ,0 )),/* SPI0_CLK_M0 */ +RK_MUXROUTE_PMU (2 ,RK_PA1 ,1 ,0x0118 ,WRITE_MASK_VAL (1 ,0 ,1 )),/* SPI0_CLK_M1 */ +RK_MUXROUTE_PMU (2 ,RK_PB2 ,6 ,0x0118 ,WRITE_MASK_VAL (1 ,0 ,2 )),/* SPI0_CLK_M2 */ + +RK_MUXROUTE_PMU (0 ,RK_PB6 ,2 ,0x0118 ,WRITE_MASK_VAL (2 ,2 ,0 )),/* UART1_TX_M0 */ +RK_MUXROUTE_PMU (1 ,RK_PD0 ,5 ,0x0118 ,WRITE_MASK_VAL (2 ,2 ,1 )),/* UART1_TX_M1 */ +}; +static struct rockchip_mux_route_data rk3128_mux_route_data[] = {RK_MUXROUTE_SAME (1 ,RK_PB2 ,1 ,0x144 ,BIT (16 +3 ) |BIT (16 +4 )),/* spi-0 */ RK_MUXROUTE_SAME (1 ,RK_PD3 ,3 ,0x144 ,BIT (16 +3 ) |BIT (16 +4 ) |BIT (3 )),/* spi-1 */
@@ -877,8 +1021,12 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin)if (bank->iomux[iomux_num].type &IOMUX_GPIO_ONLY )return RK_FUNC_GPIO ; - regmap = (bank->iomux[iomux_num].type &IOMUX_SOURCE_PMU ) - ? info->regmap_pmu : info->regmap_base; +if (bank->iomux[iomux_num].type &IOMUX_SOURCE_PMU ) + regmap = info->regmap_pmu; +else if (bank->iomux[iomux_num].type &IOMUX_L_SOURCE_PMU ) + regmap = (pin %8 <4 ) ? info->regmap_pmu : info->regmap_base; +else + regmap = info->regmap_base;/* get basic quadrupel of mux registers and the correct reg inside */ mux_type = bank->iomux[iomux_num].type;
@@ -987,8 +1135,12 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)dev_dbg (dev,"setting mux of GPIO%d-%d to %d\n" , bank->bank_num, pin, mux); - regmap = (bank->iomux[iomux_num].type &IOMUX_SOURCE_PMU ) - ? info->regmap_pmu : info->regmap_base; +if (bank->iomux[iomux_num].type &IOMUX_SOURCE_PMU ) + regmap = info->regmap_pmu; +else if (bank->iomux[iomux_num].type &IOMUX_L_SOURCE_PMU ) + regmap = (pin %8 <4 ) ? info->regmap_pmu : info->regmap_base; +else + regmap = info->regmap_base;/* get basic quadrupel of mux registers and the correct reg inside */ mux_type = bank->iomux[iomux_num].type;
@@ -1268,6 +1420,119 @@ static int rv1108_calc_schmitt_reg_and_bit(struct rockchip_pin_bank *bank,return 0 ; } +#define RV1126_PULL_PMU_OFFSET 0x40 +#define RV1126_PULL_GRF_GPIO1A0_OFFSET 0x10108 +#define RV1126_PULL_PINS_PER_REG 8 +#define RV1126_PULL_BITS_PER_PIN 2 +#define RV1126_PULL_BANK_STRIDE 16 +#define RV1126_GPIO_C4_D7 (p) (p >= 20 && p <= 31)/* GPIO0_C4 ~ GPIO0_D7 */ + +static int rv1126_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl *info = bank->drvdata; + +/* The first 24 pins of the first bank are located in PMU */ +if (bank->bank_num ==0 ) { +if (RV1126_GPIO_C4_D7 (pin_num)) { + *regmap = info->regmap_base; + *reg =RV1126_PULL_GRF_GPIO1A0_OFFSET ; + *reg -= (((31 - pin_num) /RV1126_PULL_PINS_PER_REG +1 ) *4 ); + *bit = pin_num %RV1126_PULL_PINS_PER_REG ; + *bit *=RV1126_PULL_BITS_PER_PIN ; +return 0 ; + } + *regmap = info->regmap_pmu; + *reg =RV1126_PULL_PMU_OFFSET ; + }else { + *reg =RV1126_PULL_GRF_GPIO1A0_OFFSET ; + *regmap = info->regmap_base; + *reg += (bank->bank_num -1 ) *RV1126_PULL_BANK_STRIDE ; + } + + *reg += ((pin_num /RV1126_PULL_PINS_PER_REG ) *4 ); + *bit = (pin_num %RV1126_PULL_PINS_PER_REG ); + *bit *=RV1126_PULL_BITS_PER_PIN ; + +return 0 ; +} + +#define RV1126_DRV_PMU_OFFSET 0x20 +#define RV1126_DRV_GRF_GPIO1A0_OFFSET 0x10090 +#define RV1126_DRV_BITS_PER_PIN 4 +#define RV1126_DRV_PINS_PER_REG 4 +#define RV1126_DRV_BANK_STRIDE 32 + +static int rv1126_calc_drv_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl *info = bank->drvdata; + +/* The first 24 pins of the first bank are located in PMU */ +if (bank->bank_num ==0 ) { +if (RV1126_GPIO_C4_D7 (pin_num)) { + *regmap = info->regmap_base; + *reg =RV1126_DRV_GRF_GPIO1A0_OFFSET ; + *reg -= (((31 - pin_num) /RV1126_DRV_PINS_PER_REG +1 ) *4 ); + *reg -=0x4 ; + *bit = pin_num %RV1126_DRV_PINS_PER_REG ; + *bit *=RV1126_DRV_BITS_PER_PIN ; +return 0 ; + } + *regmap = info->regmap_pmu; + *reg =RV1126_DRV_PMU_OFFSET ; + }else { + *regmap = info->regmap_base; + *reg =RV1126_DRV_GRF_GPIO1A0_OFFSET ; + *reg += (bank->bank_num -1 ) *RV1126_DRV_BANK_STRIDE ; + } + + *reg += ((pin_num /RV1126_DRV_PINS_PER_REG ) *4 ); + *bit = pin_num %RV1126_DRV_PINS_PER_REG ; + *bit *=RV1126_DRV_BITS_PER_PIN ; + +return 0 ; +} + +#define RV1126_SCHMITT_PMU_OFFSET 0x60 +#define RV1126_SCHMITT_GRF_GPIO1A0_OFFSET 0x10188 +#define RV1126_SCHMITT_BANK_STRIDE 16 +#define RV1126_SCHMITT_PINS_PER_GRF_REG 8 +#define RV1126_SCHMITT_PINS_PER_PMU_REG 8 + +static int rv1126_calc_schmitt_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num, +struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl *info = bank->drvdata; +int pins_per_reg; + +if (bank->bank_num ==0 ) { +if (RV1126_GPIO_C4_D7 (pin_num)) { + *regmap = info->regmap_base; + *reg =RV1126_SCHMITT_GRF_GPIO1A0_OFFSET ; + *reg -= (((31 - pin_num) /RV1126_SCHMITT_PINS_PER_GRF_REG +1 ) *4 ); + *bit = pin_num %RV1126_SCHMITT_PINS_PER_GRF_REG ; +return 0 ; + } + *regmap = info->regmap_pmu; + *reg =RV1126_SCHMITT_PMU_OFFSET ; + pins_per_reg =RV1126_SCHMITT_PINS_PER_PMU_REG ; + }else { + *regmap = info->regmap_base; + *reg =RV1126_SCHMITT_GRF_GPIO1A0_OFFSET ; + pins_per_reg =RV1126_SCHMITT_PINS_PER_GRF_REG ; + *reg += (bank->bank_num -1 ) *RV1126_SCHMITT_BANK_STRIDE ; + } + *reg += ((pin_num / pins_per_reg) *4 ); + *bit = pin_num % pins_per_reg; + +return 0 ; +} +#define RK3308_SCHMITT_PINS_PER_REG 8#define RK3308_SCHMITT_BANK_STRIDE 16#define RK3308_SCHMITT_GRF_OFFSET 0x1a0
@@ -1998,6 +2263,12 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank, goto config; } +if (ctrl->type ==RV1126 ) { + rmask_bits =RV1126_DRV_BITS_PER_PIN ; + ret = strength; + goto config; + } + ret = -EINVAL ;for (i =0 ; i <ARRAY_SIZE (rockchip_perpin_drv_list[drv_type]); i++) {if (rockchip_perpin_drv_list[drv_type][i] == strength) {
@@ -2168,6 +2439,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,break ;case PX30 :case RV1108 : +case RV1126 :case RK3188 :case RK3288 :case RK3308 :
@@ -2416,6 +2688,7 @@ static bool rockchip_pinconf_pull_valid(struct rockchip_pin_ctrl *ctrl,return pull ? false : true;case PX30 :case RV1108 : +case RV1126 :case RK3188 :case RK3288 :case RK3308 :
@@ -2889,12 +3162,14 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data(/* preset iomux offset value, set new start value */ if (iom->offset >=0 ) { -if (iom->type &IOMUX_SOURCE_PMU ) +if ((iom->type &IOMUX_SOURCE_PMU ) || + (iom->type &IOMUX_L_SOURCE_PMU )) pmu_offs = iom->offset;else grf_offs = iom->offset; }else {/* set current iomux offset */ - iom->offset = (iom->type &IOMUX_SOURCE_PMU ) ? + iom->offset = ((iom->type &IOMUX_SOURCE_PMU ) || + (iom->type &IOMUX_L_SOURCE_PMU )) ? pmu_offs : grf_offs; }
@@ -2919,7 +3194,7 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( inc = (iom->type & (IOMUX_WIDTH_4BIT |IOMUX_WIDTH_3BIT |IOMUX_WIDTH_2BIT )) ?8 :4 ; -if (iom->type &IOMUX_SOURCE_PMU ) +if ((iom->type &IOMUX_SOURCE_PMU ) || (iom->type &IOMUX_L_SOURCE_PMU )) pmu_offs += inc;else grf_offs += inc;
@@ -3178,6 +3453,48 @@ static struct rockchip_pin_ctrl rv1108_pin_ctrl = { .schmitt_calc_reg = rv1108_calc_schmitt_reg_and_bit, }; +static struct rockchip_pin_bank rv1126_pin_banks[] = { +PIN_BANK_IOMUX_FLAGS (0 ,32 ,"gpio0" , +IOMUX_WIDTH_4BIT |IOMUX_SOURCE_PMU , +IOMUX_WIDTH_4BIT |IOMUX_SOURCE_PMU , +IOMUX_WIDTH_4BIT |IOMUX_L_SOURCE_PMU , +IOMUX_WIDTH_4BIT ), +PIN_BANK_IOMUX_FLAGS_OFFSET (1 ,32 ,"gpio1" , +IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT , +0x10010 ,0x10018 ,0x10020 ,0x10028 ), +PIN_BANK_IOMUX_FLAGS (2 ,32 ,"gpio2" , +IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT ), +PIN_BANK_IOMUX_FLAGS (3 ,32 ,"gpio3" , +IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT ), +PIN_BANK_IOMUX_FLAGS (4 ,2 ,"gpio4" , +IOMUX_WIDTH_4BIT ,0 ,0 ,0 ), +}; + +static struct rockchip_pin_ctrl rv1126_pin_ctrl = { + .pin_banks = rv1126_pin_banks, + .nr_banks =ARRAY_SIZE (rv1126_pin_banks), + .label ="RV1126-GPIO" , + .type =RV1126 , + .grf_mux_offset =0x10004 ,/* mux offset from GPIO0_D0 */ + .pmu_mux_offset =0x0 , + .iomux_routes = rv1126_mux_route_data, + .niomux_routes =ARRAY_SIZE (rv1126_mux_route_data), + .iomux_recalced = rv1126_mux_recalced_data, + .niomux_recalced =ARRAY_SIZE (rv1126_mux_recalced_data), + .pull_calc_reg = rv1126_calc_pull_reg_and_bit, + .drv_calc_reg = rv1126_calc_drv_reg_and_bit, + .schmitt_calc_reg = rv1126_calc_schmitt_reg_and_bit, +}; +static struct rockchip_pin_bank rk2928_pin_banks[] = {PIN_BANK (0 ,32 ,"gpio0" ),PIN_BANK (1 ,32 ,"gpio1" ),
@@ -3568,6 +3885,8 @@ static const struct of_device_id rockchip_pinctrl_dt_match[] = { .data = &px30_pin_ctrl }, { .compatible = "rockchip,rv1108-pinctrl", .data = &rv1108_pin_ctrl }, + { .compatible = "rockchip,rv1126-pinctrl", + .data = &rv1126_pin_ctrl }, { .compatible = "rockchip,rk2928-pinctrl", .data = &rk2928_pin_ctrl }, { .compatible = "rockchip,rk3036-pinctrl",
drivers/pinctrl/pinctrl-rockchip.h +1 -0
@@ -186,6 +186,7 @@enum rockchip_pinctrl_type {PX30 ,RV1108 , +RV1126 ,RK2928 ,RK3066B ,RK3128 ,
Signature · 1 line
2.25.1
Re: [PATCH v3 07/19] pinctrl: rockchip: Add RV1126 pinctrl support
Quoted 11 lines · Jagan Teki
RV1126 has five GPIOs groups - GPIO0 in
PD_MMUand GPIO1-4 inPD_BUS.In GPIO0, up to Lower C group GPIO0_C[3:0] is part of PMU but rest of the groups from there are part of GRF.
Added pinctrl support for RV1126 and the pull, drv and schmitt calculations are inferred from [1] authored by Jianqun Xu.
[1] https://github.com/rockchip-linux/kernel/blob/develop-4.19/drivers/pinctrl/pinctrl-rockchip.c
Quoted 8 lines
Cc Linus Walleij <[email protected]>Signed-off-by Jianqun Xu <[email protected]>Signed-off-by Sugar Zhang <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
Changes for v3, v2:
- none
This patch applied to the pinctrl tree for v6.1.
Yours,
Linus Walleij
PATCH v3 8/19 clk: rockchip: Add MUXTBL variant
In reply to Jagan TekiFrom: Elaine Zhang <[email protected]>
A clock branch consisting of a mux with non-standard select values.
The parent in Mux table is sorted by priority.
---
Changes for v3, v2:
- none
drivers/clk/rockchip/clk.c | 27 +++++++++++++++++++++------ drivers/clk/rockchip/clk.h | 17 +++++++++++++++++ 2 files changed, 38 insertions(+), 6 deletions(-)
drivers/clk/rockchip/clk.c +21 -6
@@ -40,6 +40,7 @@ static struct clk *rockchip_clk_register_branch(const char *name, const char *const *parent_names, u8 num_parents, void __iomem *base, int muxdiv_offset, u8 mux_shift, u8 mux_width, u8 mux_flags, + u32 *mux_table, int div_offset, u8 div_shift, u8 div_width, u8 div_flags, struct clk_div_table *div_table, int gate_offset, u8 gate_shift, u8 gate_flags, unsigned long flags,
@@ -62,6 +63,7 @@ static struct clk *rockchip_clk_register_branch(const char *name, mux->shift = mux_shift; mux->mask =BIT (mux_width) -1 ; mux->flags = mux_flags; + mux->table = mux_table; mux->lock = lock; mux_ops = (mux_flags &CLK_MUX_READ_ONLY ) ? &clk_mux_ro_ops : &clk_mux_ops;
@@ -270,6 +272,8 @@ static struct clk *rockchip_clk_register_frac_branch( frac_mux->shift = child->mux_shift; frac_mux->mask =BIT (child->mux_width) -1 ; frac_mux->flags = child->mux_flags; +if (child->mux_table) + frac_mux->table = child->mux_table; frac_mux->lock = lock; frac_mux->hw.init = &init;
@@ -444,11 +448,21 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx,/* catch simple muxes */ switch (list->branch_type) {case branch_mux: - clk =clk_register_mux (NULL , list->name, - list->parent_names, list->num_parents, - flags, ctx->reg_base + list->muxdiv_offset, - list->mux_shift, list->mux_width, - list->mux_flags, &ctx->lock); +if (list->mux_table) + clk =clk_register_mux_table (NULL , list->name, + list->parent_names, list->num_parents, + flags, + ctx->reg_base + list->muxdiv_offset, + list->mux_shift, list->mux_width, + list->mux_flags, list->mux_table, + &ctx->lock); +else + clk =clk_register_mux (NULL , list->name, + list->parent_names, list->num_parents, + flags, + ctx->reg_base + list->muxdiv_offset, + list->mux_shift, list->mux_width, + list->mux_flags, &ctx->lock);break ;case branch_muxgrf: clk = rockchip_clk_register_muxgrf(list->name,
@@ -506,7 +520,8 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx, ctx->reg_base, list->muxdiv_offset, list->mux_shift, list->mux_width, list->mux_flags, - list->div_offset, list->div_shift, list->div_width, + list->mux_table, list->div_offset, + list->div_shift, list->div_width, list->div_flags, list->div_table, list->gate_offset, list->gate_shift, list->gate_flags, flags, &ctx->lock);
drivers/clk/rockchip/clk.h +17 -0
@@ -448,6 +448,7 @@ struct rockchip_clk_branch {u8 mux_shift;u8 mux_width;u8 mux_flags; +u32 *mux_table;int div_offset;u8 div_shift;u8 div_width;
@@ -680,6 +681,22 @@ struct rockchip_clk_branch { .gate_offset = -1, \ } +#define MUXTBL (_id, cname, pnames, f, o, s, w, mf, mt) \ + { \ + .id = _id, \ + .branch_type = branch_mux, \ + .name = cname, \ + .parent_names = pnames, \ + .num_parents = ARRAY_SIZE(pnames), \ + .flags = f, \ + .muxdiv_offset = o, \ + .mux_shift = s, \ + .mux_width = w, \ + .mux_flags = mf, \ + .gate_offset = -1, \ + .mux_table = mt, \ + } +#define MUXGRF (_id, cname, pnames, f, o, s, w, mf) \ { \ .id = _id, \
Signature · 1 line
2.25.1
PATCH v3 9/19 clk: rockchip: Add dt-binding header for RV1126
In reply to Jagan TekiAdd the dt-bindings header for the Rockchip RV1126, that gets shared between the clock controller and the clock references in the dts.
---
Changes for v3:
- update the file name
Changes for v2:
- exclude from clk patch
.../dt-bindings/clock/rockchip,rv1126-cru.h | 632 ++++++++++++++++++ 1 file changed, 632 insertions(+) create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h
include/dt-bindings/clock/rockchip,rv1126-cru.h new file +632 -0
@@ -0,0 +1,632 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2019 Rockchip Electronics Co. Ltd. +* Author: Finley Xiao <[email protected]> +*/ + +#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RV1126_H +#define _DT_BINDINGS_CLK_ROCKCHIP_RV1126_H + +/* pmucru-clocks indices */ + +/* pll clocks */ +#define PLL_GPLL 1 + +/* sclk (special clocks) */ +#define CLK_OSC0_DIV32K 2 +#define CLK_RTC32K 3 +#define CLK_WIFI_DIV 4 +#define CLK_WIFI_OSC0 5 +#define CLK_WIFI 6 +#define CLK_PMU 7 +#define SCLK_UART1_DIV 8 +#define SCLK_UART1_FRACDIV 9 +#define SCLK_UART1_MUX 10 +#define SCLK_UART1 11 +#define CLK_I2C0 12 +#define CLK_I2C2 13 +#define CLK_CAPTURE_PWM0 14 +#define CLK_PWM0 15 +#define CLK_CAPTURE_PWM1 16 +#define CLK_PWM1 17 +#define CLK_SPI0 18 +#define DBCLK_GPIO0 19 +#define CLK_PMUPVTM 20 +#define CLK_CORE_PMUPVTM 21 +#define CLK_REF12M 22 +#define CLK_USBPHY_OTG_REF 23 +#define CLK_USBPHY_HOST_REF 24 +#define CLK_REF24M 25 +#define CLK_MIPIDSIPHY_REF 26 + +/* pclk */ +#define PCLK_PDPMU 30 +#define PCLK_PMU 31 +#define PCLK_UART1 32 +#define PCLK_I2C0 33 +#define PCLK_I2C2 34 +#define PCLK_PWM0 35 +#define PCLK_PWM1 36 +#define PCLK_SPI0 37 +#define PCLK_GPIO0 38 +#define PCLK_PMUSGRF 39 +#define PCLK_PMUGRF 40 +#define PCLK_PMUCRU 41 +#define PCLK_CHIPVEROTP 42 +#define PCLK_PDPMU_NIU 43 +#define PCLK_PMUPVTM 44 +#define PCLK_SCRKEYGEN 45 + +#define CLKPMU_NR_CLKS (PCLK_SCRKEYGEN + 1) + +/* cru-clocks indices */ + +/* pll clocks */ +#define PLL_APLL 1 +#define PLL_DPLL 2 +#define PLL_CPLL 3 +#define PLL_HPLL 4 + +/* sclk (special clocks) */ +#define ARMCLK 5 +#define USB480M 6 +#define CLK_CORE_CPUPVTM 7 +#define CLK_CPUPVTM 8 +#define CLK_SCR1 9 +#define CLK_SCR1_CORE 10 +#define CLK_SCR1_RTC 11 +#define CLK_SCR1_JTAG 12 +#define SCLK_UART0_DIV 13 +#define SCLK_UART0_FRAC 14 +#define SCLK_UART0_MUX 15 +#define SCLK_UART0 16 +#define SCLK_UART2_DIV 17 +#define SCLK_UART2_FRAC 18 +#define SCLK_UART2_MUX 19 +#define SCLK_UART2 20 +#define SCLK_UART3_DIV 21 +#define SCLK_UART3_FRAC 22 +#define SCLK_UART3_MUX 23 +#define SCLK_UART3 24 +#define SCLK_UART4_DIV 25 +#define SCLK_UART4_FRAC 26 +#define SCLK_UART4_MUX 27 +#define SCLK_UART4 28 +#define SCLK_UART5_DIV 29 +#define SCLK_UART5_FRAC 30 +#define SCLK_UART5_MUX 31 +#define SCLK_UART5 32 +#define CLK_I2C1 33 +#define CLK_I2C3 34 +#define CLK_I2C4 35 +#define CLK_I2C5 36 +#define CLK_SPI1 37 +#define CLK_CAPTURE_PWM2 38 +#define CLK_PWM2 39 +#define DBCLK_GPIO1 40 +#define DBCLK_GPIO2 41 +#define DBCLK_GPIO3 42 +#define DBCLK_GPIO4 43 +#define CLK_SARADC 44 +#define CLK_TIMER0 45 +#define CLK_TIMER1 46 +#define CLK_TIMER2 47 +#define CLK_TIMER3 48 +#define CLK_TIMER4 49 +#define CLK_TIMER5 50 +#define CLK_CAN 51 +#define CLK_NPU_TSADC 52 +#define CLK_NPU_TSADCPHY 53 +#define CLK_CPU_TSADC 54 +#define CLK_CPU_TSADCPHY 55 +#define CLK_CRYPTO_CORE 56 +#define CLK_CRYPTO_PKA 57 +#define MCLK_I2S0_TX_DIV 58 +#define MCLK_I2S0_TX_FRACDIV 59 +#define MCLK_I2S0_TX_MUX 60 +#define MCLK_I2S0_TX 61 +#define MCLK_I2S0_RX_DIV 62 +#define MCLK_I2S0_RX_FRACDIV 63 +#define MCLK_I2S0_RX_MUX 64 +#define MCLK_I2S0_RX 65 +#define MCLK_I2S0_TX_OUT2IO 66 +#define MCLK_I2S0_RX_OUT2IO 67 +#define MCLK_I2S1_DIV 68 +#define MCLK_I2S1_FRACDIV 69 +#define MCLK_I2S1_MUX 70 +#define MCLK_I2S1 71 +#define MCLK_I2S1_OUT2IO 72 +#define MCLK_I2S2_DIV 73 +#define MCLK_I2S2_FRACDIV 74 +#define MCLK_I2S2_MUX 75 +#define MCLK_I2S2 76 +#define MCLK_I2S2_OUT2IO 77 +#define MCLK_PDM 78 +#define SCLK_ADUPWM_DIV 79 +#define SCLK_AUDPWM_FRACDIV 80 +#define SCLK_AUDPWM_MUX 81 +#define SCLK_AUDPWM 82 +#define CLK_ACDCDIG_ADC 83 +#define CLK_ACDCDIG_DAC 84 +#define CLK_ACDCDIG_I2C 85 +#define CLK_VENC_CORE 86 +#define CLK_VDEC_CORE 87 +#define CLK_VDEC_CA 88 +#define CLK_VDEC_HEVC_CA 89 +#define CLK_RGA_CORE 90 +#define CLK_IEP_CORE 91 +#define CLK_ISP_DIV 92 +#define CLK_ISP_NP5 93 +#define CLK_ISP_NUX 94 +#define CLK_ISP 95 +#define CLK_CIF_OUT_DIV 96 +#define CLK_CIF_OUT_FRACDIV 97 +#define CLK_CIF_OUT_MUX 98 +#define CLK_CIF_OUT 99 +#define CLK_MIPICSI_OUT_DIV 100 +#define CLK_MIPICSI_OUT_FRACDIV 101 +#define CLK_MIPICSI_OUT_MUX 102 +#define CLK_MIPICSI_OUT 103 +#define CLK_ISPP_DIV 104 +#define CLK_ISPP_NP5 105 +#define CLK_ISPP_NUX 106 +#define CLK_ISPP 107 +#define CLK_SDMMC 108 +#define SCLK_SDMMC_DRV 109 +#define SCLK_SDMMC_SAMPLE 110 +#define CLK_SDIO 111 +#define SCLK_SDIO_DRV 112 +#define SCLK_SDIO_SAMPLE 113 +#define CLK_EMMC 114 +#define SCLK_EMMC_DRV 115 +#define SCLK_EMMC_SAMPLE 116 +#define CLK_NANDC 117 +#define SCLK_SFC 118 +#define CLK_USBHOST_UTMI_OHCI 119 +#define CLK_USBOTG_REF 120 +#define CLK_GMAC_DIV 121 +#define CLK_GMAC_RGMII_M0 122 +#define CLK_GMAC_SRC_M0 123 +#define CLK_GMAC_RGMII_M1 124 +#define CLK_GMAC_SRC_M1 125 +#define CLK_GMAC_SRC 126 +#define CLK_GMAC_REF 127 +#define CLK_GMAC_TX_SRC 128 +#define CLK_GMAC_TX_DIV5 129 +#define CLK_GMAC_TX_DIV50 130 +#define RGMII_MODE_CLK 131 +#define CLK_GMAC_RX_SRC 132 +#define CLK_GMAC_RX_DIV2 133 +#define CLK_GMAC_RX_DIV20 134 +#define RMII_MODE_CLK 135 +#define CLK_GMAC_TX_RX 136 +#define CLK_GMAC_PTPREF 137 +#define CLK_GMAC_ETHERNET_OUT 138 +#define CLK_DDRPHY 139 +#define CLK_DDR_MON 140 +#define TMCLK_DDR_MON 141 +#define CLK_NPU_DIV 142 +#define CLK_NPU_NP5 143 +#define CLK_CORE_NPU 144 +#define CLK_CORE_NPUPVTM 145 +#define CLK_NPUPVTM 146 +#define SCLK_DDRCLK 147 +#define CLK_OTP 148 + +/* dclk */ +#define DCLK_DECOM 150 +#define DCLK_VOP_DIV 151 +#define DCLK_VOP_FRACDIV 152 +#define DCLK_VOP_MUX 153 +#define DCLK_VOP 154 +#define DCLK_CIF 155 +#define DCLK_CIFLITE 156 + +/* aclk */ +#define ACLK_PDBUS 160 +#define ACLK_DMAC 161 +#define ACLK_DCF 162 +#define ACLK_SPINLOCK 163 +#define ACLK_DECOM 164 +#define ACLK_PDCRYPTO 165 +#define ACLK_CRYPTO 166 +#define ACLK_PDVEPU 167 +#define ACLK_VENC 168 +#define ACLK_PDVDEC 169 +#define ACLK_PDJPEG 170 +#define ACLK_VDEC 171 +#define ACLK_JPEG 172 +#define ACLK_PDVO 173 +#define ACLK_RGA 174 +#define ACLK_VOP 175 +#define ACLK_IEP 176 +#define ACLK_PDVI_DIV 177 +#define ACLK_PDVI_NP5 178 +#define ACLK_PDVI 179 +#define ACLK_ISP 180 +#define ACLK_CIF 181 +#define ACLK_CIFLITE 182 +#define ACLK_PDISPP_DIV 183 +#define ACLK_PDISPP_NP5 184 +#define ACLK_PDISPP 185 +#define ACLK_ISPP 186 +#define ACLK_PDPHP 187 +#define ACLK_PDUSB 188 +#define ACLK_USBOTG 189 +#define ACLK_PDGMAC 190 +#define ACLK_GMAC 191 +#define ACLK_PDNPU_DIV 192 +#define ACLK_PDNPU_NP5 193 +#define ACLK_PDNPU 194 +#define ACLK_NPU 195 + +/* hclk */ +#define HCLK_PDCORE_NIU 200 +#define HCLK_PDUSB 201 +#define HCLK_PDCRYPTO 202 +#define HCLK_CRYPTO 203 +#define HCLK_PDAUDIO 204 +#define HCLK_I2S0 205 +#define HCLK_I2S1 206 +#define HCLK_I2S2 207 +#define HCLK_PDM 208 +#define HCLK_AUDPWM 209 +#define HCLK_PDVEPU 210 +#define HCLK_VENC 211 +#define HCLK_PDVDEC 212 +#define HCLK_PDJPEG 213 +#define HCLK_VDEC 214 +#define HCLK_JPEG 215 +#define HCLK_PDVO 216 +#define HCLK_RGA 217 +#define HCLK_VOP 218 +#define HCLK_IEP 219 +#define HCLK_PDVI 220 +#define HCLK_ISP 221 +#define HCLK_CIF 222 +#define HCLK_CIFLITE 223 +#define HCLK_PDISPP 224 +#define HCLK_ISPP 225 +#define HCLK_PDPHP 226 +#define HCLK_PDSDMMC 227 +#define HCLK_SDMMC 228 +#define HCLK_PDSDIO 229 +#define HCLK_SDIO 230 +#define HCLK_PDNVM 231 +#define HCLK_EMMC 232 +#define HCLK_NANDC 233 +#define HCLK_SFC 234 +#define HCLK_SFCXIP 235 +#define HCLK_PDBUS 236 +#define HCLK_USBHOST 237 +#define HCLK_USBHOST_ARB 238 +#define HCLK_PDNPU 239 +#define HCLK_NPU 240 + +/* pclk */ +#define PCLK_CPUPVTM 245 +#define PCLK_PDBUS 246 +#define PCLK_DCF 247 +#define PCLK_WDT 248 +#define PCLK_MAILBOX 249 +#define PCLK_UART0 250 +#define PCLK_UART2 251 +#define PCLK_UART3 252 +#define PCLK_UART4 253 +#define PCLK_UART5 254 +#define PCLK_I2C1 255 +#define PCLK_I2C3 256 +#define PCLK_I2C4 257 +#define PCLK_I2C5 258 +#define PCLK_SPI1 259 +#define PCLK_PWM2 261 +#define PCLK_GPIO1 262 +#define PCLK_GPIO2 263 +#define PCLK_GPIO3 264 +#define PCLK_GPIO4 265 +#define PCLK_SARADC 266 +#define PCLK_TIMER 267 +#define PCLK_DECOM 268 +#define PCLK_CAN 269 +#define PCLK_NPU_TSADC 270 +#define PCLK_CPU_TSADC 271 +#define PCLK_ACDCDIG 272 +#define PCLK_PDVO 273 +#define PCLK_DSIHOST 274 +#define PCLK_PDVI 275 +#define PCLK_CSIHOST 276 +#define PCLK_PDGMAC 277 +#define PCLK_GMAC 278 +#define PCLK_PDDDR 279 +#define PCLK_DDR_MON 280 +#define PCLK_PDNPU 281 +#define PCLK_NPUPVTM 282 +#define PCLK_PDTOP 283 +#define PCLK_TOPCRU 284 +#define PCLK_TOPGRF 285 +#define PCLK_CPUEMADET 286 +#define PCLK_DDRPHY 287 +#define PCLK_DSIPHY 289 +#define PCLK_CSIPHY0 290 +#define PCLK_CSIPHY1 291 +#define PCLK_USBPHY_HOST 292 +#define PCLK_USBPHY_OTG 293 +#define PCLK_OTP 294 + +#define CLK_NR_CLKS (PCLK_OTP + 1) + +/* pmu soft-reset indices */ + +/* pmu_cru_softrst_con0 */ +#define SRST_PDPMU_NIU_P 0 +#define SRST_PMU_SGRF_P 1 +#define SRST_PMU_SGRF_REMAP_P 2 +#define SRST_I2C0_P 3 +#define SRST_I2C0 4 +#define SRST_I2C2_P 7 +#define SRST_I2C2 8 +#define SRST_UART1_P 9 +#define SRST_UART1 10 +#define SRST_PWM0_P 11 +#define SRST_PWM0 12 +#define SRST_PWM1_P 13 +#define SRST_PWM1 14 +#define SRST_DDR_FAIL_SAFE 15 + +/* pmu_cru_softrst_con1 */ +#define SRST_GPIO0_P 17 +#define SRST_GPIO0_DB 18 +#define SRST_SPI0_P 19 +#define SRST_SPI0 20 +#define SRST_PMUGRF_P 21 +#define SRST_CHIPVEROTP_P 22 +#define SRST_PMUPVTM 24 +#define SRST_PMUPVTM_P 25 +#define SRST_PMUCRU_P 30 + +/* soft-reset indices */ + +/* cru_softrst_con0 */ +#define SRST_CORE0_PO 0 +#define SRST_CORE1_PO 1 +#define SRST_CORE2_PO 2 +#define SRST_CORE3_PO 3 +#define SRST_CORE0 4 +#define SRST_CORE1 5 +#define SRST_CORE2 6 +#define SRST_CORE3 7 +#define SRST_CORE0_DBG 8 +#define SRST_CORE1_DBG 9 +#define SRST_CORE2_DBG 10 +#define SRST_CORE3_DBG 11 +#define SRST_NL2 12 +#define SRST_CORE_NIU_A 13 +#define SRST_DBG_DAPLITE_P 14 +#define SRST_DAPLITE_P 15 + +/* cru_softrst_con1 */ +#define SRST_PDBUS_NIU1_A 16 +#define SRST_PDBUS_NIU1_H 17 +#define SRST_PDBUS_NIU1_P 18 +#define SRST_PDBUS_NIU2_A 19 +#define SRST_PDBUS_NIU2_H 20 +#define SRST_PDBUS_NIU3_A 21 +#define SRST_PDBUS_NIU3_H 22 +#define SRST_PDBUS_HOLD_NIU1_A 23 +#define SRST_DBG_NIU_P 24 +#define SRST_PDCORE_NIIU_H 25 +#define SRST_MUC_NIU 26 +#define SRST_DCF_A 29 +#define SRST_DCF_P 30 +#define SRST_SYSTEM_SRAM_A 31 + +/* cru_softrst_con2 */ +#define SRST_I2C1_P 32 +#define SRST_I2C1 33 +#define SRST_I2C3_P 34 +#define SRST_I2C3 35 +#define SRST_I2C4_P 36 +#define SRST_I2C4 37 +#define SRST_I2C5_P 38 +#define SRST_I2C5 39 +#define SRST_SPI1_P 40 +#define SRST_SPI1 41 +#define SRST_MCU_CORE 42 +#define SRST_PWM2_P 44 +#define SRST_PWM2 45 +#define SRST_SPINLOCK_A 46 + +/* cru_softrst_con3 */ +#define SRST_UART0_P 48 +#define SRST_UART0 49 +#define SRST_UART2_P 50 +#define SRST_UART2 51 +#define SRST_UART3_P 52 +#define SRST_UART3 53 +#define SRST_UART4_P 54 +#define SRST_UART4 55 +#define SRST_UART5_P 56 +#define SRST_UART5 57 +#define SRST_WDT_P 58 +#define SRST_SARADC_P 59 +#define SRST_GRF_P 61 +#define SRST_TIMER_P 62 +#define SRST_MAILBOX_P 63 + +/* cru_softrst_con4 */ +#define SRST_TIMER0 64 +#define SRST_TIMER1 65 +#define SRST_TIMER2 66 +#define SRST_TIMER3 67 +#define SRST_TIMER4 68 +#define SRST_TIMER5 69 +#define SRST_INTMUX_P 70 +#define SRST_GPIO1_P 72 +#define SRST_GPIO1_DB 73 +#define SRST_GPIO2_P 74 +#define SRST_GPIO2_DB 75 +#define SRST_GPIO3_P 76 +#define SRST_GPIO3_DB 77 +#define SRST_GPIO4_P 78 +#define SRST_GPIO4_DB 79 + +/* cru_softrst_con5 */ +#define SRST_CAN_P 80 +#define SRST_CAN 81 +#define SRST_DECOM_A 85 +#define SRST_DECOM_P 86 +#define SRST_DECOM_D 87 +#define SRST_PDCRYPTO_NIU_A 88 +#define SRST_PDCRYPTO_NIU_H 89 +#define SRST_CRYPTO_A 90 +#define SRST_CRYPTO_H 91 +#define SRST_CRYPTO_CORE 92 +#define SRST_CRYPTO_PKA 93 +#define SRST_SGRF_P 95 + +/* cru_softrst_con6 */ +#define SRST_PDAUDIO_NIU_H 96 +#define SRST_PDAUDIO_NIU_P 97 +#define SRST_I2S0_H 98 +#define SRST_I2S0_TX_M 99 +#define SRST_I2S0_RX_M 100 +#define SRST_I2S1_H 101 +#define SRST_I2S1_M 102 +#define SRST_I2S2_H 103 +#define SRST_I2S2_M 104 +#define SRST_PDM_H 105 +#define SRST_PDM_M 106 +#define SRST_AUDPWM_H 107 +#define SRST_AUDPWM 108 +#define SRST_ACDCDIG_P 109 +#define SRST_ACDCDIG 110 + +/* cru_softrst_con7 */ +#define SRST_PDVEPU_NIU_A 112 +#define SRST_PDVEPU_NIU_H 113 +#define SRST_VENC_A 114 +#define SRST_VENC_H 115 +#define SRST_VENC_CORE 116 +#define SRST_PDVDEC_NIU_A 117 +#define SRST_PDVDEC_NIU_H 118 +#define SRST_VDEC_A 119 +#define SRST_VDEC_H 120 +#define SRST_VDEC_CORE 121 +#define SRST_VDEC_CA 122 +#define SRST_VDEC_HEVC_CA 123 +#define SRST_PDJPEG_NIU_A 124 +#define SRST_PDJPEG_NIU_H 125 +#define SRST_JPEG_A 126 +#define SRST_JPEG_H 127 + +/* cru_softrst_con8 */ +#define SRST_PDVO_NIU_A 128 +#define SRST_PDVO_NIU_H 129 +#define SRST_PDVO_NIU_P 130 +#define SRST_RGA_A 131 +#define SRST_RGA_H 132 +#define SRST_RGA_CORE 133 +#define SRST_VOP_A 134 +#define SRST_VOP_H 135 +#define SRST_VOP_D 136 +#define SRST_TXBYTEHS_DSIHOST 137 +#define SRST_DSIHOST_P 138 +#define SRST_IEP_A 139 +#define SRST_IEP_H 140 +#define SRST_IEP_CORE 141 +#define SRST_ISP_RX_P 142 + +/* cru_softrst_con9 */ +#define SRST_PDVI_NIU_A 144 +#define SRST_PDVI_NIU_H 145 +#define SRST_PDVI_NIU_P 146 +#define SRST_ISP 147 +#define SRST_CIF_A 148 +#define SRST_CIF_H 149 +#define SRST_CIF_D 150 +#define SRST_CIF_P 151 +#define SRST_CIF_I 152 +#define SRST_CIF_RX_P 153 +#define SRST_PDISPP_NIU_A 154 +#define SRST_PDISPP_NIU_H 155 +#define SRST_ISPP_A 156 +#define SRST_ISPP_H 157 +#define SRST_ISPP 158 +#define SRST_CSIHOST_P 159 + +/* cru_softrst_con10 */ +#define SRST_PDPHPMID_NIU_A 160 +#define SRST_PDPHPMID_NIU_H 161 +#define SRST_PDNVM_NIU_H 163 +#define SRST_SDMMC_H 164 +#define SRST_SDIO_H 165 +#define SRST_EMMC_H 166 +#define SRST_SFC_H 167 +#define SRST_SFCXIP_H 168 +#define SRST_SFC 169 +#define SRST_NANDC_H 170 +#define SRST_NANDC 171 +#define SRST_PDSDMMC_H 173 +#define SRST_PDSDIO_H 174 + +/* cru_softrst_con11 */ +#define SRST_PDUSB_NIU_A 176 +#define SRST_PDUSB_NIU_H 177 +#define SRST_USBHOST_H 178 +#define SRST_USBHOST_ARB_H 179 +#define SRST_USBHOST_UTMI 180 +#define SRST_USBOTG_A 181 +#define SRST_USBPHY_OTG_P 182 +#define SRST_USBPHY_HOST_P 183 +#define SRST_USBPHYPOR_OTG 184 +#define SRST_USBPHYPOR_HOST 185 +#define SRST_PDGMAC_NIU_A 188 +#define SRST_PDGMAC_NIU_P 189 +#define SRST_GMAC_A 190 + +/* cru_softrst_con12 */ +#define SRST_DDR_DFICTL_P 193 +#define SRST_DDR_MON_P 194 +#define SRST_DDR_STANDBY_P 195 +#define SRST_DDR_GRF_P 196 +#define SRST_DDR_MSCH_P 197 +#define SRST_DDR_SPLIT_A 198 +#define SRST_DDR_MSCH 199 +#define SRST_DDR_DFICTL 202 +#define SRST_DDR_STANDBY 203 +#define SRST_NPUMCU_NIU 205 +#define SRST_DDRPHY_P 206 +#define SRST_DDRPHY 207 + +/* cru_softrst_con13 */ +#define SRST_PDNPU_NIU_A 208 +#define SRST_PDNPU_NIU_H 209 +#define SRST_PDNPU_NIU_P 210 +#define SRST_NPU_A 211 +#define SRST_NPU_H 212 +#define SRST_NPU 213 +#define SRST_NPUPVTM_P 214 +#define SRST_NPUPVTM 215 +#define SRST_NPU_TSADC_P 216 +#define SRST_NPU_TSADC 217 +#define SRST_NPU_TSADCPHY 218 +#define SRST_CIFLITE_A 220 +#define SRST_CIFLITE_H 221 +#define SRST_CIFLITE_D 222 +#define SRST_CIFLITE_RX_P 223 + +/* cru_softrst_con14 */ +#define SRST_TOPNIU_P 224 +#define SRST_TOPCRU_P 225 +#define SRST_TOPGRF_P 226 +#define SRST_CPUEMADET_P 227 +#define SRST_CSIPHY0_P 228 +#define SRST_CSIPHY1_P 229 +#define SRST_DSIPHY_P 230 +#define SRST_CPU_TSADC_P 232 +#define SRST_CPU_TSADC 233 +#define SRST_CPU_TSADCPHY 234 +#define SRST_CPUPVTM_P 235 +#define SRST_CPUPVTM 236 + +#endif
Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH v3 09/19] clk: rockchip: Add dt-binding header for RV1126
Quoted 21 lines · Jagan Teki
Add the dt-bindings header for the Rockchip RV1126, that gets shared between the clock controller and the clock references in the dts.
Signed-off-by Finley Xiao <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
Changes for v3:
- update the file name
Changes for v2:
- exclude from clk patch.../dt-bindings/clock/rockchip,rv1126-cru.h | 632 ++++++++++++++++++ 1 file changed, 632 insertions(+) create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.hinclude/dt-bindings/clock/rockchip,rv1126-cru.h new file +0
-0
include/dt-bindings/clock/rockchip,rv1126-cru.h line 1
Quoted 1 line
include/dt-bindings/clock/rockchip,rv1126-cru.h new file +1
-0@@ -0,0 +1,632 @@ +/* SPDX-License-Identifier: GPL-2.0 */
Dual license please. Need an ack from Rockchip for that (and not just on this one).
Quoted 4 lines
include/dt-bindings/clock/rockchip,rv1126-cru.h new file +4
-0+/* +* Copyright (c) 2019 Rockchip Electronics Co. Ltd. +* Author: Finley Xiao <[email protected]> +*/
Re: [PATCH v3 09/19] clk: rockchip: Add dt-binding header for RV1126
Quoted 17 lines · Rob Herring
Quoted 15 lines · Jagan Teki
Add the dt-bindings header for the Rockchip RV1126, that gets shared between the clock controller and the clock references in the dts.
Signed-off-by Finley Xiao <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
Changes for v3:
- update the file name
Changes for v2:
- exclude from clk patch.../dt-bindings/clock/rockchip,rv1126-cru.h | 632 ++++++++++++++++++ 1 file changed, 632 insertions(+) create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h
Quoted 10 lines
include/dt-bindings/clock/rockchip,rv1126-cru.h line 1
Quoted 7 lines
include/dt-bindings/clock/rockchip,rv1126-cru.h new file +1
-0@@ -0,0 +1,632 @@ +/* SPDX-License-Identifier: GPL-2.0 */ Dual license please. Need an ack from Rockchip for that (and not just on this one).
Heiko or Kever.
Can you comment on this?
Jagan.
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stübner
maintainerRe: [PATCH v3 09/19] clk: rockchip: Add dt-binding header for RV1126
Am Dienstag, 23. August 2022, 14:57:20 CEST schrieb Jagan Teki:
Quoted 29 lines · Rob Herring
Quoted 17 lines · Jagan Teki
Quoted 15 lines
Add the dt-bindings header for the Rockchip RV1126, that gets shared between the clock controller and the clock references in the dts.
Signed-off-by Finley Xiao <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
Changes for v3:
- update the file name
Changes for v2:
- exclude from clk patch.../dt-bindings/clock/rockchip,rv1126-cru.h | 632 ++++++++++++++++++ 1 file changed, 632 insertions(+) create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.hQuoted 10 lines
include/dt-bindings/clock/rockchip,rv1126-cru.h line 1
Quoted 7 lines
include/dt-bindings/clock/rockchip,rv1126-cru.h new file +1
-0@@ -0,0 +1,632 @@ +/* SPDX-License-Identifier: GPL-2.0 */ Dual license please. Need an ack from Rockchip for that (and not just on this one).
Quoted 3 lines
Heiko or Kever.
Can you comment on this?
I guess this is more a question for Kever,
@Kever can Rockchip allow that dual licensing for the dt-binding header (MIT as second license I think - at least like all the other binding headers) both in this patch and also in the other header-patches of this series?
Thanks
Heiko
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 09/19] clk: rockchip: Add dt-binding header for RV1126
Hi Kever,
Quoted 33 lines · Heiko Stübner
Am Dienstag, 23. August 2022, 14:57:20 CEST schrieb Jagan Teki:
Quoted 31 lines · Rob Herring
Quoted 17 lines · Jagan Teki
Quoted 15 lines
Add the dt-bindings header for the Rockchip RV1126, that gets shared between the clock controller and the clock references in the dts.
Signed-off-by Finley Xiao <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
Changes for v3:
- update the file name
Changes for v2:
- exclude from clk patch.../dt-bindings/clock/rockchip,rv1126-cru.h | 632 ++++++++++++++++++ 1 file changed, 632 insertions(+) create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.hQuoted 10 lines
include/dt-bindings/clock/rockchip,rv1126-cru.h line 1
Quoted 7 lines
include/dt-bindings/clock/rockchip,rv1126-cru.h new file +1
-0@@ -0,0 +1,632 @@ +/* SPDX-License-Identifier: GPL-2.0 */ Dual license please. Need an ack from Rockchip for that (and not just on this one).
Heiko or Kever.
Quoted 7 lines
Quoted 1 line
Can you comment on this?
I guess this is more a question for Kever,
@Kever can Rockchip allow that dual licensing for the dt-binding header (MIT as second license I think - at least like all the other binding headers) both in this patch and also in the other header-patches of this series?
Any comments on this?
Jagan.
Re: [PATCH v3 09/19] clk: rockchip: Add dt-binding header for RV1126
Quoted 7 lines · Jagan Teki
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
Dual license please. Need an ack from Rockchip for that (and not just on this one).
Heiko or Kever.
Can you comment on this?
Quoted 7 lines
Quoted 5 lines
I guess this is more a question for Kever,
@Kever can Rockchip allow that dual licensing for the dt-binding header (MIT as second license I think - at least like all the other binding headers) both in this patch and also in the other header-patches of this series?
Any comments on this?
https://lore.kernel.org/all/[email protected]/
Best regards,
Krzysztof
PATCH v3 10/19 dt-bindings: clock: rockchip: Document RV1126 CRU
In reply to Jagan TekiDocument dt-bindings for Rockchip RV1126 clock controller.
---
Changes for v3:
- none
Changes for v2:
- fixed title
- remove '|' in description
- add one example
.../bindings/clock/rockchip,rv1126-cru.yaml | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml new file +62 -0
@@ -0,0 +1,62 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/rockchip,rv1126-cru.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip RV1126 Clock and Reset Unit + +maintainers: + - Jagan Teki <[email protected]> + - Finley Xiao <[email protected]> + - Heiko Stuebner <[email protected]> + +description: + The RV1126 clock controller generates the clock and also implements a + reset controller for SoC peripherals. + +properties: + compatible: + enum: + - rockchip,rv1126-cru + - rockchip,rv1126-pmucru + + reg: + maxItems: 1 + + "#clock-cells": + const: 1 + + "#reset-cells": + const: 1 + + clocks: + maxItems: 1 + + clock-names: + const: xin24m + + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the syscon managing the "general register files" (GRF), + if missing pll rates are not changeable, due to the missing pll + lock status. + +required: + - compatible + - reg + - "#clock-cells" + - "#reset-cells" + +additionalProperties: false + +examples: + - | + cru: clock-controller@ff490000 { + compatible = "rockchip,rv1126-cru"; + reg = <0xff490000 0x1000>; + rockchip,grf = <&grf>; + #clock-cells = <1>; + #reset-cells = <1>; + };
Signature · 1 line
2.25.1
Stephen Boyd
maintainerRe: [PATCH v3 10/19] dt-bindings: clock: rockchip: Document RV1126 CRU
Quoting Jagan Teki (2022-08-18 05:41:23)
Quoted 9 lines
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml new file +9
-0+ + clocks: + maxItems: 1 + + clock-names: + const: xin24m + + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml line 50
Quoted 10 lines
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml new file +10
-0+ description: + Phandle to the syscon managing the "general register files" (GRF), + if missing pll rates are not changeable, due to the missing pll + lock status. + +required: + - compatible + - reg + - "#clock-cells" + - "#reset-cells"
Why aren't clocks required?
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml line 61
Quoted 11 lines
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml new file +11
-0+ +additionalProperties: false + +examples: + - | + cru: clock-controller@ff490000 { + compatible = "rockchip,rv1126-cru"; + reg = <0xff490000 0x1000>; + rockchip,grf = <&grf>; + #clock-cells = <1>; + #reset-cells = <1>;
Can you add 'clocks' property to the binding?
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 10/19] dt-bindings: clock: rockchip: Document RV1126 CRU
Quoted 15 lines · Stephen Boyd
Quoting Jagan Teki (2022-08-18 05:41:23)
Quoted 13 lines
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml new file +13
-0+ + clocks: + maxItems: 1 + + clock-names: + const: xin24m + + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the syscon managing the "general register files" (GRF), + if missing pll rates are not changeable, due to the missing pll + lock status.
Quoted 8 lines
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml line 50
Quoted 6 lines
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml new file +6
-0+ +required: + - compatible + - reg + - "#clock-cells" + - "#reset-cells"Why aren't clocks required?
I don't see any clocks being used by cru in rv1126 [1] so that is the
reason I didn't add any. Let me know if it is something that is
mandatory to add even if it's unused.
[1] https://github.com/rockchip-linux/kernel/blob/develop-4.19/arch/arm/boot/dts/rv1126.dtsi#L1074
Thanks,
Jagan.
Heiko Stübner
maintainerRe: [PATCH v3 10/19] dt-bindings: clock: rockchip: Document RV1126 CRU
Am Freitag, 19. August 2022, 23:20:03 CEST schrieb Jagan Teki:
Quoted 25 lines · Stephen Boyd
Quoted 15 lines
Quoting Jagan Teki (2022-08-18 05:41:23)
Quoted 13 lines
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml new file +13
-0+ + clocks: + maxItems: 1 + + clock-names: + const: xin24m + + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the syscon managing the "general register files" (GRF), + if missing pll rates are not changeable, due to the missing pll + lock status.Quoted 8 lines
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml line 50
Quoted 6 lines
Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml new file +6
-0+ +required: + - compatible + - reg + - "#clock-cells" + - "#reset-cells"Why aren't clocks required?
Quoted 4 lines
I don't see any clocks being used by cru in rv1126 [1] so that is the
reason I didn't add any. Let me know if it is something that is
mandatory to add even if it's unused.
[1] https://github.com/rockchip-linux/kernel/blob/develop-4.19/arch/arm/boot/dts/rv1126.dtsi#L1074
Our clock drivers normally just expect that xin24m to be present but that xin24m _is_ a clock dependency for the cru and for a lot of Rockchip SoCs Johan did update both the binding and the dtsi-s to make that explicit when converting the binding over to yaml
See for example the rk3399.
Heiko
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v3 11/19 Add clock controller support for RV1126 SoC.
In reply to Jagan TekiClock & Reset Unit (CRU) in RV1126 support clocks for CRU and CRU_PMU blocks.
This patch is trying to add minimal Clock-Architecture Diagram's inferred from [1] authored by Finley Xiao.
[1] https://github.com/rockchip-linux/kernel/blob/develop-4.19/drivers/clk/rockchip/clk-rv1126.c
---
Changes for v3:
- update file name of rv1126-cru.h
Changes for v2:
- none
drivers/clk/rockchip/Kconfig | 7 + drivers/clk/rockchip/Makefile | 1 + drivers/clk/rockchip/clk-rv1126.c | 1107 +++++++++++++++++++++++++++++ drivers/clk/rockchip/clk.h | 19 + 4 files changed, 1134 insertions(+) create mode 100644 drivers/clk/rockchip/clk-rv1126.c
drivers/clk/rockchip/Kconfig +7 -0
@@ -23,6 +23,13 @@ config CLK_RV110X help Build the driver for RV110x Clock Driver. +config CLK_RV1126 + bool "Rockchip RV1126 clock controller support" + depends on ARM || COMPILE_TEST + default y + help + Build the driver for RV1126 Clock Driver. + config CLK_RK3036 bool "Rockchip RK3036 clock controller support" depends on ARM || COMPILE_TEST
drivers/clk/rockchip/Makefile +1 -0
@@ -17,6 +17,7 @@ clk-rockchip-$(CONFIG_RESET_CONTROLLER) += softrst.o obj-$(CONFIG_CLK_PX30) += clk-px30.o obj-$(CONFIG_CLK_RV110X) += clk-rv1108.o +obj-$(CONFIG_CLK_RV1126) += clk-rv1126.o obj-$(CONFIG_CLK_RK3036) += clk-rk3036.o obj-$(CONFIG_CLK_RK312X) += clk-rk3128.o obj-$(CONFIG_CLK_RK3188) += clk-rk3188.o
drivers/clk/rockchip/clk-rv1126.c new file +1107 -0
1,107 lines not on this page · raw message
drivers/clk/rockchip/clk.h +19 -0
@@ -79,6 +79,25 @@ struct clk;#define RV1108_EMMC_CON0 0x1e8#define RV1108_EMMC_CON1 0x1ec +#define RV1126_PMU_MODE 0x0 +#define RV1126_PMU_PLL_CON (x) ((x) * 0x4 + 0x10) +#define RV1126_PMU_CLKSEL_CON (x) ((x) * 0x4 + 0x100) +#define RV1126_PMU_CLKGATE_CON (x) ((x) * 0x4 + 0x180) +#define RV1126_PMU_SOFTRST_CON (x) ((x) * 0x4 + 0x200) +#define RV1126_PLL_CON (x) ((x) * 0x4) +#define RV1126_MODE_CON 0x90 +#define RV1126_CLKSEL_CON (x) ((x) * 0x4 + 0x100) +#define RV1126_CLKGATE_CON (x) ((x) * 0x4 + 0x280) +#define RV1126_SOFTRST_CON (x) ((x) * 0x4 + 0x300) +#define RV1126_GLB_SRST_FST 0x408 +#define RV1126_GLB_SRST_SND 0x40c +#define RV1126_SDMMC_CON0 0x440 +#define RV1126_SDMMC_CON1 0x444 +#define RV1126_SDIO_CON0 0x448 +#define RV1126_SDIO_CON1 0x44c +#define RV1126_EMMC_CON0 0x450 +#define RV1126_EMMC_CON1 0x454 +#define RK2928_PLL_CON (x) ((x) * 0x4)#define RK2928_MODE_CON 0x40#define RK2928_CLKSEL_CON (x) ((x) * 0x4 + 0x44)
Signature · 1 line
2.25.1
PATCH v3 12/19 dt-bindings: soc: rockchip: Document RV1126 grf
In reply to Jagan TekiDocument compatible string for Rockchip RV1126 grf.
---
Changes for v3:
- none
Changes for v2:
- collect Rob ack
Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +1 -0
@@ -45,6 +45,7 @@ properties: - rockchip,rk3568-pmugrf - rockchip,rv1108-grf - rockchip,rv1108-pmugrf + - rockchip,rv1126-grf - const: syscon - const: simple-mfd
Signature · 1 line
2.25.1
PATCH v3 13/19 dt-bindings: soc: rockchip: Document RV1126 pmugrf
In reply to Jagan TekiDocument compatible string for Rockchip RV1126 pmugrf.
---
Changes for v3:
- none
Changes for v2:
- collect Rob ack
Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +1 -0
@@ -46,6 +46,7 @@ properties: - rockchip,rv1108-grf - rockchip,rv1108-pmugrf - rockchip,rv1126-grf + - rockchip,rv1126-pmugrf - const: syscon - const: simple-mfd
Signature · 1 line
2.25.1
PATCH v3 14/19 ARM: dts: rockchip: Add Rockchip RV1126 pinctrl
In reply to Jagan TekiAdd pinctrl definitions for Rockchip RV1126 and the pinctrl conf's are included it from arm64 rockchip devicetree path.
---
Changes for v3:
- none
Changes for v2:
- spilt pinctrl as separate patch
MAINTAINERS | 2 +- arch/arm/boot/dts/rv1126-pinctrl.dtsi | 302 ++++++++++++++++++++++++++ 2 files changed, 303 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/rv1126-pinctrl.dtsi
MAINTAINERS +1 -1
@@ -2646,7 +2646,7 @@ F: Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml F: Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml F: Documentation/devicetree/bindings/spi/spi-rockchip.yaml F: arch/arm/boot/dts/rk3* -F: arch/arm/boot/dts/rv1108* +F: arch/arm/boot/dts/rv11* F: arch/arm/mach-rockchip/ F: drivers/*/*/*rockchip* F: drivers/*/*rockchip*
arch/arm/boot/dts/rv1126-pinctrl.dtsi new file +302 -0
302 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 15/19 ARM: dts: rockchip: Add Rockchip RV1126 SoC
In reply to Jagan TekiRV1126 is a high-performance vision processor SoC for IPC/CVR, especially for AI related application.
It is based on quad-core ARM Cortex-A7 32-bit core which integrates NEON and FPU. There is a 32KB I-cache and 32KB D-cache for each core and 512KB unified L2 cache. It has build-in NPU supports INT8/INT16 hybrid operation and computing power is up to 2.0TOPs.
This patch add basic core dtsi support.
---
Changes for v3:
- update cru and power file names
Changes for v2:
- split pinctrl in separate patch
arch/arm/boot/dts/rv1126.dtsi | 500 ++++++++++++++++++++++++++++++++++ 1 file changed, 500 insertions(+) create mode 100644 arch/arm/boot/dts/rv1126.dtsi
arch/arm/boot/dts/rv1126.dtsi new file +500 -0
@@ -0,0 +1,500 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd. + * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. + */ + +#include <dt-bindings/clock/rockchip,rv1126-cru.h> +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/power/rockchip,rv1126-power.h> +#include <dt-bindings/soc/rockchip,boot-mode.h> + +/ { + #address-cells = <1>; + #size-cells = <1>; + + compatible = "rockchip,rv1126"; + + interrupt-parent = <&gic>; + + aliases { + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + i2c4 = &i2c4; + i2c5 = &i2c5; + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + serial3 = &uart3; + serial4 = &uart4; + serial5 = &uart5; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu0: cpu@f00 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0xf00>; + clocks = <&cru ARMCLK>; + }; + + cpu1: cpu@f01 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0xf01>; + clocks = <&cru ARMCLK>; + }; + + cpu2: cpu@f02 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0xf02>; + clocks = <&cru ARMCLK>; + }; + + cpu3: cpu@f03 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0xf03>; + clocks = <&cru ARMCLK>; + }; + }; + + arm-pmu { + compatible = "arm,cortex-a7-pmu"; + interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + + timer { + compatible = "arm,armv7-timer"; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, + <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, + <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, + <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + clock-frequency = <24000000>; + }; + + xin24m: oscillator { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "xin24m"; + #clock-cells = <0>; + }; + + grf: syscon@fe000000 { + compatible = "rockchip,rv1126-grf", "syscon", "simple-mfd"; + reg = <0xfe000000 0x20000>; + }; + + pmugrf: syscon@fe020000 { + compatible = "rockchip,rv1126-pmugrf", "syscon", "simple-mfd"; + reg = <0xfe020000 0x1000>; + + pmu_io_domains: io-domains { + compatible = "rockchip,rv1126-pmu-io-voltage-domain"; + status = "disabled"; + }; + }; + + qos_emmc: qos@fe860000 { + compatible = "rockchip,rv1126-qos", "syscon"; + reg = <0xfe860000 0x20>; + }; + + qos_nandc: qos@fe860080 { + compatible = "rockchip,rv1126-qos", "syscon"; + reg = <0xfe860080 0x20>; + }; + + qos_sfc: qos@fe860200 { + compatible = "rockchip,rv1126-qos", "syscon"; + reg = <0xfe860200 0x20>; + }; + + qos_sdio: qos@fe86c000 { + compatible = "rockchip,rv1126-qos", "syscon"; + reg = <0xfe86c000 0x20>; + }; + + gic: interrupt-controller@feff0000 { + compatible = "arm,gic-400"; + interrupt-controller; + #interrupt-cells = <3>; + #address-cells = <0>; + + reg = <0xfeff1000 0x1000>, + <0xfeff2000 0x2000>, + <0xfeff4000 0x2000>, + <0xfeff6000 0x2000>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + }; + + pmu: power-management@ff3e0000 { + compatible = "rockchip,rv1126-pmu", "syscon", "simple-mfd"; + reg = <0xff3e0000 0x1000>; + + power: power-controller { + compatible = "rockchip,rv1126-power-controller"; + #power-domain-cells = <1>; + #address-cells = <1>; + #size-cells = <0>; + + power-domain@RV1126_PD_NVM { + reg = <RV1126_PD_NVM>; + clocks = <&cru HCLK_EMMC>, + <&cru CLK_EMMC>, + <&cru HCLK_NANDC>, + <&cru CLK_NANDC>, + <&cru HCLK_SFC>, + <&cru HCLK_SFCXIP>, + <&cru SCLK_SFC>; + pm_qos = <&qos_emmc>, + <&qos_nandc>, + <&qos_sfc>; + #power-domain-cells = <0>; + }; + + power-domain@RV1126_PD_SDIO { + reg = <RV1126_PD_SDIO>; + clocks = <&cru HCLK_SDIO>, + <&cru CLK_SDIO>; + pm_qos = <&qos_sdio>; + #power-domain-cells = <0>; + }; + }; + }; + + i2c0: i2c@ff3f0000 { + compatible = "rockchip,rv1126-i2c", "rockchip,rk3399-i2c"; + reg = <0xff3f0000 0x1000>; + interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&pmucru CLK_I2C0>, <&pmucru PCLK_I2C0>; + clock-names = "i2c", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_xfer>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c2: i2c@ff400000 { + compatible = "rockchip,rv1126-i2c", "rockchip,rk3399-i2c"; + reg = <0xff400000 0x1000>; + interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; + rockchip,grf = <&pmugrf>; + clocks = <&pmucru CLK_I2C2>, <&pmucru PCLK_I2C2>; + clock-names = "i2c", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_xfer>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + dmac: dma-controller@ff4e0000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0xff4e0000 0x4000>; + interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; + #dma-cells = <1>; + arm,pl330-periph-burst; + clocks = <&cru ACLK_DMAC>; + clock-names = "apb_pclk"; + }; + + uart1: serial@ff410000 { + compatible = "rockchip,rv1126-uart", "snps,dw-apb-uart"; + reg = <0xff410000 0x100>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + clock-frequency = <24000000>; + clocks = <&pmucru SCLK_UART1>, <&pmucru PCLK_UART1>; + clock-names = "baudclk", "apb_pclk"; + dmas = <&dmac 7>, <&dmac 6>; + pinctrl-names = "default"; + pinctrl-0 = <&uart1m0_xfer>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + pmucru: clock-controller@ff480000 { + compatible = "rockchip,rv1126-pmucru"; + reg = <0xff480000 0x1000>; + rockchip,grf = <&grf>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + cru: clock-controller@ff490000 { + compatible = "rockchip,rv1126-cru"; + reg = <0xff490000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; + rockchip,grf = <&grf>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + i2c1: i2c@ff510000 { + compatible = "rockchip,rv1126-i2c", "rockchip,rk3399-i2c"; + reg = <0xff510000 0x1000>; + interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru CLK_I2C1>, <&cru PCLK_I2C1>; + clock-names = "i2c", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_xfer>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c3: i2c@ff520000 { + compatible = "rockchip,rv1126-i2c", "rockchip,rk3399-i2c"; + reg = <0xff520000 0x1000>; + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru CLK_I2C3>, <&cru PCLK_I2C3>; + clock-names = "i2c", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c3m0_xfer>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c4: i2c@ff530000 { + compatible = "rockchip,rv1126-i2c", "rockchip,rk3399-i2c"; + reg = <0xff530000 0x1000>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru CLK_I2C4>, <&cru PCLK_I2C4>; + clock-names = "i2c", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c4m0_xfer>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c5: i2c@ff540000 { + compatible = "rockchip,rv1126-i2c", "rockchip,rk3399-i2c"; + reg = <0xff540000 0x1000>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru CLK_I2C5>, <&cru PCLK_I2C5>; + clock-names = "i2c", "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c5m0_xfer>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + uart0: serial@ff560000 { + compatible = "rockchip,rv1126-uart", "snps,dw-apb-uart"; + reg = <0xff560000 0x100>; + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; + clock-frequency = <24000000>; + clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>; + clock-names = "baudclk", "apb_pclk"; + dmas = <&dmac 5>, <&dmac 4>; + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart2: serial@ff570000 { + compatible = "rockchip,rv1126-uart", "snps,dw-apb-uart"; + reg = <0xff570000 0x100>; + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; + clock-frequency = <24000000>; + clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>; + clock-names = "baudclk", "apb_pclk"; + dmas = <&dmac 9>, <&dmac 8>; + pinctrl-names = "default"; + pinctrl-0 = <&uart2m1_xfer>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart3: serial@ff580000 { + compatible = "rockchip,rv1126-uart", "snps,dw-apb-uart"; + reg = <0xff580000 0x100>; + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; + clock-frequency = <24000000>; + clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>; + clock-names = "baudclk", "apb_pclk"; + dmas = <&dmac 11>, <&dmac 10>; + pinctrl-names = "default"; + pinctrl-0 = <&uart3m0_xfer>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart4: serial@ff590000 { + compatible = "rockchip,rv1126-uart", "snps,dw-apb-uart"; + reg = <0xff590000 0x100>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; + clock-frequency = <24000000>; + clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>; + clock-names = "baudclk", "apb_pclk"; + dmas = <&dmac 13>, <&dmac 12>; + pinctrl-names = "default"; + pinctrl-0 = <&uart4m0_xfer>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart5: serial@ff5a0000 { + compatible = "rockchip,rv1126-uart", "snps,dw-apb-uart"; + reg = <0xff5a0000 0x100>; + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; + clock-frequency = <24000000>; + clocks = <&cru SCLK_UART5>, <&cru PCLK_UART5>; + dmas = <&dmac 15>, <&dmac 14>; + clock-names = "baudclk", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&uart5m0_xfer>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + saradc: saradc@ff5e0000 { + compatible = "rockchip,rk3399-saradc"; + reg = <0xff5e0000 0x100>; + interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; + #io-channel-cells = <1>; + clocks = <&cru CLK_SARADC>, <&cru PCLK_SARADC>; + clock-names = "saradc", "apb_pclk"; + resets = <&cru SRST_SARADC_P>; + reset-names = "saradc-apb"; + status = "disabled"; + }; + + timer: timer@ff660000 { + compatible = "rockchip,rk3288-timer"; + reg = <0xff660000 0x20>; + interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_TIMER>, <&cru CLK_TIMER0>; + clock-names = "pclk", "timer"; + }; + + emmc: mmc@ffc50000 { + compatible = "rockchip,rv1126-dw-mshc", "rockchip,rk3288-dw-mshc"; + reg = <0xffc50000 0x4000>; + interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_EMMC>, <&cru CLK_EMMC>, + <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; + fifo-depth = <0x100>; + max-frequency = <200000000>; + power-domains = <&power RV1126_PD_NVM>; + status = "disabled"; + }; + + sdmmc: mmc@ffc60000 { + compatible = "rockchip,rv1126-dw-mshc", "rockchip,rk3288-dw-mshc"; + reg = <0xffc60000 0x4000>; + interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_SDMMC>, <&cru CLK_SDMMC>, + <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; + fifo-depth = <0x100>; + max-frequency = <200000000>; + status = "disabled"; + }; + + sdio: mmc@ffc70000 { + compatible = "rockchip,rv1126-dw-mshc", "rockchip,rk3288-dw-mshc"; + reg = <0xffc70000 0x4000>; + interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_SDIO>, <&cru CLK_SDIO>, + <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; + fifo-depth = <0x100>; + max-frequency = <200000000>; + power-domains = <&power RV1126_PD_SDIO>; + status = "disabled"; + }; + + pinctrl: pinctrl { + compatible = "rockchip,rv1126-pinctrl"; + rockchip,grf = <&grf>; + rockchip,pmu = <&pmugrf>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + gpio0: gpio0@ff460000 { + compatible = "rockchip,gpio-bank"; + reg = <0xff460000 0x100>; + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&pmucru PCLK_GPIO0>, <&pmucru DBCLK_GPIO0>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + }; + + gpio1: gpio1@ff620000 { + compatible = "rockchip,gpio-bank"; + reg = <0xff620000 0x100>; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + }; + + gpio2: gpio2@ff630000 { + compatible = "rockchip,gpio-bank"; + reg = <0xff630000 0x100>; + interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + }; + + gpio3: gpio3@ff640000 { + compatible = "rockchip,gpio-bank"; + reg = <0xff640000 0x100>; + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + }; + + gpio4: gpio4@ff650000 { + compatible = "rockchip,gpio-bank"; + reg = <0xff650000 0x100>; + interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; +}; + +#include "rv1126-pinctrl.dtsi"
Signature · 1 line
2.25.1
PATCH v3 16/19 dt-bindings: vendor-prefixes: Add Edgeble AI Technologies Pvt. Ltd.
In reply to Jagan TekiEdgeble AI is an Artificial Intelligence company with a focus on deploying Neural Acceleration principles at the Edge.
Add vendor prefix for it.
---
Changes for v3:
- none
Changes for v2:
- collect Ron ack
Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@ -356,6 +356,8 @@ patternProperties: description: EBV Elektronik "^eckelmann,.*": description: Eckelmann AG + "^edgeble,.*": + description: Edgeble AI Technologies Pvt. Ltd. "^edimax,.*": description: EDIMAX Technology Co., Ltd "^edt,.*":
Signature · 1 line
2.25.1
PATCH v3 17/19 dt-bindings: arm: rockchip: Add Edgeble AI Edge Compute Module 0 Carrier
In reply to Jagan TekiEdge Compute Module 0 is a 96boards SoM-CB compute module based on Rockchip RV1126 from Edgeble AI.
Edge Compute Module 0 Carrier board is an industrial form factor evaluation board from Edgeble AI.
Edge Compute Module 0 needs to mount on top of this evaluation board for creating complete Edge Compute Module 0 Carrier board.
Add dt-bindings for it.
---
Changes for v3:
- none
Changes for v2:
- collect Ron ack
Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +6 -0
@@ -65,6 +65,12 @@ properties: - const: chipspark,rayeager-px2 - const: rockchip,rk3066a + - description: Edgeble AI Edge Compute Module 0 SoM based boards + items: + - const: edgeble,edge-compute-module-0-carrier # Edgeble AI Edge Compute Module 0 Carrier + - const: edgeble,edge-compute-module-0 # Edgeble AI Edge Compute Module 0 SoM + - const: rockchip,rv1126 + - description: Elgin RV1108 R1 items: - const: elgin,rv1108-r1
Signature · 1 line
2.25.1
PATCH v3 18/19 ARM: dts: rockchip: rv1126: Add Edgeble AI Edge Compute Module 0
In reply to Jagan TekiEdge Compute Module 0 is a 96boards SoM-CB compute module based on Rockchip RV1126 from Edgeble AI.
General features:
- Rockchip RV1126
- 2/4GB LPDDR4
- 16GB eMMC
- Fn-link 8223A-SR WiFi/BT
Edge Compute Module 0 needs to mount on top of Edgeble AI Carrier boards for creating complete platform solutions.
Add support for it.
---
Changes for v3:
- none
Changes for v2:
- change meaninful dtsi name
.../rv1126-edgeble-edge-compute-module-0.dtsi | 353 ++++++++++++++++++ 1 file changed, 353 insertions(+) create mode 100644 arch/arm/boot/dts/rv1126-edgeble-edge-compute-module-0.dtsi
arch/arm/boot/dts/rv1126-edgeble-edge-compute-module-0.dtsi new file +353 -0
@@ -0,0 +1,353 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. + * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. + */ + +/ { + compatible = "edgeble,edge-compute-module-0", "rockchip,rv1126"; + + aliases { + mmc0 = &emmc; + }; + + vcc5v0_sys: vccsys { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + vccio_flash: vccio-flash { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&flash_vol_sel>; + regulator-name = "vccio_flash"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc_3v3>; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&rk809 1>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable_h>; + reset-gpios = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; + }; +}; + +&cpu0 { + cpu-supply = <&vdd_arm>; +}; + +&emmc { + bus-width = <8>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk &emmc_rstnout>; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&vccio_flash>; + rockchip,default-sample-phase = <90>; + status = "okay"; +}; + +&i2c0 { + status = "okay"; + clock-frequency = <400000>; + + rk809: pmic@20 { + compatible = "rockchip,rk809"; + reg = <0x20>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PB1 IRQ_TYPE_LEVEL_LOW>; + #clock-cells = <1>; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_int_l>; + rockchip,system-power-controller; + wakeup-source; + + vcc1-supply = <&vcc5v0_sys>; + vcc2-supply = <&vcc5v0_sys>; + vcc3-supply = <&vcc5v0_sys>; + vcc4-supply = <&vcc5v0_sys>; + vcc5-supply = <&vcc_buck5>; + vcc6-supply = <&vcc_buck5>; + vcc7-supply = <&vcc5v0_sys>; + vcc8-supply = <&vcc3v3_sys>; + vcc9-supply = <&vcc5v0_sys>; + + regulators { + vdd_npu_vepu: DCDC_REG1 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <950000>; + regulator-ramp-delay = <6001>; + regulator-initial-mode = <0x2>; + regulator-name = "vdd_npu_vepu"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_arm: DCDC_REG2 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <725000>; + regulator-max-microvolt = <1350000>; + regulator-ramp-delay = <6001>; + regulator-initial-mode = <0x2>; + regulator-name = "vdd_arm"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_ddr: DCDC_REG3 { + regulator-always-on; + regulator-boot-on; + regulator-initial-mode = <0x2>; + regulator-name = "vcc_ddr"; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc3v3_sys: DCDC_REG4 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-initial-mode = <0x2>; + regulator-name = "vcc3v3_sys"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + + vcc_buck5: DCDC_REG5 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <2200000>; + regulator-max-microvolt = <2200000>; + regulator-name = "vcc_buck5"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <2200000>; + }; + }; + + vcc_0v8: LDO_REG1 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <800000>; + regulator-name = "vcc_0v8"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc1v8_pmu: LDO_REG2 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc1v8_pmu"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vdd0v8_pmu: LDO_REG3 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <800000>; + regulator-name = "vcc0v8_pmu"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <800000>; + }; + }; + + vcc_1v8: LDO_REG4 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc_1v8"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcc_dovdd: LDO_REG5 { + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc_dovdd"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_dvdd: LDO_REG6 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-name = "vcc_dvdd"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_avdd: LDO_REG7 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-name = "vcc_avdd"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vccio_sd: LDO_REG8 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vccio_sd"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc3v3_sd: LDO_REG9 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc3v3_sd"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_5v0: SWITCH_REG1 { + regulator-name = "vcc_5v0"; + }; + + vcc_3v3: SWITCH_REG2 { + regulator-always-on; + regulator-boot-on; + regulator-name = "vcc_3v3"; + }; + }; + }; +}; + +&pinctrl { + bt { + bt_enable: bt-enable { + rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + flash { + flash_vol_sel: flash-vol-sel { + rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + wifi { + wifi_enable_h: wifi-enable-h { + rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&pmu_io_domains { + pmuio0-supply = <&vcc1v8_pmu>; + pmuio1-supply = <&vcc3v3_sys>; + vccio1-supply = <&vccio_flash>; + vccio2-supply = <&vccio_sd>; + vccio3-supply = <&vcc_1v8>; + vccio4-supply = <&vcc_dovdd>; + vccio5-supply = <&vcc_1v8>; + vccio6-supply = <&vcc_1v8>; + vccio7-supply = <&vcc_dovdd>; + status = "okay"; +}; + +&saradc { + vref-supply = <&vcc_1v8>; + status = "okay"; +}; + +&sdio { + #address-cells = <1>; + #size-cells = <0>; + max-frequency = <100000000>; + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc1_clk &sdmmc1_cmd &sdmmc1_bus4>; + vmmc-supply = <&vcc3v3_sys>; + vqmmc-supply = <&vcc_1v8>; + rockchip,default-sample-phase = <90>; + sd-uhs-sdr104; + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer &uart0_ctsn &uart0_rtsn>; + status = "okay"; + + bluetooth { + compatible = "qcom,qca9377-bt"; + clocks = <&rk809 1>; + clock-names = "lpo"; + enable-gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>; /* BT_RST */ + max-speed = <2000000>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_enable>; + vddxo-supply = <&vcc3v3_sys>; + vddio-supply = <&vcc_1v8>; + }; +};
Signature · 1 line
2.25.1
PATCH v3 19/19 ARM: dts: rockchip: rv1126: Add Edgeble AI Edge Compute Module 0 Carrier
In reply to Jagan TekiEdge Compute Module 0 Carrier is an industrial form factor evaluation board from Edgeble AI.
General features:
- microSD slot
- 2x MIPI CSI2 connectors
- MIPI DSI connector
- 2x USB Host
- 1x USB OTG
- Ethernet
- mini PCIe
- Onboard PoE
- RS485, RS232, CAN
- Micro Phone array
- Speaker
- RTC battery slot
- 40-pin expansion
Edge Compute Module 0 needs to mount on top of this Carrier board for creating Edge Compute Module 0 Carrier platform.
Add support for it.
---
Changes for v3:
- none
Changes for v2:
- change easy and meaningful dts name
arch/arm/boot/dts/Makefile | 1 + .../boot/dts/rv1126-edgeble-ecm0-carrier.dts | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 arch/arm/boot/dts/rv1126-edgeble-ecm0-carrier.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -1097,6 +1097,7 @@ dtb-$(CONFIG_ARCH_RENESAS) += \ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rv1108-elgin-r1.dtb \ rv1108-evb.dtb \ + rv1126-edgeble-ecm0-carrier.dtb \ rk3036-evb.dtb \ rk3036-kylin.dtb \ rk3066a-bqcurie2.dtb \
arch/arm/boot/dts/rv1126-edgeble-ecm0-carrier.dts new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. + * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. + */ + +/dts-v1/; +#include "rv1126.dtsi" +#include "rv1126-edgeble-edge-compute-module-0.dtsi" + +/ { + model = "Edgeble AI Edge Compute Module 0 Carrier board"; + compatible = "edgeble,edge-compute-module-0-carrier", + "edgeble,edge-compute-module-0", "rockchip,rv1126"; + + chosen { + stdout-path = "serial2:1500000n8"; + }; +}; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + card-detect-delay = <200>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_bus4 &sdmmc0_det>; + rockchip,default-sample-phase = <90>; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + vqmmc-supply = <&vccio_sd>; + status = "okay"; +}; + +&uart2 { + status = "okay"; +};
Signature · 1 line
2.25.1
Re: (subset) [PATCH v3 00/19] ARM: Add Rockchip RV1126 support
In reply to Jagan TekiQuoted 9 lines · Jagan Teki
RV1126 is a high-performance vision processor SoC for IPC/CVR, especially for AI related application.
It is based on quad-core ARM Cortex-A7 32-bit core which integrates NEON and FPU. There is a 32KB I-cache and 32KB D-cache for each core and 512KB unified L2 cache. It has build-in NPU supports INT8/INT16 hybrid operation and computing power is up to 2.0TOPs.
[...]
Applied, thanks!
[01/19] dt-bindings: power: Add power-domain header for RV1126
commit: daf7dc86513ffc9d9b2eef0378d97361609490ca
[02/19] dt-bindings: power: rockchip: Document RV1126 power-controller
commit: 2f3484b27598427ae582a37520b67c011597d706
[03/19] soc: rockchip: power-domain: Add RV1126 power domains
commit: 66296e0a318e12ef1ca04013e1e893539e715c5a
[04/19] dt-bindings: power: rockchip: Document RV1126 PMU IO domains
commit: 593e860fdff9add7f7eba504cf111b59a728fda5
[05/19] soc: rockchip: io-domain: Add RV1126 IO domains
commit: 570ed4e5b0d9e784f51a52bede2326391afa8c3fBest regards,
Signature · 1 line
Heiko Stuebner <[email protected]>