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

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

Merge "Merge google common 'android-3.18' into 'msm-3.18'"

parents 862489a2 b3deec1f

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 100

SUBLEVEL = 102

EXTRAVERSION =

NAME = Diseased Newt

arch/alpha/kernel/console.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
struct pci_controller *pci_vga_hose;

static struct resource alpha_vga = {

	.name	= "alpha-vga+",

	.flags	= IORESOURCE_IO,

	.start	= 0x3C0,

	.end	= 0x3DF

};

arch/arm/boot/dts/am335x-pepper.dts

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 
&audio_codec {

	status = "okay";



	gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;

	reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

	AVDD-supply = <&ldo3_reg>;

	IOVDD-supply = <&ldo3_reg>;

	DRVDD-supply = <&ldo3_reg>;

arch/arm/boot/dts/moxart-uc7112lx.dts

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 */



/dts-v1/;

/include/ "moxart.dtsi"

#include "moxart.dtsi"



/ {

	model = "MOXA UC-7112-LX";

arch/arm/boot/dts/moxart.dtsi

+9 −8
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



/include/ "skeleton.dtsi"

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	compatible = "moxa,moxart";
@@ -36,8 +37,8 @@ 
		ranges;



		intc: interrupt-controller@98800000 {

			compatible = "moxa,moxart-ic";

			reg = <0x98800000 0x38>;

			compatible = "moxa,moxart-ic", "faraday,ftintc010";

			reg = <0x98800000 0x100>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-mask = <0x00080000>;
@@ -59,7 +60,7 @@ 
		timer: timer@98400000 {

			compatible = "moxa,moxart-timer";

			reg = <0x98400000 0x42>;

			interrupts = <19 1>;

			interrupts = <19 IRQ_TYPE_EDGE_FALLING>;

			clocks = <&clk_apb>;

		};
@@ -80,7 +81,7 @@ 
		dma: dma@90500000 {

			compatible = "moxa,moxart-dma";

			reg = <0x90500080 0x40>;

			interrupts = <24 0>;

			interrupts = <24 IRQ_TYPE_LEVEL_HIGH>;

			#dma-cells = <1>;

		};
@@ -93,7 +94,7 @@ 
		sdhci: sdhci@98e00000 {

			compatible = "moxa,moxart-sdhci";

			reg = <0x98e00000 0x5C>;

			interrupts = <5 0>;

			interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clk_apb>;

			dmas =  <&dma 5>,

				<&dma 5>;
@@ -120,7 +121,7 @@ 
		mac0: mac@90900000 {

			compatible = "moxa,moxart-mac";

			reg = <0x90900000 0x90>;

			interrupts = <25 0>;

			interrupts = <25 IRQ_TYPE_LEVEL_HIGH>;

			phy-handle = <&ethphy0>;

			phy-mode = "mii";

			status = "disabled";
@@ -129,7 +130,7 @@ 
		mac1: mac@92000000 {

			compatible = "moxa,moxart-mac";

			reg = <0x92000000 0x90>;

			interrupts = <27 0>;

			interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;

			phy-handle = <&ethphy1>;

			phy-mode = "mii";

			status = "disabled";
@@ -138,7 +139,7 @@ 
		uart0: uart@98200000 {

			compatible = "ns16550a";

			reg = <0x98200000 0x20>;

			interrupts = <31 8>;

			interrupts = <31 IRQ_TYPE_LEVEL_HIGH>;

			reg-shift = <2>;

			reg-io-width = <4>;

			clock-frequency = <14745600>;