To modify Ixia port numbers and IP in pod.yaml

[kvmfornfv.git] / kernel / drivers / spi / spi-sh-msiof.c

diff --git a/kernel/drivers/spi/spi-sh-msiof.c b/kernel/drivers/spi/spi-sh-msiof.c
index 7872f3c..d22de4c 100644 (file)
--- a/kernel/drivers/spi/spi-sh-msiof.c
+++ b/kernel/drivers/spi/spi-sh-msiof.c
@@ -263,6 +263,9 @@ static void sh_msiof_spi_set_clk_regs(struct sh_msiof_spi_priv *p,
 
        for (k = 0; k < ARRAY_SIZE(sh_msiof_spi_div_table); k++) {
                brps = DIV_ROUND_UP(div, sh_msiof_spi_div_table[k].div);
+               /* SCR_BRDV_DIV_1 is valid only if BRPS is x 1/1 or x 1/2 */
+               if (sh_msiof_spi_div_table[k].div == 1 && brps > 2)
+                       continue;
                if (brps <= 32) /* max of brdv is 32 */
                        break;
        }
@@ -1266,13 +1269,8 @@ static int sh_msiof_spi_remove(struct platform_device *pdev)
        return 0;
 }
 
-static struct platform_device_id spi_driver_ids[] = {
+static const struct platform_device_id spi_driver_ids[] = {
        { "spi_sh_msiof",       (kernel_ulong_t)&sh_data },
-       { "spi_r8a7790_msiof",  (kernel_ulong_t)&r8a779x_data },
-       { "spi_r8a7791_msiof",  (kernel_ulong_t)&r8a779x_data },
-       { "spi_r8a7792_msiof",  (kernel_ulong_t)&r8a779x_data },
-       { "spi_r8a7793_msiof",  (kernel_ulong_t)&r8a779x_data },
-       { "spi_r8a7794_msiof",  (kernel_ulong_t)&r8a779x_data },
        {},
 };
 MODULE_DEVICE_TABLE(platform, spi_driver_ids);