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

Commit d30c02ed authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.4.116 (20ddb25b) into msm-4.4"

parents 40cb3587 863577dd
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Adrian Bunk <bunk@stusta.de>
Alan Cox <alan@lxorguk.ukuu.org.uk>
Alan Cox <root@hraefn.swansea.linux.org.uk>
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
Al Viro <viro@ftp.linux.org.uk>
Al Viro <viro@zenIV.linux.org.uk>
Andreas Herrmann <aherrman@de.ibm.com>
@@ -85,6 +86,7 @@ Matthieu CASTET <castet.matthieu@free.fr>
Mayuresh Janorkar <mayur@ti.com>
Michael Buesch <m@bues.ch>
Michel Dänzer <michel@tungstengraphics.com>
Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
Mitesh shah <mshah@teja.com>
Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
Morten Welinder <terra@gnome.org>
+17 −0
Original line number Diff line number Diff line
Android Goldfish framebuffer

Android Goldfish framebuffer device used by Android emulator.

Required properties:

- compatible : should contain "google,goldfish-fb"
- reg        : <registers mapping>
- interrupts : <interrupt mapping>

Example:

	display-controller@1f008000 {
		compatible = "google,goldfish-fb";
		interrupts = <0x10>;
		reg = <0x1f008000 0x100>;
	};
+30 −0
Original line number Diff line number Diff line
Android Goldfish PIC

Android Goldfish programmable interrupt device used by Android
emulator.

Required properties:

- compatible : should contain "google,goldfish-pic"
- reg        : <registers mapping>
- interrupts : <interrupt mapping>

Example for mips when used in cascade mode:

        cpuintc {
                #interrupt-cells = <0x1>;
                #address-cells = <0>;
                interrupt-controller;
                compatible = "mti,cpu-interrupt-controller";
        };

        interrupt-controller@1f000000 {
                compatible = "google,goldfish-pic";
                reg = <0x1f000000 0x1000>;

                interrupt-controller;
                #interrupt-cells = <0x1>;

                interrupt-parent = <&cpuintc>;
                interrupts = <0x2>;
        };
+8 −0
Original line number Diff line number Diff line
Binding for MIPS Cluster Power Controller (CPC).

This binding allows a system to specify where the CPC registers are
located.

Required properties:
compatible : Should be "mti,mips-cpc".
regs: Should describe the address & size of the CPC register region.
+17 −0
Original line number Diff line number Diff line
Android Goldfish RTC

Android Goldfish RTC device used by Android emulator.

Required properties:

- compatible : should contain "google,goldfish-rtc"
- reg        : <registers mapping>
- interrupts : <interrupt mapping>

Example:

	goldfish_timer@9020000 {
		compatible = "google,goldfish-rtc";
		reg = <0x9020000 0x1000>;
		interrupts = <0x3>;
	};
Loading