mmc: sdhci-msm: Make tuning block table endian agnostic

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / sdhci-msm.c

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 40573a58486a165e659853b327b7c8e8f886863d..19539c61353c252ee9e52b11ac0c1be8a48b8c3d 100644 (file)
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -16,7 +16,6 @@
 
 #include <linux/module.h>
 #include <linux/of_device.h>
-#include <linux/regulator/consumer.h>
 #include <linux/delay.h>
 #include <linux/mmc/mmc.h>
 #include <linux/slab.h>
@@ -47,22 +46,34 @@
 #define CMUX_SHIFT_PHASE_SHIFT 24
 #define CMUX_SHIFT_PHASE_MASK  (7 << CMUX_SHIFT_PHASE_SHIFT)
 
-static const u32 tuning_block_64[] = {
-       0x00ff0fff, 0xccc3ccff, 0xffcc3cc3, 0xeffefffe,
-       0xddffdfff, 0xfbfffbff, 0xff7fffbf, 0xefbdf777,
-       0xf0fff0ff, 0x3cccfc0f, 0xcfcc33cc, 0xeeffefff,
-       0xfdfffdff, 0xffbfffdf, 0xfff7ffbb, 0xde7b7ff7
+static const u8 tuning_block_64[] = {
+       0xff, 0x0f, 0xff, 0x00, 0xff, 0xcc, 0xc3, 0xcc,
+       0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,
+       0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,
+       0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,
+       0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,
+       0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,
+       0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,
+       0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde,
 };
 
-static const u32 tuning_block_128[] = {
-       0xff00ffff, 0x0000ffff, 0xccccffff, 0xcccc33cc,
-       0xcc3333cc, 0xffffcccc, 0xffffeeff, 0xffeeeeff,
-       0xffddffff, 0xddddffff, 0xbbffffff, 0xbbffffff,
-       0xffffffbb, 0xffffff77, 0x77ff7777, 0xffeeddbb,
-       0x00ffffff, 0x00ffffff, 0xccffff00, 0xcc33cccc,
-       0x3333cccc, 0xffcccccc, 0xffeeffff, 0xeeeeffff,
-       0xddffffff, 0xddffffff, 0xffffffdd, 0xffffffbb,
-       0xffffbbbb, 0xffff77ff, 0xff7777ff, 0xeeddbb77
+static const u8 tuning_block_128[] = {
+       0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00,
+       0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc, 0xcc,
+       0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff, 0xff,
+       0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee, 0xff,
+       0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xdd,
+       0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xbb,
+       0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff, 0xff,
+       0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee, 0xff,
+       0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00,
+       0x00, 0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc,
+       0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff,
+       0xff, 0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee,
+       0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd,
+       0xdd, 0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff,
+       0xbb, 0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff,
+       0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee,
 };
 
 struct sdhci_msm_host {
@@ -359,7 +370,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)
 {
        int tuning_seq_cnt = 3;
        u8 phase, *data_buf, tuned_phases[16], tuned_phase_cnt = 0;
-       const u32 *tuning_block_pattern = tuning_block_64;
+       const u8 *tuning_block_pattern = tuning_block_64;
        int size = sizeof(tuning_block_64);     /* Pattern size in bytes */
        int rc;
        struct mmc_host *mmc = host->mmc;
@@ -611,7 +622,6 @@ static struct platform_driver sdhci_msm_driver = {
        .remove = sdhci_msm_remove,
        .driver = {
                   .name = "sdhci_msm",
-                  .owner = THIS_MODULE,
                   .of_match_table = sdhci_msm_dt_match,
        },
 };