lkml.org 
[lkml]   [2021]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 17/20] platform/x86: intel_oaktrail.c: Move to intel sub-directory
    Date
    Move intel_oaktrail.c to intel sub-directory to improve
    readability.

    Signed-off-by: Kate Hsuan <hpa@redhat.com>
    ---
    drivers/platform/x86/Kconfig | 10 ----------
    drivers/platform/x86/Makefile | 1 -
    drivers/platform/x86/intel/Kconfig | 10 ++++++++++
    drivers/platform/x86/intel/Makefile | 2 ++
    .../x86/{intel_oaktrail.c => intel/oaktrail.c} | 0
    5 files changed, 12 insertions(+), 11 deletions(-)
    rename drivers/platform/x86/{intel_oaktrail.c => intel/oaktrail.c} (100%)

    diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
    index 7274b586170d..3d1cb7f03309 100644
    --- a/drivers/platform/x86/Kconfig
    +++ b/drivers/platform/x86/Kconfig
    @@ -677,16 +677,6 @@ config INTEL_MENLOW

    If unsure, say N.

    -config INTEL_OAKTRAIL
    - tristate "Intel Oaktrail Platform Extras"
    - depends on ACPI
    - depends on ACPI_VIDEO || ACPI_VIDEO = n
    - depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
    - help
    - Intel Oaktrail platform need this driver to provide interfaces to
    - enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y
    - here; it will only load on supported platforms.
    -
    config INTEL_VBTN
    tristate "INTEL VIRTUAL BUTTON"
    depends on ACPI
    diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
    index 4c9a47936e65..63e78ed69fb2 100644
    --- a/drivers/platform/x86/Makefile
    +++ b/drivers/platform/x86/Makefile
    @@ -72,7 +72,6 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
    obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/

    obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
    -obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
    obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o

    # MSI
    diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
    index cf56a1c4474b..6df6e43d1061 100644
    --- a/drivers/platform/x86/intel/Kconfig
    +++ b/drivers/platform/x86/intel/Kconfig
    @@ -53,6 +53,16 @@ config INTEL_INT0002_VGPIO
    To compile this driver as a module, choose M here: the module will
    be called intel_int0002_vgpio.

    +config INTEL_OAKTRAIL
    + tristate "Intel Oaktrail Platform Extras"
    + depends on ACPI
    + depends on ACPI_VIDEO || ACPI_VIDEO = n
    + depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
    + help
    + Intel Oaktrail platform need this driver to provide interfaces to
    + enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y
    + here; it will only load on supported platforms.
    +
    config INTEL_BXTWC_PMIC_TMU
    tristate "Intel BXT Whiskey Cove TMU Driver"
    depends on REGMAP
    diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
    index 23503798b533..291219f63b04 100644
    --- a/drivers/platform/x86/intel/Makefile
    +++ b/drivers/platform/x86/intel/Makefile
    @@ -14,6 +14,8 @@ intel-hid-y := hid.o
    obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
    intel_int0002_vgpio-y := int0002_vgpio.o
    obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
    +intel_oaktrail-y := oaktrail.o
    +obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o

    # Intel PMIC / PMC / P-Unit devices
    intel_bxtwc_tmu-y := bxtwc_tmu.o
    diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel/oaktrail.c
    similarity index 100%
    rename from drivers/platform/x86/intel_oaktrail.c
    rename to drivers/platform/x86/intel/oaktrail.c
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-08-16 12:55    [W:4.090 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site