leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fixes' into for-next

Browse Source 
* fixes:
  ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
  arm: dts: nspire: Add missing #phy-cells to usb-nop-xceiv
This commit is contained in:
Arnd Bergmann 2017-12-07 15:55:08 +01:00
commit 8b6eac70ae
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/nspire.dtsi
View File

@ -56,6 +56,7 @@
usb_phy: usb_phy { usb_phy: usb_phy {
compatible = "usb-nop-xceiv"; compatible = "usb-nop-xceiv";
#phy-cells = <0>;
}; };
vbus_reg: vbus_reg { vbus_reg: vbus_reg {

2
arch/arm/mach-omap2/omap-secure.c
View File

@ -73,6 +73,7 @@ phys_addr_t omap_secure_ram_mempool_base(void)
return omap_secure_memblock_base; return omap_secure_memblock_base;
} }
#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
u32 omap3_save_secure_ram(void __iomem *addr, int size) u32 omap3_save_secure_ram(void __iomem *addr, int size)
{ {
u32 ret; u32 ret;
@ -91,6 +92,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size)
return ret; return ret;
} }
#endif
/** /**
* rx51_secure_dispatcher: Routine to dispatch secure PPA API calls * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls