2 files changed, 19 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/ata/sata_highbank.txt b/Documentation/devicetree/bindings/ata/sata_highbank.txt
index c84833e13363..aa83407cb7a4 100644
--- a/Documentation/devicetree/bindings/ata/sata_highbank.txt
+++ b/Documentation/devicetree/bindings/ata/sata_highbank.txt
@@ -23,6 +23,10 @@ Optional properties:
 - calxeda,tx-atten  : a u32 array that contains TX attenuation override
                         codes, one per port. The upper 3 bytes are always
                         0 and thus ignored.
+- calxeda,pre-clocks : a u32 that indicates the number of additional clock
+                        cycles to transmit before sending an SGPIO pattern
+- calxeda,post-clocks: a u32 that indicates the number of additional clock
+                        cycles to transmit after sending an SGPIO pattern
 
 Example:
         sata@ffe08000 {
@@ -35,4 +39,6 @@ Example:
                 calxeda,sgpio-gpio =<&gpioh 5 1 &gpioh 6 1 &gpioh 7 1>;
                 calxeda,led-order = <4 0 1 2 3>;
                 calxeda,tx-atten = <0xff 22 0xff 0xff 23>;
+                calxeda,pre-clocks = <10>;
+                calxeda,post-clocks = <0>;
         };
diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index ba43c7217545..0849672218c9 100644
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -84,6 +84,9 @@ static DEFINE_SPINLOCK(sgpio_lock);
 
 struct ecx_plat_data {
         u32             n_ports;
+        /* number of extra clocks that the SGPIO PIC controller expects */
+        u32             pre_clocks;
+        u32             post_clocks;
         unsigned        sgpio_gpio[SGPIO_PINS];
         u32             sgpio_pattern;
         u32             port_to_sgpio[SGPIO_PORTS];
@@ -160,6 +163,9 @@ static ssize_t ecx_transmit_led_message(struct ata_port *ap, u32 state,
         spin_lock_irqsave(&sgpio_lock, flags);
         ecx_parse_sgpio(pdata, ap->port_no, state);
         sgpio_out = pdata->sgpio_pattern;
+        for (i = 0; i < pdata->pre_clocks; i++)
+                ecx_led_cycle_clock(pdata);
+
         gpio_set_value(pdata->sgpio_gpio[SLOAD], 1);
         ecx_led_cycle_clock(pdata);
         gpio_set_value(pdata->sgpio_gpio[SLOAD], 0);
@@ -172,6 +178,8 @@ static ssize_t ecx_transmit_led_message(struct ata_port *ap, u32 state,
                 sgpio_out >>= 1;
                 ecx_led_cycle_clock(pdata);
         }
+        for (i = 0; i < pdata->post_clocks; i++)
+                ecx_led_cycle_clock(pdata);
 
         /* save off new led state for port/slot */
         emp->led_state = state;
@@ -206,6 +214,11 @@ static void highbank_set_em_messages(struct device *dev,
         of_property_read_u32_array(np, "calxeda,led-order",
                                                 pdata->port_to_sgpio,
                                                 pdata->n_ports);
+        if (of_property_read_u32(np, "calxeda,pre-clocks", &pdata->pre_clocks))
+                pdata->pre_clocks = 0;
+        if (of_property_read_u32(np, "calxeda,post-clocks",
+                                &pdata->post_clocks))
+                pdata->post_clocks = 0;
 
         /* store em_loc */
         hpriv->em_loc = 0;