Skip to content
  • Stephen Boyd's avatar
    d240d4c2
    Merge branches 'clk-amlogic', 'clk-rockchip', 'clk-of', 'clk-freescale' and... · d240d4c2
    Stephen Boyd authored
    Merge branches 'clk-amlogic', 'clk-rockchip', 'clk-of', 'clk-freescale' and 'clk-unused' into clk-next
    
     - Replace clk-provider.h with of_clk.h when possible
    
    * clk-amlogic:
      clk: meson: g12a: add MIPI DSI Host Pixel Clock
      dt-bindings: clk: g12a-clkc: add DSI Pixel clock bindings
      clk: meson: enable building as modules
      clk: meson: Kconfig: fix dependency for G12A
      clk: meson: axg: add MIPI DSI Host clock
      clk: meson: axg: add Video Clocks
      dt-bindings: clk: axg-clkc: add MIPI DSI Host clock binding
      dt-bindings: clk: axg-clkc: add Video Clocks
    
    * clk-rockchip:
      clk: rockchip: fix i2s gate bits on rk3066 and rk3188
      clk: rockchip: add CLK_SET_RATE_PARENT to sclk for rk3066a i2s and uart clocks
      clk: rockchip: Remove redundant null check before clk_prepare_enable
      clk: rockchip: Add appropriate arch dependencies
    
    * clk-of:
      xtensa: Replace <linux/clk-provider.h> by <linux/of_clk.h>
      sh: boards: Replace <linux/clk-provider.h> by <linux/of_clk.h>
    
    * clk-freescale:
      clk: fsl-flexspi: new driver
      dt-bindings: clock: document the fsl-flexspi-clk device
      clk: divider: add devm_clk_hw_register_divider_table()
      clk: qoriq: provide constants for the type
      clk: fsl-sai: use devm_clk_hw_register_composite_pdata()
      clk: composite: add devm_clk_hw_register_composite_pdata()
      clk: fsl-sai: fix memory leak
      clk: qoriq: Add platform dependencies
    
    * clk-unused:
      clk: scpi: mark scpi_clk_match as maybe unused
      clk: pwm: drop of_match_ptr from of_device_id table
    d240d4c2
    Merge branches 'clk-amlogic', 'clk-rockchip', 'clk-of', 'clk-freescale' and...
    Stephen Boyd authored
    Merge branches 'clk-amlogic', 'clk-rockchip', 'clk-of', 'clk-freescale' and 'clk-unused' into clk-next
    
     - Replace clk-provider.h with of_clk.h when possible
    
    * clk-amlogic:
      clk: meson: g12a: add MIPI DSI Host Pixel Clock
      dt-bindings: clk: g12a-clkc: add DSI Pixel clock bindings
      clk: meson: enable building as modules
      clk: meson: Kconfig: fix dependency for G12A
      clk: meson: axg: add MIPI DSI Host clock
      clk: meson: axg: add Video Clocks
      dt-bindings: clk: axg-clkc: add MIPI DSI Host clock binding
      dt-bindings: clk: axg-clkc: add Video Clocks
    
    * clk-rockchip:
      clk: rockchip: fix i2s gate bits on rk3066 and rk3188
      clk: rockchip: add CLK_SET_RATE_PARENT to sclk for rk3066a i2s and uart clocks
      clk: rockchip: Remove redundant null check before clk_prepare_enable
      clk: rockchip: Add appropriate arch dependencies
    
    * clk-of:
      xtensa: Replace <linux/clk-provider.h> by <linux/of_clk.h>
      sh: boards: Replace <linux/clk-provider.h> by <linux/of_clk.h>
    
    * clk-freescale:
      clk: fsl-flexspi: new driver
      dt-bindings: clock: document the fsl-flexspi-clk device
      clk: divider: add devm_clk_hw_register_divider_table()
      clk: qoriq: provide constants for the type
      clk: fsl-sai: use devm_clk_hw_register_composite_pdata()
      clk: composite: add devm_clk_hw_register_composite_pdata()
      clk: fsl-sai: fix memory leak
      clk: qoriq: Add platform dependencies
    
    * clk-unused:
      clk: scpi: mark scpi_clk_match as maybe unused
      clk: pwm: drop of_match_ptr from of_device_id table
Loading