Skip to content
  • Stephen Boyd's avatar
    Merge branches 'clk-imx6-ocram', 'clk-missing-put', 'clk-tegra-sdmmc-jitter',... · 032405a7
    Stephen Boyd authored
    Merge branches 'clk-imx6-ocram', 'clk-missing-put', 'clk-tegra-sdmmc-jitter', 'clk-allwinner' and 'clk-uniphier' into clk-next
    
    * clk-imx6-ocram:
      :  - i.MX6SX ocram_s clk support
      clk: imx: add ocram_s clock for i.mx6sx
    
    * clk-missing-put:
      :  - Add missing of_node_put()s in some i.MX clk drivers
      clk: imx6sll: fix missing of_node_put()
      clk: imx6ul: fix missing of_node_put()
    
    * clk-tegra-sdmmc-jitter:
      :  - Tegra SDMMC clk jitter improvements with high speed signaling modes
      clk: tegra: make sdmmc2 and sdmmc4 as sdmmc clocks
      clk: tegra: Add sdmmc mux divider clock
      clk: tegra: Refactor fractional divider calculation
      clk: tegra: Fix includes required by fence_udelay()
    
    * clk-allwinner:
      clk: sunxi-ng: add A64 compatible string
      dt-bindings: add compatible string for the A64 DE2 CCU
      clk: sunxi-ng: r40: Export video PLLs
      clk: sunxi-ng: r40: Allow setting parent rate to display related clocks
      clk: sunxi-ng: r40: Add minimal rate for video PLLs
    
    * clk-uniphier:
      :  - Uniphier NAND, USB3 PHY, and SPI clk support
      clk: uniphier: add clock frequency support for SPI
      clk: uniphier: add more USB3 PHY clocks
      clk: uniphier: add NAND 200MHz clock
    032405a7