diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 23:16:02 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 23:16:34 +0400 |
| commit | 730346236af3fcd3324dbc26e4fa13955c59fa7e (patch) | |
| tree | 8bdc0ac70d36636a26e2284670aee5f15b930831 /drivers/clk/ti/mux.c | |
| parent | 1409f3fd5bdb548b0e11a109baa1087680b60c5a (diff) | |
| parent | 8fe9346b945d76ddb3f08c00e34d701174c62fa0 (diff) | |
| download | linux-730346236af3fcd3324dbc26e4fa13955c59fa7e.tar.xz | |
Merge tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx into next/dt
Merge "Xilinx Zynq changes for v3.17" from Michal Simek:
arm: Xilinx Zynq dt patches for v3.17
- Document and use new cadence serial binding
* tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx:
ARM: zynq: DT: Migrate UART to Cadence binding
tty: cadence: Document DT binding
+ Linux 3.16-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clk/ti/mux.c')
| -rw-r--r-- | drivers/clk/ti/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c index 0197a478720c..e9d650e51287 100644 --- a/drivers/clk/ti/mux.c +++ b/drivers/clk/ti/mux.c @@ -160,7 +160,7 @@ static void of_mux_clk_setup(struct device_node *node) u8 clk_mux_flags = 0; u32 mask = 0; u32 shift = 0; - u32 flags = 0; + u32 flags = CLK_SET_RATE_NO_REPARENT; num_parents = of_clk_get_parent_count(node); if (num_parents < 2) { |