diff --git a/MAINTAINERS b/MAINTAINERS index a19041a4b8fa492ae2fd0fc624383e20e5c96fee..84c2fd43608bd3717eb00b795dadf0624c3dfe2d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2641,7 +2641,7 @@ M: Andrzej Hajda <andrzej.hajda@intel.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-mfc/ +F: drivers/media/platform/samsung/s5p-mfc/ ARM/SHMOBILE ARM ARCHITECTURE M: Geert Uytterhoeven <geert+renesas@glider.be> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 5f7a89e2af806aa0e0a4ef75a2dd8b9f717437cb..c95a8b283d2aac6c14838da360e47b8f107aaff6 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -87,12 +87,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/samsung/s3c-camif/Kconfig" source "drivers/media/platform/samsung/s5p-g2d/Kconfig" source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" +source "drivers/media/platform/samsung/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/sunxi/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 86f81e81dadc0caa8f7ebbaa7745ba043b2cd774..65bc673587b12c4e3282f046de9cab3d698bc8f8 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -29,12 +29,12 @@ obj-y += qcom/venus/ obj-y += renesas/ obj-y += rockchip/rga/ obj-y += rockchip/rkisp1/ -obj-y += s5p-mfc/ obj-y += samsung/exynos-gsc/ obj-y += samsung/exynos4-is/ obj-y += samsung/s3c-camif/ obj-y += samsung/s5p-g2d/ obj-y += samsung/s5p-jpeg/ +obj-y += samsung/s5p-mfc/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/s5p-mfc/Kconfig b/drivers/media/platform/samsung/s5p-mfc/Kconfig similarity index 100% rename from drivers/media/platform/s5p-mfc/Kconfig rename to drivers/media/platform/samsung/s5p-mfc/Kconfig diff --git a/drivers/media/platform/s5p-mfc/Makefile b/drivers/media/platform/samsung/s5p-mfc/Makefile similarity index 100% rename from drivers/media/platform/s5p-mfc/Makefile rename to drivers/media/platform/samsung/s5p-mfc/Makefile diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v10.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v6.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v7.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v7.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v8.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v8.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c similarity index 89% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c index 0e88c28f4ad37bfb5eff6e0e03a1d0ac44e44b00..774c573dc075b4e386ac85aab865ef06ea563ac0 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c * * Copyright (C) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h similarity index 92% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h index ed4e32a12552d0f5e8c88f18198c6ccb8dd95866..945d12fdceb7d5b4dde07a3bdee30586b7efab7f 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h * * Copyright (C) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c index 1ea4eda9c8e0feb0832644e80516d6ad29582473..327e54e7061140ee0ce94221176a2f5c2d64c6fa 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h similarity index 82% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h index 917854bffe9f27801b22e8333f84b65528c98a7a..6eafa514aebca7c7fe73740097b2ca2f17d82b78 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c index 1f42130cc8658261f85281e77e05da36f176e233..f8588e52dfc823a52fbfc3a50b8ec97053d0ea19 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c * * Copyright (c) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h similarity index 82% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h index c19884ea2bfcf83d45e8b893ba91cbceb78ba577..9dc44460cc38d95f2e11d1d76f8377a478ba028a 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_common.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c index da138c314963aba04eac10a5dc908675aadd73b6..72d70984e99a66430d166bdb76d7ecc23c630de4 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h similarity index 92% rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h index 7f32ef8a6b6103f79386f1f58af418cddb0d0029..653ba5f3d0480a16afc93b553fce3920d27043e4 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h similarity index 95% rename from drivers/media/platform/s5p-mfc/s5p_mfc_debug.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h index 752bbe4fe48e289c5e00043fb724c64ad6079799..bba5dad6dbfff29d61e4e66294a3416e97360cb1 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_debug.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * This file contains debug macros diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c index c0798811755cd79261c681e3ccb6674c909989ea..4b89df8bfd187887c849d08af37595fb36b1661c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h similarity index 90% rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h index 0e9a0e3bbbe77d068acbd0894a22bda1b09ad1e0..0c52ab46cff730a6ab451e25bfc8cfda2e444c5d 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c index 1fad99edb0913bb787296babe671010ef028f193..a8877d805b29163ed0c82feadfc05be020fb6137 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c * * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h similarity index 90% rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h index cacd1ca43e19eaccf7ca258d1b99b09aec6f351e..3f1b1a037a4f554aabf840f209708ccd77785b3d 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c index bb65671eea91cd7e08626e7d2269f14f9a1c771c..673962301173cb6d0625c0bc197a917d10fe55f5 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr.c + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c * * Samsung MFC (Multi Function Codec - FIMV) driver * This file contains hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h index 1c5d2d4c0543d6650af602e1638d2790c2663f30..b9831275f3ab6bdc6c319767f98325faf01b049f 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * Contains declarations of hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c index a1453053e31aba1ee1b57e16835e04648ee8a51c..8227004f674693790d695061f1df6a2d49c6a74b 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c * * Samsung MFC (Multi Function Codec - FIMV) driver * This file contains hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h similarity index 96% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h index 8ca514bf5e37581cf5f761dfe4f369632ef5f256..e4dd03c5454c3a1065860cd173d31771af812744 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * Contains declarations of hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c similarity index 97% rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c index 88b7d33c919733e883f5212530c67a1874574fdc..72a901e9945039edb352b3b317a3fed3f7e539d0 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h similarity index 87% rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h index 3d26443189a2c9c1eff7fe9d337ab74fa659bd5f..4159d2364e8729a61db56804f9fef2f690717afb 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/