Merge tag 'clk-for-linus-3.11' of git://git.linaro.org/people/mturquette/linux

Pull clock framework updates from Mike Turquette:
 "The common clock framework changes for 3.11 include new clock drivers
  across several different platforms and architectures, fixes to
  existing drivers, a MAINTAINERS file fix and improvements to the basic
  clock types that allow them to be of use to more platforms than before.

  Only a few fixes to the core framework are included with most all of
  the changes landing in the various clock drivers themselves."

* tag 'clk-for-linus-3.11' of git://git.linaro.org/people/mturquette/linux: (55 commits)
  clk: tegra: fix ifdef for tegra_periph_reset_assert inline
  clk: tegra: provide tegra_periph_reset_assert alternative
  clk: exynos4: Fix clock aliases for cpufreq related clocks
  clk: samsung: Add MUX_FA macro to pass flag and alias
  clk: add support for Rockchip gate clocks
  clk: vexpress: Make the clock drivers directly available for arm64
  clk: vexpress: Use full node name to identify individual clocks
  clk: tegra: T114: add DFLL DVCO reset control
  clk: tegra: T114: add DFLL source clocks
  clk: tegra: T114: add FCPU clock shaper programming, needed by the DFLL
  clk: gate: add CLK_GATE_HIWORD_MASK
  clk: divider: add CLK_DIVIDER_HIWORD_MASK flag
  clk: mux: add CLK_MUX_HIWORD_MASK
  clk: Always notify whole subtree when reparenting
  MAINTAINERS: make drivers/clk entry match subdirs
  clk: honor CLK_GET_RATE_NOCACHE in clk_set_rate
  clk: use clk_get_rate() for debugfs
  clk: tegra: Use override bits when needed
  clk: tegra: override bits for Tegra30 PLLM
  clk: tegra: override bits for Tegra114 PLLM
  ...

1 files changed, 75 insertions, 4 deletions

diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c
index 24f553673b72..c50e83744b0a 100644
--- a/drivers/clk/clk-si5351.c
+++ b/drivers/clk/clk-si5351.c
@@ -851,6 +851,41 @@ static int _si5351_clkout_set_drive_strength(
         return 0;
 }
 
+static int _si5351_clkout_set_disable_state(
+        struct si5351_driver_data *drvdata, int num,
+        enum si5351_disable_state state)
+{
+        u8 reg = (num < 4) ? SI5351_CLK3_0_DISABLE_STATE :
+                SI5351_CLK7_4_DISABLE_STATE;
+        u8 shift = (num < 4) ? (2 * num) : (2 * (num-4));
+        u8 mask = SI5351_CLK_DISABLE_STATE_MASK << shift;
+        u8 val;
+
+        if (num > 8)
+                return -EINVAL;
+
+        switch (state) {
+        case SI5351_DISABLE_LOW:
+                val = SI5351_CLK_DISABLE_STATE_LOW;
+                break;
+        case SI5351_DISABLE_HIGH:
+                val = SI5351_CLK_DISABLE_STATE_HIGH;
+                break;
+        case SI5351_DISABLE_FLOATING:
+                val = SI5351_CLK_DISABLE_STATE_FLOAT;
+                break;
+        case SI5351_DISABLE_NEVER:
+                val = SI5351_CLK_DISABLE_STATE_NEVER;
+                break;
+        default:
+                return 0;
+        }
+
+        si5351_set_bits(drvdata, reg, mask, val << shift);
+
+        return 0;
+}
+
 static int si5351_clkout_prepare(struct clk_hw *hw)
 {
         struct si5351_hw_data *hwdata =
@@ -1225,6 +1260,33 @@ static int si5351_dt_parse(struct i2c_client *client)
                         }
                 }
 
+                if (!of_property_read_u32(child, "silabs,disable-state",
+                                          &val)) {
+                        switch (val) {
+                        case 0:
+                                pdata->clkout[num].disable_state =
+                                        SI5351_DISABLE_LOW;
+                                break;
+                        case 1:
+                                pdata->clkout[num].disable_state =
+                                        SI5351_DISABLE_HIGH;
+                                break;
+                        case 2:
+                                pdata->clkout[num].disable_state =
+                                        SI5351_DISABLE_FLOATING;
+                                break;
+                        case 3:
+                                pdata->clkout[num].disable_state =
+                                        SI5351_DISABLE_NEVER;
+                                break;
+                        default:
+                                dev_err(&client->dev,
+                                        "invalid disable state %d for clkout %d\n",
+                                        val, num);
+                                return -EINVAL;
+                        }
+                }
+
                 if (!of_property_read_u32(child, "clock-frequency", &val))
                         pdata->clkout[num].rate = val;
 
@@ -1281,9 +1343,6 @@ static int si5351_i2c_probe(struct i2c_client *client,
 
         /* Disable interrupts */
         si5351_reg_write(drvdata, SI5351_INTERRUPT_MASK, 0xf0);
-        /* Set disabled output drivers to drive low */
-        si5351_reg_write(drvdata, SI5351_CLK3_0_DISABLE_STATE, 0x00);
-        si5351_reg_write(drvdata, SI5351_CLK7_4_DISABLE_STATE, 0x00);
         /* Ensure pll select is on XTAL for Si5351A/B */
         if (drvdata->variant != SI5351_VARIANT_C)
                 si5351_set_bits(drvdata, SI5351_PLL_INPUT_SOURCE,
@@ -1327,6 +1386,15 @@ static int si5351_i2c_probe(struct i2c_client *client,
                                 n, pdata->clkout[n].drive);
                         return ret;
                 }
+
+                ret = _si5351_clkout_set_disable_state(drvdata, n,
+                                                pdata->clkout[n].disable_state);
+                if (ret) {
+                        dev_err(&client->dev,
+                                "failed set disable state of clkout%d to %d\n",
+                                n, pdata->clkout[n].disable_state);
+                        return ret;
+                }
         }
 
         /* register xtal input clock gate */
@@ -1500,7 +1568,10 @@ static int si5351_i2c_probe(struct i2c_client *client,
 }
 
 static const struct i2c_device_id si5351_i2c_ids[] = {
-        { "silabs,si5351", 0 },
+        { "si5351a", 0 },
+        { "si5351a-msop", 0 },
+        { "si5351b", 0 },
+        { "si5351c", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, si5351_i2c_ids);