Most times I think it depends on the ecosystem as well as the platform itself where farming is taking place.
Yield farming and staking are similar as you get to earn yields from both but staking mainly is done using one asset while with yield farming itt can be more than two.
However, they're platforms looking to combine both and make it easier, like Maiar for example which allows for metastaking. I got RIDE over there.