[POWERPC] ps3: get av_multi_out params

Allow the PS3 AV settings driver to access the default video mode stored in
the OS area.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index b4ac924ada43b8db342e522e7f86e92059b00652..6d0d2ac39bd8e66a4421032f9459b8acfaf4f0d0 100644 (file)
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -66,13 +66,6 @@ enum {
        PARAM_BOOT_FLAG_OTHER_OS = 1,
 };
 
-enum {
-       PARAM_AV_MULTI_OUT_NTSC = 0,
-       PARAM_AV_MULTI_OUT_PAL_RGB = 1,
-       PARAM_AV_MULTI_OUT_PAL_YCBCR = 2,
-       PARAM_AV_MULTI_OUT_SECAM = 3,
-};
-
 enum {
        PARAM_CTRL_BUTTON_O_IS_YES = 0,
        PARAM_CTRL_BUTTON_X_IS_YES = 1,
@@ -257,3 +250,13 @@ u64 ps3_os_area_rtc_diff(void)
 {
        return saved_params.rtc_diff ? saved_params.rtc_diff : 946684800UL;
 }
+
+/**
+ * ps3_os_area_get_av_multi_out - Returns the default video mode.
+ */
+
+enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void)
+{
+    return saved_params.av_multi_out;
+}
+EXPORT_SYMBOL_GPL(ps3_os_area_get_av_multi_out);

diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h
index d1ae87df7776bd4133511a00cbd117c6fe5902d7..f4347c195bfb489a67f988690ffb285aa6527988 100644 (file)
--- a/include/asm-powerpc/ps3.h
+++ b/include/asm-powerpc/ps3.h
@@ -39,6 +39,17 @@ union ps3_firmware_version {
 
 int ps3_get_firmware_version(union ps3_firmware_version *v);
 
+/* 'Other OS' area */
+
+enum ps3_param_av_multi_out {
+       PS3_PARAM_AV_MULTI_OUT_NTSC = 0,
+       PS3_PARAM_AV_MULTI_OUT_PAL_RGB = 1,
+       PS3_PARAM_AV_MULTI_OUT_PAL_YCBCR = 2,
+       PS3_PARAM_AV_MULTI_OUT_SECAM = 3,
+};
+
+enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void);
+
 /**
  * struct ps3_device_id - HV bus device identifier from the system repository
  * @bus_id: HV bus id, {1..} (zero invalid)