]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'keystone_driver_soc_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Fri, 5 Jan 2018 07:12:57 +0000 (23:12 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 5 Jan 2018 07:12:57 +0000 (23:12 -0800)
SOC: Keystone Soc driver updates for 4.16

 - TI EMIF-SRAM driver
 - TI SCI print format fix
 - Navigator strndup lenth fix

* tag 'keystone_driver_soc_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  soc: ti: fix max dup length for kstrndup
  firmware: ti_sci: Use %zu for size_t print format
  memory: ti-emif-sram: remove unused variable
  memory: ti-emif-sram: introduce relocatable suspend/resume handlers
  Documentation: dt: Update ti,emif bindings

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

index 152eeccbde1ccd7f3e7686867404733c3f0f8a29,29a99871e808c5ca146dd8f04407f9b0b6f7b30c..621b41c79faab3c355a28fb1bf2693bcb8aa6cee
@@@ -44,9 -51,9 +51,9 @@@ Optional properties
  - hw-caps-temp-alert  : Have this property if the controller
    has capability for generating SDRAM temperature alerts
  
Example:
-Examples:
  
 -emif1: emif@0x4c000000 {
 +emif1: emif@4c000000 {
        compatible      = "ti,emif-4d";
        ti,hwmods       = "emif2";
        phy-type        = <1>;