Commit a9fa1f7c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.10/soc-signed' of... 

Merge tag 'omap-for-v4.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC changes for omaps for v4.10 merge window:

- Add hwmod interconnect target wrapper module data for crypto
  accelerators for am3xxx, am43xx and dra7

- Add support for dra71x family of SoCs

- PM fixes for omap4/5 needed for omap5 cpuidle

* tag 'omap-for-v4.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: DRA7: hwmod: Do not register RTC on DRA71
  ARM: OMAP2+: board-generic: add support for DRA71x family
  ARM: AMx3xx: hwmod: Add data for RNG
  ARM: AM43xx: hwmod: Add data for DES
  ARM: OMAP: DRA7xx: Make L4SEC clock domain SWSUP only
  ARM: DRA7: hwmod: Add data for RNG IP
  ARM: DRA7: hwmod: Add data for SHA IP
  ARM: DRA7: hwmod: Add data for AES IP
  ARM: DRA7: hwmod: Add data for DES IP
  ARM: OMAP5: Add basic cpuidle MPU CSWR support
  ARM: OMAP4+: Fix bad fallthrough for cpuidle
  ARM: OMAP5: Fix mpuss_early_init
  ARM: OMAP5: Fix build for PM code

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e1cb1c78 2bb6375f

Documentation/devicetree/bindings/arm/omap/omap.txt

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ SoCs: 
- DRA722

  compatible = "ti,dra722", "ti,dra72", "ti,dra7"



- DRA718

  compatible = "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7"



- AM5728

  compatible = "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"
@@ -181,6 +184,9 @@ Boards: 
- DRA722 EVM: Software Development Board for DRA722

  compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"



- DRA718 EVM: Software Development Board for DRA718

  compatible = "ti,dra718-evm", "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7"



- DM3730 Logic PD Torpedo + Wireless: Commercial System on Module with WiFi and Bluetooth

  compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3"

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ endif 
# Power Management

omap-4-5-pm-common			= omap-mpuss-lowpower.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-4-5-pm-common)

obj-$(CONFIG_ARCH_OMAP5)		+= $(omap-4-5-pm-common)

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-pm-common)

obj-$(CONFIG_OMAP_PM_NOOP)		+= omap-pm-noop.o



ifeq ($(CONFIG_PM),y)

arch/arm/mach-omap2/board-generic.c

+1 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ static const char *const dra72x_boards_compat[] __initconst = { 
	"ti,am5718",

	"ti,am5716",

	"ti,dra722",

	"ti,dra718",

	NULL,

};

arch/arm/mach-omap2/clockdomains7xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static struct clockdomain l4sec_7xx_clkdm = { 
	.dep_bit	  = DRA7XX_L4SEC_STATDEP_SHIFT,

	.wkdep_srcs	  = l4sec_wkup_sleep_deps,

	.sleepdep_srcs	  = l4sec_wkup_sleep_deps,

	.flags		  = CLKDM_CAN_HWSUP_SWSUP,

	.flags		  = CLKDM_CAN_SWSUP,

};



static struct clockdomain l3main1_7xx_clkdm = {

arch/arm/mach-omap2/common.h

+29 −9
Original line number Diff line number Diff line
@@ -262,8 +262,6 @@ extern void __iomem *omap4_get_sar_ram_base(void); 
extern void omap4_mpuss_early_init(void);

extern void omap_do_wfi(void);



extern void omap4_secondary_startup(void);

extern void omap4460_secondary_startup(void);



#ifdef CONFIG_SMP

/* Needed for secondary core boot */
@@ -275,16 +273,11 @@ extern void omap4_cpu_die(unsigned int cpu); 
extern int omap4_cpu_kill(unsigned int cpu);



extern const struct smp_operations omap4_smp_ops;



extern void omap5_secondary_startup(void);

extern void omap5_secondary_hyp_startup(void);

#endif



#if defined(CONFIG_SMP) && defined(CONFIG_PM)

extern int omap4_mpuss_init(void);

extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state);

extern int omap4_finish_suspend(unsigned long cpu_state);

extern void omap4_cpu_resume(void);

extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state);

#else

static inline int omap4_enter_lowpower(unsigned int cpu,
@@ -305,14 +298,41 @@ static inline int omap4_mpuss_init(void) 
	return 0;

}



#endif



#ifdef CONFIG_ARCH_OMAP4

void omap4_secondary_startup(void);

void omap4460_secondary_startup(void);

int omap4_finish_suspend(unsigned long cpu_state);

void omap4_cpu_resume(void);

#else

static inline void omap4_secondary_startup(void)

{

}



static inline void omap4460_secondary_startup(void)

{

}

static inline int omap4_finish_suspend(unsigned long cpu_state)

{

	return 0;

}



static inline void omap4_cpu_resume(void)

{}

{

}

#endif



#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)

void omap5_secondary_startup(void);

void omap5_secondary_hyp_startup(void);

#else

static inline void omap5_secondary_startup(void)

{

}



static inline void omap5_secondary_hyp_startup(void)

{

}

#endif



void pdata_quirks_init(const struct of_device_id *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE