Revert "ODROID-COMMON:osd: Adjust osd scaler and vout serve to fit in KODI. Only...

This reverts commit 0427609dc95c93d0989b1b2dea84b9c41f2ba4ba.

Change-Id: Idcf054d6da7a2602dbac904ae2a6ec6da0ee00bf

diff --git a/drivers/amlogic/media/osd/osd_fb.c b/drivers/amlogic/media/osd/osd_fb.c
index f0d0a21b621ee30f2994fbf618d043cd7e4863dc..ebe36aa9eb9b49e0aecb86925bdb5027a1c03ddc 100644 (file)
--- a/drivers/amlogic/media/osd/osd_fb.c
+++ b/drivers/amlogic/media/osd/osd_fb.c
@@ -53,11 +53,6 @@
 #ifdef CONFIG_INSTABOOT
 #include <linux/amlogic/instaboot/instaboot.h>
 #endif
-
-#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
-#include <linux/platform_data/board_odroid.h>
-#endif
-
 /* Local Headers */
 #include "osd.h"
 #include "osd_fb.h"
@@ -697,10 +692,10 @@ static int osd_set_par(struct fb_info *info)
 
        output_index = get_output_device_id(fbdev->fb_index);
 
-       if (board_is_odroidn2()) {
-               info->var.xres_virtual = info->var.xres;
-               info->var.yres_virtual = info->var.yres;
-       }
+#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
+       info->var.xres_virtual = info->var.xres;
+       info->var.yres_virtual = info->var.yres;
+#endif
 
        if (fbdev->fb_index < osd_hw.osd_meson_dev.viu1_osd_count) {
                vinfo = get_current_vinfo();

diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c
index a0e03fd828d7853711d55adc14b23a0550c6152b..31e93390032fcfd07a15e22190d705dd7609d3bf 100644 (file)
--- a/drivers/amlogic/media/osd/osd_hw.c
+++ b/drivers/amlogic/media/osd/osd_hw.c
@@ -59,10 +59,6 @@
 #include <linux/amlogic/media/amdolbyvision/dolby_vision.h>
 #endif
 
-#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
-#include <linux/platform_data/board_odroid.h>
-#endif
-
 /* Local Headers */
 #include "osd_canvas.h"
 #include "osd_prot.h"
@@ -2806,9 +2802,8 @@ void osd_setup_hw(u32 index,
        int update_geometry = 0;
        u32 w = (color->bpp * xres_virtual + 7) >> 3;
        u32 i;
-
 #if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
-       if (board_is_odroidn2() && (index == 0)) {
+       if (index == 0) {
                xres_virtual = xres;
                yres_virtual = yres;
        }
@@ -2898,8 +2893,7 @@ void osd_setup_hw(u32 index,
                        index, osd_hw.osd_afbcd[index].out_addr_id);
 
 #if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
-               if (board_is_odroidn2())
-                       set_osd_logo_freescaler();
+               set_osd_logo_freescaler();
 #endif
                if (osd_hw.osd_meson_dev.osd_ver == OSD_SIMPLE)
                        osd_update_phy_addr(0);

diff --git a/drivers/amlogic/media/osd/osd_logo.c b/drivers/amlogic/media/osd/osd_logo.c
index 15af781e6e209716072fb16396f5f0546ee7502c..49d26014706b6bc24f33aa0764544b841bfba46b 100644 (file)
--- a/drivers/amlogic/media/osd/osd_logo.c
+++ b/drivers/amlogic/media/osd/osd_logo.c
@@ -33,7 +33,6 @@
 #include "osd.h"
 
 #if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
-#include <linux/platform_data/board_odroid.h>
 #include "osd_fb.h"
 #endif
 
@@ -196,14 +195,12 @@ int set_osd_logo_freescaler(void)
        s32 target_x_end = 0, target_y_end = 0;
 
 #if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
-       if (board_is_odroidn2()) {
-               struct osd_fb_dev_s *fb_dev;
+       struct osd_fb_dev_s *fb_dev;
 
-               fb_dev = gp_fbdev_list[0];
-               if (fb_dev) {
-                       logo_info.fb_width = fb_dev->fb_info->var.xres;
-                       logo_info.fb_height = fb_dev->fb_info->var.yres;
-               }
+       fb_dev = gp_fbdev_list[0];
+       if (fb_dev) {
+               logo_info.fb_width = fb_dev->fb_info->var.xres;
+               logo_info.fb_height = fb_dev->fb_info->var.yres;
        }
 #endif