3 files changed, 4 insertions, 10 deletions

diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 0f4e23828190..5f239b8bcddd 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -18,9 +18,8 @@ Required properties:
 - pinctrl-names: Must contain a "default" entry.
 - pinctrl-NNN: One property must exist for each entry in pinctrl-names.
   See ../pinctrl/pinctrl-bindings.txt for details of the property values.
-- big-endian-regs: If this property is absent, the little endian mode will
-  be in use as default, or the big endian mode will be in use for all the
-  device registers.
+- big-endian: Boolean property, required if all the FTM_PWM registers
+  are big-endian rather than little-endian.
 - big-endian-data: If this property is absent, the little endian mode will
   be in use as default, or the big endian mode will be in use for all the
   fifo data.
@@ -38,6 +37,6 @@ sai2: sai@40031000 {
               dma-names = "tx", "rx";
               dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>,
                    <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>;
-              big-endian-regs;
+              big-endian;
               big-endian-data;
 };
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index faa049797897..52d1e9982639 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -539,7 +539,7 @@ static bool fsl_sai_writeable_reg(struct device *dev, unsigned int reg)
         }
 }
 
-static struct regmap_config fsl_sai_regmap_config = {
+static const struct regmap_config fsl_sai_regmap_config = {
         .reg_bits = 32,
         .reg_stride = 4,
         .val_bits = 32,
@@ -568,10 +568,6 @@ static int fsl_sai_probe(struct platform_device *pdev)
         if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai"))
                 sai->sai_on_imx = true;
 
-        sai->big_endian_regs = of_property_read_bool(np, "big-endian-regs");
-        if (sai->big_endian_regs)
-                fsl_sai_regmap_config.val_format_endian = REGMAP_ENDIAN_BIG;
-
         sai->big_endian_data = of_property_read_bool(np, "big-endian-data");
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index 0e6c9f595d75..20e3e53ce6ea 100644
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -131,7 +131,6 @@ struct fsl_sai {
         struct clk *bus_clk;
         struct clk *mclk_clk[FSL_SAI_MCLK_MAX];
 
-        bool big_endian_regs;
         bool big_endian_data;
         bool is_dsp_mode;
         bool sai_on_imx;