Skip to content
  • Olof Johansson's avatar
    fba31105
    Merge tag 'imx-dt-3.20' of... · fba31105
    Olof Johansson authored
    Merge tag 'imx-dt-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
    
    Merge "ARM: imx: device tree changes for 3.20" from Shawn Guo:
    
    The i.MX device tree update for 3.20:
     - Update i.MX6 operating-points setting in device tree to match the
       latest i.MX6 data sheet
     - Add i.MX6SX sabreauto board support
     - Add imx6dl-udoo board support based off imx6q-udoo
     - Update sabrelite board to include I2C and HDMI support
     - Update the VPU compatible strings to also use cnm,coda<model>
     - Remove the ocram clock from the VPU node, as the clock is already
       provided inside the ocram node
     - Add system reset controller and syscon-reboot for VF610
     - Update VF610 device tree to use zero based naming for GPIO nodes,
       so that the number scheme matches hardware manual
     - A number of random device additions like watchdog for VF610, sahara
       for i.MX53, QSPI for imx6sx-sdb board, etc.
    
    Note: the branch imx/soc was merged into imx/dt because the SNVS device
    tree node needs to refer to the new clock ID added by the imx/soc patch.
    
    * tag 'imx-dt-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux
    
    : (28 commits)
      ARM: dts: imx28-evk: remove duplicate property
      ARM: vf610: use zero based naming for GPIO nodes
      ARM: dts: imx6q: enable dma for ecspi5
      ARM: dts: vfxxx: Add SNVS node
      ARM: imx: clk-vf610: Add clock for SNVS
      ARM: imx: clk-vf610: Add clock for UART4 and UART5
      ARM: imx: drop CPUIDLE_FLAG_TIME_VALID from cpuidle-imx6sx
      ARM: dts: imx6dl-udoo: Add board support based off imx6q-udoo
      ARM: imx: support arm power off in cpuidle for i.mx6sx
      ARM: imx: remove unnecessary setting for DSM
      ARM: dts: imx6sx: add i.mx6sx sabreauto board support
      ARM: dts: imx6sx-sdb: Add QSPI support
      ARM: dts: imx6qdl: Remove OCRAM clock from VPU node
      ARM: imx: apf51dev: add gpio-backlight support
      ARM: imx: correct the hardware clock gate setting for shared nodes
      ARM: imx: pllv3: add shift for frequency multiplier
      ARM vf610: add compatibilty strings of supported Vybrid SoC's
      ARM: i.MX53: dts: add sahara module
      ARM: dts: imx6dl: correct cpufreq volt/freq table
      ARM: dts: imx6q: update cpufreq volt/freq table
      ...
    
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    fba31105
    Merge tag 'imx-dt-3.20' of...
    Olof Johansson authored
    Merge tag 'imx-dt-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
    
    Merge "ARM: imx: device tree changes for 3.20" from Shawn Guo:
    
    The i.MX device tree update for 3.20:
     - Update i.MX6 operating-points setting in device tree to match the
       latest i.MX6 data sheet
     - Add i.MX6SX sabreauto board support
     - Add imx6dl-udoo board support based off imx6q-udoo
     - Update sabrelite board to include I2C and HDMI support
     - Update the VPU compatible strings to also use cnm,coda<model>
     - Remove the ocram clock from the VPU node, as the clock is already
       provided inside the ocram node
     - Add system reset controller and syscon-reboot for VF610
     - Update VF610 device tree to use zero based naming for GPIO nodes,
       so that the number scheme matches hardware manual
     - A number of random device additions like watchdog for VF610, sahara
       for i.MX53, QSPI for imx6sx-sdb board, etc.
    
    Note: the branch imx/soc was merged into imx/dt because the SNVS device
    tree node needs to refer to the new clock ID added by the imx/soc patch.
    
    * tag 'imx-dt-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux
    
    : (28 commits)
      ARM: dts: imx28-evk: remove duplicate property
      ARM: vf610: use zero based naming for GPIO nodes
      ARM: dts: imx6q: enable dma for ecspi5
      ARM: dts: vfxxx: Add SNVS node
      ARM: imx: clk-vf610: Add clock for SNVS
      ARM: imx: clk-vf610: Add clock for UART4 and UART5
      ARM: imx: drop CPUIDLE_FLAG_TIME_VALID from cpuidle-imx6sx
      ARM: dts: imx6dl-udoo: Add board support based off imx6q-udoo
      ARM: imx: support arm power off in cpuidle for i.mx6sx
      ARM: imx: remove unnecessary setting for DSM
      ARM: dts: imx6sx: add i.mx6sx sabreauto board support
      ARM: dts: imx6sx-sdb: Add QSPI support
      ARM: dts: imx6qdl: Remove OCRAM clock from VPU node
      ARM: imx: apf51dev: add gpio-backlight support
      ARM: imx: correct the hardware clock gate setting for shared nodes
      ARM: imx: pllv3: add shift for frequency multiplier
      ARM vf610: add compatibilty strings of supported Vybrid SoC's
      ARM: i.MX53: dts: add sahara module
      ARM: dts: imx6dl: correct cpufreq volt/freq table
      ARM: dts: imx6q: update cpufreq volt/freq table
      ...
    
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Loading