Osmosis is the special case of diffusion involving water molecules. Water molecules move from areas of high water concentration to areas of low water concentration through a selectively permeable membrane.
Diffusion is a spontaneous movement of particles from an area of high concentration to an area of low concentration; it does not require energy.