diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-04-18 14:56:53 -0700 |
|---|---|---|
| committer | audahadi <wan.audahadi@gmail.com> | 2015-07-20 04:49:55 +0800 |
| commit | a6efce690ae608761887a82c276e8c923d4dabe8 (patch) | |
| tree | 61cc12fcee8e67d2ad30d4d3586883f25cf4d229 | |
| parent | 6534b5f08a17485f38b26381e490e0a6526ca7e9 (diff) | |
msm8974: Adjust qcrypto device name
* Userspace doesn't like when we have a comma in a wakeup source.
Change-Id: Iff5e1a086fcee2307b9f83ad8f4697445226cbb3
Signed-off-by: Jean Francis Dominique S. Mabalot <jmabalot@google.com>
| -rw-r--r-- | arch/arm/boot/dts/msm8974.dtsi | 25 | ||||
| -rw-r--r-- | arch/arm/mach-msm/clock-8974.c | 13 |
2 files changed, 31 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi index f76f3e6931d..e6815acc74d 100644 --- a/arch/arm/boot/dts/msm8974.dtsi +++ b/arch/arm/boot/dts/msm8974.dtsi @@ -2213,7 +2213,7 @@ qcom,memory-reservation-size = <0x280000>; /* 2.5M EBI1 buffer */ }; - qcom,qcedev@fd440000 { + qcom_cedev: qcedev@fd440000 { compatible = "qcom,qcedev"; reg = <0xfd440000 0x20000>, <0xfd444000 0x8000>; @@ -2229,7 +2229,7 @@ <56 512 3936000 393600>; }; - qcom,qcrypto@fd444000 { + qcom_crypto: qcrypto@fd440000 { compatible = "qcom,qcrypto"; reg = <0xfd440000 0x20000>, <0xfd444000 0x8000>; @@ -2248,7 +2248,26 @@ <56 512 0 0>, <56 512 3936000 393600>; }; - + qcom_crypto1: qcrypto1@fd440000 { + compatible = "qcom,qcrypto"; + reg = <0xfd440000 0x20000>, + <0xfd444000 0x1b000>; + reg-names = "crypto-base","crypto-bam-base"; + interrupts = <0 236 0>; + qcom,bam-pipe-pair = <0>; + qcom,ce-hw-instance = <1>; + qcom,ce-device = <1>; + qcom,clk-mgmt-sus-res; + qcom,msm-bus,name = "qcrypto-noc"; + qcom,msm-bus,num-cases = <2>; + qcom,msm-bus,num-paths = <1>; + qcom,use-sw-aes-cbc-ecb-ctr-algo; + qcom,use-sw-aes-xts-algo; + qcom,use-sw-ahash-algo; + qcom,msm-bus,vectors-KBps = + <56 512 0 0>, + <56 512 3936000 393600>; + }; qcom,usbbam@f9304000 { compatible = "qcom,usb-bam-msm"; reg = <0xf9304000 0x5000>, diff --git a/arch/arm/mach-msm/clock-8974.c b/arch/arm/mach-msm/clock-8974.c index 97ecb18aa61..892f2d84468 100644 --- a/arch/arm/mach-msm/clock-8974.c +++ b/arch/arm/mach-msm/clock-8974.c @@ -5014,10 +5014,15 @@ static struct clk_lookup msm_clocks_8974_common[] __initdata = { CLK_LOOKUP("bus_clk", gcc_ce2_axi_clk.c, "qcedev.0"), CLK_LOOKUP("core_clk_src", ce2_clk_src.c, "qcedev.0"), - CLK_LOOKUP("core_clk", gcc_ce2_clk.c, "qcrypto.0"), - CLK_LOOKUP("iface_clk", gcc_ce2_ahb_clk.c, "qcrypto.0"), - CLK_LOOKUP("bus_clk", gcc_ce2_axi_clk.c, "qcrypto.0"), - CLK_LOOKUP("core_clk_src", ce2_clk_src.c, "qcrypto.0"), + CLK_LOOKUP("core_clk", gcc_ce2_clk.c, "fd440000.qcrypto"), + CLK_LOOKUP("iface_clk", gcc_ce2_ahb_clk.c, "fd440000.qcrypto"), + CLK_LOOKUP("bus_clk", gcc_ce2_axi_clk.c, "fd440000.qcrypto"), + CLK_LOOKUP("core_clk_src", ce2_clk_src.c, "fd440000.qcrypto"), + + CLK_LOOKUP("core_clk", gcc_ce2_clk.c, "fd440000.qcrypto1"), + CLK_LOOKUP("iface_clk", gcc_ce2_ahb_clk.c, "fd440000.qcrypto1"), + CLK_LOOKUP("bus_clk", gcc_ce2_axi_clk.c, "fd440000.qcrypto1"), + CLK_LOOKUP("core_clk_src", ce2_clk_src.c, "fd440000.qcrypto1"), CLK_LOOKUP("core_clk", gcc_ce1_clk.c, "qseecom"), CLK_LOOKUP("iface_clk", gcc_ce1_ahb_clk.c, "qseecom"), |