From: Olof Johansson Date: Fri, 5 Jan 2018 07:12:57 +0000 (-0800) Subject: Merge tag 'keystone_driver_soc_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.15~9497^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11077e9bf7fef8b1081221b482260a6bfa2b6d5f;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'keystone_driver_soc_for_4.16' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/drivers 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 --- 11077e9bf7fef8b1081221b482260a6bfa2b6d5f diff --cc Documentation/devicetree/bindings/memory-controllers/ti/emif.txt index 152eecc,29a9987..621b41c7 --- a/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt +++ b/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt @@@ -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>;