mtd: m25p80: Add missing m25p80 flash merge

Added m25p80 flash merge which is missing on below
merge commit
"Merge tag 'v3.12' into master-next"
(sha1: cd30bed1eb9cddb9bd24c0fcd13bdbba6373ac1f)

Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
clk/zynq/clkc: Fix fclk-enable logic

Commit 'clk/zynq/clkc: Add 'fclk-enable' functionality'
(d0b69caa6c963ed23f7bd725fcc68670dd2ed257) introduced the fclk-enable
feature and DT property. And commit 'clk: zynq: Change handling of FCLK
default state' (48461c50475550328e02c7bb46d7f5d53f5bdecb) changed the
fclk handling during boot. Unfortunately the logic to enable/disable
fclks was buggy, not implementing the intended behavior.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>