Enable s2w and dt2w properly in defconfig