diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-12-07 15:55:08 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-12-07 15:55:08 +0100 |
| commit | 8b6eac70ae3e8bb46e02a04e421e9db7a9b24d6f (patch) | |
| tree | e2769c379d5c934cdafb4694344f8c5a4eef64f6 | |
| parent | ee4c54d0912713f69da51bca922735846fac25a8 (diff) | |
| parent | 863204cfdae98626a92535ac928ad79f4d6b74ff (diff) | |
| download | linux-8b6eac70ae3e8bb46e02a04e421e9db7a9b24d6f.tar.gz linux-8b6eac70ae3e8bb46e02a04e421e9db7a9b24d6f.tar.bz2 linux-8b6eac70ae3e8bb46e02a04e421e9db7a9b24d6f.zip | |
Merge branch 'fixes' into for-next
* fixes:
ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
arm: dts: nspire: Add missing #phy-cells to usb-nop-xceiv
| -rw-r--r-- | arch/arm/boot/dts/nspire.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap-secure.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi index ec2283b1a638..1a5ae4cd107f 100644 --- 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 index 9ff92050053c..fa7f308c9027 100644 --- 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 |