2 files changed, 36 insertions, 4 deletions

diff --git a/Documentation/devicetree/bindings/spi/fsl-spi.txt b/Documentation/devicetree/bindings/spi/fsl-spi.txt
index b032dd76e9d2..a2331372068c 100644
--- a/Documentation/devicetree/bindings/spi/fsl-spi.txt
+++ b/Documentation/devicetree/bindings/spi/fsl-spi.txt
@@ -42,6 +42,10 @@ Required properties:
 - interrupts : should contain eSPI interrupt, the device has one interrupt.
 - fsl,espi-num-chipselects : the number of the chipselect signals.
 
+Optional properties:
+- fsl,csbef: chip select assertion time in bits before frame starts
+- fsl,csaft: chip select negation time in bits after frame ends
+
 Example:
         spi@110000 {
                 #address-cells = <1>;
@@ -51,4 +55,6 @@ Example:
                 interrupts = <53 0x2>;
                 interrupt-parent = <&mpic>;
                 fsl,espi-num-chipselects = <4>;
+                fsl,csbef = <1>;
+                fsl,csaft = <1>;
         };
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index e767f5831b9c..24096c84e9c4 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -586,8 +586,10 @@ static struct spi_master * fsl_espi_probe(struct device *dev,
         struct spi_master *master;
         struct mpc8xxx_spi *mpc8xxx_spi;
         struct fsl_espi_reg *reg_base;
-        u32 regval;
-        int i, ret = 0;
+        struct device_node *nc;
+        const __be32 *prop;
+        u32 regval, csmode;
+        int i, len, ret = 0;
 
         master = spi_alloc_master(dev, sizeof(struct mpc8xxx_spi));
         if (!master) {
@@ -634,8 +636,32 @@ static struct spi_master * fsl_espi_probe(struct device *dev,
         mpc8xxx_spi_write_reg(&reg_base->event, 0xffffffff);
 
         /* Init eSPI CS mode register */
-        for (i = 0; i < pdata->max_chipselect; i++)
-                mpc8xxx_spi_write_reg(&reg_base->csmode[i], CSMODE_INIT_VAL);
+        for_each_available_child_of_node(master->dev.of_node, nc) {
+                /* get chip select */
+                prop = of_get_property(nc, "reg", &len);
+                if (!prop || len < sizeof(*prop))
+                        continue;
+                i = be32_to_cpup(prop);
+                if (i < 0 || i >= pdata->max_chipselect)
+                        continue;
+
+                csmode = CSMODE_INIT_VAL;
+                /* check if CSBEF is set in device tree */
+                prop = of_get_property(nc, "fsl,csbef", &len);
+                if (prop && len >= sizeof(*prop)) {
+                        csmode &= ~(CSMODE_BEF(0xf));
+                        csmode |= CSMODE_BEF(be32_to_cpup(prop));
+                }
+                /* check if CSAFT is set in device tree */
+                prop = of_get_property(nc, "fsl,csaft", &len);
+                if (prop && len >= sizeof(*prop)) {
+                        csmode &= ~(CSMODE_AFT(0xf));
+                        csmode |= CSMODE_AFT(be32_to_cpup(prop));
+                }
+                mpc8xxx_spi_write_reg(&reg_base->csmode[i], csmode);
+
+                dev_info(dev, "cs=%d, init_csmode=0x%x\n", i, csmode);
+        }
 
         /* Enable SPI interface */
         regval = pdata->initial_spmode | SPMODE_INIT_VAL | SPMODE_ENABLE;