evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: tegra: Device tree changes for v3.20

Browse source 
A couple of unit addresses fixes in device trees, addition of microphone
 detection on Chromebook 13 and a vendor prefix update.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJUwmxNAAoJEN0jrNd/PrOh/gUP/RYDOOkQZZf1TRgdlVquAYJD
 LKAyXzT76rIlOsQo333UUZ3l9t2fpQQWa1aJ03uzCaD5eIeBy+T3Caj1v3fzV/N/
 D/Jcr4wqZRin1bHWT+OB/m0i5EIJlPU6QSNvKA9WKJWLRrq5qNGb9aw78xX/q7/5
 nuUljiAPX3/ntWlh8RTco2Zs57sdP8cPS3Z85w043vqZaZW7AIA3c4oYQjBGkIZy
 +fNgGKSZiIX9Zn5jMBEf2AiX3rsmfDm/BwFGl6ZK4sMLTALle34Es8LQWtnxrbmB
 naLmlqJlPZuyCBgW+TpZqL5WAoaE2L+S9BA/YXMaRj+0EC1C67ISX9VBI8pjc6gI
 Sq9mbQU2ukA286SGcZM/sreUNP+jkMht+OA75bscq5svKLR6BQtwsizlep2jiSNe
 nD9wJeiius38MBwupsq+e53O87fq/ld9fL+1pUrdgJm4LYI2+MABukLo5IpfYTuV
 aOhHZIMvwEdj2Wbm448wJk3mJBosclC9FBzxEv5/QC5wCU6fHS2AfMZgimTPvooM
 mg6wuPmSURGyIzj9OrnfgZA/dn0VnKMAj9buFRiyCamKIe7W5qj32KsP1JRuxXE4
 odZCzEc9/CmkPGar1qdV9wdGZSNrge8uSyxBXvkdcMHwoH7wURQ2664m9Un26M+o
 aeVDRZlGSzdOdxl48zBg
 =6KYW
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.20-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

Merge "ARM: tegra: Device tree changes for v3.20" from Thierry Reding:

A couple of unit addresses fixes in device trees, addition of microphone
detection on Chromebook 13 and a vendor prefix update.

* tag 'tegra-for-3.20-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Update isl29028 compatible string to use isil vendor prefix
  ARM: tegra: Fix unit address for Cortex-A9 TWD timer
  ARM: dts: tegra20: fix GR3D, DSI unit and reg base addresses
  ARM: tegra: Enable the mic-detect gpio on Acer Chromebook 13

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-01-23 14:51:41 -08:00
commit 12fd74965f
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/tegra124-nyan-big.dts
View file

@ -1131,6 +1131,8 @@
clock-names = "pll_a", "pll_a_out0", "mclk"; clock-names = "pll_a", "pll_a_out0", "mclk";
nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(I, 7) GPIO_ACTIVE_HIGH>; nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(I, 7) GPIO_ACTIVE_HIGH>;
nvidia,mic-det-gpios =
<&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
}; };
}; };

10
arch/arm/boot/dts/tegra20.dtsi
View file

@ -68,9 +68,9 @@
reset-names = "2d"; reset-names = "2d";
}; };
gr3d@54140000 { gr3d@54180000 {
compatible = "nvidia,tegra20-gr3d"; compatible = "nvidia,tegra20-gr3d";
reg = <0x54140000 0x00040000>; reg = <0x54180000 0x00040000>;
clocks = <&tegra_car TEGRA20_CLK_GR3D>; clocks = <&tegra_car TEGRA20_CLK_GR3D>;
resets = <&tegra_car 24>; resets = <&tegra_car 24>;
reset-names = "3d"; reset-names = "3d";
@ -130,9 +130,9 @@
status = "disabled"; status = "disabled";
}; };
dsi@542c0000 { dsi@54300000 {
compatible = "nvidia,tegra20-dsi"; compatible = "nvidia,tegra20-dsi";
reg = <0x542c0000 0x00040000>; reg = <0x54300000 0x00040000>;
clocks = <&tegra_car TEGRA20_CLK_DSI>; clocks = <&tegra_car TEGRA20_CLK_DSI>;
resets = <&tegra_car 48>; resets = <&tegra_car 48>;
reset-names = "dsi"; reset-names = "dsi";
@ -140,7 +140,7 @@
}; };
}; };
timer@50004600 { timer@50040600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0x50040600 0x20>; reg = <0x50040600 0x20>;
interrupts = <GIC_PPI 13 interrupts = <GIC_PPI 13

2
arch/arm/boot/dts/tegra30-cardhu.dtsi
View file

@ -189,7 +189,7 @@
/* ALS and Proximity sensor */ /* ALS and Proximity sensor */
isl29028@44 { isl29028@44 {
compatible = "isl,isl29028"; compatible = "isil,isl29028";
reg = <0x44>; reg = <0x44>;
interrupt-parent = <&gpio>; interrupt-parent = <&gpio>;
interrupts = <TEGRA_GPIO(L, 0) IRQ_TYPE_LEVEL_HIGH>; interrupts = <TEGRA_GPIO(L, 0) IRQ_TYPE_LEVEL_HIGH>;

2
arch/arm/boot/dts/tegra30.dtsi
View file

@ -225,7 +225,7 @@
}; };
}; };
timer@50004600 { timer@50040600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0x50040600 0x20>; reg = <0x50040600 0x20>;
interrupts = <GIC_PPI 13 interrupts = <GIC_PPI 13