Probe omap4 crypt accelerators with ti-sysc
Subsystems (5)
Tony Lindgren
maintainercover Probe omap4 crypt accelerators with ti-sysc
Hi,
This series updates omap4 crypto accelerators to probe with ti-sysc.
Note that this series depends on the following series:
[PATCH 0/5] Clock changes needed to probe rng on omap4 and 5
Regards,
Tony
Tony Lindgren (6):
ARM: dts: Configure interconnect target module for omap4 sham
ARM: dts: Configure interconnect target module for omap4 aes
ARM: dts: Configure interconnect target module for omap4 des
ARM: OMAP2+: Drop legacy platform data for omap4 aes
ARM: OMAP2+: Drop legacy platform data for omap4 sham
ARM: OMAP2+: Drop legacy platform data for omap4 des
arch/arm/boot/dts/omap4-l4.dtsi | 29 +++++ arch/arm/boot/dts/omap4.dtsi | 110 ++++++++++++----- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 135 --------------------- 3 files changed, 109 insertions(+), 165 deletions(-)
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 1/6 ARM: dts: Configure interconnect target module for omap4 sham
We can now probe devices with device tree only configuration using ti-sysc interconnect target module driver. Let's configure the module, but keep the legacy "ti,hwmods" peroperty to avoid new boot time warnings. The legacy property will be removed in later patches together with the legacy platform data.
--- arch/arm/boot/dts/omap4.dtsi | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap4.dtsi +26 -6
@@ -293,13 +293,33 @@ des: des@480a5000 { dma-names = "tx", "rx"; }; - sham: sham@4b100000 { - compatible = "ti,omap4-sham"; + sham_target: target-module@4b100000 { + compatible = "ti,sysc-omap3-sham", "ti,sysc"; ti,hwmods = "sham"; - reg = <0x4b100000 0x300>; - interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&sdma 119>; - dma-names = "rx"; + reg = <0x4b100100 0x4>, + <0x4b100110 0x4>, + <0x4b100114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + /* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */ + clocks = <&l4_secure_clkctrl OMAP4_SHA2MD5_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x4b100000 0x1000>; + + sham: sham@0 { + compatible = "ti,omap4-sham"; + reg = <0 0x300>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&sdma 119>; + dma-names = "rx"; + }; }; abb_mpu: regulator-abb-mpu {
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 2/6 ARM: dts: Configure interconnect target module for omap4 aes
In reply to Tony LindgrenWe can now probe devices with device tree only configuration using ti-sysc interconnect target module driver. Let's configure the module, but keep the legacy "ti,hwmods" peroperty to avoid new boot time warnings. The legacy property will be removed in later patches together with the legacy platform data.
--- arch/arm/boot/dts/omap4.dtsi | 66 +++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 12 deletions(-)
arch/arm/boot/dts/omap4.dtsi +54 -12
@@ -266,22 +266,64 @@ emif2: emif@4d000000 { hw-caps-temp-alert; }; - aes1: aes@4b501000 { - compatible = "ti,omap4-aes"; + aes1_target: target-module@4b501000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "aes1"; - reg = <0x4b501000 0xa0>; - interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&sdma 111>, <&sdma 110>; - dma-names = "tx", "rx"; + reg = <0x4b501080 0x4>, + <0x4b501084 0x4>, + <0x4b501088 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>, + <SYSC_IDLE_SMART_WKUP>; + ti,syss-mask = <1>; + /* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */ + clocks = <&l4_secure_clkctrl OMAP4_AES1_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x4b501000 0x1000>; + + aes1: aes@0 { + compatible = "ti,omap4-aes"; + reg = <0 0xa0>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&sdma 111>, <&sdma 110>; + dma-names = "tx", "rx"; + }; }; - aes2: aes@4b701000 { - compatible = "ti,omap4-aes"; + aes2_target: target-module@4b701000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "aes2"; - reg = <0x4b701000 0xa0>; - interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&sdma 114>, <&sdma 113>; - dma-names = "tx", "rx"; + reg = <0x4b701080 0x4>, + <0x4b701084 0x4>, + <0x4b701088 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>, + <SYSC_IDLE_SMART_WKUP>; + ti,syss-mask = <1>; + /* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */ + clocks = <&l4_secure_clkctrl OMAP4_AES2_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x4b701000 0x1000>; + + aes2: aes@0 { + compatible = "ti,omap4-aes"; + reg = <0 0xa0>; + interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&sdma 114>, <&sdma 113>; + dma-names = "tx", "rx"; + }; }; des: des@480a5000 {
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 3/6 ARM: dts: Configure interconnect target module for omap4 des
In reply to Tony LindgrenWe can now probe devices with device tree only configuration using ti-sysc interconnect target module driver. Let's configure the module, but keep the legacy "ti,hwmods" peroperty to avoid new boot time warnings. The legacy property will be removed in later patches together with the legacy platform data.
--- arch/arm/boot/dts/omap4-l4.dtsi | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap4.dtsi | 9 --------- 2 files changed, 30 insertions(+), 9 deletions(-)
arch/arm/boot/dts/omap4-l4.dtsi +30 -0
@@ -2185,6 +2185,36 @@ target-module@a4000 { /* 0x480a4000, ap 59 34.0 */ <0x00001000 0x000a5000 0x00001000>; }; + des_target: target-module@a5000 { /* 0x480a5000 */ + compatible = "ti,sysc-omap2", "ti,sysc"; + ti,hwmods = "des"; + reg = <0xa5030 0x4>, + <0xa5034 0x4>, + <0xa5038 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>, + <SYSC_IDLE_SMART_WKUP>; + ti,syss-mask = <1>; + /* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */ + clocks = <&l4_secure_clkctrl OMAP4_DES3DES_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0xa5000 0x00001000>; + + des: des@0 { + compatible = "ti,omap4-des"; + reg = <0 0xa0>; + interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&sdma 117>, <&sdma 116>; + dma-names = "tx", "rx"; + }; + }; + target-module@a8000 { /* 0x480a8000, ap 61 3e.0 */ compatible = "ti,sysc"; status = "disabled";
arch/arm/boot/dts/omap4.dtsi +0 -9
@@ -326,15 +326,6 @@ aes2: aes@0 { }; }; - des: des@480a5000 { - compatible = "ti,omap4-des"; - ti,hwmods = "des"; - reg = <0x480a5000 0xa0>; - interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&sdma 117>, <&sdma 116>; - dma-names = "tx", "rx"; - }; - sham_target: target-module@4b100000 { compatible = "ti,sysc-omap3-sham", "ti,sysc"; ti,hwmods = "sham";
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 4/6 ARM: OMAP2+: Drop legacy platform data for omap4 aes
In reply to Tony LindgrenWe can now probe devices with ti-sysc interconnect driver and dts data. Let's drop the related platform data and custom ti,hwmods dts property.
As we're just dropping data, and the early platform data init is based on the custom ti,hwmods property, we want to drop both the platform data and ti,hwmods property in a single patch.
--- arch/arm/boot/dts/omap4.dtsi | 2 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 62 ---------------------- 2 files changed, 64 deletions(-)
arch/arm/boot/dts/omap4.dtsi +0 -2
@@ -268,7 +268,6 @@ emif2: emif@4d000000 { aes1_target: target-module@4b501000 { compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "aes1"; reg = <0x4b501080 0x4>, <0x4b501084 0x4>, <0x4b501088 0x4>;
@@ -298,7 +297,6 @@ aes1: aes@0 { aes2_target: target-module@4b701000 { compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "aes2"; reg = <0x4b701080 0x4>, <0x4b701084 0x4>, <0x4b701088 0x4>;
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -62
74 lines not on this page · raw message
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 5/6 ARM: OMAP2+: Drop legacy platform data for omap4 sham
In reply to Tony LindgrenWe can now probe devices with ti-sysc interconnect driver and dts data. Let's drop the related platform data and custom ti,hwmods dts property.
As we're just dropping data, and the early platform data init is based on the custom ti,hwmods property, we want to drop both the platform data and ti,hwmods property in a single patch.
--- arch/arm/boot/dts/omap4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 35 ---------------------- 2 files changed, 36 deletions(-)
arch/arm/boot/dts/omap4.dtsi +0 -1
@@ -326,7 +326,6 @@ aes2: aes@0 { sham_target: target-module@4b100000 { compatible = "ti,sysc-omap3-sham", "ti,sysc"; - ti,hwmods = "sham"; reg = <0x4b100100 0x4>, <0x4b100110 0x4>, <0x4b100114 0x4>;
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -35
@@ -777,32 +777,6 @@ static struct omap_hwmod omap44xx_dss_venc_hwmod = { .opt_clks_cnt = ARRAY_SIZE(dss_venc_opt_clks), }; -/* sha0 HIB2 (the 'P' (public) device) */ -static struct omap_hwmod_class_sysconfig omap44xx_sha0_sysc = { - .rev_offs =0x100 , - .sysc_offs =0x110 , - .syss_offs =0x114 , - .sysc_flags =SYSS_HAS_RESET_STATUS , -}; - -static struct omap_hwmod_class omap44xx_sha0_hwmod_class = { - .name ="sham" , - .sysc = &omap44xx_sha0_sysc, -}; - -static struct omap_hwmod omap44xx_sha0_hwmod = { - .name ="sham" , - .class = &omap44xx_sha0_hwmod_class, - .clkdm_name ="l4_secure_clkdm" , - .main_clk ="l3_div_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4SEC_SHA2MD51_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4SEC_SHA2MD51_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -};/* * 'elm' class
@@ -2545,14 +2519,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_venc = { .user = OCP_USER_MPU, }; -/* l3_main_2 -> sham */ -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__sha0 = { - .master = &omap44xx_l3_main_2_hwmod, - .slave = &omap44xx_sha0_hwmod, - .clk ="l3_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l4_per -> elm */ static struct omap_hwmod_ocp_if omap44xx_l4_per__elm = { .master = &omap44xx_l4_per_hwmod,
@@ -2986,7 +2952,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_mpu__emif1, &omap44xx_mpu__emif2, &omap44xx_l3_main_2__des, - &omap44xx_l3_main_2__sha0, NULL, };
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 6/6 ARM: OMAP2+: Drop legacy platform data for omap4 des
In reply to Tony LindgrenWe can now probe devices with ti-sysc interconnect driver and dts data. Let's drop the related platform data and custom ti,hwmods dts property.
As we're just dropping data, and the early platform data init is based on the custom ti,hwmods property, we want to drop both the platform data and ti,hwmods property in a single patch.
--- arch/arm/boot/dts/omap4-l4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 38 ---------------------- 2 files changed, 39 deletions(-)
arch/arm/boot/dts/omap4-l4.dtsi +0 -1
@@ -2187,7 +2187,6 @@ target-module@a4000 { /* 0x480a4000, ap 59 34.0 */ des_target: target-module@a5000 { /* 0x480a5000 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "des"; reg = <0xa5030 0x4>, <0xa5034 0x4>, <0xa5038 0x4>;
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -38
@@ -858,43 +858,6 @@ static struct omap_hwmod omap44xx_emif2_hwmod = { }, }; - -/* -* 'des' class for DES3DES module -*/ -static struct omap_hwmod_class_sysconfig omap44xx_des_sysc = { - .rev_offs =0x30 , - .sysc_offs =0x34 , - .syss_offs =0x38 , - .sysc_flags =SYSS_HAS_RESET_STATUS , -}; - -static struct omap_hwmod_class omap44xx_des_hwmod_class = { - .name ="des" , - .sysc = &omap44xx_des_sysc, -}; - -static struct omap_hwmod omap44xx_des_hwmod = { - .name ="des" , - .class = &omap44xx_des_hwmod_class, - .clkdm_name ="l4_secure_clkdm" , - .main_clk ="l3_div_ck" , - .prcm = { - .omap4 = { - .context_offs =OMAP4_RM_L4SEC_DES3DES_CONTEXT_OFFSET , - .clkctrl_offs =OMAP4_CM_L4SEC_DES3DES_CLKCTRL_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__des = { - .master = &omap44xx_l3_main_2_hwmod, - .slave = &omap44xx_des_hwmod, - .clk ="l3_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* * 'fdif' class * face detection hw accelerator module
@@ -2951,7 +2914,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l4_cfg__usb_tll_hs, &omap44xx_mpu__emif1, &omap44xx_mpu__emif2, - &omap44xx_l3_main_2__des, NULL, };
Signature · 1 line
2.24.0