Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11077e9b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'keystone_driver_soc_for_4.16' of... 

Merge tag 'keystone_driver_soc_for_4.16' of git://git.kernel.org/pub/scm/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: default avatarOlof Johansson <olof@lixom.net>
parents 8102324d aefc5818

Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

+16 −1
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ Required properties: 
  the value shall be "emif<n>" where <n> is the number of the EMIF

  instance with base 1.



Required only for "ti,emif-am3352" and "ti,emif-am4372":

- sram			: Phandles for generic sram driver nodes,

  first should be type 'protect-exec' for the driver to use to copy

  and run PM functions, second should be regular pool to be used for

  data region for code. See Documentation/devicetree/bindings/sram/sram.txt

  for more details.



Optional properties:

- cs1-used		: Have this property if CS1 of this EMIF

  instance has a memory part attached to it. If there is a memory
@@ -44,7 +51,7 @@ Optional properties: 
- hw-caps-temp-alert	: Have this property if the controller

  has capability for generating SDRAM temperature alerts



Example:

-Examples:



emif1: emif@4c000000 {

	compatible	= "ti,emif-4d";
@@ -56,3 +63,11 @@ emif1: emif@4c000000 { 
	hw-caps-ll-interface;

	hw-caps-temp-alert;

};



/* From am33xx.dtsi */

emif: emif@4c000000 {

        compatible = "ti,emif-am3352";

        reg =   <0x4C000000 0x1000>;

        sram = <&pm_sram_code

                &pm_sram_data>;

};

drivers/firmware/ti_sci.c

+2 −2
Original line number Diff line number Diff line
@@ -287,13 +287,13 @@ static void ti_sci_rx_callback(struct mbox_client *cl, void *m) 


	/* Is the message of valid length? */

	if (mbox_msg->len > info->desc->max_msg_size) {

		dev_err(dev, "Unable to handle %d xfer(max %d)\n",

		dev_err(dev, "Unable to handle %zu xfer(max %d)\n",

			mbox_msg->len, info->desc->max_msg_size);

		ti_sci_dump_header_dbg(dev, hdr);

		return;

	}

	if (mbox_msg->len < xfer->rx_len) {

		dev_err(dev, "Recv xfer %d < expected %d length\n",

		dev_err(dev, "Recv xfer %zu < expected %d length\n",

			mbox_msg->len, xfer->rx_len);

		ti_sci_dump_header_dbg(dev, hdr);

		return;

drivers/memory/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -84,6 +84,16 @@ config OMAP_GPMC_DEBUG 
	  bootloader or else the GPMC timings won't be identical with the

	  bootloader timings.



config TI_EMIF_SRAM

	tristate "Texas Instruments EMIF SRAM driver"

	depends on (SOC_AM33XX || SOC_AM43XX) && SRAM

	help

	  This driver is for the EMIF module available on Texas Instruments

	  AM33XX and AM43XX SoCs and is required for PM. Certain parts of

	  the EMIF PM code must run from on-chip SRAM late in the suspend

	  sequence so this driver provides several relocatable PM functions

	  for the SoC PM code to use.



config MVEBU_DEVBUS

	bool "Marvell EBU Device Bus Controller"

	default y

drivers/memory/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -23,3 +23,11 @@ obj-$(CONFIG_DA8XX_DDRCTL) += da8xx-ddrctl.o 


obj-$(CONFIG_SAMSUNG_MC)	+= samsung/

obj-$(CONFIG_TEGRA_MC)		+= tegra/

obj-$(CONFIG_TI_EMIF_SRAM)	+= ti-emif-sram.o

ti-emif-sram-objs		:= ti-emif-pm.o ti-emif-sram-pm.o



AFLAGS_ti-emif-sram-pm.o	:=-Wa,-march=armv7-a



include drivers/memory/Makefile.asm-offsets



drivers/memory/ti-emif-sram-pm.o: include/generated/ti-emif-asm-offsets.h

drivers/memory/Makefile.asm-offsets

0 → 100644
+5 −0
Original line number Diff line number Diff line 
drivers/memory/emif-asm-offsets.s: drivers/memory/emif-asm-offsets.c

	$(call if_changed_dep,cc_s_c)



include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE

	$(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__)