|
|
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
|
|
|
--- a/drivers/mmc/core/sd.c
|
|
|
+++ b/drivers/mmc/core/sd.c
|
|
|
-@@ -1015,83 +1015,6 @@ static bool mmc_sd_card_using_v18(struct
|
|
|
+@@ -1016,83 +1016,6 @@ static bool mmc_sd_card_using_v18(struct
|
|
|
(SD_MODE_UHS_SDR50 | SD_MODE_UHS_SDR104 | SD_MODE_UHS_DDR50);
|
|
|
}
|
|
|
|
|
|
@@ -100,7 +100,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
static int sd_parse_ext_reg_power(struct mmc_card *card, u8 fno, u8 page,
|
|
|
u16 offset)
|
|
|
{
|
|
|
-@@ -1101,7 +1024,7 @@ static int sd_parse_ext_reg_power(struct
|
|
|
+@@ -1102,7 +1025,7 @@ static int sd_parse_ext_reg_power(struct
|
|
|
reg_buf = card->ext_reg_buf;
|
|
|
|
|
|
/* Read the extension register for power management function. */
|
|
|
@@ -109,7 +109,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
if (err) {
|
|
|
pr_warn("%s: error %d reading PM func of ext reg\n",
|
|
|
mmc_hostname(card->host), err);
|
|
|
-@@ -1139,7 +1062,7 @@ static int sd_parse_ext_reg_perf(struct
|
|
|
+@@ -1140,7 +1063,7 @@ static int sd_parse_ext_reg_perf(struct
|
|
|
|
|
|
reg_buf = card->ext_reg_buf;
|
|
|
|
|
|
@@ -118,7 +118,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
if (err) {
|
|
|
pr_warn("%s: error %d reading PERF func of ext reg\n",
|
|
|
mmc_hostname(card->host), err);
|
|
|
-@@ -1234,7 +1157,7 @@ static int sd_parse_ext_reg(struct mmc_c
|
|
|
+@@ -1235,7 +1158,7 @@ static int sd_parse_ext_reg(struct mmc_c
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
@@ -127,7 +127,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
{
|
|
|
int err, i;
|
|
|
u8 num_ext, *gen_info_buf;
|
|
|
-@@ -1260,7 +1183,7 @@ static int sd_read_ext_regs(struct mmc_c
|
|
|
+@@ -1261,7 +1184,7 @@ static int sd_read_ext_regs(struct mmc_c
|
|
|
* Read 512 bytes of general info, which is found at function number 0,
|
|
|
* at page 0 and with no offset.
|
|
|
*/
|
|
|
@@ -136,7 +136,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
if (err) {
|
|
|
pr_err("%s: error %d reading general info of SD ext reg\n",
|
|
|
mmc_hostname(card->host), err);
|
|
|
-@@ -1332,7 +1255,7 @@ static int sd_flush_cache(struct mmc_hos
|
|
|
+@@ -1333,7 +1256,7 @@ static int sd_flush_cache(struct mmc_hos
|
|
|
page = card->ext_perf.page;
|
|
|
offset = card->ext_perf.offset + 261;
|
|
|
|
|
|
@@ -145,7 +145,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
if (err) {
|
|
|
pr_warn("%s: error %d writing Cache Flush bit\n",
|
|
|
mmc_hostname(host), err);
|
|
|
-@@ -1348,7 +1271,7 @@ static int sd_flush_cache(struct mmc_hos
|
|
|
+@@ -1349,7 +1272,7 @@ static int sd_flush_cache(struct mmc_hos
|
|
|
* Read the Flush Cache bit. The card shall reset it, to confirm that
|
|
|
* it's has completed the flushing of the cache.
|
|
|
*/
|
|
|
@@ -154,7 +154,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
if (err) {
|
|
|
pr_warn("%s: error %d reading Cache Flush bit\n",
|
|
|
mmc_hostname(host), err);
|
|
|
-@@ -1371,7 +1294,7 @@ static int sd_enable_cache(struct mmc_ca
|
|
|
+@@ -1372,7 +1295,7 @@ static int sd_enable_cache(struct mmc_ca
|
|
|
* Set Cache Enable at bit 0 in the performance enhancement register at
|
|
|
* 260 bytes offset.
|
|
|
*/
|
|
|
@@ -163,7 +163,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
card->ext_perf.offset + 260, BIT(0));
|
|
|
if (err) {
|
|
|
pr_warn("%s: error %d writing Cache Enable bit\n",
|
|
|
-@@ -1541,7 +1464,7 @@ retry:
|
|
|
+@@ -1545,7 +1468,7 @@ retry:
|
|
|
cont:
|
|
|
if (!oldcard) {
|
|
|
/* Read/parse the extension registers. */
|
|
|
@@ -172,7 +172,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
if (err)
|
|
|
goto free_card;
|
|
|
}
|
|
|
-@@ -1668,7 +1591,7 @@ static int sd_busy_poweroff_notify_cb(vo
|
|
|
+@@ -1672,7 +1595,7 @@ static int sd_busy_poweroff_notify_cb(vo
|
|
|
* one byte offset and is one byte long. The Power Off Notification
|
|
|
* Ready is bit 0.
|
|
|
*/
|
|
|
@@ -181,7 +181,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
|
|
|
card->ext_power.offset + 1, 1, data->reg_buf);
|
|
|
if (err) {
|
|
|
pr_warn("%s: error %d reading status reg of PM func\n",
|
|
|
-@@ -1694,7 +1617,7 @@ static int sd_poweroff_notify(struct mmc
|
|
|
+@@ -1698,7 +1621,7 @@ static int sd_poweroff_notify(struct mmc
|
|
|
* Set the Power Off Notification bit in the power management settings
|
|
|
* register at 2 bytes offset.
|
|
|
*/
|