diff --git a/arch/arm/boot/dts/amlogic/meson-s1a.dtsi b/arch/arm/boot/dts/amlogic/meson-s1a.dtsi
index 69ce980e1..b3f70c30b 100644
--- a/arch/arm/boot/dts/amlogic/meson-s1a.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson-s1a.dtsi
@@ -1893,7 +1893,7 @@
 	};
 
 	fb: fb {
-		compatible = "amlogic, fb-s4";
+		compatible = "amlogic, fb-s1a";
 		memory-region = <&logo_reserved>;
 		status = "disabled";
 		interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING
diff --git a/drivers/media/osd/osd_hw.c b/drivers/media/osd/osd_hw.c
index d7dfb3965..b114f09bd 100644
--- a/drivers/media/osd/osd_hw.c
+++ b/drivers/media/osd/osd_hw.c
@@ -14918,7 +14918,9 @@ void osd_init_hw(u32 logo_loaded, u32 osd_probe,
 		}
 		osd_set_basic_urgent(true);
 		if (osd_hw.osd_meson_dev.cpu_id !=
-			__MESON_CPU_MAJOR_ID_TXHD2)
+			__MESON_CPU_MAJOR_ID_TXHD2 &&
+			osd_hw.osd_meson_dev.cpu_id !=
+			__MESON_CPU_MAJOR_ID_S1A )
 			osd_set_two_ports(true);
 		if (osd_dev_hw.prevsync_support) {
 			u32 vpp0_pre_go_field = 0;