diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2012-12-14 15:09:56 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2012-12-14 15:09:56 +0000 |
| commit | 878f7ae56d42c1a8bd402bb4f8fd9c80363e1bac (patch) | |
| tree | 350c0f874e1b5c3f659be14d2af87ed565d94508 | |
| parent | e1b90cc25d58509dc7d38041e40f100b3ab1e23f (diff) | |
| download | kernel-878f7ae56d42c1a8bd402bb4f8fd9c80363e1bac.tar.gz kernel-878f7ae56d42c1a8bd402bb4f8fd9c80363e1bac.tar.xz kernel-878f7ae56d42c1a8bd402bb4f8fd9c80363e1bac.zip | |
Add patch to fix arm imx drm driver build
| -rw-r--r-- | arm-imx-fixdrm.patch | 37 | ||||
| -rw-r--r-- | config-arm-imx | 10 | ||||
| -rw-r--r-- | kernel.spec | 7 |
3 files changed, 49 insertions, 5 deletions
diff --git a/arm-imx-fixdrm.patch b/arm-imx-fixdrm.patch new file mode 100644 index 000000000..069cbb005 --- /dev/null +++ b/arm-imx-fixdrm.patch @@ -0,0 +1,37 @@ +This fixes the following error when building for arm-imx: +> ERROR: "__clk_get_name" [drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.ko] undefined! +> make[1]: *** [__modpost] Error 1 +> make: *** [modules] Error 2 + +There are valid usecases to get the name of a clock, be it for debugging +purposes or to register a children of a clock like done in this IPU driver. +Therefore exporting __clk_get_name() and make it available for others makes +sense. + +Reported-by: Peter Robinson <pbrobinson at gmail.com> +CC: Sascha Hauer <s.hauer at pengutronix.de> +CC: Mike Turquette <mturquette at linaro.org> +Signed-off-by: Niels de Vos <ndevos at redhat.com> +--- + drivers/clk/clk.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c +index 251e45d..fbe0f3a 100644 +--- a/drivers/clk/clk.c ++++ b/drivers/clk/clk.c +@@ -259,10 +259,11 @@ late_initcall(clk_disable_unused); + + /*** helper functions ***/ + +-inline const char *__clk_get_name(struct clk *clk) ++const char *__clk_get_name(struct clk *clk) + { + return !clk ? NULL : clk->name; + } ++EXPORT_SYMBOL_GPL(__clk_get_name); + + inline struct clk_hw *__clk_get_hw(struct clk *clk) + { +-- +1.7.11.7 diff --git a/config-arm-imx b/config-arm-imx index 090263ba3..8ffd96559 100644 --- a/config-arm-imx +++ b/config-arm-imx @@ -79,11 +79,11 @@ CONFIG_MMC_MXC=m CONFIG_RTC_MXC=y CONFIG_RTC_DRV_MXC=m -# CONFIG_DRM_IMX is not set -# CONFIG_DRM_IMX_FB_HELPER=m -# CONFIG_DRM_IMX_PARALLEL_DISPLAY=m -# CONFIG_DRM_IMX_IPUV3_CORE=m -# CONFIG_DRM_IMX_IPUV3=m +CONFIG_DRM_IMX=m +CONFIG_DRM_IMX_FB_HELPER=m +CONFIG_DRM_IMX_PARALLEL_DISPLAY=m +CONFIG_DRM_IMX_IPUV3_CORE=m +CONFIG_DRM_IMX_IPUV3=m CONFIG_VIDEO_CODA=m CONFIG_BACKLIGHT_PWM=m CONFIG_LEDS_PWM=m diff --git a/kernel.spec b/kernel.spec index d2704f002..73c0b643e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -741,6 +741,9 @@ Patch21004: arm-tegra-nvec-kconfig.patch Patch21005: arm-tegra-usb-no-reset-linux33.patch Patch21006: arm-tegra-sdhci-module-fix.patch +# ARM imx +Patch21008: arm-imx-fixdrm.patch + #rhbz 754518 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch @@ -1339,6 +1342,7 @@ ApplyPatch vmbugon-warnon.patch ApplyPatch arm-export-read_current_timer.patch ApplyPatch arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch ApplyPatch arm-omapdrm-fixinc.patch +ApplyPatch arm-imx-fixdrm.patch ApplyPatch arm-tegra-nvec-kconfig.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch ApplyPatch arm-tegra-sdhci-module-fix.patch @@ -2344,6 +2348,9 @@ fi # ||----w | # || || %changelog +* Fri Dec 14 2012 Peter Robinson <pbrobinson@fedoraproject.org> +- Add patch to fix arm imx drm driver build + * Wed Dec 12 2012 Josh Boyer <jwboyer@redhat.com> - Fix infinite loop in efi signature parser - Don't error out if db doesn't exist |