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

Commit a606b0f1 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge tag 'v3.18.9' into msm-3.18



This is the 3.18.9 stable release

Change-Id: Ica4795b84ccfb8583b8db7c536bba48f38fb28df
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 2c03824a d1034e83
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 8
SUBLEVEL = 9
EXTRAVERSION =
NAME = Shuffling Zombie Juror

+2 −1
Original line number Diff line number Diff line
@@ -259,7 +259,8 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep)
#define pmd_clear(xp)			do { pmd_val(*(xp)) = 0; } while (0)

#define pte_page(x) (mem_map + \
		(unsigned long)(((pte_val(x) - PAGE_OFFSET) >> PAGE_SHIFT)))
		(unsigned long)(((pte_val(x) - CONFIG_LINUX_LINK_BASE) >> \
				PAGE_SHIFT)))

#define mk_pte(page, pgprot)						\
({									\
+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@

&usb0 {
	status = "okay";
	dr_mode = "peripheral";
};

&usb1 {
+3 −2
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@
			reg = <0x1d000 0x1000>;
			cache-unified;
			cache-level = <2>;
			cache-sets = <16>;
			cache-size = <0x80000>;
			cache-size = <524288>;
			cache-sets = <1024>;
			cache-line-size = <32>;
			interrupts = <GIC_PPI 0 IRQ_TYPE_LEVEL_HIGH>;
		};

+4 −4
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@
			reset-names = "2d";
		};

		gr3d@54140000 {
		gr3d@54180000 {
			compatible = "nvidia,tegra20-gr3d";
			reg = <0x54140000 0x00040000>;
			reg = <0x54180000 0x00040000>;
			clocks = <&tegra_car TEGRA20_CLK_GR3D>;
			resets = <&tegra_car 24>;
			reset-names = "3d";
@@ -130,9 +130,9 @@
			status = "disabled";
		};

		dsi@542c0000 {
		dsi@54300000 {
			compatible = "nvidia,tegra20-dsi";
			reg = <0x542c0000 0x00040000>;
			reg = <0x54300000 0x00040000>;
			clocks = <&tegra_car TEGRA20_CLK_DSI>;
			resets = <&tegra_car 48>;
			reset-names = "dsi";
Loading