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

Commit 8b6eac70 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents ee4c54d0 863204cf

arch/arm/boot/dts/nspire.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 


	usb_phy: usb_phy {

		compatible = "usb-nop-xceiv";

		#phy-cells = <0>;

	};



	vbus_reg: vbus_reg {

arch/arm/mach-omap2/omap-secure.c

+2 −0
Original line number Diff line number Diff line
@@ -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