summaryrefslogtreecommitdiffstats
path: root/kernel/arch/powerpc/platforms/ps3
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/arch/powerpc/platforms/ps3')
-rw-r--r--kernel/arch/powerpc/platforms/ps3/Kconfig2
-rw-r--r--kernel/arch/powerpc/platforms/ps3/interrupt.c3
-rw-r--r--kernel/arch/powerpc/platforms/ps3/os-area.c5
-rw-r--r--kernel/arch/powerpc/platforms/ps3/time.c3
4 files changed, 4 insertions, 9 deletions
diff --git a/kernel/arch/powerpc/platforms/ps3/Kconfig b/kernel/arch/powerpc/platforms/ps3/Kconfig
index 56f274064..b27f40f26 100644
--- a/kernel/arch/powerpc/platforms/ps3/Kconfig
+++ b/kernel/arch/powerpc/platforms/ps3/Kconfig
@@ -1,6 +1,6 @@
config PPC_PS3
bool "Sony PS3"
- depends on PPC64 && PPC_BOOK3S
+ depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN
select PPC_CELL
select USB_OHCI_LITTLE_ENDIAN
select USB_OHCI_BIG_ENDIAN_MMIO
diff --git a/kernel/arch/powerpc/platforms/ps3/interrupt.c b/kernel/arch/powerpc/platforms/ps3/interrupt.c
index a6c42f343..638c40609 100644
--- a/kernel/arch/powerpc/platforms/ps3/interrupt.c
+++ b/kernel/arch/powerpc/platforms/ps3/interrupt.c
@@ -678,7 +678,8 @@ static int ps3_host_map(struct irq_domain *h, unsigned int virq,
return 0;
}
-static int ps3_host_match(struct irq_domain *h, struct device_node *np)
+static int ps3_host_match(struct irq_domain *h, struct device_node *np,
+ enum irq_domain_bus_token bus_token)
{
/* Match all */
return 1;
diff --git a/kernel/arch/powerpc/platforms/ps3/os-area.c b/kernel/arch/powerpc/platforms/ps3/os-area.c
index 097871398..3db53e8af 100644
--- a/kernel/arch/powerpc/platforms/ps3/os-area.c
+++ b/kernel/arch/powerpc/platforms/ps3/os-area.c
@@ -194,11 +194,6 @@ static const struct os_area_db_id os_area_db_id_rtc_diff = {
.key = OS_AREA_DB_KEY_RTC_DIFF
};
-static const struct os_area_db_id os_area_db_id_video_mode = {
- .owner = OS_AREA_DB_OWNER_LINUX,
- .key = OS_AREA_DB_KEY_VIDEO_MODE
-};
-
#define SECONDS_FROM_1970_TO_2000 946684800LL
/**
diff --git a/kernel/arch/powerpc/platforms/ps3/time.c b/kernel/arch/powerpc/platforms/ps3/time.c
index ce73ce865..791c6142c 100644
--- a/kernel/arch/powerpc/platforms/ps3/time.c
+++ b/kernel/arch/powerpc/platforms/ps3/time.c
@@ -92,5 +92,4 @@ static int __init ps3_rtc_init(void)
return PTR_ERR_OR_ZERO(pdev);
}
-
-module_init(ps3_rtc_init);
+device_initcall(ps3_rtc_init);