Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions arch/arm/mach-imx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -268,13 +268,15 @@ config SOC_IMX7ULP
select PINCTRL_IMX7ULP
select SOC_IMX7D_CA7 if ARCH_MULTI_V7
select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M
imply GPIO_VF610
help
This enables support for Freescale i.MX7 Ultra Low Power processor.

config SOC_VF610
bool "Vybrid Family VF610 support"
select ARM_GIC if ARCH_MULTI_V7
select PINCTRL_VF610
imply GPIO_VF610

help
This enables support for Freescale Vybrid VF610 processor.
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/mach-imx/busfreq-imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ static int busfreq_notify(enum busfreq_event event)
return notifier_to_errno(ret);
}

#if defined(CONFIG_HAVE_IMX_BUSFREQ)

int register_busfreq_notifier(struct notifier_block *nb)
{
return raw_notifier_chain_register(&busfreq_notifier_chain, nb);
Expand All @@ -192,6 +194,8 @@ int unregister_busfreq_notifier(struct notifier_block *nb)
}
EXPORT_SYMBOL(unregister_busfreq_notifier);

#endif /* CONFIG_HAVE_IMX_BUSFREQ */

static struct clk *origin_step_parent;

/*
Expand Down Expand Up @@ -818,6 +822,7 @@ static int set_high_bus_freq(int high_bus_freq)
return 0;
}

#if defined(CONFIG_HAVE_IMX_BUSFREQ)
void request_bus_freq(enum bus_freq_mode mode)
{
mutex_lock(&bus_freq_mutex);
Expand Down Expand Up @@ -949,6 +954,8 @@ int get_bus_freq_mode(void)
}
EXPORT_SYMBOL(get_bus_freq_mode);

#endif /* CONFIG_HAVE_IMX_BUSFREQ */

static struct map_desc ddr_iram_io_desc __initdata = {
/* .virtual and .pfn are run-time assigned */
.length = SZ_1M,
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -676,11 +676,11 @@ config GPIO_UNIPHIER
Say yes here to support UniPhier GPIOs.

config GPIO_VF610
def_bool y
bool "Vybrid VF610/i.MX7ULP GPIO driver"
depends on ARCH_MXC
select GPIOLIB_IRQCHIP
help
Say yes here to support Vybrid vf610 GPIOs.
Say yes here to support Vybrid VF610/i.MX7ULP GPIOs.

config GPIO_VISCONTI
tristate "Toshiba Visconti GPIO support"
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/bridge/it6161.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include <linux/err.h>
#include <linux/gpio/consumer.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <sound/hdmi-codec.h>
Expand Down
1 change: 1 addition & 0 deletions drivers/net/ethernet/freescale/fec_uio.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/busfreq-imx.h>
#include <linux/of_mdio.h>
#include "fec.h"
#include <linux/pinctrl/consumer.h>

struct fec_dev *fec_dev;
static const char fec_uio_version[] = "FEC UIO driver v1.0";
Expand Down
7 changes: 7 additions & 0 deletions scripts/extract-cert.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
#include <openssl/err.h>
#include <openssl/engine.h>

/*
* OpenSSL 3.0 deprecates the OpenSSL's ENGINE API.
*
* Remove this if/when that API is no longer used
*/
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

#define PKEY_ID_PKCS7 2

static __attribute__((noreturn))
Expand Down
7 changes: 7 additions & 0 deletions scripts/sign-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
#include <openssl/err.h>
#include <openssl/engine.h>

/*
* OpenSSL 3.0 deprecates the OpenSSL's ENGINE API.
*
* Remove this if/when that API is no longer used
*/
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

/*
* Use CMS if we have openssl-1.0.0 or newer available - otherwise we have to
* assume that it's not available and its header file is missing and that we
Expand Down