Commit 9787f839 authored by florian's avatar florian

brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

Backport r42678
Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42682 3c298f89-4303-0410-b956-a3cf2f4a3e73
parent b3f82943
From dd611b3364087514ef5fc59c6106d8924d2a2a30 Mon Sep 17 00:00:00 2001
From 34844524c88edbb0fd75339fd655f6b69b221b0a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 1 May 2013 19:54:32 +0100
Subject: [PATCH 003/174] bcm2708 watchdog driver
Subject: [PATCH 003/196] bcm2708 watchdog driver
Signed-off-by: popcornmix <popcornmix@gmail.com>
---
......@@ -11,6 +11,8 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
3 files changed, 392 insertions(+)
create mode 100644 drivers/watchdog/bcm2708_wdog.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index e89fc31..60ca320 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -391,6 +391,12 @@ config RETU_WATCHDOG
......@@ -26,9 +28,11 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
# AVR32 Architecture
config AT32AP700X_WDT
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index a300b94..0e357711 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -54,6 +54,7 @@ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_
@@ -54,6 +54,7 @@ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o
obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o
......@@ -36,6 +40,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
diff --git a/drivers/watchdog/bcm2708_wdog.c b/drivers/watchdog/bcm2708_wdog.c
new file mode 100644
index 0000000..dd33c35
--- /dev/null
+++ b/drivers/watchdog/bcm2708_wdog.c
@@ -0,0 +1,385 @@
......@@ -424,3 +431,6 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+MODULE_ALIAS_MISCDEV(TEMP_MINOR);
+MODULE_LICENSE("GPL");
+
--
1.9.1
From c9fbd3932a41a14af51d04fb6f43c45d60e66f8c Mon Sep 17 00:00:00 2001
From db56ac21f4312a9cf97d4f9f35ff2593b5b81f7d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 1 May 2013 19:55:09 +0100
Subject: [PATCH 004/174] bcm2708 framebuffer driver
Subject: [PATCH 004/196] bcm2708 framebuffer driver
Signed-off-by: popcornmix <popcornmix@gmail.com>
---
......@@ -12,6 +12,8 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
4 files changed, 1387 insertions(+), 1602 deletions(-)
create mode 100644 drivers/video/bcm2708_fb.c
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2e937bd..9f4c58f 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -310,6 +310,20 @@ config FB_PM2_FIFO_DISCONNECT
......@@ -35,9 +37,11 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
config FB_ARMCLCD
tristate "ARM PrimeCell PL110 support"
depends on FB && ARM && ARM_AMBA
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index e8bae8d..032f386 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -100,6 +100,7 @@ obj-$(CONFIG_FB_PVR2) += pvr
@@ -100,6 +100,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o
obj-$(CONFIG_FB_VOODOO1) += sstfb.o
obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o
obj-$(CONFIG_FB_GOLDFISH) += goldfishfb.o
......@@ -45,6 +49,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
obj-$(CONFIG_FB_68328) += 68328fb.o
obj-$(CONFIG_FB_GBE) += gbefb.o
obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o
diff --git a/drivers/video/bcm2708_fb.c b/drivers/video/bcm2708_fb.c
new file mode 100644
index 0000000..08d9238
--- /dev/null
+++ b/drivers/video/bcm2708_fb.c
@@ -0,0 +1,491 @@
......@@ -539,6 +546,8 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+MODULE_PARM_DESC(fbwidth, "Width of ARM Framebuffer");
+MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer");
+MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer");
diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
index 3c14e43..7626beb 100644
--- a/drivers/video/logo/logo_linux_clut224.ppm
+++ b/drivers/video/logo/logo_linux_clut224.ppm
@@ -1,1604 +1,883 @@
......@@ -3027,3 +3036,6 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
--
1.9.1
From 2fdd1c3ab61a7a58a3ef3bc5b3d1504202bbc108 Mon Sep 17 00:00:00 2001
From 8edd8c6dbdb6a5288c7116ea6e9dc59705b15a6a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 2 Jul 2013 23:42:01 +0100
Subject: [PATCH 005/174] bcm2708 vchiq driver
Subject: [PATCH 005/196] bcm2708 vchiq driver
Signed-off-by: popcornmix <popcornmix@gmail.com>
---
......@@ -71,6 +71,8 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
create mode 100644 drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
create mode 100644 drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index c002d86..84d3100 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -536,4 +536,6 @@ source "drivers/misc/carma/Kconfig"
......@@ -80,6 +82,8 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+source "drivers/misc/vc04_services/Kconfig"
endmenu
+
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index c235d5b..d72aaf2 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -53,3 +53,4 @@ obj-$(CONFIG_INTEL_MEI) += mei/
......@@ -87,6 +91,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o
obj-$(CONFIG_SRAM) += sram.o
+obj-y += vc04_services/
diff --git a/drivers/misc/vc04_services/Kconfig b/drivers/misc/vc04_services/Kconfig
new file mode 100644
index 0000000..b48a3f3
--- /dev/null
+++ b/drivers/misc/vc04_services/Kconfig
@@ -0,0 +1,10 @@
......@@ -100,6 +107,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+ Defaults to Y when the Broadcom Videocore services
+ are included in the build, N otherwise.
+
diff --git a/drivers/misc/vc04_services/Makefile b/drivers/misc/vc04_services/Makefile
new file mode 100644
index 0000000..1aeb20a
--- /dev/null
+++ b/drivers/misc/vc04_services/Makefile
@@ -0,0 +1,18 @@
......@@ -121,6 +131,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+endif
+
diff --git a/drivers/misc/vc04_services/interface/vchi/connections/connection.h b/drivers/misc/vc04_services/interface/vchi/connections/connection.h
new file mode 100644
index 0000000..fef6ac3
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchi/connections/connection.h
@@ -0,0 +1,328 @@
......@@ -452,6 +465,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+#endif /* CONNECTION_H_ */
+
+/****************************** End of file **********************************/
diff --git a/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h b/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
new file mode 100644
index 0000000..8b3f767
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
@@ -0,0 +1,204 @@
......@@ -659,6 +675,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+#endif // _VCHI_MESSAGE_H_
+
+/****************************** End of file ***********************************/
diff --git a/drivers/misc/vc04_services/interface/vchi/vchi.h b/drivers/misc/vc04_services/interface/vchi/vchi.h
new file mode 100644
index 0000000..cee5291
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchi/vchi.h
@@ -0,0 +1,373 @@
......@@ -1035,6 +1054,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+#endif /* VCHI_H_ */
+
+/****************************** End of file **********************************/
diff --git a/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h b/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
new file mode 100644
index 0000000..26bc2d3
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
@@ -0,0 +1,224 @@
......@@ -1262,6 +1284,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+#endif /* VCHI_CFG_H_ */
+
+/****************************** End of file **********************************/
diff --git a/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h b/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
new file mode 100644
index 0000000..35dcba4
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
@@ -0,0 +1,71 @@
......@@ -1336,6 +1361,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+//#define VCHI_RX_NANOLOCKS
+
+#endif /*VCHI_CFG_INTERNAL_H_*/
diff --git a/drivers/misc/vc04_services/interface/vchi/vchi_common.h b/drivers/misc/vc04_services/interface/vchi/vchi_common.h
new file mode 100644
index 0000000..9e6c00e
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchi/vchi_common.h
@@ -0,0 +1,163 @@
......@@ -1502,6 +1530,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+
+#endif // VCHI_COMMON_H_
diff --git a/drivers/misc/vc04_services/interface/vchi/vchi_mh.h b/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
new file mode 100644
index 0000000..198bd07
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
@@ -0,0 +1,42 @@
......@@ -1547,6 +1578,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+#define VCHI_MEM_HANDLE_INVALID 0
+
+#endif
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
new file mode 100644
index 0000000..f87dcbd
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
@@ -0,0 +1,41 @@
......@@ -1591,6 +1625,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+#endif
+
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
new file mode 100644
index 0000000..7ea5c64
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
@@ -0,0 +1,42 @@
......@@ -1636,6 +1673,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1
+
+#endif /* VCHIQ_2835_H */
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
new file mode 100644
index 0000000..2b5fa56
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -0,0 +1,538 @@
......@@ -2177,6 +2217,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+ kfree(pagelist);
+}
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
new file mode 100644
index 0000000..f44d4b4
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -0,0 +1,2813 @@
......@@ -4993,6 +5036,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+module_exit(vchiq_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom Corporation");
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
new file mode 100644
index 0000000..75ad4c6
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -0,0 +1,212 @@
......@@ -5208,6 +5254,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+
+#endif /* VCHIQ_ARM_H */
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
new file mode 100644
index 0000000..df64581
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
@@ -0,0 +1,37 @@
......@@ -5248,6 +5297,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+const char *vchiq_get_build_version(void);
+const char *vchiq_get_build_time(void);
+const char *vchiq_get_build_date(void);
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
new file mode 100644
index 0000000..493c86c
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
@@ -0,0 +1,60 @@
......@@ -5311,6 +5363,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+#endif
+
+#endif /* VCHIQ_CFG_H */
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
new file mode 100644
index 0000000..65f4b52
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
@@ -0,0 +1,119 @@
......@@ -5433,6 +5488,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+ mutex_unlock(&g_connected_mutex);
+}
+EXPORT_SYMBOL(vchiq_add_connected_callback);
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
new file mode 100644
index 0000000..e4cfdcc
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
@@ -0,0 +1,51 @@
......@@ -5487,6 +5545,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+#endif /* VCHIQ_CONNECTED_H */
+
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
new file mode 100644
index 0000000..f35ed4f
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -0,0 +1,3824 @@
......@@ -9314,6 +9375,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+ numBytes = 0;
+ }
+}
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
new file mode 100644
index 0000000..47cdf27
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -0,0 +1,706 @@
......@@ -10023,6 +10087,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+ size_t numBytes);
+
+#endif
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
new file mode 100644
index 0000000..77dd613
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
@@ -0,0 +1,89 @@
......@@ -10115,6 +10182,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+EOF
+
+
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
new file mode 100644
index 0000000..50359b0
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -0,0 +1,188 @@
......@@ -10306,6 +10376,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+ short *peer_version);
+
+#endif /* VCHIQ_IF_H */
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
new file mode 100644
index 0000000..e248037
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
@@ -0,0 +1,129 @@
......@@ -10438,6 +10511,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+#define VCHIQ_IOC_MAX 15
+
+#endif
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
new file mode 100644
index 0000000..be9735f
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
@@ -0,0 +1,456 @@
......@@ -10897,6 +10973,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+ return status;
+}
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
new file mode 100644
index 0000000..d02e776
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
@@ -0,0 +1,71 @@
......@@ -10971,6 +11050,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+ const VCHIQ_PLATFORM_DATA_T * platform_data);
+
+#endif
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
new file mode 100644
index 0000000..54a3ece
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
@@ -0,0 +1,58 @@
......@@ -11032,6 +11114,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+} FRAGMENTS_T;
+
+#endif /* VCHIQ_PAGELIST_H */
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
new file mode 100644
index 0000000..dc3bdda
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
@@ -0,0 +1,254 @@
......@@ -11289,6 +11374,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+#endif
+
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
new file mode 100644
index 0000000..f752f8d
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -0,0 +1,815 @@
......@@ -12107,6 +12195,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+ return ret;
+}
+EXPORT_SYMBOL(vchi_service_release);
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
new file mode 100644
index 0000000..c2eefef
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
@@ -0,0 +1,151 @@
......@@ -12261,6 +12352,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+ return header;
+}
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
new file mode 100644
index 0000000..7c4bf7c
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
@@ -0,0 +1,82 @@
......@@ -12346,6 +12440,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+#endif
+
diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
new file mode 100644
index 0000000..b6bfa21
--- /dev/null
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
@@ -0,0 +1,59 @@
......@@ -12408,3 +12505,6 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+{
+ return vchiq_build_time;
+}
--
1.9.1
From ff28398a53a45795382bdb25db71f2a8b3394dab Mon Sep 17 00:00:00 2001
From 15b3faf99f1b16184620bc89be78a5f205acbe92 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 3 Jul 2013 00:31:47 +0100
Subject: [PATCH 006/174] cma: Add vc_cma driver to enable use of CMA
Subject: [PATCH 006/196] cma: Add vc_cma driver to enable use of CMA
Signed-off-by: popcornmix <popcornmix@gmail.com>
---
......@@ -20,6 +20,8 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
create mode 100644 drivers/char/broadcom/vc_cma/vc_cma.c
create mode 100644 include/linux/broadcom/vc_cma.h
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 3bb6fa3..022b91c 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -586,6 +586,8 @@ config DEVPORT
......@@ -31,6 +33,8 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
config MSM_SMD_PKT
bool "Enable device interface for some SMD packet ports"
default n
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 7ff1d0d..c594502 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -62,3 +62,6 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o
......@@ -40,6 +44,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/
+
diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
new file mode 100644
index 0000000..e23b440
--- /dev/null
+++ b/drivers/char/broadcom/Kconfig
@@ -0,0 +1,16 @@
......@@ -59,11 +66,17 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+ help
+ Helper for videocore CMA access.
+
diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
new file mode 100644
index 0000000..c8574c8
--- /dev/null
+++ b/drivers/char/broadcom/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_BCM_VC_CMA) += vc_cma/
+
diff --git a/drivers/char/broadcom/vc_cma/Makefile b/drivers/char/broadcom/vc_cma/Makefile
new file mode 100644
index 0000000..ae71918
--- /dev/null
+++ b/drivers/char/broadcom/vc_cma/Makefile
@@ -0,0 +1,15 @@
......@@ -82,6 +95,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+vc-cma-objs := vc_cma.o
+
diff --git a/drivers/char/broadcom/vc_cma/vc_cma.c b/drivers/char/broadcom/vc_cma/vc_cma.c
new file mode 100644
index 0000000..fe80887
--- /dev/null
+++ b/drivers/char/broadcom/vc_cma/vc_cma.c
@@ -0,0 +1,1143 @@
......@@ -1228,6 +1244,8 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+module_exit(vc_cma_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom Corporation");
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index d72aaf2..24b40c3 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -53,4 +53,4 @@ obj-$(CONFIG_INTEL_MEI) += mei/
......@@ -1236,6 +1254,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
obj-$(CONFIG_SRAM) += sram.o
-obj-y += vc04_services/
+obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/
diff --git a/include/linux/broadcom/vc_cma.h b/include/linux/broadcom/vc_cma.h
new file mode 100644
index 0000000..bdc9d79
--- /dev/null
+++ b/include/linux/broadcom/vc_cma.h
@@ -0,0 +1,30 @@
......@@ -1269,3 +1290,6 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
+#endif /* VC_CMA_H */
+
--
1.9.1
From 7868fb252f8846b21a00b9a42a8bfa10f1c969ee Mon Sep 17 00:00:00 2001
From f99826368eeb17ddaf6b9459f577356c0387f365 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 26 Mar 2012 22:15:50 +0100
Subject: [PATCH 007/174] bcm2708: alsa sound driver
Subject: [PATCH 007/196] bcm2708: alsa sound driver
Signed-off-by: popcornmix <popcornmix@gmail.com>
---
......@@ -24,6 +24,8 @@ Subject: [PATCH 007/174] bcm2708: alsa sound driver
create mode 100755 sound/arm/bcm2835.h
create mode 100644 sound/arm/vc_vchi_audioserv_defs.h
diff --git a/arch/arm/configs/bcmrpi_cutdown_defconfig b/arch/arm/configs/bcmrpi_cutdown_defconfig
index 74f2dc9..e519412 100644
--- a/arch/arm/configs/bcmrpi_cutdown_defconfig
+++ b/arch/arm/configs/bcmrpi_cutdown_defconfig
@@ -208,6 +208,26 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
......@@ -53,6 +55,8 @@ Subject: [PATCH 007/174] bcm2708: alsa sound driver
CONFIG_HID_PID=y
CONFIG_USB_HIDDEV=y
CONFIG_HID_A4TECH=m
diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
index 339aabf..df947e5 100644
--- a/arch/arm/configs/bcmrpi_defconfig
+++ b/arch/arm/configs/bcmrpi_defconfig
@@ -225,6 +225,26 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
......@@ -82,9 +86,11 @@ Subject: [PATCH 007/174] bcm2708: alsa sound driver
CONFIG_HID_PID=y
CONFIG_USB_HIDDEV=y
CONFIG_HID_A4TECH=m
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
index 64a2783..67f3608 100644
--- a/arch/arm/mach-bcm2708/bcm2708.c
+++ b/arch/arm/mach-bcm2708/bcm2708.c
@@ -424,6 +424,16 @@ struct platform_device bcm2708_powerman_
@@ -424,6 +424,16 @@ struct platform_device bcm2708_powerman_device = {
.coherent_dma_mask = 0xffffffffUL},
};
......@@ -110,6 +116,8 @@ Subject: [PATCH 007/174] bcm2708: alsa sound driver
for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
struct amba_device *d = amba_devs[i];
diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 885683a..f7ceafd 100644
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -39,5 +39,12 @@ config SND_PXA2XX_AC97
......@@ -125,9 +133,11 @@ Subject: [PATCH 007/174] bcm2708: alsa sound driver
+
endif # SND_ARM
diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index 8c0c851..181cb57 100644
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -14,3 +14,9 @@ snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_A
@@ -14,3 +14,9 @@ snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_AC97) += pxa2xx-ac97-lib.o
obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
snd-pxa2xx-ac97-objs := pxa2xx-ac97.o
......@@ -137,6 +147,9 @@ Subject: [PATCH 007/174] bcm2708: alsa sound driver
+
+EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000
+
diff --git a/sound/arm/bcm2835-ctl.c b/sound/arm/bcm2835-ctl.c
new file mode 100755
index 0000000..c3e0f7a
--- /dev/null