Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2ff0ff2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "A few fixes who have come in near or during the merge window:

   - Removal of a VLA usage in Marvell mpp platform code

   - Enable some IPMI options for ARM64 servers by default, helps
     testing

   - Enable PREEMPT on 32-bit ARMv7 defconfig

   - Minor fix for stm32 DT (removal of an unused DMA property)

   - Bugfix for TI OMAP1-based ams-delta (-EINVAL -> IRQ_NOTCONNECTED)"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: stm32: update HASH1 dmas property on stm32mp157c
  ARM: orion: avoid VLA in orion_mpp_conf
  ARM: defconfig: Update multi_v7 to use PREEMPT
  arm64: defconfig: Enable some IPMI configs
  soc: ti: QMSS: Fix usage of irq_set_affinity_hint
  ARM: OMAP1: ams-delta: Fix impossible .irq < 0
parents 83650fd5 8008cc78

arch/arm/boot/dts/stm32mp157c.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ 
			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&rcc HASH1>;

			resets = <&rcc HASH1_R>;

			dmas = <&mdma1 31 0x10 0x1000A02 0x0 0x0 0x0>;

			dmas = <&mdma1 31 0x10 0x1000A02 0x0 0x0>;

			dma-names = "in";

			dma-maxburst = <2>;

			status = "disabled";

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

arch/arm/mach-omap1/board-ams-delta.c

+2 −6
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ static struct plat_serial8250_port ams_delta_modem_ports[] = { 
	{

		.membase	= IOMEM(MODEM_VIRT),

		.mapbase	= MODEM_PHYS,

		.irq		= -EINVAL, /* changed later */

		.irq		= IRQ_NOTCONNECTED, /* changed later */

		.flags		= UPF_BOOT_AUTOCONF,

		.irqflags	= IRQF_TRIGGER_RISING,

		.iotype		= UPIO_MEM,
@@ -864,8 +864,7 @@ static int __init modem_nreset_init(void) 




/*

 * This function expects MODEM IRQ number already assigned to the port

 * and fails if it's not.

 * This function expects MODEM IRQ number already assigned to the port.

 * The MODEM device requires its RESET# pin kept high during probe.

 * That requirement can be fulfilled in several ways:

 * - with a descriptor of already functional modem_nreset regulator
@@ -888,9 +887,6 @@ static int __init ams_delta_modem_init(void) 
	if (!machine_is_ams_delta())

		return -ENODEV;



	if (ams_delta_modem_ports[0].irq < 0)

		return ams_delta_modem_ports[0].irq;



	omap_cfg_reg(M14_1510_GPIO2);



	/* Initialize the modem_nreset regulator consumer before use */

arch/arm/plat-orion/mpp.c

+6 −1
Original line number Diff line number Diff line
@@ -28,10 +28,15 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask, 
			   unsigned int mpp_max, void __iomem *dev_bus)

{

	unsigned int mpp_nr_regs = (1 + mpp_max/8);

	u32 mpp_ctrl[mpp_nr_regs];

	u32 mpp_ctrl[8];

	int i;



	printk(KERN_DEBUG "initial MPP regs:");

	if (mpp_nr_regs > ARRAY_SIZE(mpp_ctrl)) {

		printk(KERN_ERR "orion_mpp_conf: invalid mpp_max\n");

		return;

	}



	for (i = 0; i < mpp_nr_regs; i++) {

		mpp_ctrl[i] = readl(mpp_ctrl_addr(i, dev_bus));

		printk(" %08x", mpp_ctrl[i]);

arch/arm64/configs/defconfig

+3 −0
Original line number Diff line number Diff line
@@ -308,6 +308,9 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y 
CONFIG_SERIAL_MVEBU_UART=y

CONFIG_SERIAL_DEV_BUS=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_IPMI_HANDLER=m

CONFIG_IPMI_DEVICE_INTERFACE=m

CONFIG_IPMI_SI=m

CONFIG_TCG_TPM=y

CONFIG_TCG_TIS_I2C_INFINEON=y

CONFIG_I2C_CHARDEV=y