add previous merge made on Pat 3.4.67 in sunxi-3.4