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

Commit aa5306a3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'vexpress-for-v4.5/fixes-rc2' of... 

Merge tag 'vexpress-for-v4.5/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes

vexpress fixes for v4.5

Couple of minor fixes for vexpress platforms:
1. Add missing of_node_put in vexpress config bus
2. Add missing DMA-330 abort interrupt on Juno platforms

* tag 'vexpress-for-v4.5/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux

:
  arm64: dts: Add missing DMA Abort interrupt to Juno
  bus: vexpress-config: Add missing of_node_put

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6c388927 aeb2ee56

arch/arm64/boot/dts/arm/juno-base.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
			     <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,

drivers/bus/vexpress-config.c

+3 −1
Original line number Diff line number Diff line
@@ -192,9 +192,11 @@ static int __init vexpress_config_init(void) 
	/* Need the config devices early, before the "normal" devices... */

	for_each_compatible_node(node, NULL, "arm,vexpress,config-bus") {

		err = vexpress_config_populate(node);

		if (err)

		if (err) {

			of_node_put(node);

			break;

		}

	}



	return err;

}