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

Commit fabc2c9c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-4.4' of... 

Merge tag 'imx-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

Merge "The i.MX fixes for 4.4" from Shawn Guo:

- Add missing .irq_set_type for i.MX GPC irq_chip.  It fixes an issue
  that device IRQ type setting doesn't match the one specified in device
  tree, since stacked IRQ domain is adopted in GPC driver.
- Fix the wrong spi-num-chipselects settings for Vybrid DSPI devices.
- Fix a merge error in Vybrid dts regarding to ADC device property
  fsl,adck-max-frequency

* tag 'imx-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: vfxxx: Fix dspi[01] spi-num-chipselects.
  ARM: imx: add platform irq type setting in gpc
  ARM: dts: vfxxx: Fix erroneous property in esdhc0 node
parents 627b6553 897ed0ca

arch/arm/boot/dts/vfxxx.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 
				interrupts = <67 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks VF610_CLK_DSPI0>;

				clock-names = "dspi";

				spi-num-chipselects = <5>;

				spi-num-chipselects = <6>;

				status = "disabled";

			};
@@ -170,7 +170,7 @@ 
				interrupts = <68 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks VF610_CLK_DSPI1>;

				clock-names = "dspi";

				spi-num-chipselects = <5>;

				spi-num-chipselects = <4>;

				status = "disabled";

			};
@@ -461,6 +461,8 @@ 
				clock-names = "adc";

				#io-channel-cells = <1>;

				status = "disabled";

				fsl,adck-max-frequency = <30000000>, <40000000>,

							<20000000>;

			};



			esdhc0: esdhc@400b1000 {
@@ -472,8 +474,6 @@ 
					<&clks VF610_CLK_ESDHC0>;

				clock-names = "ipg", "ahb", "per";

				status = "disabled";

				fsl,adck-max-frequency = <30000000>, <40000000>,

							<20000000>;

			};



			esdhc1: esdhc@400b2000 {

arch/arm/mach-imx/gpc.c

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static struct irq_chip imx_gpc_chip = { 
	.irq_unmask		= imx_gpc_irq_unmask,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_wake		= imx_gpc_irq_set_wake,

	.irq_set_type           = irq_chip_set_type_parent,

#ifdef CONFIG_SMP

	.irq_set_affinity	= irq_chip_set_affinity_parent,

#endif