Revert "regmap: Synchronize cache for the page selector"

This reverts commit 1fd60ed.

The patch is not longer available upstream

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

Author: ujfalusi

drivers/base/regmap/regmap.c

@@ -1559,40 +1559,24 @@ static int _regmap_select_page(struct regmap *map, unsigned int *reg,
 			return -EINVAL;
 	}
 
-	/*
-	 * It is possible to have selector register inside data window.
-	 * In that case, selector register is located on every page and it
-	 * needs no page switching, when accessed alone.
-	 *
-	 * Nevertheless we should synchronize the cache values for it.
-	 */
+	/* It is possible to have selector register inside data window.
+	   In that case, selector register is located on every page and
+	   it needs no page switching, when accessed alone. */
 	if (val_num > 1 ||
 	    range->window_start + win_offset != range->selector_reg) {
-		unsigned int page_off = win_page * range->window_len;
-		unsigned int sel_offset = range->selector_reg - range->window_start;
-		unsigned int sel_register = range->range_min + page_off + sel_offset;
-		unsigned int val = win_page << range->selector_shift;
-		unsigned int mask = range->selector_mask;
-
 		/* Use separate work_buf during page switching */
 		orig_work_buf = map->work_buf;
 		map->work_buf = map->selector_work_buf;
 
-		ret = _regmap_update_bits(map, range->selector_reg, mask, val,
+		ret = _regmap_update_bits(map, range->selector_reg,
+					  range->selector_mask,
+					  win_page << range->selector_shift,
 					  &page_chg, false);
 
 		map->work_buf = orig_work_buf;
 
 		if (ret != 0)
 			return ret;
-
-		/*
-		 * If selector register has been just updated, update the respective
-		 * virtual copy as well.
-		 */
-		if (page_chg &&
-		    in_range(range->selector_reg, range->window_start, range->window_len))
-			_regmap_update_bits(map, sel_register, mask, val, NULL, false);
 	}
 
 	*reg = range->window_start + win_offset;