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

Commit 3db62afd authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2016-04-20' into devicetree/next 



This pull request brings in VC4 devicetree support and the other minor
DT changes for 4.7.

Also included is a DRM patch necessary to prevent regressions when
simplefb and vc4 drivers are both present.  The patch was suggested by
the simplefb maintainer as the solution agreed upon at ELCE 2014, and
was acked by the DRM maintainer for merging through this tree.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 1b47b98a 896ad420

Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ Bank 1: 
24: DMA8

25: DMA9

26: DMA10

27: DMA11

28: DMA12

27: DMA11-14 - shared interrupt for DMA 11 to 14

28: DMAALL - triggers on all dma interrupts (including chanel 15)

29: AUX

30: ARM

31: VPUDMA

arch/arm/boot/dts/bcm2835-rpi-a-plus.dts

+4 −0
Original line number Diff line number Diff line
@@ -29,3 +29,7 @@ 
		brcm,function = <BCM2835_FSEL_ALT0>;

	};

};



&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

};

arch/arm/boot/dts/bcm2835-rpi-a.dts

+4 −0
Original line number Diff line number Diff line
@@ -22,3 +22,7 @@ 
		brcm,function = <BCM2835_FSEL_ALT2>;

	};

};



&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

};

arch/arm/boot/dts/bcm2835-rpi-b-plus.dts

+4 −0
Original line number Diff line number Diff line
@@ -29,3 +29,7 @@ 
		brcm,function = <BCM2835_FSEL_ALT0>;

	};

};



&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

};

arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts

+4 −0
Original line number Diff line number Diff line
@@ -22,3 +22,7 @@ 
		brcm,function = <BCM2835_FSEL_ALT2>;

	};

};



&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

};