Merge branch 'fixes' into for-next

arndb · arndb · commit 8b6eac70ae3e · 2017-12-07T15:55:08.000+01:00
* fixes:
  ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
  arm: dts: nspire: Add missing #phy-cells to usb-nop-xceiv
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
@@ -56,6 +56,7 @@
 
 	usb_phy: usb_phy {
 		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
 	};
 
 	vbus_reg: vbus_reg {
diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c
@@ -73,6 +73,7 @@ phys_addr_t omap_secure_ram_mempool_base(void)
 	return omap_secure_memblock_base;
 }
 
+#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
 u32 omap3_save_secure_ram(void __iomem *addr, int size)
 {
 	u32 ret;
@@ -91,6 +92,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size)
 
 	return ret;
 }
+#endif
 
 /**
  * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ phys_addr_t omap_secure_ram_mempool_base(void)`
`73`	`73`	`return omap_secure_memblock_base;`
`74`	`74`	`}`
`75`	`75`
	`76`	`+#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)`
`76`	`77`	`u32 omap3_save_secure_ram(void __iomem *addr, int size)`
`77`	`78`	`{`
`78`	`79`	`u32 ret;`
`@@ -91,6 +92,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size)`
`91`	`92`
`92`	`93`	`return ret;`
`93`	`94`	`}`
	`95`	`+#endif`
`94`	`96`
`95`	`97`	`/**`
`96`	`98`	`* rx51_secure_dispatcher: Routine to dispatch secure PPA API calls`