video: tegra: dynamic tsec, msenc firmware name
Mark Stadler [Thu, 30 Aug 2012 22:04:32 +0000 (15:04 -0700)]
Post-merge fix in support of runtime firmware choice

Change-Id: I4d4beaa54c5bc91e8ffd5a4ba4e1f1e72a522f59
Signed-off-by: Mark Stadler <mastadler@nvidia.com>
Reviewed-on: http://git-master/r/128668
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Ken Adams <kadams@nvidia.com>

drivers/video/tegra/host/msenc/msenc.c
drivers/video/tegra/host/tsec/tsec.c

index 642664b..68faf26 100644 (file)
@@ -260,13 +260,13 @@ static int msenc_setup_ucode_image(struct platform_device *dev,
        return 0;
 }
 
-int msenc_read_ucode(struct platform_device *dev)
+int msenc_read_ucode(struct platform_device *dev, const char *fw_name)
 {
        struct msenc *m = get_msenc(dev);
        const struct firmware *ucode_fw;
        int err;
 
-       ucode_fw  = nvhost_client_request_firmware(dev, MSENC_FIRMWARE_NAME);
+       ucode_fw  = nvhost_client_request_firmware(dev, fw_name);
        if (!ucode_fw) {
                dev_err(&dev->dev, "failed to get msenc firmware\n");
                err = -ENOENT;
index 4b7cb4c..2b6cfb0 100644 (file)
@@ -386,13 +386,13 @@ static int tsec_setup_ucode_image(struct platform_device *dev,
        return 0;
 }
 
-int tsec_read_ucode(struct platform_device *dev)
+int tsec_read_ucode(struct platform_device *dev, const char *fw_name)
 {
        struct tsec *m = get_tsec(dev);
        const struct firmware *ucode_fw;
        int err;
 
-       ucode_fw = nvhost_client_request_firmware(dev, TSEC_FIRMWARE_NAME);
+       ucode_fw = nvhost_client_request_firmware(dev, fw_name);
        if (!ucode_fw) {
                dev_err(&dev->dev, "failed to get tsec firmware\n");
                err = -ENOENT;