Merge "arm/dt: 8610: add cdrom support"